Merge branch 'main' into referral

This commit is contained in:
Neeraj Gupta 2023-02-16 16:13:17 +05:30
commit 24bc8146c5
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
2 changed files with 28 additions and 3 deletions

View file

@ -26,7 +26,7 @@ jobs:
- uses: subosito/flutter-action@v2
with:
channel: 'stable'
flutter-version: '3.7.1'
flutter-version: '3.7.3'
# Fetch sub modules
- run: git submodule update --init --recursive

View file

@ -27,7 +27,7 @@ final lightThemeData = ThemeData(
onPrimary: const Color.fromRGBO(255, 255, 255, 1),
primary: const Color.fromRGBO(0, 0, 0, 1),
),
toggleableActiveColor: const Color.fromRGBO(102, 187, 106, 1),
switchTheme: getSwitchThemeData(const Color.fromRGBO(102, 187, 106, 1)),
scaffoldBackgroundColor: const Color.fromRGBO(255, 255, 255, 1),
backgroundColor: const Color.fromRGBO(255, 255, 255, 1),
appBarTheme: const AppBarTheme().copyWith(
@ -97,7 +97,7 @@ final darkThemeData = ThemeData(
buttonColor: const Color.fromRGBO(45, 194, 98, 1.0),
),
textTheme: _buildTextTheme(const Color.fromRGBO(255, 255, 255, 1)),
toggleableActiveColor: const Color.fromRGBO(102, 187, 106, 1),
switchTheme: getSwitchThemeData(const Color.fromRGBO(102, 187, 106, 1)),
outlinedButtonTheme: buildOutlinedButtonThemeData(
bgDisabled: const Color.fromRGBO(158, 158, 158, 1),
bgEnabled: const Color.fromRGBO(255, 255, 255, 1),
@ -411,3 +411,28 @@ ElevatedButtonThemeData buildElevatedButtonThemeData({
),
);
}
SwitchThemeData getSwitchThemeData(Color activeColor) {
return SwitchThemeData(
thumbColor:
MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return activeColor;
}
return null;
}),
trackColor:
MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return activeColor;
}
return null;
}),
);
}