From 4aa94bcc7ce96b72ac9fc30ed6e927b9a0be780a Mon Sep 17 00:00:00 2001
From: vfsfitvnm <vfsfitvnm@protonmail.com>
Date: Fri, 29 Jul 2022 18:29:37 +0200
Subject: [PATCH] Tweak code

---
 .../it/vfsfitvnm/vimusic/enums/BuiltInPlaylist.kt     |  2 +-
 .../vimusic/ui/screens/BuiltInPlaylistScreen.kt       |  6 +++---
 .../it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt     |  2 +-
 .../vfsfitvnm/vimusic/ui/views/PlaylistPreviewItem.kt | 11 ++++++++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/enums/BuiltInPlaylist.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/enums/BuiltInPlaylist.kt
index 03b8f1e..e93c7f2 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/enums/BuiltInPlaylist.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/enums/BuiltInPlaylist.kt
@@ -2,5 +2,5 @@ package it.vfsfitvnm.vimusic.enums
 
 enum class BuiltInPlaylist {
     Favorites,
-    Cached
+    Offline
 }
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/BuiltInPlaylistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/BuiltInPlaylistScreen.kt
index e96d326..ee9d4d1 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/BuiltInPlaylistScreen.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/BuiltInPlaylistScreen.kt
@@ -71,7 +71,7 @@ fun BuiltInPlaylistScreen(builtInPlaylist: BuiltInPlaylist) {
             val songs by remember(binder?.cache, builtInPlaylist) {
                 when (builtInPlaylist) {
                     BuiltInPlaylist.Favorites -> Database.favorites()
-                    BuiltInPlaylist.Cached -> Database.songsWithContentLength().map { songs ->
+                    BuiltInPlaylist.Offline -> Database.songsWithContentLength().map { songs ->
                         songs.filter { song ->
                             song.contentLength?.let {
                                 binder?.cache?.isCached(song.song.id, 0, song.contentLength)
@@ -114,7 +114,7 @@ fun BuiltInPlaylistScreen(builtInPlaylist: BuiltInPlaylist) {
                         BasicText(
                             text = when (builtInPlaylist) {
                                 BuiltInPlaylist.Favorites -> "Favorites"
-                                BuiltInPlaylist.Cached -> "Offline"
+                                BuiltInPlaylist.Offline -> "Offline"
                             },
                             style = typography.m.semiBold
                         )
@@ -196,7 +196,7 @@ fun BuiltInPlaylistScreen(builtInPlaylist: BuiltInPlaylist) {
                         menuContent = {
                             when (builtInPlaylist) {
                                 BuiltInPlaylist.Favorites -> InFavoritesMediaItemMenu(song = song)
-                                BuiltInPlaylist.Cached -> InHistoryMediaItemMenu(song = song)
+                                BuiltInPlaylist.Offline -> InHistoryMediaItemMenu(song = song)
                             }
                         }
                     )
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt
index 2d21478..add3958 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/HomeScreen.kt
@@ -492,7 +492,7 @@ fun HomeScreen() {
                                         .clickable(
                                             indication = rememberRipple(bounded = true),
                                             interactionSource = remember { MutableInteractionSource() },
-                                            onClick = { builtInPlaylistRoute(BuiltInPlaylist.Cached) }
+                                            onClick = { builtInPlaylistRoute(BuiltInPlaylist.Offline) }
                                         )
                                 )
                             }
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlaylistPreviewItem.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlaylistPreviewItem.kt
index e586cc8..e02a937 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlaylistPreviewItem.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlaylistPreviewItem.kt
@@ -37,6 +37,7 @@ import it.vfsfitvnm.vimusic.utils.semiBold
 import it.vfsfitvnm.vimusic.utils.thumbnail
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
 
 @Composable
 fun PlaylistPreviewItem(
@@ -52,7 +53,11 @@ fun PlaylistPreviewItem(
     }
 
     val thumbnails by remember(playlistPreview.playlist.id) {
-        Database.playlistThumbnailUrls(playlistPreview.playlist.id).distinctUntilChanged()
+        Database.playlistThumbnailUrls(playlistPreview.playlist.id).distinctUntilChanged().map {
+            it.map { url ->
+                url.thumbnail(thumbnailSizePx)
+            }
+        }
     }.collectAsState(initial = emptyList(), context = Dispatchers.IO)
 
     PlaylistItem(
@@ -62,7 +67,7 @@ fun PlaylistPreviewItem(
         imageContent = {
             if (thumbnails.toSet().size == 1) {
                 AsyncImage(
-                    model = thumbnails.first().thumbnail(thumbnailSizePx),
+                    model = thumbnails.first(),
                     contentDescription = null,
                     contentScale = ContentScale.Crop,
                     modifier = Modifier
@@ -81,7 +86,7 @@ fun PlaylistPreviewItem(
                         Alignment.BottomEnd
                     ).forEachIndexed { index, alignment ->
                         AsyncImage(
-                            model = thumbnails.getOrNull(index).thumbnail(thumbnailSizePx),
+                            model = thumbnails.getOrNull(index),
                             contentDescription = null,
                             contentScale = ContentScale.Crop,
                             modifier = Modifier