Merge pull request #23 from Tiger-OperatingSystem/beta1.2

feat: colors themes
Tiger-OperatingSystem · Dec 11, 2023 · 82da0bf · 82da0bf
2 parents dc129b7 + ff42a89
commit 82da0bf
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 15 deletions.
diff --git a/lib/src/modules/applications/widgets/items_menu.dart b/lib/src/modules/applications/widgets/items_menu.dart
@@ -18,12 +18,9 @@ class ItemMenuWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     final navigation = context.read<Navigation>();
     return ListTile(
-      leading: CircleAvatar(
-        maxRadius: 16,
-        backgroundColor: Theme.of(context).colorScheme.primary,
-        foregroundColor: Theme.of(context).colorScheme.onPrimary,
-        child: Icon(icon, size: 18),
-      ),
+      leading: Icon(
+        icon, size: 18, 
+        color: Theme.of(context).colorScheme.primary,),
       title: Text(title,
           style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
       onTap: () => navigation.pageView(

diff --git a/lib/src/modules/main/widgets/logo.dart b/lib/src/modules/main/widgets/logo.dart
@@ -7,14 +7,7 @@ class LogoWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return Padding(
       padding: const EdgeInsets.all(2.0),
-      child: CircleAvatar(
-        child: Image.asset(
-          'assets/images/logo.png',
-          fit: BoxFit.cover,
-          width: 35,
-          height: 35,
-        ),
-      ),
+      child: Icon(Icons.shopping_bag),
     );
   }
 }
diff --git a/lib/src/themes/color_schemes.g.dart b/lib/src/themes/color_schemes.g.dart
@@ -67,3 +67,37 @@ const darkColorScheme = ColorScheme(
   outlineVariant: Color(0xFF50453A),
   scrim: Color(0xFF000000),
 );
+
+const darkColorScheme2 = ColorScheme(
+  brightness: Brightness.dark,
+  primary: Color(0xFFFFB868),
+  onPrimary: Color(0xFF482900),
+  primaryContainer: Color(0xFF673D00),
+  onPrimaryContainer: Color(0xFFD0E4FF),
+  secondary: Color(0xFFBAC8DB),
+  onSecondary: Color(0xFF243140),
+  secondaryContainer: Color(0xFF3B4857),
+  onSecondaryContainer: Color(0xFFD6E4F7),
+  tertiary: Color(0xFFB5C4FF),
+  onTertiary: Color(0xFF042978),
+  tertiaryContainer: Color(0xFF264190),
+  onTertiaryContainer: Color(0xFFDCE1FF),
+  error: Color(0xFFFFB4AB),
+  errorContainer: Color(0xFF93000A),
+  onError: Color(0xFF690005),
+  onErrorContainer: Color(0xFFFFDAD6),
+  background: Color(0xFF1A1C1E),
+  onBackground: Color(0xFFE2E2E6),
+  surface: Color(0xFF1A1C1E),
+  onSurface: Color(0xFFE2E2E6),
+  surfaceVariant: Color(0xFF42474E),
+  onSurfaceVariant: Color(0xFFC2C7CF),
+  outline: Color(0xFF8C9199),
+  onInverseSurface: Color(0xFF1A1C1E),
+  inverseSurface: Color(0xFFE2E2E6),
+  inversePrimary: Color(0xFF0062A0),
+  shadow: Color(0xFF000000),
+  surfaceTint: Color(0xFF9BCAFF),
+  outlineVariant: Color(0xFF42474E),
+  scrim: Color(0xFF000000),
+);
diff --git a/lib/src/themes/themes.dart b/lib/src/themes/themes.dart
@@ -17,7 +17,7 @@ ThemeData _lightTheme = ThemeData(
 
 ThemeData _darkTheme = ThemeData(
   useMaterial3: true,
-  colorScheme: darkColorScheme,
+  colorScheme: darkColorScheme2,
   appBarTheme: const AppBarTheme(
     elevation: 0,
   )