Merge pull request #240 from Piwigo/change_modal_folder_box_colors

Change modal folder box colors

Author: Renarde-dev

lib/components/modals/select_move_or_copy_modal.dart

@@ -4,7 +4,6 @@ import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/network/albums.dart';
 import 'package:piwigo_ng/network/api_error.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
-import 'package:piwigo_ng/utils/resources.dart';
 
 class SelectMoveOrCopyModal extends StatefulWidget {
   const SelectMoveOrCopyModal({
@@ -243,15 +242,12 @@ class _ExpansionAlbumTileState extends State<ExpansionAlbumTile> {
                         child: Row(spacing: 4, children: [
                           Text(
                             '${widget.album.nbCategories}',
-                            style: TextStyle(
-                              color: Theme.of(context).colorScheme.inverseSurface,
-                              fontSize: 14,
-                            ),
+                            style: Theme.of(context).textTheme.labelMedium,
                           ),
                           Icon(
                             Icons.folder,
                             size: 15,
-                            color: Theme.of(context).colorScheme.inverseSurface,
+                            color: Theme.of(context).textTheme.labelMedium?.color,
                           ),
                         ]),
                       )),

lib/utils/resources.dart

@@ -40,6 +40,10 @@ class AppColors {
   static const Color lightPink = const Color(0xFFFFCFCF);
   static const Color pink = const Color(0xFFFF5252);
 
+  static const Color textOnBackgroundLight = Color.fromARGB(255, 77, 77, 77);
+  static const Color textOnBackgroundDark = Color.fromARGB(255, 237, 237, 237);
+
+
   static const List<Color> foregroundColors = [
     AppColors.green,
     AppColors.orange,

lib/utils/themes.dart

@@ -129,6 +129,8 @@ final ThemeData lightTheme = ThemeData.light(useMaterial3: true).copyWith(
       color: AppColors.black,
       letterSpacing: 0,
     ),
+    labelMedium:
+        TextStyle(fontSize: 14, color: AppColors.textOnBackgroundLight),
     bodySmall: TextStyle(
       fontSize: 14,
       color: const Color(0x80000000),
@@ -168,7 +170,8 @@ final ThemeData lightTheme = ThemeData.light(useMaterial3: true).copyWith(
       color: AppColors.black,
       fontWeight: FontWeight.normal,
     ),
-  ), dialogTheme: DialogThemeData(backgroundColor: AppColors.backgroundLight),
+  ),
+  dialogTheme: DialogThemeData(backgroundColor: AppColors.backgroundLight),
 );
 
 final ThemeData darkTheme = ThemeData.dark(useMaterial3: true).copyWith(
@@ -298,6 +301,10 @@ final ThemeData darkTheme = ThemeData.dark(useMaterial3: true).copyWith(
       color: AppColors.white,
       letterSpacing: 0,
     ),
+    labelMedium: TextStyle(
+        fontSize: 14,
+        color: AppColors.textOnBackgroundDark
+    ),
     bodySmall: TextStyle(
       fontSize: 14,
       color: const Color(0x80FFFFFF),
@@ -327,5 +334,6 @@ final ThemeData darkTheme = ThemeData.dark(useMaterial3: true).copyWith(
       color: AppColors.white,
       fontWeight: FontWeight.bold,
     ),
-  ), dialogTheme: DialogThemeData(backgroundColor: AppColors.backgroundDark),
+  ),
+  dialogTheme: DialogThemeData(backgroundColor: AppColors.backgroundDark),
 );