WIP Refactor themes

ashtanko · ashtanko · commit ccd1a48215f8 · 2024-05-02T12:30:31.000+02:00
diff --git a/lib/bloc/theme/app_theme.dart b/lib/bloc/theme/app_theme.dart
@@ -1,7 +1,10 @@
 enum AppTheme {
   light,
   dark,
-  yellow,
+  lightGold,
+  darkGold,
+  lightMint,
+  darkMint,
   system,
   experimental,
 }
diff --git a/lib/bloc/theme/theme_cubit.dart b/lib/bloc/theme/theme_cubit.dart
@@ -7,8 +7,11 @@ import 'package:flutter_bloc_app_template/repository/theme_repository.dart';
 final Map<AppTheme, ThemeData> themeData = {
   AppTheme.system: Style.light,
   AppTheme.light: Style.light,
+  AppTheme.lightGold: Style.lightGoldTheme,
+  AppTheme.lightMint: Style.lightMintTheme,
   AppTheme.dark: Style.dark,
-  AppTheme.yellow: Style.yellow,
+  AppTheme.darkGold: Style.darkGoldTheme,
+  AppTheme.darkMint: Style.darkMintTheme,
   AppTheme.experimental: Style.experimental,
 };
 
@@ -39,9 +42,12 @@ class ThemeCubit extends Cubit<AppTheme> {
     switch (state) {
       case AppTheme.experimental:
       case AppTheme.light:
-      case AppTheme.yellow:
+      case AppTheme.lightGold:
+      case AppTheme.lightMint:
         return ThemeMode.light;
       case AppTheme.dark:
+      case AppTheme.darkGold:
+      case AppTheme.darkMint:
         return ThemeMode.dark;
       default:
         return ThemeMode.system;
@@ -53,10 +59,16 @@ class ThemeCubit extends Cubit<AppTheme> {
     switch (state) {
       case AppTheme.light:
         return themeData[AppTheme.light] ?? Style.light;
+      case AppTheme.lightGold:
+        return themeData[AppTheme.lightGold] ?? Style.light;
+      case AppTheme.lightMint:
+        return themeData[AppTheme.lightMint] ?? Style.light;
       case AppTheme.dark:
         return themeData[AppTheme.dark] ?? Style.dark;
-      case AppTheme.yellow:
-        return themeData[AppTheme.yellow] ?? Style.light;
+      case AppTheme.darkGold:
+        return themeData[AppTheme.darkGold] ?? Style.dark;
+      case AppTheme.darkMint:
+        return themeData[AppTheme.darkMint] ?? Style.dark;
       case AppTheme.system:
         return themeData[AppTheme.system] ?? Style.light;
       case AppTheme.experimental:
diff --git a/lib/features/contacts/contacts_screen.dart b/lib/features/contacts/contacts_screen.dart
@@ -0,0 +1,10 @@
+import 'package:flutter/widgets.dart';
+
+class ContactsScreen extends StatelessWidget {
+  const ContactsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Placeholder();
+  }
+}
diff --git a/lib/features/main/main_screen.dart b/lib/features/main/main_screen.dart
@@ -36,6 +36,9 @@ class MainScreenState extends State<MainScreen> {
             ],
           ),
           bottomNavigationBar: NavigationBar(
+            //backgroundColor: Color(0xFFF2F4F7),
+            //surfaceTintColor: Colors.white,
+            //indicatorColor: Color(0xFFD0E9FF),
             destinations: destinations,
             selectedIndex: currentIndex,
             onDestinationSelected: onSelected,
diff --git a/lib/features/settings/settings_screen.dart b/lib/features/settings/settings_screen.dart
@@ -40,9 +40,27 @@ class SettingsScreen extends StatelessWidget {
                     onChanged: (value) => updateTheme(context, value),
                   ),
                   ThemeDialogCell<AppTheme>(
-                    title: S.of(context).yellowThemeTitle,
+                    title: S.of(context).lightGoldThemeTitle,
                     groupValue: state,
-                    value: AppTheme.yellow,
+                    value: AppTheme.lightGold,
+                    onChanged: (value) => updateTheme(context, value),
+                  ),
+                  ThemeDialogCell<AppTheme>(
+                    title: S.of(context).lightMintThemeTitle,
+                    groupValue: state,
+                    value: AppTheme.lightMint,
+                    onChanged: (value) => updateTheme(context, value),
+                  ),
+                  ThemeDialogCell<AppTheme>(
+                    title: S.of(context).darkGoldThemeTitle,
+                    groupValue: state,
+                    value: AppTheme.darkGold,
+                    onChanged: (value) => updateTheme(context, value),
+                  ),
+                  ThemeDialogCell<AppTheme>(
+                    title: S.of(context).darkMintThemeTitle,
+                    groupValue: state,
+                    value: AppTheme.darkMint,
                     onChanged: (value) => updateTheme(context, value),
                   ),
                   ThemeDialogCell<AppTheme>(
diff --git a/lib/features/view.dart b/lib/features/view.dart
@@ -1,3 +1,4 @@
+export 'contacts/contacts_screen.dart';
 export 'email_list/email_list_screen.dart';
 export 'email_list/view/email_list_item.dart';
 export 'email_list/view/email_list_view.dart';
diff --git a/lib/generated/intl/messages_de.dart b/lib/generated/intl/messages_de.dart
@@ -30,6 +30,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("BorderRadius"),
         "borderSideButtonTitle":
             MessageLookupByLibrary.simpleMessage("BorderSide"),
+        "darkGoldThemeTitle":
+            MessageLookupByLibrary.simpleMessage("Dunkles Gold-Thema"),
+        "darkMintThemeTitle":
+            MessageLookupByLibrary.simpleMessage("Dunkles Minz-Thema"),
         "darkThemeTitle": MessageLookupByLibrary.simpleMessage("Dunkles Thema"),
         "disabledButtonTitle": MessageLookupByLibrary.simpleMessage("Disabled"),
         "disabledRoundedButtonTitle":
@@ -39,15 +43,17 @@ class MessageLookup extends MessageLookupByLibrary {
         "emptyList": MessageLookupByLibrary.simpleMessage("Leere Liste"),
         "enabledButtonTitle": MessageLookupByLibrary.simpleMessage("Enabled"),
         "error": MessageLookupByLibrary.simpleMessage("Fehler"),
-        "experimentalThemeTitle":
-            MessageLookupByLibrary.simpleMessage("Experimental Theme"),
         "iconAndPaddingButtonTitle":
             MessageLookupByLibrary.simpleMessage("With Icon Padding"),
         "iconButtonTitle": MessageLookupByLibrary.simpleMessage("With Icon"),
         "itemDetailsTitle":
             MessageLookupByLibrary.simpleMessage("Artikel Details"),
         "itemTitle": m0,
         "itemsTitle": MessageLookupByLibrary.simpleMessage("Musterartikel"),
+        "lightGoldThemeTitle":
+            MessageLookupByLibrary.simpleMessage("Helles Gold-Thema"),
+        "lightMintThemeTitle":
+            MessageLookupByLibrary.simpleMessage("Helles Minz-Thema"),
         "lightThemeTitle": MessageLookupByLibrary.simpleMessage("Licht-Thema"),
         "messagesTitle": MessageLookupByLibrary.simpleMessage("Nachrichten"),
         "newsScreen": MessageLookupByLibrary.simpleMessage("News"),
@@ -58,7 +64,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "tabSettings": MessageLookupByLibrary.simpleMessage("Settings"),
         "themeTitle": MessageLookupByLibrary.simpleMessage("Thema"),
         "transparentButtonTitle":
-            MessageLookupByLibrary.simpleMessage("Transparent"),
-        "yellowThemeTitle": MessageLookupByLibrary.simpleMessage("Gelbes Thema")
+            MessageLookupByLibrary.simpleMessage("Transparent")
       };
 }
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -30,6 +30,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("BorderRadius"),
         "borderSideButtonTitle":
             MessageLookupByLibrary.simpleMessage("BorderSide"),
+        "darkGoldThemeTitle": MessageLookupByLibrary.simpleMessage("Dark Gold"),
+        "darkMintThemeTitle": MessageLookupByLibrary.simpleMessage("Dark Mint"),
         "darkThemeTitle": MessageLookupByLibrary.simpleMessage("Dark Theme"),
         "disabledButtonTitle": MessageLookupByLibrary.simpleMessage("Disabled"),
         "disabledRoundedButtonTitle":
@@ -48,6 +50,10 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Item Details"),
         "itemTitle": m0,
         "itemsTitle": MessageLookupByLibrary.simpleMessage("Sample Items"),
+        "lightGoldThemeTitle":
+            MessageLookupByLibrary.simpleMessage("Light Gold"),
+        "lightMintThemeTitle":
+            MessageLookupByLibrary.simpleMessage("Light Mint"),
         "lightThemeTitle": MessageLookupByLibrary.simpleMessage("Light Theme"),
         "messagesTitle": MessageLookupByLibrary.simpleMessage("Messages"),
         "newsScreen": MessageLookupByLibrary.simpleMessage("News"),
@@ -58,7 +64,6 @@ class MessageLookup extends MessageLookupByLibrary {
         "tabSettings": MessageLookupByLibrary.simpleMessage("Settings"),
         "themeTitle": MessageLookupByLibrary.simpleMessage("Theme"),
         "transparentButtonTitle":
-            MessageLookupByLibrary.simpleMessage("Transparent"),
-        "yellowThemeTitle": MessageLookupByLibrary.simpleMessage("Yellow Theme")
+            MessageLookupByLibrary.simpleMessage("Transparent")
       };
 }
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb
@@ -27,10 +27,19 @@
   "@lightThemeTitle": {},
   "darkThemeTitle": "Dunkles Thema",
   "@darkThemeTitle": {},
-  "yellowThemeTitle": "Gelbes Thema",
-  "@yellowThemeTitle": {},
-  "experimentalThemeTitle": "Experimental Theme",
-  "@experimentalThemeTitle": {},
+
+  "lightGoldThemeTitle": "Helles Gold-Thema",
+  "@lightGoldThemeTitle": {},
+
+  "darkGoldThemeTitle": "Dunkles Gold-Thema",
+  "@darkGoldThemeTitle": {},
+
+  "lightMintThemeTitle": "Helles Minz-Thema",
+  "@lightMintThemeTitle": {},
+
+  "darkMintThemeTitle": "Dunkles Minz-Thema",
+  "@darkMintThemeTitle": {},
+
   "itemDetailsTitle": "Artikel Details",
   "@itemDetailsTitle": {
     "description": "Der Titel des Bildschirms Artikeldetails"
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -27,8 +27,19 @@
   "@lightThemeTitle": {},
   "darkThemeTitle": "Dark Theme",
   "@darkThemeTitle": {},
-  "yellowThemeTitle": "Yellow Theme",
-  "@yellowThemeTitle": {},
+
+  "lightGoldThemeTitle": "Light Gold",
+  "@lightGoldThemeTitle": {},
+
+  "darkGoldThemeTitle": "Dark Gold",
+  "@darkGoldThemeTitle": {},
+
+  "lightMintThemeTitle": "Light Mint",
+  "@lightMintThemeTitle": {},
+
+  "darkMintThemeTitle": "Dark Mint",
+  "@darkMintThemeTitle": {},
+
   "experimentalThemeTitle": "Experimental Theme",
   "@experimentalThemeTitle": {},
   "itemDetailsTitle": "Item Details",
diff --git a/lib/routes/router.dart b/lib/routes/router.dart
@@ -9,13 +9,13 @@ final List<NavDestination> destinations = [
     label: 'Contacts',
     icon: Assets.icons.navigation.iconContactsOutline.svg(),
     selectedIcon: Assets.icons.navigation.iconContacts.svg(),
-    screen: const EmailListScreen(),
+    screen: const ContactsScreen(),
   ),
   const NavDestination(
-    label: 'News',
+    label: 'Emails',
     icon: Icon(Icons.library_books_outlined),
     selectedIcon: Icon(Icons.library_books),
-    screen: NewsScreen(),
+    screen: EmailListScreen(),
   ),
   const NavDestination(
     label: 'Settings',
diff --git a/lib/theme/style.dart b/lib/theme/style.dart
diff --git a/test/bloc/theme/theme_cubit_test.dart b/test/bloc/theme/theme_cubit_test.dart
diff --git a/test/view/settings/settings_test.dart b/test/view/settings/settings_test.dart

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+export 'contacts/contacts_screen.dart';`
`1`	`2`	`export 'email_list/email_list_screen.dart';`
`2`	`3`	`export 'email_list/view/email_list_item.dart';`
`3`	`4`	`export 'email_list/view/email_list_view.dart';`