Minor UI fixes.

Komodo5197 · Feb 11, 2024 · 27465cf · 27465cf
1 parent caea382
commit 27465cf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 24 deletions.
diff --git a/lib/components/PlayerScreen/artist_chip.dart b/lib/components/PlayerScreen/artist_chip.dart
@@ -45,14 +45,14 @@ class ArtistChips extends StatelessWidget {
             final currentArtist = artists![index];
 
             return ArtistChip(
-              backgroundColor: backgroundColor,
-              color: color,
-              artist: BaseItemDto(
-                id: currentArtist.id,
-                name: currentArtist.name,
-                type: "MusicArtist",
-              ),
-            );
+                backgroundColor: backgroundColor,
+                color: color,
+                artist: BaseItemDto(
+                  id: currentArtist.id,
+                  name: currentArtist.name,
+                  type: "MusicArtist",
+                ),
+                key: ValueKey(currentArtist.id));
           }),
         ),
       ),

diff --git a/lib/components/PlayerScreen/song_name_content.dart b/lib/components/PlayerScreen/song_name_content.dart
@@ -1,19 +1,16 @@
-import 'package:audio_service/audio_service.dart';
+import 'package:balanced_text/balanced_text.dart';
 import 'package:finamp/components/PlayerScreen/player_buttons_more.dart';
 import 'package:finamp/models/finamp_models.dart';
 import 'package:finamp/models/jellyfin_models.dart' as jellyfin_models;
 import 'package:flutter/material.dart';
-import 'package:balanced_text/balanced_text.dart';
 
 import '../favourite_button.dart';
 import 'album_chip.dart';
 import 'artist_chip.dart';
 
 class SongNameContent extends StatelessWidget {
   const SongNameContent(
-      {Key? key,
-      required this.currentTrack,
-      required this.secondaryTextColour})
+      {Key? key, required this.currentTrack, required this.secondaryTextColour})
       : super(key: key);
   final FinampQueueItem currentTrack;
   final Color? secondaryTextColour;
@@ -58,15 +55,6 @@ class SongNameContent extends StatelessWidget {
               child: ArtistChips(
                 baseItem: songBaseItemDto,
                 backgroundColor: IconTheme.of(context).color!.withOpacity(0.1),
-                key: songBaseItemDto?.albumArtist == null
-                    ? null
-                    // We have to add -artist and -album to the keys because otherwise
-                    // self-titled albums (e.g. Aerosmith by Aerosmith) will break due
-                    // to duplicate keys.
-                    // Its probably more efficient to put a single character instead
-                    // of a whole 6-7 characters, but I think we can spare the CPU
-                    // cycles.
-                    : ValueKey("${songBaseItemDto!.albumArtist}-artist"),
               ),
             ),
             FavoriteButton(

diff --git a/lib/components/icon_and_text.dart b/lib/components/icon_and_text.dart
@@ -27,8 +27,9 @@ class IconAndText extends StatelessWidget {
           ),
           const Padding(padding: EdgeInsets.symmetric(horizontal: 2)),
           Expanded(
-            child: RichText(
-              text: textSpan,
+            // RichText blocks theming.  Text.rich does not.
+            child: Text.rich(
+              textSpan,
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
             ),