chore: allow monochrome colors

namidaco · Feb 23, 2025 · 7c3424f · 7c3424f
1 parent a6739fd
commit 7c3424f
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 15 deletions.
diff --git a/lib/controller/current_color.dart b/lib/controller/current_color.dart
@@ -538,13 +538,21 @@ class CurrentColor {
 }
 
 extension ColorUtils on Color {
+  bool _isNearWhiteOrBlack() {
+    final luminance = computeLuminance();
+    return luminance <= 0.1 || luminance >= 0.9;
+  }
+
   Color get delightned {
+    if (_isNearWhiteOrBlack()) return this;
+
     final hslColor = HSLColor.fromColor(this);
     final modifiedColor = hslColor.withLightness(0.4).toColor();
     return modifiedColor;
   }
 
   Color get lighter {
+    if (_isNearWhiteOrBlack()) return this;
     final hslColor = HSLColor.fromColor(this);
     final modifiedColor = hslColor.withLightness(0.64).toColor();
     return modifiedColor;

diff --git a/lib/controller/file_browser.dart b/lib/controller/file_browser.dart
@@ -13,6 +13,7 @@ import 'package:namida/core/constants.dart';
 import 'package:namida/core/extensions.dart';
 import 'package:namida/core/icon_fonts/broken_icons.dart';
 import 'package:namida/core/namida_converter_ext.dart';
+import 'package:namida/core/themes.dart';
 import 'package:namida/core/translations/language.dart';
 import 'package:namida/core/utils.dart';
 import 'package:namida/packages/three_arched_circle.dart';
@@ -1321,6 +1322,7 @@ class _NamidaFileBrowserState<T extends FileSystemEntity> extends State<_NamidaF
                                     child: const Icon(
                                       Broken.tick_square,
                                       size: 32.0,
+                                      color: AppThemes.fabForegroundColor,
                                     ),
                                   )
                                 : const SizedBox(),

diff --git a/lib/core/themes.dart b/lib/core/themes.dart
@@ -11,6 +11,8 @@ class AppThemes {
   static final AppThemes _instance = AppThemes._internal();
   AppThemes._internal();
 
+  static const fabForegroundColor = Color.fromRGBO(255, 255, 255, 0.8);
+
   ThemeData getAppTheme([Color? color, bool? light, bool lighterDialog = true]) {
     color ??= CurrentColor.inst.color;
     light ??= namida.theme.brightness == Brightness.light;
@@ -41,10 +43,16 @@ class AppThemes {
 
     const fontFallback = ['sans-serif', 'Roboto'];
 
+    final brightness = light ? Brightness.light : Brightness.dark;
     return ThemeData(
-      brightness: light ? Brightness.light : Brightness.dark,
+      brightness: brightness,
       useMaterial3: true,
-      colorSchemeSeed: color,
+      colorScheme: ColorScheme.fromSeed(
+        seedColor: color,
+        brightness: brightness,
+        contrastLevel: 0.1,
+        dynamicSchemeVariant: DynamicSchemeVariant.content, // ensure monochrome colors are not modified
+      ),
       fontFamily: "LexendDeca",
       fontFamilyFallback: fontFallback,
       scaffoldBackgroundColor: pitchBlack ?? (light ? Color.alphaBlend(color.withAlpha(60), Colors.white) : null),
@@ -93,15 +101,18 @@ class AppThemes {
                   : null),
         ),
       ),
-      dialogBackgroundColor: lighterDialog
-          ? light
-              ? Color.alphaBlend(getMainColorWithAlpha(60), Colors.white)
-              : Color.alphaBlend(getMainColorWithAlpha(20), pitchBlack ?? const Color.fromARGB(255, 12, 12, 12))
-          : light
-              ? Color.alphaBlend(getMainColorWithAlpha(35), Colors.white)
-              : Color.alphaBlend(getMainColorWithAlpha(12), pitchBlack ?? const Color.fromARGB(255, 16, 16, 16)),
       focusColor: light ? const Color.fromARGB(200, 190, 190, 190) : const Color.fromARGB(150, 80, 80, 80),
-      dialogTheme: DialogTheme(surfaceTintColor: Colors.transparent, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.0.multipliedRadius))),
+      dialogTheme: DialogTheme(
+        surfaceTintColor: Colors.transparent,
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24.0.multipliedRadius)),
+        backgroundColor: lighterDialog
+            ? light
+                ? Color.alphaBlend(getMainColorWithAlpha(60), Colors.white)
+                : Color.alphaBlend(getMainColorWithAlpha(20), pitchBlack ?? const Color.fromARGB(255, 12, 12, 12))
+            : light
+                ? Color.alphaBlend(getMainColorWithAlpha(35), Colors.white)
+                : Color.alphaBlend(getMainColorWithAlpha(12), pitchBlack ?? const Color.fromARGB(255, 16, 16, 16)),
+      ),
       listTileTheme: ListTileThemeData(
         horizontalTitleGap: 16.0,
         selectedColor: light

diff --git a/lib/ui/dialogs/general_popup_dialog.dart b/lib/ui/dialogs/general_popup_dialog.dart
@@ -777,7 +777,7 @@ Future<void> showGeneralPopupDialog(
         return AnimatedThemeOrTheme(
           data: theme,
           child: Dialog(
-            backgroundColor: theme.dialogBackgroundColor,
+            backgroundColor: theme.dialogTheme.backgroundColor,
             insetPadding: EdgeInsets.symmetric(horizontal: horizontalMargin, vertical: 24.0),
             clipBehavior: Clip.antiAlias,
             child: SingleChildScrollView(

diff --git a/lib/ui/pages/main_page.dart b/lib/ui/pages/main_page.dart
@@ -18,6 +18,7 @@ import 'package:namida/core/enums.dart';
 import 'package:namida/core/extensions.dart';
 import 'package:namida/core/icon_fonts/broken_icons.dart';
 import 'package:namida/core/namida_converter_ext.dart';
+import 'package:namida/core/themes.dart';
 import 'package:namida/core/translations/language.dart';
 import 'package:namida/core/utils.dart';
 import 'package:namida/packages/searchbar_animation.dart';
@@ -324,7 +325,7 @@ class __MainPageFABButtonState extends State<_MainPageFABButton> {
                             rx: ScrollSearchController.inst.currentSearchType,
                             builder: (context, currentSearchType) => Icon(
                               _shouldShowSubmitSearch && currentSearchType == SearchType.youtube ? Broken.search_normal : Broken.shield_slash,
-                              color: Color.fromRGBO(255, 255, 255, 0.8),
+                              color: AppThemes.fabForegroundColor,
                             ),
                           ),
                           if (runningSearchesCount > 0) searchProgressWidget,
@@ -336,7 +337,7 @@ class __MainPageFABButtonState extends State<_MainPageFABButton> {
                     rx: settings.floatingActionButton,
                     builder: (context, fabButton) => Icon(
                       fabButton.toIcon(),
-                      color: const Color.fromRGBO(255, 255, 255, 0.8),
+                      color: AppThemes.fabForegroundColor,
                     ),
                   ),
           ),

diff --git a/lib/youtube/widgets/yt_queue_chip.dart b/lib/youtube/widgets/yt_queue_chip.dart
@@ -13,6 +13,7 @@ import 'package:namida/core/extensions.dart';
 import 'package:namida/core/functions.dart';
 import 'package:namida/core/icon_fonts/broken_icons.dart';
 import 'package:namida/core/namida_converter_ext.dart';
+import 'package:namida/core/themes.dart';
 import 'package:namida/core/translations/language.dart';
 import 'package:namida/core/utils.dart';
 import 'package:namida/packages/scroll_physics_modified.dart';
@@ -190,7 +191,10 @@ class YTMiniplayerQueueChipState extends State<YTMiniplayerQueueChip> with Ticke
                                 heroTag: 'yt_queue_fab_hero',
                                 backgroundColor: context.theme.colorScheme.secondaryContainer.withValues(alpha: 0.9),
                                 onPressed: () => _animateSmallToBig(),
-                                child: const Icon(Broken.driver),
+                                child: const Icon(
+                                  Broken.driver,
+                                  color: AppThemes.fabForegroundColor,
+                                ),
                               ),
                             )
                           : NamidaInkWell(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: namida
 description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
 publish_to: "none"
-version: 5.0.09-beta+250218789
+version: 5.0.1-beta+250223227
 
 environment:
   sdk: ">=3.6.0 <4.0.0"