formatting

jmshrv · Sep 25, 2023 · 2ef5510 · 2ef5510
1 parent 4a5693c
commit 2ef5510
Show file tree

Hide file tree

Showing 8 changed files with 552 additions and 487 deletions.
diff --git a/lib/components/AlbumScreen/song_list_tile.dart b/lib/components/AlbumScreen/song_list_tile.dart
@@ -25,7 +25,6 @@ enum SongListTileMenuItems {
   addToQueue,
   playNext,
   addToNextUp,
-  replaceQueueWithItem,
   addToPlaylist,
   removeFromPlaylist,
   instantMix,
@@ -257,13 +256,6 @@ class _SongListTileState extends State<SongListTile> {
                 title: Text(AppLocalizations.of(context)!.addToNextUp),
               ),
             ),
-            PopupMenuItem<SongListTileMenuItems>(
-              value: SongListTileMenuItems.replaceQueueWithItem,
-              child: ListTile(
-                leading: const Icon(Icons.play_circle),
-                title: Text(AppLocalizations.of(context)!.replaceQueue),
-              ),
-            ),
             widget.isInPlaylist
                 ? PopupMenuItem<SongListTileMenuItems>(
                     enabled: !isOffline,
@@ -355,18 +347,6 @@ class _SongListTileState extends State<SongListTile> {
             ));
             break;
 
-          case SongListTileMenuItems.replaceQueueWithItem:
-            // await _audioServiceHelper
-            //     .replaceQueueWithItem(itemList: [widget.item]);
-            await _queueService.startPlayback(items: [widget.item], source: QueueItemSource(type: QueueItemSourceType.unknown, name: QueueItemSourceName(type: QueueItemSourceNameType.preTranslated, pretranslatedName: AppLocalizations.of(context)!.queue), id: widget.parentId ?? "unknown"));
-
-            if (!mounted) return;
-
-            ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-              content: Text(AppLocalizations.of(context)!.queueReplaced),
-            ));
-            break;
-
           case SongListTileMenuItems.addToPlaylist:
             Navigator.of(context).pushNamed(AddToPlaylistScreen.routeName,
                 arguments: widget.item.id);

diff --git a/lib/components/PlaybackHistoryScreen/playback_history_list.dart b/lib/components/PlaybackHistoryScreen/playback_history_list.dart
@@ -23,7 +23,6 @@ class PlaybackHistoryList extends StatelessWidget {
         stream: playbackHistoryService.historyStream,
         builder: (context, snapshot) {
           if (snapshot.hasData) {
-
             history = snapshot.data;
             // groupedHistory = playbackHistoryService.getHistoryGroupedByDate();
             groupedHistory = playbackHistoryService.getHistoryGroupedByHour();
@@ -36,7 +35,6 @@ class PlaybackHistoryList extends StatelessWidget {
                 return SliverList(
                   delegate: SliverChildBuilderDelegate(
                     (context, index) {
-
                       final actualIndex = group.value.length - index - 1;
 
                       final historyItem = Card(
@@ -49,35 +47,46 @@ class PlaybackHistoryList extends StatelessWidget {
                           audioServiceHelper: audioServiceHelper,
                           onTap: () {
                             ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                              content: Text(AppLocalizations.of(context)!.startingInstantMix),
+                              content: Text(AppLocalizations.of(context)!
+                                  .startingInstantMix),
                             ));
 
-                            audioServiceHelper.startInstantMixForItem(jellyfin_models.BaseItemDto.fromJson(group.value[actualIndex].item.item.extras?["itemJson"])).catchError((e) {
-                              ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                                content: Text(AppLocalizations.of(context)!.anErrorHasOccured),
+                            audioServiceHelper
+                                .startInstantMixForItem(
+                                    jellyfin_models.BaseItemDto.fromJson(group
+                                        .value[actualIndex]
+                                        .item
+                                        .item
+                                        .extras?["itemJson"]))
+                                .catchError((e) {
+                              ScaffoldMessenger.of(context)
+                                  .showSnackBar(SnackBar(
+                                content: Text(AppLocalizations.of(context)!
+                                    .anErrorHasOccured),
                               ));
                             });
                           },
                         ),
                       );
-
-                      return index == 0 ?
-                      Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.only(left: 16.0, top: 8.0, bottom: 4.0),
-                            child: Text(
-                              "${group.key.hour % 12} ${group.key.hour >= 12 ? "pm" : "am"}",
-                              style: const TextStyle(
-                                fontSize: 16.0,
-                              ),
-                            ),
-                          ),
-                          historyItem,
-                        ],
-                      )
-                      : historyItem;
+
+                      return index == 0
+                          ? Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Padding(
+                                  padding: const EdgeInsets.only(
+                                      left: 16.0, top: 8.0, bottom: 4.0),
+                                  child: Text(
+                                    "${group.key.hour % 12} ${group.key.hour >= 12 ? "pm" : "am"}",
+                                    style: const TextStyle(
+                                      fontSize: 16.0,
+                                    ),
+                                  ),
+                                ),
+                                historyItem,
+                              ],
+                            )
+                          : historyItem;
                     },
                     childCount: group.value.length,
                   ),
@@ -89,9 +98,6 @@ class PlaybackHistoryList extends StatelessWidget {
               child: CircularProgressIndicator(),
             );
           }
-        }
-
-    );
+        });
   }
-
 }