implemented "dislike" by long-tap & related fixes

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/Database.kt

@@ -194,19 +194,19 @@ interface Database {
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY artistsText")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY artistsText")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByArtistAsc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY artistsText DESC")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY artistsText DESC")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByArtistDesc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY totalPlayTimeMs")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY totalPlayTimeMs")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByPlayTimeAsc(): Flow<List<SongEntity>>
 
@@ -222,7 +222,7 @@ interface Database {
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY totalPlayTimeMs DESC")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY totalPlayTimeMs DESC")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByPlayTimeDesc(): Flow<List<SongEntity>>
 
@@ -238,63 +238,63 @@ interface Database {
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY title COLLATE NOCASE ASC")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY title COLLATE NOCASE ASC")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByTitleAsc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY title COLLATE NOCASE DESC")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY title COLLATE NOCASE DESC")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByTitleDesc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY ROWID")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY ROWID")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByRowIdAsc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY ROWID DESC")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY ROWID DESC")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByRowIdDesc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY likedAt")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY likedAt")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByLikedAtAsc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY likedAt DESC")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY likedAt DESC")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByLikedAtDesc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
     @Query("SELECT DISTINCT S.* FROM Song S LEFT JOIN Event E ON E.songId=S.id " +
-            "WHERE likedAt IS NOT NULL " +
+            "WHERE likedAt IS NOT NULL AND likedAt > 0 " +
             "ORDER BY E.timestamp DESC")
     fun songsFavoritesByDatePlayedDesc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
     @Query("SELECT DISTINCT S.* FROM Song S LEFT JOIN Event E ON E.songId=S.id " +
-            "WHERE likedAt IS NOT NULL " +
+            "WHERE likedAt IS NOT NULL AND likedAt > 0 " +
             "ORDER BY E.timestamp")
     fun songsFavoritesByDatePlayedAsc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY durationText")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY durationText")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByDurationAsc(): Flow<List<SongEntity>>
 
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
-    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL ORDER BY durationText DESC")
+    @Query("SELECT * FROM Song WHERE likedAt IS NOT NULL AND likedAt > 0 ORDER BY durationText DESC")
     @RewriteQueriesToDropUnusedColumns
     fun songsFavoritesByDurationDesc(): Flow<List<SongEntity>>
 
