feat: fix material3

muxable · Apr 29, 2024 · 815b231 · 815b231
1 parent 66b72ed
commit 815b231
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 118 deletions.
diff --git a/lib/screens/onboarding.dart b/lib/screens/onboarding.dart
@@ -19,6 +19,7 @@ class OnboardingScreen extends StatelessWidget {
       data: Themes.darkTheme,
       child: Scaffold(
           resizeToAvoidBottomInset: false,
+          backgroundColor: Colors.black,
           body: SafeArea(
             child: Center(
               child: Padding(

diff --git a/lib/themes.dart b/lib/themes.dart
@@ -38,80 +38,26 @@ final primarySwatch = generateMaterialColor(accentColor);
 
 class Themes {
   static final lightTheme = ThemeData(
-      fontFamily: GoogleFonts.poppins().fontFamily,
-      brightness: Brightness.light,
-      colorScheme: ColorScheme.fromSwatch(
-        primarySwatch: primarySwatch,
-        accentColor: lightAccentColor,
-      ).copyWith(
-        primary: lightAccentColor,
-        secondary: lightAccentColor,
-        tertiary: detailColor,
-        background: Colors.white,
-      ),
-      indicatorColor: lightAccentColor,
-      inputDecorationTheme: const InputDecorationTheme(
-        fillColor: lightTextFieldColor,
-      ),
-      appBarTheme: const AppBarTheme(
-          color: detailColor,
-          titleTextStyle: TextStyle(color: Colors.white, fontSize: 20),
-          iconTheme: IconThemeData(
-            color: Colors.white,
-          )),
-      tabBarTheme: const TabBarTheme(labelColor: lightAccentColor),
-      checkboxTheme: CheckboxThemeData(
-        fillColor: MaterialStateProperty.resolveWith<Color?>(
-            (Set<MaterialState> states) {
-          if (states.contains(MaterialState.disabled)) {
-            return null;
-          }
-          if (states.contains(MaterialState.selected)) {
-            return lightAccentColor;
-          }
-          return null;
-        }),
-      ),
-      radioTheme: RadioThemeData(
-        fillColor: MaterialStateProperty.resolveWith<Color?>(
-            (Set<MaterialState> states) {
-          if (states.contains(MaterialState.disabled)) {
-            return null;
-          }
-          if (states.contains(MaterialState.selected)) {
-            return lightAccentColor;
-          }
-          return null;
-        }),
-      ),
-      switchTheme: SwitchThemeData(
-        thumbColor: MaterialStateProperty.resolveWith<Color?>(
-            (Set<MaterialState> states) {
-          if (states.contains(MaterialState.disabled)) {
-            return null;
-          }
-          if (states.contains(MaterialState.selected)) {
-            return lightAccentColor;
-          }
-          return null;
-        }),
-        trackColor: MaterialStateProperty.resolveWith<Color?>(
-            (Set<MaterialState> states) {
-          if (states.contains(MaterialState.disabled)) {
-            return null;
-          }
-          if (states.contains(MaterialState.selected)) {
-            return lightAccentColor;
-          }
-          return null;
-        }),
-      ));
+    fontFamily: GoogleFonts.poppins().fontFamily,
+    brightness: Brightness.light,
+    colorScheme: ColorScheme.fromSwatch(
+      primarySwatch: primarySwatch,
+      accentColor: lightAccentColor,
+    ).copyWith(
+      primary: lightAccentColor,
+      secondary: lightAccentColor,
+      tertiary: detailColor,
+      background: Colors.white,
+    ),
+    indicatorColor: lightAccentColor,
+    inputDecorationTheme: const InputDecorationTheme(
+      fillColor: lightTextFieldColor,
+    ),
+  );
 
   static final darkTheme = ThemeData(
-    useMaterial3: false,
+    useMaterial3: true,
     fontFamily: GoogleFonts.poppins().fontFamily,
-    canvasColor: Colors.black,
-    cardColor: Colors.black,
     appBarTheme: const AppBarTheme(
         color: detailColor,
         titleTextStyle: TextStyle(color: Colors.white, fontSize: 20),
@@ -131,52 +77,5 @@ class Themes {
     inputDecorationTheme: const InputDecorationTheme(
       fillColor: textFieldColor,
     ),
-    textTheme: const TextTheme(headlineMedium: TextStyle(color: Colors.white)),
-    checkboxTheme: CheckboxThemeData(
-      fillColor: MaterialStateProperty.resolveWith<Color?>(
-          (Set<MaterialState> states) {
-        if (states.contains(MaterialState.disabled)) {
-          return null;
-        }
-        if (states.contains(MaterialState.selected)) {
-          return accentColor;
-        }
-        return null;
-      }),
-    ),
-    radioTheme: RadioThemeData(
-      fillColor: MaterialStateProperty.resolveWith<Color?>(
-          (Set<MaterialState> states) {
-        if (states.contains(MaterialState.disabled)) {
-          return null;
-        }
-        if (states.contains(MaterialState.selected)) {
-          return accentColor;
-        }
-        return null;
-      }),
-    ),
-    switchTheme: SwitchThemeData(
-      thumbColor: MaterialStateProperty.resolveWith<Color?>(
-          (Set<MaterialState> states) {
-        if (states.contains(MaterialState.disabled)) {
-          return null;
-        }
-        if (states.contains(MaterialState.selected)) {
-          return accentColor;
-        }
-        return null;
-      }),
-      trackColor: MaterialStateProperty.resolveWith<Color?>(
-          (Set<MaterialState> states) {
-        if (states.contains(MaterialState.disabled)) {
-          return null;
-        }
-        if (states.contains(MaterialState.selected)) {
-          return accentColor;
-        }
-        return null;
-      }),
-    ),
   );
 }