Skip to content

Commit 1cef0b4

Browse files
committed
resolved deprecated toggleableActiveColor
1 parent 60efaca commit 1cef0b4

File tree

1 file changed

+92
-2
lines changed

1 file changed

+92
-2
lines changed

lib/theme/app_theme.dart

Lines changed: 92 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,54 @@ class AppTheme {
1010
),
1111
primaryColor: kBluePrimaryLT,
1212
disabledColor: kGreyLT,
13-
toggleableActiveColor: kIndigoSecondaryLT,
1413
colorScheme:
1514
ColorScheme.fromSwatch().copyWith(secondary: kIndigoSecondaryLT),
15+
switchTheme: SwitchThemeData(
16+
thumbColor: MaterialStateProperty.resolveWith<Color?>(
17+
(Set<MaterialState> states) {
18+
if (states.contains(MaterialState.disabled)) {
19+
return null;
20+
}
21+
if (states.contains(MaterialState.selected)) {
22+
return kIndigoSecondaryLT;
23+
}
24+
return null;
25+
}),
26+
trackColor: MaterialStateProperty.resolveWith<Color?>(
27+
(Set<MaterialState> states) {
28+
if (states.contains(MaterialState.disabled)) {
29+
return null;
30+
}
31+
if (states.contains(MaterialState.selected)) {
32+
return kIndigoSecondaryLT;
33+
}
34+
return null;
35+
}),
36+
),
37+
radioTheme: RadioThemeData(
38+
fillColor: MaterialStateProperty.resolveWith<Color?>(
39+
(Set<MaterialState> states) {
40+
if (states.contains(MaterialState.disabled)) {
41+
return null;
42+
}
43+
if (states.contains(MaterialState.selected)) {
44+
return kIndigoSecondaryLT;
45+
}
46+
return null;
47+
}),
48+
),
49+
checkboxTheme: CheckboxThemeData(
50+
fillColor: MaterialStateProperty.resolveWith<Color?>(
51+
(Set<MaterialState> states) {
52+
if (states.contains(MaterialState.disabled)) {
53+
return null;
54+
}
55+
if (states.contains(MaterialState.selected)) {
56+
return kIndigoSecondaryLT;
57+
}
58+
return null;
59+
}),
60+
),
1661
);
1762

1863
static final ThemeData darkTheme = ThemeData.dark().copyWith(
@@ -23,7 +68,52 @@ class AppTheme {
2368
),
2469
primaryColor: kPrimaryDT,
2570
disabledColor: kGreyDT,
26-
toggleableActiveColor: kSecondaryDT,
2771
colorScheme: ColorScheme.fromSwatch().copyWith(secondary: kSecondaryDT),
72+
switchTheme: SwitchThemeData(
73+
thumbColor: MaterialStateProperty.resolveWith<Color?>(
74+
(Set<MaterialState> states) {
75+
if (states.contains(MaterialState.disabled)) {
76+
return null;
77+
}
78+
if (states.contains(MaterialState.selected)) {
79+
return kSecondaryDT;
80+
}
81+
return null;
82+
}),
83+
trackColor: MaterialStateProperty.resolveWith<Color?>(
84+
(Set<MaterialState> states) {
85+
if (states.contains(MaterialState.disabled)) {
86+
return null;
87+
}
88+
if (states.contains(MaterialState.selected)) {
89+
return kSecondaryDT;
90+
}
91+
return null;
92+
}),
93+
),
94+
radioTheme: RadioThemeData(
95+
fillColor: MaterialStateProperty.resolveWith<Color?>(
96+
(Set<MaterialState> states) {
97+
if (states.contains(MaterialState.disabled)) {
98+
return null;
99+
}
100+
if (states.contains(MaterialState.selected)) {
101+
return kSecondaryDT;
102+
}
103+
return null;
104+
}),
105+
),
106+
checkboxTheme: CheckboxThemeData(
107+
fillColor: MaterialStateProperty.resolveWith<Color?>(
108+
(Set<MaterialState> states) {
109+
if (states.contains(MaterialState.disabled)) {
110+
return null;
111+
}
112+
if (states.contains(MaterialState.selected)) {
113+
return kSecondaryDT;
114+
}
115+
return null;
116+
}),
117+
),
28118
);
29119
}

0 commit comments

Comments
 (0)