@@ -17,27 +17,25 @@ class AppTheme {
1717 focusColor: ColorManager .black,
1818 disabledColor: ColorManager .blackOp50,
1919 switchTheme: const SwitchThemeData (),
20- dialogBackgroundColor: ColorManager .whiteD1,
2120 hoverColor: ColorManager .blackOp50,
22- indicatorColor: ColorManager .blackOp40,
2321 highlightColor: ColorManager .whiteD3,
2422 bottomSheetTheme: const BottomSheetThemeData (
2523 backgroundColor: ColorManager .white,
2624 surfaceTintColor: ColorManager .white,
2725 shadowColor: ColorManager .white,
2826 ),
29- dialogTheme: const DialogTheme (surfaceTintColor: ColorManager .whiteD5),
27+ dialogTheme: const DialogThemeData (surfaceTintColor: ColorManager .whiteD5),
3028 dividerColor: ColorManager .blackOp10,
3129 scaffoldBackgroundColor: ColorManager .white,
3230 iconTheme: const IconThemeData (color: ColorManager .black),
3331 outlinedButtonTheme: _outlinedButtonTheme (),
3432 elevatedButtonTheme: _elevatedButtonThemeData (),
3533 textButtonTheme: const TextButtonThemeData (
3634 style: ButtonStyle (
37- overlayColor: WidgetStatePropertyAll (
38- ColorManager .whiteD3,
39- ),
40- )),
35+ overlayColor: WidgetStatePropertyAll (
36+ ColorManager .whiteD3,
37+ ),
38+ )),
4139 chipTheme: const ChipThemeData (backgroundColor: ColorManager .blackOp10),
4240 canvasColor: ColorManager .transparent,
4341 splashColor: ColorManager .white,
@@ -56,20 +54,16 @@ class AppTheme {
5654 // circle avatar color
5755 primaryContainer: ColorManager .whiteD4,
5856 surface: ColorManager .whiteD3,
59- )
60- .copyWith (surface: ColorManager .whiteD5)
61- .copyWith (error: ColorManager .black),
57+ ).copyWith (surface: ColorManager .whiteD5).copyWith (error: ColorManager .black),
6258 );
6359 }
6460
6561 static ElevatedButtonThemeData _elevatedButtonThemeData () {
6662 return ElevatedButtonThemeData (
6763 style: ButtonStyle (
6864 fixedSize: WidgetStateProperty .all <Size >(Size (double .maxFinite, 45. r)),
69- backgroundColor: WidgetStateProperty .resolveWith <Color ?>(
70- (_) => ColorManager .whiteD2),
71- overlayColor: WidgetStateProperty .resolveWith <Color ?>(
72- (_) => ColorManager .whiteOp20),
65+ backgroundColor: WidgetStateProperty .resolveWith <Color ?>((_) => ColorManager .whiteD2),
66+ overlayColor: WidgetStateProperty .resolveWith <Color ?>((_) => ColorManager .whiteOp20),
7367 shape: WidgetStateProperty .all <RoundedRectangleBorder >(
7468 const RoundedRectangleBorder (borderRadius: BorderRadius .zero),
7569 ),
@@ -81,15 +75,14 @@ class AppTheme {
8175 return OutlinedButtonThemeData (
8276 style: OutlinedButton .styleFrom (
8377 fixedSize: Size (double .maxFinite, 45. r),
84- shape:
85- RoundedRectangleBorder (borderRadius: BorderRadius .circular (50. r)),
78+ shape: RoundedRectangleBorder (borderRadius: BorderRadius .circular (50. r)),
8679 side: BorderSide (width: 1. r, color: ColorManager .whiteD5),
8780 ),
8881 );
8982 }
9083
91- static TabBarTheme _tabBarTheme () {
92- return TabBarTheme (
84+ static TabBarThemeData _tabBarTheme () {
85+ return TabBarThemeData (
9386 indicatorSize: TabBarIndicatorSize .label,
9487 labelPadding: EdgeInsets .zero,
9588 indicator: BoxDecoration (
@@ -105,20 +98,16 @@ class AppTheme {
10598 static TextTheme _textTheme () {
10699 return TextTheme (
107100 bodyLarge: _getStyle (const GetRegularStyle (color: ColorManager .greyD4)),
108- bodyMedium: _getStyle (
109- const GetRegularStyle (color: ColorManager .greyD5, fontSize: 12 )),
101+ bodyMedium: _getStyle (const GetRegularStyle (color: ColorManager .greyD5, fontSize: 12 )),
110102 bodySmall: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
111103 titleSmall: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
112104 labelSmall: _getStyle (const GetMediumStyle (color: ColorManager .greyD2)),
113105 displaySmall: _getStyle (const GetMediumStyle (color: ColorManager .greyD2)),
114106 displayLarge: _getStyle (const GetMediumStyle (color: ColorManager .grey)),
115107 displayMedium: _getStyle (const GetMediumStyle (color: ColorManager .grey)),
116- headlineLarge:
117- _getStyle (const GetRegularStyle (color: ColorManager .whiteD3)),
118- headlineMedium:
119- _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
120- headlineSmall:
121- _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
108+ headlineLarge: _getStyle (const GetRegularStyle (color: ColorManager .whiteD3)),
109+ headlineMedium: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
110+ headlineSmall: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
122111 labelLarge: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
123112 labelMedium: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
124113 titleLarge: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
@@ -139,8 +128,7 @@ class AppTheme {
139128 shadowColor: ColorManager .blackOp20,
140129 scrolledUnderElevation: 1.5 .r,
141130 iconTheme: const IconThemeData (color: ColorManager .black),
142- titleTextStyle: const GetRegularStyle (
143- fontSize: 16 , color: ColorManager .black),
131+ titleTextStyle: const GetRegularStyle (fontSize: 16 , color: ColorManager .black),
144132 );
145133 }
146134
@@ -155,16 +143,14 @@ class AppTheme {
155143 shadowColor: ColorManager .whiteOp10,
156144 focusColor: ColorManager .white,
157145 disabledColor: ColorManager .whiteOp50,
158- dialogBackgroundColor: ColorManager .blackL1,
159146 hoverColor: ColorManager .whiteOp50,
160- indicatorColor: ColorManager .whiteOp40,
161147 highlightColor: ColorManager .blackL3Blue,
162148 bottomSheetTheme: const BottomSheetThemeData (
163149 backgroundColor: ColorManager .blackL5,
164150 surfaceTintColor: ColorManager .blackL5,
165151 shadowColor: ColorManager .blackL5,
166152 ),
167- dialogTheme: const DialogTheme (surfaceTintColor: ColorManager .blackL5),
153+ dialogTheme: const DialogThemeData (surfaceTintColor: ColorManager .blackL5),
168154 dividerColor: ColorManager .whiteOp10,
169155 scaffoldBackgroundColor: ColorManager .blackBlue,
170156 iconTheme: const IconThemeData (color: ColorManager .white),
@@ -191,20 +177,16 @@ class AppTheme {
191177 colorScheme: const ColorScheme .highContrastDark (
192178 primaryContainer: ColorManager .blackL4,
193179 surface: ColorManager .blackL6,
194- )
195- .copyWith (surface: ColorManager .blackL6)
196- .copyWith (error: ColorManager .white),
180+ ).copyWith (surface: ColorManager .blackL6).copyWith (error: ColorManager .white),
197181 );
198182 }
199183
200184 static ElevatedButtonThemeData _elevatedButtonDarkThemeData () {
201185 return ElevatedButtonThemeData (
202186 style: ButtonStyle (
203187 fixedSize: WidgetStateProperty .all <Size >(Size (double .maxFinite, 45. r)),
204- backgroundColor: WidgetStateProperty .resolveWith <Color ?>(
205- (_) => ColorManager .blackL2),
206- overlayColor: WidgetStateProperty .resolveWith <Color ?>(
207- (_) => ColorManager .blackOp20),
188+ backgroundColor: WidgetStateProperty .resolveWith <Color ?>((_) => ColorManager .blackL2),
189+ overlayColor: WidgetStateProperty .resolveWith <Color ?>((_) => ColorManager .blackOp20),
208190 shape: WidgetStateProperty .all <RoundedRectangleBorder >(
209191 const RoundedRectangleBorder (borderRadius: BorderRadius .zero),
210192 ),
@@ -216,15 +198,14 @@ class AppTheme {
216198 return OutlinedButtonThemeData (
217199 style: OutlinedButton .styleFrom (
218200 fixedSize: Size (double .maxFinite, 45. r),
219- shape:
220- RoundedRectangleBorder (borderRadius: BorderRadius .circular (50. r)),
201+ shape: RoundedRectangleBorder (borderRadius: BorderRadius .circular (50. r)),
221202 side: BorderSide (width: 1. r, color: ColorManager .whiteD5),
222203 ),
223204 );
224205 }
225206
226- static TabBarTheme _tabBarDarkTheme () {
227- return TabBarTheme (
207+ static TabBarThemeData _tabBarDarkTheme () {
208+ return TabBarThemeData (
228209 indicatorSize: TabBarIndicatorSize .label,
229210 labelPadding: EdgeInsets .zero,
230211 indicator: BoxDecoration (
@@ -240,20 +221,16 @@ class AppTheme {
240221 static TextTheme _textDarkTheme () {
241222 return TextTheme (
242223 bodyLarge: _getStyle (const GetRegularStyle (color: ColorManager .greyD1)),
243- bodyMedium: _getStyle (
244- const GetRegularStyle (color: ColorManager .grey, fontSize: 12 )),
224+ bodyMedium: _getStyle (const GetRegularStyle (color: ColorManager .grey, fontSize: 12 )),
245225 bodySmall: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
246226 titleSmall: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
247227 labelSmall: _getStyle (const GetMediumStyle (color: ColorManager .greyD2)),
248228 displaySmall: _getStyle (const GetMediumStyle (color: ColorManager .greyD2)),
249229 displayLarge: _getStyle (const GetMediumStyle (color: ColorManager .grey)),
250230 displayMedium: _getStyle (const GetMediumStyle (color: ColorManager .grey)),
251- headlineLarge:
252- _getStyle (const GetRegularStyle (color: ColorManager .blackL3Blue)),
253- headlineMedium:
254- _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
255- headlineSmall:
256- _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
231+ headlineLarge: _getStyle (const GetRegularStyle (color: ColorManager .blackL3Blue)),
232+ headlineMedium: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
233+ headlineSmall: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
257234 labelLarge: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
258235 labelMedium: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
259236 titleLarge: _getStyle (const GetRegularStyle (color: ColorManager .greyD2)),
@@ -270,8 +247,7 @@ class AppTheme {
270247 shadowColor: ColorManager .greyD8,
271248 scrolledUnderElevation: 1.5 .r,
272249 iconTheme: const IconThemeData (color: ColorManager .white),
273- titleTextStyle: const GetRegularStyle (
274- fontSize: 16 , color: ColorManager .white),
250+ titleTextStyle: const GetRegularStyle (fontSize: 16 , color: ColorManager .white),
275251 );
276252 }
277253}
0 commit comments