marquee text

lib/components/AlbumScreen/song_menu.dart

@@ -10,6 +10,7 @@ import 'package:finamp/screens/artist_screen.dart';
 import 'package:finamp/services/current_track_metadata_provider.dart';
 import 'package:finamp/services/feedback_helper.dart';
 import 'package:finamp/services/metadata_provider.dart';
+import 'package:finamp/services/one_line_marquee_helper.dart';
 import 'package:finamp/services/music_player_background_task.dart';
 import 'package:finamp/services/queue_service.dart';
 import 'package:finamp/services/theme_provider.dart';
@@ -314,7 +315,7 @@ class _SongMenuState extends ConsumerState<SongMenu> {
       ),
       ListTile(
         leading: Icon(
-          TablerIcons.playlist,
+          Icons.playlist_add,
           color: iconColor,
         ),
         title: Text(AppLocalizations.of(context)!.addToQueue),
@@ -836,20 +837,17 @@ class _SongInfoState extends ConsumerState<SongInfo> {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      Text(
-                        widget.item.name ??
+                      OneLineMarqueeHelper(
+                        key: ValueKey(widget.item.id),
+                        text: widget.item.name ??
                             AppLocalizations.of(context)!.unknownName,
-                        textAlign: TextAlign.start,
                         style: TextStyle(
                           fontSize: widget.condensed ? 16 : 18,
                           height: 1.2,
                           color:
                               Theme.of(context).textTheme.bodyMedium?.color ??
                                   Colors.white,
                         ),
-                        overflow: TextOverflow.ellipsis,
-                        softWrap: true,
-                        maxLines: 2,
                       ),
                       Padding(
                         padding: widget.condensed
@@ -873,11 +871,8 @@ class _SongInfoState extends ConsumerState<SongInfo> {
                           color:
                               Theme.of(context).textTheme.bodyMedium?.color ??
                                   Colors.white,
-                          backgroundColor: IconTheme.of(context)
-                                  .color
-                                  ?.withOpacity(0.1) ??
-                              Theme.of(context).textTheme.bodyMedium?.color ??
-                              Colors.white,
+                          backgroundColor:
+                              IconTheme.of(context).color!.withOpacity(0.1),
                           key: widget.item.album == null
                               ? null
                               : ValueKey("${widget.item.album}-album"),

lib/components/PlayerScreen/album_chip.dart

@@ -1,7 +1,10 @@
+import 'package:finamp/models/jellyfin_models.dart' as jellyfin_models;
 import 'package:flutter/material.dart';
 import 'package:flutter/semantics.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
+import 'package:finamp/services/scrolling_text_helper.dart';
+import 'package:marquee/marquee.dart';
 
 import '../../models/jellyfin_models.dart';
 import '../../screens/album_screen.dart';
@@ -14,26 +17,73 @@ final _borderRadius = BorderRadius.circular(4);
 class AlbumChip extends StatelessWidget {
   const AlbumChip({
     super.key,
-    this.item,
-    this.backgroundColor,
-    this.color,
+    required this.item,
+    required this.backgroundColor,
+    required this.color,
   });
 
-  final BaseItemDto? item;
+  final BaseItemDto item;
   final Color? backgroundColor;
   final Color? color;
 
   @override
   Widget build(BuildContext context) {
-    if (item == null) return const _EmptyAlbumChip();
+    if (item?.album == null) return const SizedBox.shrink();
+
+    // Calculate text width
+    final textSpan = TextSpan(
+      text: item?.album ?? '',
+      style: Theme.of(context).textTheme.bodyMedium,
+    );
+    final textPainter = TextPainter(
+      text: textSpan,
+      textDirection: TextDirection.ltr,
+    )..layout();
+
+    final textWidth = textPainter.width + 24;
+    final screenWidth = MediaQuery.of(context).size.width - 32;
+    final shouldScroll = textWidth > screenWidth;
 
     return Container(
-        constraints: const BoxConstraints(minWidth: 10),
-        child: _AlbumChipContent(
-          item: item!,
-          color: color,
-          backgroundColor: backgroundColor,
-        ));
+      height: 32,
+      width: shouldScroll ? screenWidth : textWidth,
+      decoration: BoxDecoration(
+        color: backgroundColor?.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(4),
+      ),
+      child: Material(
+        type: MaterialType.transparency,
+        child: InkWell(
+          borderRadius: BorderRadius.circular(4),
+          onTap: () => Navigator.of(context).pushNamed(
+            AlbumScreen.routeName,
+            arguments: item?.albumId,
+          ),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12),
+            child: Center(
+              child: shouldScroll
+                  ? Marquee(
+                      text: item?.album ?? '',
+                      style: Theme.of(context).textTheme.bodyMedium,
+                      scrollAxis: Axis.horizontal,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      blankSpace: 50.0,
+                      velocity: 30.0,
+                      pauseAfterRound: const Duration(seconds: 1),
+                      startAfter: const Duration(seconds: 1),
+                      fadingEdgeStartFraction: 0.1,
+                      fadingEdgeEndFraction: 0.1,
+                    )
+                  : Text(
+                      item?.album ?? '',
+                      style: Theme.of(context).textTheme.bodyMedium,
+                    ),
+            ),
+          ),
+        ),
+      ),
+    );
   }
 }
 

lib/components/PlayerScreen/queue_list.dart

@@ -11,6 +11,7 @@ import 'package:finamp/models/finamp_models.dart';
 import 'package:finamp/screens/blurred_player_screen_background.dart';
 import 'package:finamp/services/feedback_helper.dart';
 import 'package:finamp/services/finamp_settings_helper.dart';
+import 'package:finamp/services/one_line_marquee_helper.dart';
 import 'package:finamp/services/theme_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -847,15 +848,24 @@ class _CurrentTrackState extends State<CurrentTrack> {
                                     crossAxisAlignment:
                                         CrossAxisAlignment.start,
                                     children: [
-                                      Text(
-                                        currentTrack?.item.title ??
-                                            AppLocalizations.of(context)!
-                                                .unknownName,
-                                        style: const TextStyle(
-                                            color: Colors.white,
+                                      SizedBox(
+                                        height: 20,
+                                        child: OneLineMarqueeHelper(
+                                          key: ValueKey(currentTrack?.item.id),
+                                          text: currentTrack?.item.title ??
+                                              AppLocalizations.of(context)!
+                                                  .unknownName,
+                                          style: TextStyle(
                                             fontSize: 16,
-                                            fontWeight: FontWeight.w500,
-                                            overflow: TextOverflow.ellipsis),
+                                            height: 26 / 20,
+                                            color: Colors.white,
+                                            fontWeight:
+                                                Theme.of(context).brightness ==
+                                                        Brightness.light
+                                                    ? FontWeight.w500
+                                                    : FontWeight.w600,
+                                          ),
+                                        ),
                                       ),
                                       const SizedBox(height: 4),
                                       Row(

lib/components/PlayerScreen/song_name.dart

@@ -2,6 +2,7 @@ import 'package:audio_service/audio_service.dart';
 import 'package:finamp/models/jellyfin_models.dart';
 import 'package:finamp/screens/artist_screen.dart';
 import 'package:finamp/services/finamp_settings_helper.dart';
+import 'package:finamp/services/scrolling_text_helper.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -130,14 +131,23 @@ class SongNameContent extends StatelessWidget {
             ),
           ),
           const Padding(padding: EdgeInsets.symmetric(vertical: 2)),
-          Text(
-            mediaItem == null
-                ? AppLocalizations.of(context)!.noItem
-                : mediaItem!.title,
-            style: const TextStyle(fontSize: 24, fontWeight: FontWeight.w600),
-            overflow: TextOverflow.fade,
-            softWrap: false,
-            maxLines: 1,
+          Center(
+            child:
+            ScrollingTextHelper(
+              id: ValueKey(mediaItem!.id),
+              alignment: TextAlign.center,
+              text:  mediaItem == null
+                  ? AppLocalizations.of(context)!.noItem
+                  : mediaItem!.title,
+              style: TextStyle(
+                fontSize: 24,
+                height: 26 / 20,
+                fontWeight:
+                Theme.of(context).brightness == Brightness.light
+                    ? FontWeight.w500
+                    : FontWeight.w600,
+              ),
+            ),
           ),
           const Padding(padding: EdgeInsets.symmetric(vertical: 2)),
           RichText(