@@ -1329,7 +1329,7 @@ interface Database {
     @Query("UPDATE Playlist SET name = REPLACE(name,'${PINNED_PREFIX}','') WHERE id = :playlistId")
     fun unPinPlaylist(playlistId: Long): Int
 
-    @Query("SELECT count(id) FROM Song WHERE id = :songId and likedAt IS NOT NULL")
+    @Query("SELECT count(id) FROM Song WHERE id = :songId and likedAt IS NOT NULL and likedAt > 0")
     fun songliked(songId: String): Int
 
     @Query("SELECT * FROM Song WHERE id = :id")
@@ -1341,6 +1341,9 @@ interface Database {
     @Query("SELECT likedAt FROM Song WHERE id = :songId")
     fun likedAt(songId: String): Flow<Long?>
 
+    @Query("SELECT likedAt FROM Song WHERE id = :songId")
+    fun getLikedAt(songId: String): Long?
+
     @Query("UPDATE Album SET bookmarkedAt = :bookmarkedAt WHERE id = :id")
     fun bookmarkAlbum(id: String, bookmarkedAt: Long?): Int
 

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/models/Song.kt

@@ -5,6 +5,7 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 import it.fast4x.rimusic.cleanPrefix
 import it.fast4x.rimusic.utils.durationTextToMillis
+import it.fast4x.rimusic.utils.setDisLikeState
 import it.fast4x.rimusic.utils.setLikeState
 import kotlinx.serialization.Serializable
 
@@ -40,6 +41,12 @@ data class Song(
         )
     }
 
+    fun toggleDislike(): Song {
+        return copy(
+            likedAt = setDisLikeState(likedAt)
+        )
+    }
+
     fun cleanTitle() = cleanPrefix( this.title )
 
     fun relativePlayTime(): Double {

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/IconButton.kt

@@ -1,9 +1,11 @@
 package it.fast4x.rimusic.ui.components.themed
 
 import androidx.annotation.DrawableRes
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.Indication
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -39,9 +41,11 @@ fun HeaderIconButton(
     )
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun IconButton(
     onClick: () -> Unit,
+    onLongClick: (() -> Unit)? = null,
     @DrawableRes icon: Int,
     color: Color,
     modifier: Modifier = Modifier,
@@ -53,11 +57,12 @@ fun IconButton(
         contentDescription = null,
         colorFilter = ColorFilter.tint(color),
         modifier = Modifier
-            .clickable(
+            .combinedClickable(
                 indication = indication ?: ripple(bounded = false),
                 interactionSource = remember { MutableInteractionSource() },
                 enabled = enabled,
-                onClick = onClick
+                onClick = onClick,
+                onLongClick = onLongClick
             )
             .then(modifier)
     )

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemGridMenu.kt

@@ -92,8 +92,13 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import it.fast4x.rimusic.colorPalette
+import it.fast4x.rimusic.context
+import it.fast4x.rimusic.models.Song
+import it.fast4x.rimusic.service.MyDownloadHelper
 import it.fast4x.rimusic.typography
 import it.fast4x.rimusic.ui.screens.settings.isYouTubeSyncEnabled
+import it.fast4x.rimusic.utils.getLikeState
+import it.fast4x.rimusic.utils.setDisLikeState
 
 @OptIn(UnstableApi::class)
 @Composable
@@ -304,14 +309,13 @@ fun MediaItemGridMenu (
 
     val isLocal by remember { derivedStateOf { mediaItem.isLocal } }
 
-    var updateData by remember {
-        mutableStateOf(false)
-    }
     var likedAt by remember {
         mutableStateOf<Long?>(null)
     }
-    LaunchedEffect(Unit, mediaItem.mediaId, updateData) {
-        Database.likedAt(mediaItem.mediaId).collect { likedAt = it }
+    LaunchedEffect(Unit, mediaItem.mediaId) {
+        Database.likedAt(mediaItem.mediaId).collect {
+            likedAt = it
+        }
     }
 
     var downloadState by remember {
@@ -434,11 +438,22 @@ fun MediaItemGridMenu (
 
             Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
                 IconButton(
-                    icon = if (likedAt == null) R.drawable.heart_outline else R.drawable.heart,
+                    icon = getLikeState(mediaItem.mediaId),
                     color = colorPalette().favoritesIcon,
                     onClick = {
                         mediaItemToggleLike(mediaItem)
-                        updateData = !updateData
+                        Database.asyncQuery {
+                            if(songliked(mediaItem.mediaId) != 0){
+                                MyDownloadHelper.autoDownloadWhenLiked(context(), mediaItem)
+                            }
+                        }
+                    },
+                    onLongClick = {
+                        Database.asyncTransaction {
+                            if (like(mediaItem.mediaId, setDisLikeState(likedAt)) == 0) {
+                                insert(mediaItem, Song::toggleDislike)
+                            }
+                        }
                     },
                     modifier = Modifier
                         .padding(all = 4.dp)

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/themed/MediaItemMenu.kt

@@ -118,6 +118,8 @@ import it.fast4x.rimusic.context
 import it.fast4x.rimusic.service.MyDownloadHelper
 import it.fast4x.rimusic.typography
 import it.fast4x.rimusic.ui.screens.settings.isYouTubeSyncEnabled
+import it.fast4x.rimusic.utils.mediaItemToggleLike
+import it.fast4x.rimusic.utils.setDisLikeState
 import timber.log.Timber
 import java.time.LocalTime.now
 import java.time.format.DateTimeFormatter
@@ -1130,12 +1132,19 @@ fun MediaItemMenu(
                             color = colorPalette().favoritesIcon,
                             //color = if (likedAt == null) colorPalette().textDisabled else colorPalette().text,
                             onClick = {
+                                mediaItemToggleLike(mediaItem)
+                                Database.asyncQuery {
+                                    if(songliked(mediaItem.mediaId) != 0){
+                                        MyDownloadHelper.autoDownloadWhenLiked(context(), mediaItem)
+                                    }
+                                }
+                            },
+                            onLongClick = {
                                 Database.asyncTransaction {
-                                    if ( like( mediaItem.mediaId, setLikeState(likedAt) ) == 0 ) {
-                                        insert(mediaItem, Song::toggleLike)
+                                    if (like(mediaItem.mediaId, setDisLikeState(likedAt)) == 0) {
+                                        insert(mediaItem, Song::toggleDislike)
                                     }
                                 }
-                                MyDownloadHelper.autoDownloadWhenLiked(context(),mediaItem)
                             },
                             modifier = Modifier
                                 .padding(all = 4.dp)

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/album/AlbumDetails.kt

@@ -143,6 +143,7 @@ import it.fast4x.rimusic.models.SongAlbumMap
 import it.fast4x.rimusic.service.MyDownloadHelper
 import it.fast4x.rimusic.typography
 import it.fast4x.rimusic.ui.screens.settings.isYouTubeSyncEnabled
+import it.fast4x.rimusic.utils.mediaItemSetLiked
 import it.fast4x.rimusic.utils.mediaItemToggleLike
 import kotlinx.coroutines.flow.first
 import timber.log.Timber
@@ -989,12 +990,9 @@ fun AlbumDetails(
                                             },
                                             onAddToFavourites = {
                                                 songs.forEach { song ->
-
-                                                      val likedAt: Long? = song.likedAt
-                                                        if(likedAt == null) {
-                                                            mediaItemToggleLike(song.asMediaItem)
-                                                        }
-                                                  }
+                                                    mediaItemSetLiked(song.asMediaItem)
+                                                }
+                                                SmartMessage(context.resources.getString(R.string.done), context = context)
                                             },
                                             disableScrollingText = disableScrollingText
                                         )

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/screens/localplaylist/LocalPlaylistSongsModern.kt

@@ -189,6 +189,7 @@ import it.fast4x.rimusic.utils.isNowPlaying
 import it.fast4x.rimusic.utils.saveImageToInternalStorage
 import kotlinx.coroutines.CoroutineScope
 import it.fast4x.rimusic.models.SongEntity
+import it.fast4x.rimusic.utils.mediaItemSetLiked
 import it.fast4x.rimusic.utils.mediaItemToggleLike
 import kotlinx.coroutines.flow.map
 
@@ -1287,10 +1288,9 @@ fun LocalPlaylistSongsModern(
                                         },
                                         onAddToPreferites = {
                                             playlistSongs.forEachIndexed { _, song ->
-                                                if(song.song.likedAt == null) {
-                                                    mediaItemToggleLike(song.asMediaItem)
-                                                }
+                                                mediaItemSetLiked(song.asMediaItem)
                                             }
+                                            SmartMessage(context.resources.getString(R.string.done), context = context)
                                         },
                                         onRenumberPositions = {
                                             if (playlistNotMonthlyType)