feat: individual shuffle and repeat/loop button of player

lib/components/library/user_albums.dart

@@ -39,11 +39,12 @@ class UserAlbums extends HookConsumerWidget {
     final searchText = useState('');
 
     final albums = useMemoized(() {
+      if (searchText.value.isEmpty) {
+        return albumsQuery.data?.toList() ?? [];
+      }
       return albumsQuery.data
               ?.map((e) => Tuple2(
-                    searchText.value.isEmpty
+                    weightedRatio(e.name!, searchText.value),
-                        ? 100
-                        : weightedRatio(e.name!, searchText.value),
                     e,
                   ))
               .sorted((a, b) => b.item1.compareTo(a.item1))

lib/components/library/user_artists.dart

@@ -33,12 +33,15 @@ class UserArtists extends HookConsumerWidget {
     final searchText = useState('');
 
     final filteredArtists = useMemoized(() {
-      return artistQuery.pages
+      final artists = artistQuery.pages
-          .expand<Artist>((page) => page?.items ?? const Iterable.empty())
+          .expand<Artist>((page) => page?.items ?? const Iterable.empty());
+
+      if (searchText.value.isEmpty) {
+        return artists.toList();
+      }
+      return artists
           .map((e) => Tuple2(
-                searchText.value.isEmpty
+                weightedRatio(e.name!, searchText.value),
-                    ? 100
-                    : weightedRatio(e.name!, searchText.value),
                 e,
               ))
           .sorted((a, b) => b.item1.compareTo(a.item1))

lib/components/library/user_local_tracks.dart

@@ -250,11 +250,12 @@ class UserLocalTracks extends HookConsumerWidget {
             }, [sortBy.value, tracks]);
 
             final filteredTracks = useMemoized(() {
+              if (searchText.value.isEmpty) {
+                return sortedTracks;
+              }
               return sortedTracks
                   .map((e) => Tuple2(
-                        searchText.value.isEmpty
+                        weightedRatio(
-                            ? 100
-                            : weightedRatio(
                           "${e.name} - ${TypeConversionUtils.artists_X_String<Artist>(e.artists ?? [])}",
                           searchText.value,
                         ),

lib/components/library/user_playlists.dart

@@ -52,20 +52,26 @@ class UserPlaylists extends HookConsumerWidget {
     likedTracksPlaylist.images = [image];
 
     final playlists = useMemoized(
-      () => [
+      () {
+        if (searchText.value.isEmpty) {
+          return [
+            likedTracksPlaylist,
+            ...?playlistsQuery.data,
+          ];
+        }
+        return [
           likedTracksPlaylist,
           ...?playlistsQuery.data,
         ]
             .map((e) => Tuple2(
-                searchText.value.isEmpty
+                  weightedRatio(e.name!, searchText.value),
-                    ? 100
-                    : weightedRatio(e.name!, searchText.value),
                   e,
                 ))
             .sorted((a, b) => b.item1.compareTo(a.item1))
             .where((e) => e.item1 > 50)
             .map((e) => e.item2)
-          .toList(),
+            .toList();
+      },
       [playlistsQuery.data, searchText.value],
     );
 

lib/components/player/player_controls.dart

@@ -139,22 +139,20 @@ class PlayerControls extends HookConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                 children: [
                   PlatformIconButton(
-                    tooltip: playback.isLoop
+                    tooltip: playback.isShuffled
-                        ? "Repeat playlist"
+                        ? "Unshuffle playlist"
-                        : playback.isShuffled
-                            ? "Loop track"
                         : "Shuffle playlist",
                     icon: Icon(
-                      playback.isLoop
+                      Icons.shuffle_rounded,
-                          ? Icons.repeat_one_rounded
+                      color: playback.isShuffled
-                          : playback.isShuffled
+                          ? PlatformTheme.of(context).primaryColor
-                              ? Icons.shuffle_rounded
+                          : null,
-                              : Icons.repeat_rounded,
                     ),
-                    onPressed:
+                    onPressed: playback.playlist == null
-                        playback.track == null || playback.playlist == null
                         ? null
-                            : playback.cyclePlaybackMode,
+                        : () {
+                            playback.setIsShuffled(!playback.isShuffled);
+                          },
                   ),
                   PlatformIconButton(
                       tooltip: "Previous track",
@@ -209,7 +207,22 @@ class PlayerControls extends HookConsumerWidget {
                             }
                           }
                         : null,
-                  )
+                  ),
+                  PlatformIconButton(
+                    tooltip:
+                        !playback.isLoop ? "Loop Track" : "Repeat playlist",
+                    icon: Icon(
+                      playback.isLoop
+                          ? Icons.repeat_one_rounded
+                          : Icons.repeat_rounded,
+                    ),
+                    onPressed:
+                        playback.track == null || playback.playlist == null
+                            ? null
+                            : () {
+                                playback.setIsLoop(!playback.isLoop);
+                              },
+                  ),
                 ],
               ),
               const SizedBox(height: 5)

lib/components/shared/track_table/track_collection_view.dart

@@ -103,11 +103,12 @@ class TrackCollectionView<T> extends HookConsumerWidget {
     final searchText = useState("");
 
     final filteredTracks = useMemoized(() {
+      if (searchText.value.isEmpty) {
+        return tracksSnapshot.data;
+      }
       return tracksSnapshot.data
           ?.map((e) => Tuple2(
-                searchText.value.isEmpty
+                weightedRatio(
-                    ? 100
-                    : weightedRatio(
                   "${e.name} - ${TypeConversionUtils.artists_X_String<Artist>(e.artists ?? [])}",
                   searchText.value,
                 ),

lib/models/current_playlist.dart

@@ -40,7 +40,7 @@ class CurrentPlaylist {
     // won't shuffle if already shuffled
     if (_tempTrack == null) {
       _tempTrack = [...tracks];
-      tracks.shuffle();
+      tracks = List.from(tracks)..shuffle();
       if (topTrack != null) {
         tracks.remove(topTrack);
         tracks.insert(0, topTrack);

lib/provider/playback_provider.dart

@@ -39,15 +39,10 @@ enum AudioQuality {
   low,
 }
 
-enum PlaybackMode {
-  repeat,
-  shuffle,
-  normal,
-}
-
 class Playback extends PersistedChangeNotifier {
   // player properties
-  PlaybackMode playbackMode;
+  bool isShuffled;
+  bool isLoop;
   bool isPlaying;
   Duration currentDuration;
   double volume;
@@ -83,7 +78,8 @@ class Playback extends PersistedChangeNotifier {
     this.mobileAudioService,
   })  : volume = 1,
         isPlaying = false,
-        playbackMode = PlaybackMode.normal,
+        isShuffled = false,
+        isLoop = false,
         currentDuration = Duration.zero,
         _subscriptions = [],
         status = PlaybackStatus.idle,
@@ -287,25 +283,18 @@ class Playback extends PersistedChangeNotifier {
     isPlaying ? await pause() : await resume();
   }
 
-  void cyclePlaybackMode() {
+  void setIsShuffled(bool shuffle) {
-    switch (playbackMode) {
+    isShuffled = shuffle;
-      case PlaybackMode.normal:
+    if (isShuffled) {
-        playbackMode = PlaybackMode.shuffle;
       playlist?.shuffle(track);
-        break;
+    } else {
-      case PlaybackMode.shuffle:
-        playbackMode = PlaybackMode.repeat;
       playlist?.unshuffle();
-        break;
-      case PlaybackMode.repeat:
-        playbackMode = PlaybackMode.normal;
-        break;
     }
     notifyListeners();
   }
 
-  void setPlaybackMode(PlaybackMode mode) {
+  void setIsLoop(bool loop) {
-    playbackMode = mode;
+    isLoop = loop;
     notifyListeners();
   }
 
@@ -325,7 +314,8 @@ class Playback extends PersistedChangeNotifier {
     await player.stop();
     await player.release();
     isPlaying = false;
-    playbackMode = PlaybackMode.normal;
+    isShuffled = false;
+    isLoop = false;
     playlist = null;
     track = null;
     status = PlaybackStatus.idle;
@@ -685,9 +675,6 @@ class Playback extends PersistedChangeNotifier {
     };
   }
 
-  bool get isLoop => playbackMode == PlaybackMode.repeat;
-  bool get isShuffled => playbackMode == PlaybackMode.shuffle;
-  bool get isNormal => playbackMode == PlaybackMode.normal;
   UnmodifiableListView<Video> get siblingYtVideos =>
       UnmodifiableListView(_siblingYtVideos);
 }

lib/services/linux_audio_service.dart

@@ -249,13 +249,15 @@ class _MprisMediaPlayer2Player extends DBusObject {
 
   /// Gets value of property org.mpris.MediaPlayer2.Player.LoopStatus
   Future<DBusMethodResponse> getLoopStatus() async {
-    return DBusMethodSuccessResponse([const DBusString("Playlist")]);
+    return DBusMethodSuccessResponse([
+      playback.isLoop ? const DBusString("Track") : const DBusString("None"),
+    ]);
   }
 
   /// Sets property org.mpris.MediaPlayer2.Player.LoopStatus
   Future<DBusMethodResponse> setLoopStatus(String value) async {
-    return DBusMethodErrorResponse.failed(
+    playback.setIsLoop(value == "Track");
-        'Set org.mpris.MediaPlayer2.Player.LoopStatus not implemented');
+    return DBusMethodSuccessResponse();
   }
 
   /// Gets value of property org.mpris.MediaPlayer2.Player.Rate
@@ -275,9 +277,7 @@ class _MprisMediaPlayer2Player extends DBusObject {
 
   /// Sets property org.mpris.MediaPlayer2.Player.Shuffle
   Future<DBusMethodResponse> setShuffle(bool value) async {
-    playback.setPlaybackMode(
+    playback.setIsShuffled(value);
-      value ? PlaybackMode.shuffle : PlaybackMode.normal,
-    );
     return DBusMethodSuccessResponse();
   }