chore: less annoying colors (#1297)

Author: Feichtmeier

lib/app/view/master_tile.dart

@@ -194,7 +194,7 @@ class __PlayAbleMasterTileState extends State<_PlayAbleMasterTile> {
                   icon: Icon(
                     isPlaying && isEnQueued ? Iconz.pause : Iconz.playFilled,
                     size: kTinyButtonIconSize,
-                    color: context.theme.colorScheme.primary,
+                    color: context.theme.colorScheme.onSurface,
                   ),
                 ),
               ),

lib/app/view/mobile_bottom_bar.dart

@@ -13,21 +13,19 @@ class MobileBottomBar extends StatelessWidget with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
-    final color = watchPropertyValue(
-      (PlayerModel m) {
-        final theme = context.theme;
-        return Color.alphaBlend(
-          m.color?.withAlpha(theme.isLight ? 20 : 40) ??
-              theme.scaffoldBackgroundColor,
-          context.theme.scaffoldBackgroundColor,
-        );
-      },
-    );
+    final theme = context.theme;
+    final color = watchPropertyValue((PlayerModel m) => m.color);
+
     return SizedBox(
       width: context.mediaQuerySize.width,
       child: RepaintBoundary(
         child: Material(
-          color: color,
+          color: color == null
+              ? theme.cardColor
+              : Color.alphaBlend(
+                  color.withAlpha(theme.isLight ? 20 : 40),
+                  theme.scaffoldBackgroundColor,
+                ),
           child: Column(
             mainAxisSize: MainAxisSize.min,
             children: [

lib/app/view/mobile_page.dart

@@ -2,6 +2,8 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 
+import '../../common/page_ids.dart';
+import '../../common/view/icons.dart';
 import '../../common/view/ui_constants.dart';
 import '../../extensions/build_context_x.dart';
 import '../../player/player_model.dart';
@@ -117,9 +119,13 @@ class MasterRail extends StatelessWidget with WatchItMixin {
     final destinations = permanentMasterItems
         .map(
           (e) => NavigationRailDestination(
-            icon: e.iconBuilder(false),
+            icon: e.pageId == PageIDs.likedAudios
+                ? Icon(Iconz.heart)
+                : e.iconBuilder(false),
             label: e.titleBuilder(context),
-            selectedIcon: e.iconBuilder(true),
+            selectedIcon: e.pageId == PageIDs.likedAudios
+                ? Icon(Iconz.heartFilled)
+                : e.iconBuilder(true),
             padding: const EdgeInsets.symmetric(vertical: kSmallestSpace),
           ),
         )

lib/player/view/bottom_player_image.dart

@@ -52,7 +52,7 @@ class BottomPlayerImage extends StatelessWidget with WatchItMixin {
     Widget child;
 
     final fallBackImage = PlayerFallBackImage(
-      audio: audio,
+      audioType: audio?.audioType,
       height: size,
       width: size,
     );

lib/player/view/full_height_player_image.dart

@@ -38,7 +38,7 @@ class FullHeightPlayerImage extends StatelessWidget with WatchItMixin {
 
     final fallBackImage = PlayerFallBackImage(
       noIcon: emptyFallBack,
-      audio: audio,
+      audioType: audio?.audioType,
       height: theHeight,
       width: theWidth,
     );

lib/player/view/player_color.dart

@@ -25,10 +25,9 @@ class PlayerColor extends StatelessWidget with WatchItMixin {
     final baseColor =
         watchPropertyValue((PlayerModel m) => m.color?.withValues(alpha: 0.4));
 
-    final color = (baseColor ?? theme.cardColor).scale(
-      lightness: theme.isLight ? -0.1 : 0.2,
-      saturation: theme.isLight ? 0.9 : 0.5,
-    );
+    final color = baseColor?.scale(lightness: theme.isLight ? -0.1 : 0.2) ??
+        theme.scaffoldBackgroundColor;
+
     return Opacity(
       opacity: alpha * 0.8,
       child: Container(

lib/player/view/player_fall_back_image.dart

@@ -1,32 +1,32 @@
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
-import '../../common/data/audio.dart';
+import '../../common/data/audio_type.dart';
 import '../../common/view/icons.dart';
 import '../../extensions/build_context_x.dart';
 import '../../extensions/theme_data_x.dart';
 
 class PlayerFallBackImage extends StatelessWidget {
   const PlayerFallBackImage({
     super.key,
-    this.audio,
+    this.audioType,
     required this.height,
     required this.width,
     this.noIcon = false,
-    this.color,
   });
 
-  final Audio? audio;
+  final AudioType? audioType;
   final double height;
   final double width;
   final bool noIcon;
-  final Color? color;
 
   @override
   Widget build(BuildContext context) {
     final iconSize = width * 0.7;
     final theme = context.theme;
-    final color = this.color ?? theme.primaryColor;
+    final color = theme.cardColor.scale(
+      lightness: theme.isLight ? -0.15 : 0.3,
+    );
     return Center(
       child: Container(
         decoration: BoxDecoration(
@@ -50,7 +50,7 @@ class PlayerFallBackImage extends StatelessWidget {
         child: noIcon
             ? null
             : Icon(
-                audio?.audioType?.iconData ?? Iconz.musicNote,
+                audioType?.iconData ?? Iconz.musicNote,
                 size: iconSize,
                 color: contrastColor(color),
               ),

lib/player/view/player_remote_source_image.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:phoenix_theme/phoenix_theme.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../../common/view/safe_network_image.dart';
@@ -26,7 +27,9 @@ class PlayerRemoteSourceImage extends StatelessWidget with WatchItMixin {
     final theme = context.theme;
 
     return Container(
-      color: theme.cardColor,
+      color: theme.cardColor.scale(
+        lightness: theme.isLight ? -0.15 : 0.3,
+      ),
       height: height,
       width: width,
       child: SafeNetworkImage(

lib/settings/view/settings_page.dart

@@ -64,7 +64,7 @@ class _SettingsPageState extends State<SettingsPage> {
               constraints: constraints,
               limit: 600,
               min: 0,
-            ).copyWith(bottom: bottomPlayerDefaultHeight),
+            ).copyWith(bottom: bottomPlayerDefaultHeight * 2),
             children: const [
               ThemeSection(),
               PodcastSection(),