🐛 Fix: index of item when shuffle enabled

devaryakjha · Oct 23, 2023 · 2cf9f0e · 2cf9f0e
1 parent 37dd776
commit 2cf9f0e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/cubits/player/player_cubit.dart b/lib/cubits/player/player_cubit.dart
@@ -62,10 +62,13 @@ class MediaPlayerCubit extends AppCubit<MediaPlayerState>
 
   Future<void> playFromMediaPlaylist<T extends PlayableMedia>(
     MediaPlaylist<T> playlist, [
-    int? startIndex,
+    PlayableMedia? initialMedia,
     bool autoPlay = true,
   ]) async {
     if (playlist.id == state.currentPlaylist && !audioHandler.player.playing) {
+      final startIndex = initialMedia == null
+          ? null
+          : state.queueState.queue.indexOf(initialMedia.toMediaItem());
       if (startIndex != null) {
         await skipToIndex(startIndex, autoPlay);
       } else if (autoPlay) {
@@ -76,6 +79,13 @@ class MediaPlayerCubit extends AppCubit<MediaPlayerState>
     unawaited(_configCubit.saveCurrentPlaylist(playlist));
     emit(state.copyWith(currentPlaylist: playlist.id));
     await audioHandler.updateQueue(playlist.mediaItemsAsMediaItems);
+    final shuffleModeEnabled = audioHandler.player.shuffleModeEnabled;
+    if (shuffleModeEnabled) {
+      await audioHandler.setShuffleMode(AudioServiceShuffleMode.all);
+    }
+    final startIndex = initialMedia == null
+        ? null
+        : state.queueState.queue.indexOf(initialMedia.toMediaItem());
     if (startIndex != null) {
       await skipToIndex(startIndex, autoPlay);
     } else if (autoPlay) {

diff --git a/lib/features/library/ui/library_widgets/page.dart b/lib/features/library/ui/library_widgets/page.dart
@@ -162,7 +162,7 @@ class _LibraryContentState extends State<LibraryContent> {
                       } else {
                         context.readMediaPlayerCubit.playFromMediaPlaylist(
                           state.playlist.copyWith(mediaItems: sortedMediaItems),
-                          index,
+                          mediaItem,
                         );
                       }
                     },