Queue string improvements (#343)

Author: Feichtmeier

lib/src/player/player_utils.dart

@@ -93,3 +93,9 @@ void onArtistTap({
     navigatorKey.currentState?.maybePop();
   }
 }
+
+String createQueueElement(Audio? audio) {
+  final title = audio?.title?.isNotEmpty == true ? audio?.title! : '';
+  final artist = audio?.artist?.isNotEmpty == true ? ' • ${audio?.artist}' : '';
+  return '$title$artist'.trim();
+}

lib/src/player/queue_popup.dart

@@ -39,7 +39,7 @@ class QueuePopup extends StatelessWidget {
               children: [
                 for (final e in queue)
                   Text(
-                    '${e.title ?? ''} • ${e.artist ?? ''}',
+                    createQueueElement(e),
                     style: theme.textTheme.labelMedium?.copyWith(
                       color: e == audio
                           ? theme.colorScheme.onSurface

lib/src/player/up_next_bubble.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import '../../data.dart';
-import '../l10n/l10n.dart';
 import 'package:yaru_widgets/yaru_widgets.dart';
 
-import 'player_model.dart';
+import '../../data.dart';
+import '../../player.dart';
+import '../l10n/l10n.dart';
 
 class UpNextBubble extends StatelessWidget {
   const UpNextBubble({
@@ -42,7 +42,7 @@ class UpNextBubble extends StatelessWidget {
                 right: 10,
               ),
               child: Text(
-                context.l10n.upNext,
+                isUpNextExpanded ? context.l10n.queue : context.l10n.upNext,
                 style: theme.textTheme.labelSmall,
               ),
             ),
@@ -58,7 +58,7 @@ class UpNextBubble extends StatelessWidget {
                           right: 10,
                         ),
                         child: Text(
-                          '${e.title ?? ''} • ${e.artist ?? ''}',
+                          createQueueElement(e),
                           style: theme.textTheme.labelMedium?.copyWith(
                             color: theme.colorScheme.onSurface,
                             fontWeight: e == audio
@@ -79,7 +79,7 @@ class UpNextBubble extends StatelessWidget {
                   bottom: 10,
                 ),
                 child: Text(
-                  '${nextAudio!.title!} • ${nextAudio?.artist!}',
+                  createQueueElement(nextAudio),
                   style: theme.textTheme.labelMedium
                       ?.copyWith(color: theme.colorScheme.onSurface),
                   overflow: TextOverflow.ellipsis,