Skip to content

Commit 7c2fb77

Browse files
Yacine2731Yacine2731
committed
fix the UI
1 parent 8b9ee08 commit 7c2fb77

File tree

10 files changed

+507
-485
lines changed

10 files changed

+507
-485
lines changed

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png

3.08 KB
Loading

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png

6.43 KB
Loading

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png

3.37 KB
Loading

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png

6.41 KB
Loading

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png

4.64 KB
Loading

‎ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png

8.28 KB
Loading

‎lib/Pages/home_page.dart

Lines changed: 330 additions & 432 deletions
Large diffs are not rendered by default.

‎lib/Pages/settings_page.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ class _SettingsPageState extends State<SettingsPage> {
229229
),
230230
),
231231
ListView(
232+
physics: const BouncingScrollPhysics(),
232233
shrinkWrap: true,
233234
children: _themes.map((theme) {
234235
return Padding(

‎lib/utils/strings.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ import '../widgets/app_theme.dart';
22

33
final appThemes = {
44
material: 'Material',
5+
materialHighContrast: 'Material High Contrast',
6+
espressoAndCream: 'Espresso and Cream',
57
indigoTheme: 'Indigo Nights',
68
blueWhaleTheme: 'Blue Whale',
79
goldSunset: 'Gold Sunset',
810
dellGenoaGreen: 'Dell Genoe Green',
11+
greyLaw: 'Grey Law',
12+
camaroneGreen: 'Camarone Green',
13+
rustDeepOrange: 'Rust Deep Orange',
914
};
1015

1116
const system = 'system';

‎lib/widgets/app_theme.dart

Lines changed: 171 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -26,104 +26,119 @@ class AppTheme {
2626
});
2727
}
2828

29-
3029
AppTheme indigoTheme = AppTheme(
3130
name: 'Indigo Nights',
3231
lightTheme: FlexThemeData.light(
33-
useMaterial3: true,
3432
scheme: FlexScheme.indigo,
3533
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
36-
blendLevel: 9,
34+
blendLevel: 7,
3735
subThemesData: const FlexSubThemesData(
3836
blendOnLevel: 10,
3937
blendOnColors: false,
40-
navigationBarHeight: 70,
38+
useM2StyleDividerInM3: true,
4139
),
4240
visualDensity: FlexColorScheme.comfortablePlatformDensity,
43-
fontFamily: 'Cairo',
44-
41+
useMaterial3: true,
42+
swapLegacyOnMaterial3: true,
4543
),
4644
darkTheme: FlexThemeData.dark(
47-
useMaterial3: true,
4845
scheme: FlexScheme.indigo,
4946
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
50-
blendLevel: 15,
47+
blendLevel: 13,
5148
subThemesData: const FlexSubThemesData(
5249
blendOnLevel: 20,
53-
navigationBarHeight: 70,
50+
useM2StyleDividerInM3: true,
5451
),
5552
visualDensity: FlexColorScheme.comfortablePlatformDensity,
56-
fontFamily: 'Cairo',
53+
useMaterial3: true,
54+
swapLegacyOnMaterial3: true,
5755
),
5856
);
5957

60-
61-
62-
6358
AppTheme blueWhaleTheme = AppTheme(
6459
name: 'Blue Whale',
6560
lightTheme: FlexThemeData.light(
66-
useMaterial3: true,
6761
scheme: FlexScheme.blueWhale,
6862
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
69-
blendLevel: 9,
63+
blendLevel: 7,
7064
subThemesData: const FlexSubThemesData(
7165
blendOnLevel: 10,
7266
blendOnColors: false,
73-
navigationBarHeight: 70,
67+
useM2StyleDividerInM3: true,
7468
),
7569
visualDensity: FlexColorScheme.comfortablePlatformDensity,
76-
fontFamily: 'Cairo',
77-
70+
useMaterial3: true,
71+
swapLegacyOnMaterial3: true,
7872
),
7973
darkTheme: FlexThemeData.dark(
80-
useMaterial3: true,
8174
scheme: FlexScheme.blueWhale,
8275
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
83-
blendLevel: 15,
76+
blendLevel: 13,
8477
subThemesData: const FlexSubThemesData(
8578
blendOnLevel: 20,
86-
navigationBarHeight: 70,
87-
79+
useM2StyleDividerInM3: true,
8880
),
8981
visualDensity: FlexColorScheme.comfortablePlatformDensity,
90-
fontFamily: 'Cairo',
91-
82+
useMaterial3: true,
83+
swapLegacyOnMaterial3: true,
9284
),
9385
);
9486

9587
AppTheme material = AppTheme(
9688
name: 'Material',
9789
lightTheme: FlexThemeData.light(
98-
useMaterial3: true,
9990
scheme: FlexScheme.material,
10091
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
101-
blendLevel: 9,
92+
blendLevel: 7,
10293
subThemesData: const FlexSubThemesData(
10394
blendOnLevel: 10,
10495
blendOnColors: false,
105-
navigationBarHeight: 70,
106-
96+
useM2StyleDividerInM3: true,
10797
),
10898
visualDensity: FlexColorScheme.comfortablePlatformDensity,
99+
useMaterial3: true,
109100
swapLegacyOnMaterial3: true,
110-
fontFamily: 'Cairo',
111-
112101
),
113102
darkTheme: FlexThemeData.dark(
114-
useMaterial3: true,
115103
scheme: FlexScheme.material,
116104
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
117-
blendLevel: 15,
105+
blendLevel: 13,
118106
subThemesData: const FlexSubThemesData(
119107
blendOnLevel: 20,
120-
navigationBarHeight: 70,
121-
108+
useM2StyleDividerInM3: true,
122109
),
123110
visualDensity: FlexColorScheme.comfortablePlatformDensity,
111+
useMaterial3: true,
124112
swapLegacyOnMaterial3: true,
125-
fontFamily: 'Cairo',
113+
),
114+
);
126115

116+
AppTheme materialHighContrast = AppTheme(
117+
name: 'Material High Contrast',
118+
lightTheme: FlexThemeData.light(
119+
scheme: FlexScheme.materialHc,
120+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
121+
blendLevel: 7,
122+
subThemesData: const FlexSubThemesData(
123+
blendOnLevel: 10,
124+
blendOnColors: false,
125+
useM2StyleDividerInM3: true,
126+
),
127+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
128+
useMaterial3: true,
129+
swapLegacyOnMaterial3: true,
130+
),
131+
darkTheme: FlexThemeData.dark(
132+
scheme: FlexScheme.materialHc,
133+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
134+
blendLevel: 13,
135+
subThemesData: const FlexSubThemesData(
136+
blendOnLevel: 20,
137+
useM2StyleDividerInM3: true,
138+
),
139+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
140+
useMaterial3: true,
141+
swapLegacyOnMaterial3: true,
127142
),
128143
);
129144

@@ -132,68 +147,171 @@ AppTheme goldSunset = AppTheme(
132147
lightTheme: FlexThemeData.light(
133148
scheme: FlexScheme.gold,
134149
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
135-
blendLevel: 9,
150+
blendLevel: 7,
136151
subThemesData: const FlexSubThemesData(
137152
blendOnLevel: 10,
138153
blendOnColors: false,
139-
navigationBarHeight: 70,
140-
154+
useM2StyleDividerInM3: true,
141155
),
142156
visualDensity: FlexColorScheme.comfortablePlatformDensity,
143157
useMaterial3: true,
144158
swapLegacyOnMaterial3: true,
145-
fontFamily: 'Cairo',
146-
147159
),
148160
darkTheme: FlexThemeData.dark(
149161
scheme: FlexScheme.gold,
150162
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
151-
blendLevel: 15,
163+
blendLevel: 13,
152164
subThemesData: const FlexSubThemesData(
153165
blendOnLevel: 20,
154-
navigationBarHeight: 70,
155-
166+
useM2StyleDividerInM3: true,
156167
),
157168
visualDensity: FlexColorScheme.comfortablePlatformDensity,
158169
useMaterial3: true,
159170
swapLegacyOnMaterial3: true,
160-
fontFamily: 'Cairo',
161-
162171
),
163-
164172
);
165173

166174
AppTheme dellGenoaGreen = AppTheme(
167175
name: 'Dell Genoe Green',
168176
lightTheme: FlexThemeData.light(
169177
scheme: FlexScheme.dellGenoa,
170178
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
171-
blendLevel: 9,
179+
blendLevel: 7,
172180
subThemesData: const FlexSubThemesData(
173181
blendOnLevel: 10,
174182
blendOnColors: false,
175-
navigationBarHeight: 70,
183+
useM2StyleDividerInM3: true,
184+
),
185+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
186+
useMaterial3: true,
187+
swapLegacyOnMaterial3: true,
188+
),
189+
darkTheme: FlexThemeData.dark(
190+
scheme: FlexScheme.dellGenoa,
191+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
192+
blendLevel: 13,
193+
subThemesData: const FlexSubThemesData(
194+
blendOnLevel: 20,
195+
useM2StyleDividerInM3: true,
196+
),
197+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
198+
useMaterial3: true,
199+
swapLegacyOnMaterial3: true,
200+
),
201+
);
176202

203+
AppTheme greyLaw = AppTheme(
204+
name: 'Grey Law',
205+
lightTheme: FlexThemeData.light(
206+
scheme: FlexScheme.greyLaw,
207+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
208+
blendLevel: 7,
209+
subThemesData: const FlexSubThemesData(
210+
blendOnLevel: 10,
211+
blendOnColors: false,
212+
useM2StyleDividerInM3: true,
177213
),
178214
visualDensity: FlexColorScheme.comfortablePlatformDensity,
179215
useMaterial3: true,
180216
swapLegacyOnMaterial3: true,
181-
fontFamily: 'Cairo',
217+
),
218+
darkTheme: FlexThemeData.dark(
219+
scheme: FlexScheme.greyLaw,
220+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
221+
blendLevel: 13,
222+
subThemesData: const FlexSubThemesData(
223+
blendOnLevel: 20,
224+
useM2StyleDividerInM3: true,
225+
),
226+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
227+
useMaterial3: true,
228+
swapLegacyOnMaterial3: true,
229+
),
230+
);
182231

232+
AppTheme camaroneGreen = AppTheme(
233+
name: 'Camarone Green',
234+
lightTheme: FlexThemeData.light(
235+
scheme: FlexScheme.greenM3,
236+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
237+
blendLevel: 7,
238+
subThemesData: const FlexSubThemesData(
239+
blendOnLevel: 10,
240+
blendOnColors: false,
241+
useM2StyleDividerInM3: true,
242+
),
243+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
244+
useMaterial3: true,
245+
swapLegacyOnMaterial3: true,
183246
),
184247
darkTheme: FlexThemeData.dark(
185-
scheme: FlexScheme.dellGenoa,
248+
scheme: FlexScheme.greenM3,
186249
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
187-
blendLevel: 15,
250+
blendLevel: 13,
188251
subThemesData: const FlexSubThemesData(
189252
blendOnLevel: 20,
190-
navigationBarHeight: 70,
253+
useM2StyleDividerInM3: true,
254+
),
255+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
256+
useMaterial3: true,
257+
swapLegacyOnMaterial3: true,
258+
),
259+
);
191260

261+
AppTheme rustDeepOrange = AppTheme(
262+
name: 'Rust Deep Orange',
263+
lightTheme: FlexThemeData.light(
264+
scheme: FlexScheme.deepOrangeM3,
265+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
266+
blendLevel: 7,
267+
subThemesData: const FlexSubThemesData(
268+
blendOnLevel: 10,
269+
blendOnColors: false,
270+
useM2StyleDividerInM3: true,
192271
),
193272
visualDensity: FlexColorScheme.comfortablePlatformDensity,
194273
useMaterial3: true,
195274
swapLegacyOnMaterial3: true,
196-
fontFamily: 'Cairo',
275+
),
276+
darkTheme: FlexThemeData.dark(
277+
scheme: FlexScheme.deepOrangeM3,
278+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
279+
blendLevel: 13,
280+
subThemesData: const FlexSubThemesData(
281+
blendOnLevel: 20,
282+
useM2StyleDividerInM3: true,
283+
),
284+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
285+
useMaterial3: true,
286+
swapLegacyOnMaterial3: true,
287+
),
288+
);
197289

290+
AppTheme espressoAndCream = AppTheme(
291+
name: 'Espresso and Cream',
292+
lightTheme: FlexThemeData.light(
293+
scheme: FlexScheme.espresso,
294+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
295+
blendLevel: 7,
296+
subThemesData: const FlexSubThemesData(
297+
blendOnLevel: 10,
298+
blendOnColors: false,
299+
useM2StyleDividerInM3: true,
300+
),
301+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
302+
useMaterial3: true,
303+
swapLegacyOnMaterial3: true,
304+
),
305+
darkTheme: FlexThemeData.dark(
306+
scheme: FlexScheme.espresso,
307+
surfaceMode: FlexSurfaceMode.levelSurfacesLowScaffold,
308+
blendLevel: 13,
309+
subThemesData: const FlexSubThemesData(
310+
blendOnLevel: 20,
311+
useM2StyleDividerInM3: true,
312+
),
313+
visualDensity: FlexColorScheme.comfortablePlatformDensity,
314+
useMaterial3: true,
315+
swapLegacyOnMaterial3: true,
198316
),
199317
);

0 commit comments

Comments
 (0)