Skip to content

Commit 82da0bf

Browse files
authored
Merge pull request #23 from Tiger-OperatingSystem/beta1.2
feat: colors themes
2 parents dc129b7 + ff42a89 commit 82da0bf

4 files changed

Lines changed: 39 additions & 15 deletions

File tree

lib/src/modules/applications/widgets/items_menu.dart

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@ class ItemMenuWidget extends StatelessWidget {
1818
Widget build(BuildContext context) {
1919
final navigation = context.read<Navigation>();
2020
return ListTile(
21-
leading: CircleAvatar(
22-
maxRadius: 16,
23-
backgroundColor: Theme.of(context).colorScheme.primary,
24-
foregroundColor: Theme.of(context).colorScheme.onPrimary,
25-
child: Icon(icon, size: 18),
26-
),
21+
leading: Icon(
22+
icon, size: 18,
23+
color: Theme.of(context).colorScheme.primary,),
2724
title: Text(title,
2825
style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
2926
onTap: () => navigation.pageView(

lib/src/modules/main/widgets/logo.dart

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ class LogoWidget extends StatelessWidget {
77
Widget build(BuildContext context) {
88
return Padding(
99
padding: const EdgeInsets.all(2.0),
10-
child: CircleAvatar(
11-
child: Image.asset(
12-
'assets/images/logo.png',
13-
fit: BoxFit.cover,
14-
width: 35,
15-
height: 35,
16-
),
17-
),
10+
child: Icon(Icons.shopping_bag),
1811
);
1912
}
2013
}

lib/src/themes/color_schemes.g.dart

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,37 @@ const darkColorScheme = ColorScheme(
6767
outlineVariant: Color(0xFF50453A),
6868
scrim: Color(0xFF000000),
6969
);
70+
71+
const darkColorScheme2 = ColorScheme(
72+
brightness: Brightness.dark,
73+
primary: Color(0xFFFFB868),
74+
onPrimary: Color(0xFF482900),
75+
primaryContainer: Color(0xFF673D00),
76+
onPrimaryContainer: Color(0xFFD0E4FF),
77+
secondary: Color(0xFFBAC8DB),
78+
onSecondary: Color(0xFF243140),
79+
secondaryContainer: Color(0xFF3B4857),
80+
onSecondaryContainer: Color(0xFFD6E4F7),
81+
tertiary: Color(0xFFB5C4FF),
82+
onTertiary: Color(0xFF042978),
83+
tertiaryContainer: Color(0xFF264190),
84+
onTertiaryContainer: Color(0xFFDCE1FF),
85+
error: Color(0xFFFFB4AB),
86+
errorContainer: Color(0xFF93000A),
87+
onError: Color(0xFF690005),
88+
onErrorContainer: Color(0xFFFFDAD6),
89+
background: Color(0xFF1A1C1E),
90+
onBackground: Color(0xFFE2E2E6),
91+
surface: Color(0xFF1A1C1E),
92+
onSurface: Color(0xFFE2E2E6),
93+
surfaceVariant: Color(0xFF42474E),
94+
onSurfaceVariant: Color(0xFFC2C7CF),
95+
outline: Color(0xFF8C9199),
96+
onInverseSurface: Color(0xFF1A1C1E),
97+
inverseSurface: Color(0xFFE2E2E6),
98+
inversePrimary: Color(0xFF0062A0),
99+
shadow: Color(0xFF000000),
100+
surfaceTint: Color(0xFF9BCAFF),
101+
outlineVariant: Color(0xFF42474E),
102+
scrim: Color(0xFF000000),
103+
);

lib/src/themes/themes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ThemeData _lightTheme = ThemeData(
1717

1818
ThemeData _darkTheme = ThemeData(
1919
useMaterial3: true,
20-
colorScheme: darkColorScheme,
20+
colorScheme: darkColorScheme2,
2121
appBarTheme: const AppBarTheme(
2222
elevation: 0,
2323
)

0 commit comments

Comments
 (0)