Skip to content

Commit 7393db8

Browse files
committed
Complete yellow theme
1 parent cefedc5 commit 7393db8

File tree

4 files changed

+34
-399
lines changed

4 files changed

+34
-399
lines changed

lib/app/app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class MyApp extends StatelessWidget {
6969
onGenerateTitle: (BuildContext context) =>
7070
S.of(context).appTitle,
7171
theme: context.watch<ThemeCubit>().getDefaultTheme(theme),
72-
darkTheme: theme.dark(),
72+
darkTheme: theme.yellowDark(),
7373
themeMode: context.watch<ThemeCubit>().themeMode,
7474
navigatorKey: appNavigatorKey,
7575
onGenerateRoute: navigator.onGenerateRoute,

lib/bloc/theme/theme_cubit.dart

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import 'package:flutter_bloc_app_template/repository/theme_repository.dart';
66

77
Map<AppTheme, ThemeData> getThemeData(MaterialTheme theme) {
88
final themeData = <AppTheme, ThemeData>{
9-
AppTheme.system: theme.light(),
10-
AppTheme.light: theme.light(),
11-
AppTheme.lightGold: theme.lightHighContrast(),
12-
AppTheme.lightMint: theme.lightMediumContrast(),
13-
AppTheme.dark: theme.dark(),
14-
AppTheme.darkGold: theme.darkHighContrast(),
15-
AppTheme.darkMint: theme.darkMediumContrast(),
16-
AppTheme.experimental: theme.darkMediumContrast(),
9+
AppTheme.system: theme.yellowLight(),
10+
AppTheme.light: theme.yellowLight(),
11+
AppTheme.lightGold: theme.yellowLightHighContrast(),
12+
AppTheme.lightMint: theme.yellowLightMediumContrast(),
13+
AppTheme.dark: theme.yellowDark(),
14+
AppTheme.darkGold: theme.yellowDarkHighContrast(),
15+
AppTheme.darkMint: theme.yellowDarkMediumContrast(),
16+
AppTheme.experimental: theme.yellowDarkMediumContrast(),
1717
};
1818

1919
return themeData;
@@ -63,21 +63,21 @@ class ThemeCubit extends Cubit<AppTheme> {
6363
final themeData = getThemeData(theme);
6464
switch (state) {
6565
case AppTheme.light:
66-
return themeData[AppTheme.light] ?? theme.light();
66+
return themeData[AppTheme.light] ?? theme.yellowLight();
6767
case AppTheme.lightGold:
68-
return themeData[AppTheme.lightGold] ?? theme.light();
68+
return themeData[AppTheme.lightGold] ?? theme.yellowLight();
6969
case AppTheme.lightMint:
70-
return themeData[AppTheme.lightMint] ?? theme.light();
70+
return themeData[AppTheme.lightMint] ?? theme.yellowLight();
7171
case AppTheme.dark:
72-
return themeData[AppTheme.dark] ?? theme.dark();
72+
return themeData[AppTheme.dark] ?? theme.yellowDark();
7373
case AppTheme.darkGold:
74-
return themeData[AppTheme.darkGold] ?? theme.dark();
74+
return themeData[AppTheme.darkGold] ?? theme.yellowDark();
7575
case AppTheme.darkMint:
76-
return themeData[AppTheme.darkMint] ?? theme.dark();
76+
return themeData[AppTheme.darkMint] ?? theme.yellowDark();
7777
case AppTheme.system:
78-
return themeData[AppTheme.system] ?? theme.light();
78+
return themeData[AppTheme.system] ?? theme.yellowLight();
7979
case AppTheme.experimental:
80-
return themeData[AppTheme.experimental] ?? theme.light();
80+
return themeData[AppTheme.experimental] ?? theme.yellowLight();
8181
}
8282
}
8383

0 commit comments

Comments
 (0)