Fixed card themes

Author: Manuito83

android/app/build.gradle

@@ -13,7 +13,7 @@ if (flutterRoot == null) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '364'
+    flutterVersionCode = '365'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')

ios/Runner.xcodeproj/project.pbxproj

@@ -536,7 +536,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 364;
+				CURRENT_PROJECT_VERSION = 365;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -680,7 +680,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 364;
+				CURRENT_PROJECT_VERSION = 365;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -718,7 +718,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 364;
+				CURRENT_PROJECT_VERSION = 365;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;

lib/main.dart

@@ -53,8 +53,8 @@ import 'package:workmanager/workmanager.dart';
 
 // TODO: CONFIGURE FOR APP RELEASE, include exceptions in Drawer if applicable
 const String appVersion = '3.2.2';
-const String androidCompilation = '364';
-const String iosCompilation = '364';
+const String androidCompilation = '365';
+const String iosCompilation = '365';
 
 final FirebaseAnalytics analytics = FirebaseAnalytics.instance;
 
@@ -303,12 +303,8 @@ class MyAppState extends State<MyApp> with WidgetsBindingObserver {
       cardColor: _themeProvider.cardColor,
       cardTheme: CardTheme(
         // Material 3 overrides
-        surfaceTintColor: _themeProvider.currentTheme == AppTheme.extraDark
-            ? Color.fromARGB(255, 14, 14, 14)
-            : _themeProvider.currentTheme == AppTheme.dark
-                ? Colors.grey[800]
-                : null,
-        color: _themeProvider.currentTheme == AppTheme.extraDark ? Color.fromARGB(255, 14, 14, 14) : Colors.grey[800],
+        surfaceTintColor: _themeProvider.cardSurfaceTintColor,
+        color: _themeProvider.cardColor,
       ),
       appBarTheme: AppBarTheme(
         systemOverlayStyle: SystemUiOverlayStyle.light,

lib/providers/theme_provider.dart

@@ -18,6 +18,7 @@ class ThemeProvider extends ChangeNotifier {
   Color? buttonText;
   Color? navSelected;
   Color? cardColor;
+  Color? cardSurfaceTintColor;
   Color? statusBar;
 
   bool _useMaterial3 = true;
@@ -47,26 +48,32 @@ class ThemeProvider extends ChangeNotifier {
   final _colorMainTextLIGHT = Colors.black;
   final _colorButtonTextLIGHT = Colors.white;
   final _colorNavSelectedLIGHT = Colors.blueGrey[100];
-  final _colorCardLIGHT = Colors.white;
   final _colorStatusBarLIGHT = Colors.blueGrey;
+  // Cards
+  final _colorCardLIGHT = Colors.white;
+  final _surfaceTintCardLIGHT = Colors.white;
 
   // COLORS ##DARK##
   final _canvasBackgroundDARK = Colors.grey[900];
   final _colorBackgroundDARK = Colors.grey[800];
   final _colorMainTextDARK = Colors.grey[50];
   final _colorButtonTextDARK = Colors.grey[200];
   final _colorNavSelectedDARK = Colors.blueGrey[600];
+  final _colorStatusBarDARK = Color.fromARGB(255, 37, 37, 37);
+  // Cards
   final _colorCardDARK = Colors.grey[800];
-  final _colorStatusBarDARK = const Color.fromARGB(255, 37, 37, 37);
+  final _surfaceTintCardDARK = Colors.grey[800];
 
   // COLORS ##EXTRA DARK##
   final _canvasBackgroundExtraDARK = Colors.black;
-  final _colorBackgroundExtraDARK = const Color(0xFF0C0C0C);
+  final _colorBackgroundExtraDARK = Color(0xFF0C0C0C);
   final _colorMainTextExtraDARK = Colors.grey[50];
   final _colorButtonTextExtraDARK = Colors.grey[200];
   final _colorNavSelectedExtraDARK = Colors.blueGrey[800];
-  final _colorCardExtraDARK = const Color(0xFF131313);
-  final _colorStatusBarExtraDARK = const Color(0xFF0C0C0C);
+  final _colorStatusBarExtraDARK = Color(0xFF0C0C0C);
+  // Cards
+  final _colorCardExtraDARK = Color.fromARGB(255, 14, 14, 14);
+  final _surfaceTintCardExtraDARK = Color.fromARGB(255, 14, 14, 14);
 
   void _getColors() {
     switch (_currentTheme) {
@@ -77,6 +84,7 @@ class ThemeProvider extends ChangeNotifier {
         buttonText = _colorButtonTextLIGHT;
         navSelected = _colorNavSelectedLIGHT;
         cardColor = _colorCardLIGHT;
+        cardSurfaceTintColor = _surfaceTintCardLIGHT;
         statusBar = _colorStatusBarLIGHT;
       case AppTheme.dark:
         canvas = _canvasBackgroundDARK;
@@ -85,6 +93,7 @@ class ThemeProvider extends ChangeNotifier {
         buttonText = _colorButtonTextDARK;
         navSelected = _colorNavSelectedDARK;
         cardColor = _colorCardDARK;
+        cardSurfaceTintColor = _surfaceTintCardDARK;
         statusBar = _colorStatusBarDARK;
       case AppTheme.extraDark:
         canvas = _canvasBackgroundExtraDARK;
@@ -93,6 +102,7 @@ class ThemeProvider extends ChangeNotifier {
         buttonText = _colorButtonTextExtraDARK;
         navSelected = _colorNavSelectedExtraDARK;
         cardColor = _colorCardExtraDARK;
+        cardSurfaceTintColor = _surfaceTintCardExtraDARK;
         statusBar = _colorStatusBarExtraDARK;
     }
   }

lib/utils/changelog.dart

@@ -39,7 +39,7 @@ class ChangeLogState extends State<ChangeLog> {
   void _createItems() {
     final itemList = <ChangeLogItem>[];
 
-    // Build 364 - 05/12/2023
+    // Build 365 - 06/12/2023
 
     // VERSION 3.2.2
     final v3_2_2 = ChangeLogItem();