Commit 7172961
committed
feat: Implement adaptive Master-Detail layout for Settings
- Refactor Settings screen into a Master-Detail architecture using `ListDetailPaneScaffold`.
- Create `SettingsCategoriesViewModel` and `SettingsMasterScreen` to manage category selection (Theme, Security, Info).
- Move detailed preference logic to `SettingsDetailScreen` and separate components into `ThemePreferences`, `SecurityPreferences`, and `InfoPreferences`.
- Update `AdaptiveInteractor` and `SettingsViewModel` to synchronize category selection state across adaptive panes.
- Add pull-to-refresh support to both settings master and detail views for state re-sync.
- Introduce `SettingsCategory` enum in the domain module to standardize category identification.
- Optimize adaptive UI components by extracting `VerticalPaneExpansionDragHandle` and `selectedListItemColor` into shared composables.
- Update `Router` and its implementations to better handle the lifecycle and navigation of the adaptive navigator.
- Enhance UI tests and test screens to accommodate the new settings navigation flow and categories.
- Improve build efficiency by updating the `build_quick.sh` script to more accurately exclude redundant iOS-related Gradle tasks.
- Disable the `ui:test` CocoaPods release framework for iOS simulators to reduce unnecessary linking during test execution.1 parent 3f69453 commit 7172961
42 files changed
Lines changed: 954 additions & 376 deletions
File tree
- .github/workflows
- app
- android/src/androidTest/java/com/softartdev/notedelight/ui
- desktop/src/jvmTest/kotlin/com/softartdev/notedelight/ui
- iosApp
- Pods/Pods.xcodeproj
- iosApp.xcworkspace/xcuserdata/artur.xcuserdatad
- core
- domain/src/commonMain/kotlin/com/softartdev/notedelight/model
- presentation
- src
- androidHostTest/kotlin/com/softartdev/notedelight/presentation
- adaptive
- settings
- commonMain/kotlin/com/softartdev/notedelight
- interactor
- presentation/settings
- docs
- gradle
- ui
- test
- src/commonMain/kotlin/com/softartdev/notedelight
- ui
- cases
- screen
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
40 | 42 | | |
41 | 43 | | |
42 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
225 | 225 | | |
226 | 226 | | |
227 | 227 | | |
| 228 | + | |
228 | 229 | | |
229 | 230 | | |
230 | 231 | | |
| |||
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
38 | 42 | | |
39 | | - | |
| |||
Lines changed: 7 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
107 | | - | |
108 | | - | |
109 | | - | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
110 | 113 | | |
111 | 114 | | |
112 | 115 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Lines changed: 13 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| 59 | + | |
59 | 60 | | |
60 | 61 | | |
61 | 62 | | |
| |||
68 | 69 | | |
69 | 70 | | |
70 | 71 | | |
71 | | - | |
| 72 | + | |
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| |||
Lines changed: 74 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
| 13 | + | |
12 | 14 | | |
13 | 15 | | |
14 | 16 | | |
15 | 17 | | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
| 21 | + | |
19 | 22 | | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
20 | 28 | | |
21 | 29 | | |
22 | 30 | | |
23 | 31 | | |
| 32 | + | |
| 33 | + | |
24 | 34 | | |
25 | 35 | | |
26 | 36 | | |
| |||
52 | 62 | | |
53 | 63 | | |
54 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
55 | 68 | | |
56 | 69 | | |
57 | | - | |
| 70 | + | |
58 | 71 | | |
59 | 72 | | |
| 73 | + | |
| 74 | + | |
60 | 75 | | |
61 | 76 | | |
62 | 77 | | |
| |||
84 | 99 | | |
85 | 100 | | |
86 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
87 | 115 | | |
88 | 116 | | |
89 | 117 | | |
| |||
93 | 121 | | |
94 | 122 | | |
95 | 123 | | |
96 | | - | |
| 124 | + | |
97 | 125 | | |
98 | 126 | | |
99 | 127 | | |
| |||
103 | 131 | | |
104 | 132 | | |
105 | 133 | | |
106 | | - | |
| 134 | + | |
107 | 135 | | |
108 | 136 | | |
109 | 137 | | |
110 | 138 | | |
111 | 139 | | |
112 | | - | |
| 140 | + | |
113 | 141 | | |
114 | 142 | | |
115 | 143 | | |
116 | 144 | | |
117 | 145 | | |
118 | 146 | | |
119 | | - | |
| 147 | + | |
120 | 148 | | |
121 | 149 | | |
122 | 150 | | |
| |||
138 | 166 | | |
139 | 167 | | |
140 | 168 | | |
141 | | - | |
| 169 | + | |
142 | 170 | | |
143 | 171 | | |
144 | 172 | | |
145 | 173 | | |
146 | 174 | | |
147 | | - | |
| 175 | + | |
148 | 176 | | |
149 | 177 | | |
150 | 178 | | |
| |||
163 | 191 | | |
164 | 192 | | |
165 | 193 | | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
166 | 233 | | |
Lines changed: 28 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
| |||
38 | 39 | | |
39 | 40 | | |
40 | 41 | | |
41 | | - | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
42 | 52 | | |
43 | 53 | | |
44 | 54 | | |
| |||
58 | 68 | | |
59 | 69 | | |
60 | 70 | | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
61 | 88 | | |
62 | 89 | | |
63 | 90 | | |
| |||
0 commit comments