fix: improve queue management and song skipping logic in audio service

Author: gokadzev

lib/services/audio_service.dart

@@ -865,17 +865,21 @@ class MusifyAudioHandler extends BaseAudioHandler {
 
       if (index < _currentQueueIndex) {
         _currentQueueIndex--;
-      } else if (index == _currentQueueIndex && _queueList.isNotEmpty) {
-        // If removing the currently-loading song, reset loading state
-        if (_currentLoadingIndex == index) {
-          _currentLoadingIndex = -1;
-          _currentLoadingTransitionId = -1;
-        }
+      } else if (index == _currentQueueIndex) {
+        if (_queueList.isEmpty) {
+          await stop();
+        } else {
+          // If removing the currently-loading song, reset loading state
+          if (_currentLoadingIndex == index) {
+            _currentLoadingIndex = -1;
+            _currentLoadingTransitionId = -1;
+          }
 
-        if (_currentQueueIndex >= _queueList.length) {
-          _currentQueueIndex = _queueList.length - 1;
+          if (_currentQueueIndex >= _queueList.length) {
+            _currentQueueIndex = _queueList.length - 1;
+          }
+          await _playFromQueue(_currentQueueIndex);
         }
-        await _playFromQueue(_currentQueueIndex);
       }
 
       _hydrateQueueEntryIds();
@@ -1598,6 +1602,9 @@ class MusifyAudioHandler extends BaseAudioHandler {
     }
   }
 
+  @override
+  Future<void> skipToQueueItem(int index) => skipToSong(index);
+
   @override
   Future<void> skipToNext() async {
     try {

lib/services/common_services.dart

@@ -241,10 +241,11 @@ Future<void> updateSongLikeStatus(dynamic songId, bool add) async {
 }
 
 void moveLikedSong(int oldIndex, int newIndex) {
-  final _song = userLikedSongsList[oldIndex];
-  userLikedSongsList
-    ..removeAt(oldIndex)
-    ..insert(newIndex, _song);
+  if (oldIndex < newIndex) {
+    newIndex -= 1;
+  }
+  final _song = userLikedSongsList.removeAt(oldIndex);
+  userLikedSongsList.insert(newIndex, _song);
   currentLikedSongsLength.value = userLikedSongsList.length;
   unawaited(addOrUpdateData('user', 'likedSongs', userLikedSongsList));
 }
@@ -701,7 +702,6 @@ const recentlyPlayedSongsLimit = 250;
 Future<void> updateRecentlyPlayed(dynamic songId) async {
   try {
     if (userRecentlyPlayed.isNotEmpty &&
-        userRecentlyPlayed.length == 1 &&
         userRecentlyPlayed[0]['ytid'] == songId) {
       final existing = userRecentlyPlayed[0] as Map;
       existing['listeningCount'] = (existing['listeningCount'] ?? 0) + 1;

lib/services/playlist_download_service.dart

@@ -478,9 +478,8 @@ class OfflinePlaylistService {
   void cleanupProgressNotifier(String playlistId) {
     try {
       if (downloadProgressNotifiers.containsKey(playlistId)) {
-        downloadProgressNotifiers[playlistId]?.value = DownloadProgress(
-          total: 0,
-        );
+        final notifier = downloadProgressNotifiers.remove(playlistId);
+        notifier?.dispose();
       }
     } catch (e, stackTrace) {
       logger.log(