Fixed the saved cards layout and fixed color scheme issues with too m…

…any nested items(?)
GameTec-live · Sep 3, 2023 · 5e38ac3 · 5e38ac3
1 parent 3902a70
commit 5e38ac3
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/chameleonultragui/lib/gui/page/saved_cards.dart b/chameleonultragui/lib/gui/page/saved_cards.dart
@@ -347,6 +347,11 @@ class SavedCardsPageState extends State<SavedCardsPage> {
                             }
                           },
                           style: ButtonStyle(
+                            backgroundColor: MaterialStateProperty.resolveWith<Color>(
+                              (Set<MaterialState> states) {
+                                return appState.sharedPreferencesProvider.getThemeComplementaryColor(); 
+                              },
+                            ),
                             shape: MaterialStateProperty.all<
                                 RoundedRectangleBorder>(
                               RoundedRectangleBorder(
@@ -362,6 +367,7 @@ class SavedCardsPageState extends State<SavedCardsPage> {
                       return Container(
                         constraints: const BoxConstraints(minHeight: 80, maxHeight: 150),
                         child: ElevatedButton(
+
                           onPressed: () {
                             showDialog(
                               context: context,
@@ -458,6 +464,11 @@ class SavedCardsPageState extends State<SavedCardsPage> {
                             );
                           },
                           style: ButtonStyle(
+                            backgroundColor: MaterialStateProperty.resolveWith<Color>(
+                              (Set<MaterialState> states) {
+                                return appState.sharedPreferencesProvider.getThemeComplementaryColor(); 
+                              },
+                            ),
                             shape: MaterialStateProperty.all<
                                 RoundedRectangleBorder>(
                               RoundedRectangleBorder(
@@ -479,7 +490,9 @@ class SavedCardsPageState extends State<SavedCardsPage> {
                                       ),
                                     ],
                                   ),
-                                  Expanded(
+                                  Positioned(top: 0,right: 0,
+                                  child: SizedBox(child: ConstrainedBox(constraints: BoxConstraints(minHeight: 80,),
+                                  child: Expanded(
                                     flex: 1,
                                     child: Wrap(
                                       //mainAxisAlignment: MainAxisAlignment.end,
@@ -514,6 +527,8 @@ class SavedCardsPageState extends State<SavedCardsPage> {
 
                                     ),
                                   ),
+                                  ),
+                                  ),),
                                 ],
                               ),
                               Positioned(

diff --git a/chameleonultragui/lib/sharedprefsprovider.dart b/chameleonultragui/lib/sharedprefsprovider.dart
@@ -217,6 +217,28 @@ class SharedPreferencesProvider extends ChangeNotifier {
     }
   }
 
+    Color getThemeComplementaryColor() {
+    final themeValue = _sharedPreferences.getInt('app_theme_color') ?? 0;
+    switch (themeValue) {
+      case 1:
+        return Color.fromARGB(30, 116, 58, 183);
+      case 2:
+        return Color.fromARGB(44, 62, 216, 243);
+      case 3:
+        return Color.fromARGB(50, 175, 76, 172);
+      case 4:
+        return Color.fromARGB(46, 130, 51, 196);
+      case 5:
+        return Color.fromARGB(48, 110, 116, 29);
+      case 6:
+        return Color.fromARGB(47, 188, 43, 201);
+      case 7:
+        return Color.fromARGB(44, 58, 104, 202);
+      default:
+        return Color.fromARGB(16, 202, 43, 43);
+    }
+  }
+
   void setThemeColor(int color) {
     _sharedPreferences.setInt('app_theme_color', color);
   }