From 897732c2ca230487d6c41283f07796690ca40d21 Mon Sep 17 00:00:00 2001
From: iliano101 <iliandelagrange@gmail.com>
Date: Sun, 3 Nov 2024 16:40:16 -0500
Subject: [PATCH 1/6] Added rules to remove logs from release build

---
 .idea/gradle.xml                              |   1 +
 .idea/runConfigurations.xml                   |  17 +++
 ...kotlin-compiler-9740287438046207964.salive |   0
 app/proguard-rules.pro                        |  11 +-
 .../simpmusic/ui/screen/home/HomeScreen.kt    | 129 +++++++++---------
 5 files changed, 95 insertions(+), 63 deletions(-)
 create mode 100644 .idea/runConfigurations.xml
 delete mode 100644 .kotlin/sessions/kotlin-compiler-9740287438046207964.salive

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e873a888..4a782973 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..16660f1d
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.kotlin/sessions/kotlin-compiler-9740287438046207964.salive b/.kotlin/sessions/kotlin-compiler-9740287438046207964.salive
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 437b0a49..bc23d336 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -28,4 +28,13 @@
 -keep class com.maxrave.simpmusic.data.model.** { *; }
 -keep class com.maxrave.simpmusic.extension.AllExtKt { *; }
 -keep class com.maxrave.simpmusic.extension.AllExtKt$* { *; }
--keep class com.maxrave.kotlinytmusicscraper.extension.MapExtKt$* { *; }
\ No newline at end of file
+-keep class com.maxrave.kotlinytmusicscraper.extension.MapExtKt$* { *; }
+
+# Removes all Logs as they cause perfomance issues in prod
+-assumenosideeffects class android.util.Log {
+    public static int w(...);
+    public static int e(...);
+    public static int i(...);
+    public static int d(...);
+    public static int v(...);
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt b/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
index 859ef404..fd3b6383 100644
--- a/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
@@ -139,7 +139,7 @@ fun HomeScreen(
             LinearOutSlowInEasing.transform(pullToRefreshState.progress).coerceIn(0f, 1f)
         }
     if (pullToRefreshState.isRefreshing) {
-        viewModel.getHomeItemList()
+        //  viewModel.getHomeItemList() // Why is this call here twice ?
         viewModel.getHomeItemList()
         if (!loading) {
             pullToRefreshState.endRefresh()
@@ -185,21 +185,24 @@ fun HomeScreen(
             enter = fadeIn() + expandVertically(),
             exit = fadeOut() + shrinkVertically()
         ) {
-            Spacer(modifier = Modifier
-                .fillMaxWidth()
-                .windowInsetsPadding(
-                    WindowInsets.statusBars
-                ))
+            Spacer(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .windowInsetsPadding(
+                        WindowInsets.statusBars
+                    )
+            )
         }
-        Row (
+        Row(
             modifier = Modifier
                 .horizontalScroll(chipRowState)
                 .padding(vertical = 8.dp, horizontal = 15.dp),
         ) {
             Config.listOfHomeChip.forEach { id ->
                 Spacer(modifier = Modifier.width(4.dp))
-                Chip(isSelected =
-                    when(params) {
+                Chip(
+                    isSelected =
+                    when (params) {
                         Constants.HOME_PARAMS_RELAX -> id == R.string.relax
                         Constants.HOME_PARAMS_SLEEP -> id == R.string.sleep
                         Constants.HOME_PARAMS_ENERGIZE -> id == R.string.energize
@@ -211,8 +214,9 @@ fun HomeScreen(
                         Constants.HOME_PARAMS_COMMUTE -> id == R.string.commute
                         Constants.HOME_PARAMS_FOCUS -> id == R.string.focus
                         else -> id == R.string.all
-                }, text = stringResource(id = id)) {
-                    when(id) {
+                    }, text = stringResource(id = id)
+                ) {
+                    when (id) {
                         R.string.all -> viewModel.setParams(null)
                         R.string.relax -> viewModel.setParams(Constants.HOME_PARAMS_RELAX)
                         R.string.sleep -> viewModel.setParams(Constants.HOME_PARAMS_SLEEP)
@@ -264,21 +268,21 @@ fun HomeScreen(
                         item {
                             androidx.compose.animation.AnimatedVisibility(
                                 visible =
+                                homeData.find {
+                                    it.title ==
+                                        context.getString(
+                                            R.string.quick_picks,
+                                        )
+                                } != null,
+                            ) {
+                                QuickPicks(
+                                    homeItem =
                                     homeData.find {
                                         it.title ==
                                             context.getString(
                                                 R.string.quick_picks,
                                             )
-                                    } != null,
-                            ) {
-                                QuickPicks(
-                                    homeItem =
-                                        homeData.find {
-                                            it.title ==
-                                                context.getString(
-                                                    R.string.quick_picks,
-                                                )
-                                        } ?: return@AnimatedVisibility,
+                                    } ?: return@AnimatedVisibility,
                                     sharedViewModel = sharedViewModel,
                                 )
                             }
@@ -407,23 +411,23 @@ fun HomeTopAppBar(navController: NavController) {
                 )
                 Text(
                     text =
-                        when (hour) {
-                            in 6..12 -> {
-                                stringResource(R.string.good_morning)
-                            }
+                    when (hour) {
+                        in 6..12 -> {
+                            stringResource(R.string.good_morning)
+                        }
 
-                            in 13..17 -> {
-                                stringResource(R.string.good_afternoon)
-                            }
+                        in 13..17 -> {
+                            stringResource(R.string.good_afternoon)
+                        }
 
-                            in 18..23 -> {
-                                stringResource(R.string.good_evening)
-                            }
+                        in 18..23 -> {
+                            stringResource(R.string.good_evening)
+                        }
 
-                            else -> {
-                                stringResource(R.string.good_night)
-                            }
-                        },
+                        else -> {
+                            stringResource(R.string.good_night)
+                        }
+                    },
                     style = typo.bodySmall,
                 )
             }
@@ -465,17 +469,17 @@ fun AccountLayout(
             CoilImage(
                 imageModel = { url },
                 imageOptions =
-                    ImageOptions(
-                        contentScale = ContentScale.Crop,
-                        alignment = Alignment.Center,
-                    ),
+                ImageOptions(
+                    contentScale = ContentScale.Crop,
+                    alignment = Alignment.Center,
+                ),
                 previewPlaceholder = painterResource(id = R.drawable.holder),
                 component =
-                    rememberImageComponent {
-                        CrossfadePlugin(
-                            duration = 550,
-                        )
-                    },
+                rememberImageComponent {
+                    CrossfadePlugin(
+                        duration = 550,
+                    )
+                },
                 modifier =
                 Modifier
                     .size(40.dp)
@@ -488,8 +492,8 @@ fun AccountLayout(
                 style = typo.headlineMedium,
                 color = Color.White,
                 modifier =
-                    Modifier
-                        .padding(start = 8.dp),
+                Modifier
+                    .padding(start = 8.dp),
             )
         }
     }
@@ -538,23 +542,24 @@ fun QuickPicks(
         ) {
             items(homeItem.contents) {
                 if (it != null) {
-                    QuickPicksItem(onClick = {
-                        val firstQueue: Track = it.toTrack()
-                        sharedViewModel.simpleMediaServiceHandler?.setQueueData(
-                            QueueData(
-                                listTracks = arrayListOf(firstQueue),
-                                firstPlayedTrack = firstQueue,
-                                playlistId = "RDAMVM${it.videoId}",
-                                playlistName = "\"${it.title}\" Radio",
-                                playlistType = PlaylistType.RADIO,
-                                continuation = null
+                    QuickPicksItem(
+                        onClick = {
+                            val firstQueue: Track = it.toTrack()
+                            sharedViewModel.simpleMediaServiceHandler?.setQueueData(
+                                QueueData(
+                                    listTracks = arrayListOf(firstQueue),
+                                    firstPlayedTrack = firstQueue,
+                                    playlistId = "RDAMVM${it.videoId}",
+                                    playlistName = "\"${it.title}\" Radio",
+                                    playlistType = PlaylistType.RADIO,
+                                    continuation = null
+                                )
                             )
-                        )
-                        sharedViewModel.loadMediaItemFromTrack(
-                            firstQueue,
-                            type = Config.SONG_CLICK,
-                        )
-                    },
+                            sharedViewModel.loadMediaItemFromTrack(
+                                firstQueue,
+                                type = Config.SONG_CLICK,
+                            )
+                        },
                         data = it,
                         widthDp = widthDp,
                     )

From 5f5b7a100db36d044c47a9e823501d1ac5f25c7f Mon Sep 17 00:00:00 2001
From: iliano101 <iliandelagrange@gmail.com>
Date: Sun, 3 Nov 2024 17:01:51 -0500
Subject: [PATCH 2/6] Added @Immutable to some classes to optimize Compose

---
 .../maxrave/simpmusic/data/model/browse/album/AlbumBrowse.kt | 2 ++
 .../com/maxrave/simpmusic/data/model/browse/album/Track.kt   | 2 ++
 .../simpmusic/data/model/browse/playlist/AlbumPlaylist.kt    | 2 ++
 .../maxrave/simpmusic/data/model/browse/playlist/Author.kt   | 2 ++
 .../simpmusic/data/model/browse/playlist/PlaylistBrowse.kt   | 2 ++
 .../simpmusic/data/model/browse/playlist/TrackPlaylist.kt    | 2 ++
 .../com/maxrave/simpmusic/data/model/explore/mood/Genre.kt   | 2 ++
 .../com/maxrave/simpmusic/data/model/explore/mood/Mood.kt    | 2 ++
 .../maxrave/simpmusic/data/model/explore/mood/MoodsMoment.kt | 2 ++
 .../simpmusic/data/model/explore/mood/genre/Content.kt       | 2 ++
 .../simpmusic/data/model/explore/mood/genre/GenreObject.kt   | 2 ++
 .../simpmusic/data/model/explore/mood/genre/ItemsPlaylist.kt | 2 ++
 .../simpmusic/data/model/explore/mood/genre/ItemsSong.kt     | 2 ++
 .../maxrave/simpmusic/data/model/explore/mood/genre/Title.kt | 2 ++
 .../simpmusic/data/model/explore/mood/moodmoments/Content.kt | 2 ++
 .../simpmusic/data/model/explore/mood/moodmoments/Item.kt    | 2 ++
 .../data/model/explore/mood/moodmoments/MoodsMomentObject.kt | 2 ++
 .../java/com/maxrave/simpmusic/data/model/home/Content.kt    | 2 ++
 .../com/maxrave/simpmusic/data/model/home/HomeDataCombine.kt | 5 +++--
 .../java/com/maxrave/simpmusic/data/model/home/HomeItem.kt   | 2 ++
 .../com/maxrave/simpmusic/data/model/home/HomeResponse.kt    | 2 ++
 .../com/maxrave/simpmusic/data/model/home/chart/Artists.kt   | 3 +++
 .../com/maxrave/simpmusic/data/model/home/chart/Chart.kt     | 2 ++
 .../com/maxrave/simpmusic/data/model/home/chart/Countries.kt | 2 ++
 .../maxrave/simpmusic/data/model/home/chart/ItemArtist.kt    | 2 ++
 .../com/maxrave/simpmusic/data/model/home/chart/ItemVideo.kt | 3 +++
 .../com/maxrave/simpmusic/data/model/home/chart/Selected.kt  | 2 ++
 .../com/maxrave/simpmusic/data/model/home/chart/Videos.kt    | 2 ++
 28 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/album/AlbumBrowse.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/album/AlbumBrowse.kt
index 02a29466..aed8c481 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/album/AlbumBrowse.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/album/AlbumBrowse.kt
@@ -1,10 +1,12 @@
 package com.maxrave.simpmusic.data.model.browse.album
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.searchResult.songs.Artist
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class AlbumBrowse(
     @SerializedName("artists")
     val artists: List<Artist>,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/album/Track.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/album/Track.kt
index c84cd642..a226f32a 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/album/Track.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/album/Track.kt
@@ -1,12 +1,14 @@
 package com.maxrave.simpmusic.data.model.browse.album
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.searchResult.songs.Album
 import com.maxrave.simpmusic.data.model.searchResult.songs.Artist
 import com.maxrave.simpmusic.data.model.searchResult.songs.FeedbackTokens
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class Track(
     @SerializedName("album")
     val album: Album?,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/AlbumPlaylist.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/AlbumPlaylist.kt
index 32ffbc8b..ffba1ab7 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/AlbumPlaylist.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/AlbumPlaylist.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.browse.playlist
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class AlbumPlaylist(
     @SerializedName("id")
     val id: Any,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/Author.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/Author.kt
index f225f159..e145aa5f 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/Author.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/Author.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.browse.playlist
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class Author(
     @SerializedName("id")
     val id: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/PlaylistBrowse.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/PlaylistBrowse.kt
index c15db246..384fac9f 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/PlaylistBrowse.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/PlaylistBrowse.kt
@@ -1,10 +1,12 @@
 package com.maxrave.simpmusic.data.model.browse.playlist
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.browse.album.Track
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class PlaylistBrowse(
     @SerializedName("author")
     val author: Author,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/TrackPlaylist.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/TrackPlaylist.kt
index 280f5891..f5f596e6 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/TrackPlaylist.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/browse/playlist/TrackPlaylist.kt
@@ -1,10 +1,12 @@
 package com.maxrave.simpmusic.data.model.browse.playlist
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.searchResult.songs.Artist
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class TrackPlaylist(
     @SerializedName("album")
     val albumPlaylist: AlbumPlaylist,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/Genre.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/Genre.kt
index f666dcfb..f325bc2d 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/Genre.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/Genre.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.explore.mood
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class Genre(
     @SerializedName("params")
     val params: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/Mood.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/Mood.kt
index f48e4e1c..163516bd 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/Mood.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/Mood.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.explore.mood
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class Mood(
     @SerializedName(value = "Genres", alternate = ["Thể loại", "Gatunki", "Per te"])
     val genres: ArrayList<Genre>,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/MoodsMoment.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/MoodsMoment.kt
index e0734b51..3378632e 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/MoodsMoment.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/MoodsMoment.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.explore.mood
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class MoodsMoment(
     @SerializedName("params")
     val params: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/Content.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/Content.kt
index 71de8b40..e47c933d 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/Content.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/Content.kt
@@ -1,9 +1,11 @@
 package com.maxrave.simpmusic.data.model.explore.mood.genre
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class Content(
     @SerializedName("playlistBrowseId")
     val playlistBrowseId: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/GenreObject.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/GenreObject.kt
index 6df7687f..d04eed5b 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/GenreObject.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/GenreObject.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.explore.mood.genre
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class GenreObject(
     @SerializedName("header")
     val header: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/ItemsPlaylist.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/ItemsPlaylist.kt
index 9e297efc..ac46374b 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/ItemsPlaylist.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/ItemsPlaylist.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.explore.mood.genre
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class ItemsPlaylist(
     @SerializedName("contents")
     val contents: List<Content>,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/ItemsSong.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/ItemsSong.kt
index 72bc58af..f2005254 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/ItemsSong.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/ItemsSong.kt
@@ -1,7 +1,9 @@
 package com.maxrave.simpmusic.data.model.explore.mood.genre
 
+import androidx.compose.runtime.Immutable
 import com.maxrave.simpmusic.data.model.searchResult.songs.Artist
 
+@Immutable
 data class ItemsSong(
     val title: String,
     val artist: List<Artist>?,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/Title.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/Title.kt
index 76171d88..dfee4874 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/Title.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/genre/Title.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.explore.mood.genre
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class Title(
     @SerializedName("subtitle")
     val subtitle: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/Content.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/Content.kt
index 58992cc9..16ef3918 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/Content.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/Content.kt
@@ -1,9 +1,11 @@
 package com.maxrave.simpmusic.data.model.explore.mood.moodmoments
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class Content(
     @SerializedName("playlistBrowseId")
     val playlistBrowseId: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/Item.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/Item.kt
index ec1f6caf..ee97ec8c 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/Item.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/Item.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.explore.mood.moodmoments
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class Item(
     @SerializedName("contents")
     val contents: List<Content>,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/MoodsMomentObject.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/MoodsMomentObject.kt
index b3cd8907..8f4819ba 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/MoodsMomentObject.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/MoodsMomentObject.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.explore.mood.moodmoments
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class MoodsMomentObject(
     @SerializedName("endpoint")
     val endpoint: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/Content.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/Content.kt
index a917f406..9d37397a 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/Content.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/Content.kt
@@ -1,11 +1,13 @@
 package com.maxrave.simpmusic.data.model.home
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.searchResult.songs.Album
 import com.maxrave.simpmusic.data.model.searchResult.songs.Artist
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class Content(
     @SerializedName("album")
     val album: Album?,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeDataCombine.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeDataCombine.kt
index fc706bae..dbfe10b2 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeDataCombine.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeDataCombine.kt
@@ -1,13 +1,14 @@
 package com.maxrave.simpmusic.data.model.home
 
+import androidx.compose.runtime.Immutable
 import com.maxrave.simpmusic.data.model.explore.mood.Mood
 import com.maxrave.simpmusic.data.model.home.chart.Chart
 import com.maxrave.simpmusic.utils.Resource
 
+@Immutable
 data class HomeDataCombine(
     val home: Resource<ArrayList<HomeItem>>,
     val mood: Resource<Mood>,
     val chart: Resource<Chart>,
     val newRelease: Resource<ArrayList<HomeItem>>,
-) {
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeItem.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeItem.kt
index 404a09a0..7b28d48f 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeItem.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeItem.kt
@@ -1,9 +1,11 @@
 package com.maxrave.simpmusic.data.model.home
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class HomeItem(
     @SerializedName("contents")
     val contents: List<Content?>,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeResponse.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeResponse.kt
index 7af78da7..76bc00e8 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeResponse.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/HomeResponse.kt
@@ -1,10 +1,12 @@
 package com.maxrave.simpmusic.data.model.home
 
+import androidx.compose.runtime.Immutable
 import com.maxrave.simpmusic.data.model.explore.mood.Mood
 import com.maxrave.simpmusic.data.model.home.chart.Chart
 import com.maxrave.simpmusic.utils.Resource
 
 
+@Immutable
 data class HomeResponse(
     val homeItem: Resource<ArrayList<HomeItem>>,
     val exploreMood: Resource<Mood>,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Artists.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Artists.kt
index 68a26958..c174edb8 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Artists.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Artists.kt
@@ -1,8 +1,11 @@
 package com.maxrave.simpmusic.data.model.home.chart
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+
+@Immutable
 data class Artists(
     @SerializedName("items")
     val itemArtists: ArrayList<ItemArtist>,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Chart.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Chart.kt
index 2b1bf2f0..6cdf78d8 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Chart.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Chart.kt
@@ -1,9 +1,11 @@
 package com.maxrave.simpmusic.data.model.home.chart
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.browse.album.Track
 
+@Immutable
 data class Chart(
     @SerializedName("artists")
     val artists: Artists,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Countries.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Countries.kt
index 91d21090..77f367c7 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Countries.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Countries.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.home.chart
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class Countries(
     @SerializedName("options")
     val options: List<String>,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/ItemArtist.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/ItemArtist.kt
index 8b5fe176..04072a2f 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/ItemArtist.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/ItemArtist.kt
@@ -1,9 +1,11 @@
 package com.maxrave.simpmusic.data.model.home.chart
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class ItemArtist(
     @SerializedName("browseId")
     val browseId: String,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/ItemVideo.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/ItemVideo.kt
index a84886aa..c9870d3b 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/ItemVideo.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/ItemVideo.kt
@@ -1,11 +1,13 @@
 package com.maxrave.simpmusic.data.model.home.chart
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 import com.maxrave.simpmusic.data.model.browse.album.Track
 import com.maxrave.simpmusic.data.model.searchResult.songs.Artist
 import com.maxrave.simpmusic.data.model.searchResult.songs.Thumbnail
 
+@Immutable
 data class ItemVideo(
     @SerializedName("artists")
     val artists: List<Artist>?,
@@ -20,6 +22,7 @@ data class ItemVideo(
     @SerializedName("views")
     val views: String
 )
+
 fun ItemVideo.toTrack(): Track {
     return Track(
         album = null,
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Selected.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Selected.kt
index 729ccc08..1c0b6f2a 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Selected.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Selected.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.home.chart
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class Selected(
     @SerializedName("text")
     val text: String
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Videos.kt b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Videos.kt
index 48d5e0b1..c1b9a97c 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Videos.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/model/home/chart/Videos.kt
@@ -1,8 +1,10 @@
 package com.maxrave.simpmusic.data.model.home.chart
 
 
+import androidx.compose.runtime.Immutable
 import com.google.gson.annotations.SerializedName
 
+@Immutable
 data class Videos(
     @SerializedName("items")
     val items: ArrayList<ItemVideo>,

From 13c3435c55cc9c86b6ec189449ba26ced83bffad Mon Sep 17 00:00:00 2001
From: iliano101 <iliandelagrange@gmail.com>
Date: Sun, 3 Nov 2024 17:05:11 -0500
Subject: [PATCH 3/6] Added Key to "items" in HomeScreen and PlaylistScreen

---
 .../simpmusic/ui/screen/home/HomeScreen.kt    |  37 +-
 .../ui/screen/library/PlaylistScreen.kt       | 508 +++++++++---------
 2 files changed, 280 insertions(+), 265 deletions(-)

diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt b/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
index fd3b6383..8c1c5802 100644
--- a/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
@@ -287,7 +287,7 @@ fun HomeScreen(
                                 )
                             }
                         }
-                        items(homeData) {
+                        items(homeData, key = { it.title + it.channelId }) {
                             if (it.title != context.getString(R.string.quick_picks)) {
                                 HomeItem(
                                     homeViewModel = viewModel,
@@ -297,7 +297,7 @@ fun HomeScreen(
                                 )
                             }
                         }
-                        items(newRelease) {
+                        items(newRelease, key = { it.title + it.channelId }) {
                             androidx.compose.animation.AnimatedVisibility(
                                 visible = newRelease.isNotEmpty(),
                             ) {
@@ -540,7 +540,7 @@ fun QuickPicks(
             state = lazyListState,
             flingBehavior = snapperFlingBehavior,
         ) {
-            items(homeItem.contents) {
+            items(homeItem.contents, key = { it?.videoId ?: "item_${it.hashCode()}" }) {
                 if (it != null) {
                     QuickPicksItem(
                         onClick = {
@@ -605,7 +605,7 @@ fun MoodMomentAndGenre(
             state = lazyListState1,
             flingBehavior = snapperFlingBehavior1,
         ) {
-            items(mood.moodsMoments) {
+            items(mood.moodsMoments, key = { it.title }) {
                 MoodMomentAndGenreHomeItem(title = it.title) {
                     navController.navigateSafe(
                         R.id.action_global_moodFragment,
@@ -630,7 +630,7 @@ fun MoodMomentAndGenre(
             state = lazyListState2,
             flingBehavior = snapperFlingBehavior2,
         ) {
-            items(mood.genres) {
+            items(mood.genres, key = { it.title }) {
                 MoodMomentAndGenreHomeItem(title = it.title) {
                     navController.navigateSafe(
                         R.id.action_global_moodFragment,
@@ -718,24 +718,23 @@ fun ChartData(
                         state = lazyListState1,
                         flingBehavior = snapperFlingBehavior1,
                     ) {
-                        items(chart.songs.size) {
-                            val data = chart.songs[it]
+                        items(chart.songs, key = { it.videoId }) {
                             ItemTrackChart(onClick = {
                                 sharedViewModel.simpleMediaServiceHandler?.setQueueData(
                                     QueueData(
-                                        listTracks = arrayListOf(data),
-                                        firstPlayedTrack = data,
-                                        playlistName = "\"${data.title}\" ${context.getString(R.string.in_charts)}",
+                                        listTracks = arrayListOf(it),
+                                        firstPlayedTrack = it,
+                                        playlistName = "\"${it.title}\" ${context.getString(R.string.in_charts)}",
                                         playlistType = PlaylistType.RADIO,
-                                        playlistId = "RDAMVM${data.videoId}",
+                                        playlistId = "RDAMVM${it.videoId}",
                                         continuation = null
                                     )
                                 )
                                 sharedViewModel.loadMediaItemFromTrack(
-                                    data,
+                                    it,
                                     type = Config.VIDEO_CLICK,
                                 )
-                            }, data = data, position = it + 1, widthDp = gridWidthDp)
+                            }, data = it, position = chart.songs.indexOf(it) + 1, widthDp = gridWidthDp)
                         }
                     }
                 }
@@ -754,7 +753,7 @@ fun ChartData(
             state = lazyListState,
             flingBehavior = snapperFlingBehavior
         ) {
-            items(chart.videos.items.size) {
+            items(chart.videos.items.size, key = { index -> chart.videos.items[index].videoId }) {
                 val data = chart.videos.items[it]
                 ItemVideoChart(
                     onClick = {
@@ -793,7 +792,10 @@ fun ChartData(
             state = lazyListState2,
             flingBehavior = snapperFlingBehavior2,
         ) {
-            items(chart.artists.itemArtists.size) {
+            items(chart.artists.itemArtists.size, key = { index ->
+                val item = chart.artists.itemArtists[index]
+                item.title + item.browseId
+            }) {
                 val data = chart.artists.itemArtists[it]
                 ItemArtistChart(onClick = {
                     val args = Bundle()
@@ -820,7 +822,10 @@ fun ChartData(
                         state = lazyListState3,
                         flingBehavior = snapperFlingBehavior3,
                     ) {
-                        items(chart.trending.size) {
+                        items(chart.trending.size, key = { index ->
+                            val item = chart.trending[index]
+                            item.videoId
+                        }) {
                             val data = chart.trending[it]
                             ItemTrackChart(onClick = {
                                 sharedViewModel.simpleMediaServiceHandler?.setQueueData(
diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/screen/library/PlaylistScreen.kt b/app/src/main/java/com/maxrave/simpmusic/ui/screen/library/PlaylistScreen.kt
index 386c4354..77d0b9f8 100644
--- a/app/src/main/java/com/maxrave/simpmusic/ui/screen/library/PlaylistScreen.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/ui/screen/library/PlaylistScreen.kt
@@ -157,10 +157,10 @@ fun PlaylistScreen(
         initialValue = -limit,
         targetValue = limit,
         animationSpec =
-            infiniteRepeatable(
-                animation = tween(5000, easing = LinearEasing),
-                repeatMode = RepeatMode.Reverse,
-            ),
+        infiniteRepeatable(
+            animation = tween(5000, easing = LinearEasing),
+            repeatMode = RepeatMode.Reverse,
+        ),
         label = "shimmer",
     )
     val infiniteTransition = rememberInfiniteTransition(label = "rotation")
@@ -168,10 +168,10 @@ fun PlaylistScreen(
         initialValue = 0f,
         targetValue = 360f,
         animationSpec =
-            infiniteRepeatable(
-                animation = tween(5000, easing = LinearEasing),
-                repeatMode = RepeatMode.Restart,
-            ),
+        infiniteRepeatable(
+            animation = tween(5000, easing = LinearEasing),
+            repeatMode = RepeatMode.Restart,
+        ),
         label = "rotation",
     )
 
@@ -242,15 +242,15 @@ fun PlaylistScreen(
                     playlistName = "Playlist \"${localPlaylist?.title}\"",
                     playlistType = PlaylistType.LOCAL_PLAYLIST,
                     continuation =
-                        if (offset > 0) {
-                            if (filterState == FilterState.OlderFirst) {
-                                (ASC + offset.toString())
-                            } else {
-                                (DESC + offset)
-                            }
+                    if (offset > 0) {
+                        if (filterState == FilterState.OlderFirst) {
+                            (ASC + offset.toString())
                         } else {
-                            null
-                        },
+                            (DESC + offset)
+                        }
+                    } else {
+                        null
+                    },
                 ),
             )
             sharedViewModel.loadMediaItemFromTrack(
@@ -310,7 +310,7 @@ fun PlaylistScreen(
             localPlaylist?.downloadState?.let { viewModel.playlistDownloadState.emit(it) }
             shouldShowSuggestButton =
                 localPlaylist?.youtubePlaylistId != null &&
-                localPlaylist?.youtubePlaylistId != ""
+                    localPlaylist?.youtubePlaylistId != ""
             firstTimeGetLocalPlaylist = false
         }
     }
@@ -333,23 +333,23 @@ fun PlaylistScreen(
 //    Box {
     LazyColumn(
         modifier =
-            Modifier
-                .fillMaxWidth()
-                .background(Color.Black),
+        Modifier
+            .fillMaxWidth()
+            .background(Color.Black),
         state = lazyState,
     ) {
         item(contentType = "header") {
             Box(
                 modifier =
-                    Modifier
-                        .fillMaxWidth()
-                        .wrapContentHeight()
-                        .background(Color.Transparent),
+                Modifier
+                    .fillMaxWidth()
+                    .wrapContentHeight()
+                    .background(Color.Transparent),
             ) {
                 Box(
                     modifier =
-                        Modifier
-                            .fillMaxWidth(),
+                    Modifier
+                        .fillMaxWidth(),
 //                                .haze(
 //                                    hazeState,
 //                                    style = HazeMaterials.regular(),
@@ -357,29 +357,30 @@ fun PlaylistScreen(
                 ) {
                     Box(
                         modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .aspectRatio(1f)
-                                .clip(
-                                    RoundedCornerShape(8.dp),
-                                ).angledGradientBackground(bg, 25f),
+                        Modifier
+                            .fillMaxWidth()
+                            .aspectRatio(1f)
+                            .clip(
+                                RoundedCornerShape(8.dp),
+                            )
+                            .angledGradientBackground(bg, 25f),
                     )
                     Box(
                         modifier =
-                            Modifier
-                                .fillMaxWidth()
-                                .height(180.dp)
-                                .align(Alignment.BottomCenter)
-                                .background(
-                                    brush =
-                                        Brush.verticalGradient(
-                                            listOf(
-                                                Color.Transparent,
-                                                Color(0x75000000),
-                                                Color.Black,
-                                            ),
-                                        ),
+                        Modifier
+                            .fillMaxWidth()
+                            .height(180.dp)
+                            .align(Alignment.BottomCenter)
+                            .background(
+                                brush =
+                                Brush.verticalGradient(
+                                    listOf(
+                                        Color.Transparent,
+                                        Color(0x75000000),
+                                        Color.Black,
+                                    ),
                                 ),
+                            ),
                     )
                 }
                 Column(
@@ -389,10 +390,10 @@ fun PlaylistScreen(
                 ) {
                     Row(
                         modifier =
-                            Modifier
-                                .wrapContentWidth()
-                                .padding(16.dp)
-                                .windowInsetsPadding(WindowInsets.statusBars),
+                        Modifier
+                            .wrapContentWidth()
+                            .padding(16.dp)
+                            .windowInsetsPadding(WindowInsets.statusBars),
                     ) {
                         RippleIconButton(
                             resId = R.drawable.baseline_arrow_back_ios_new_24,
@@ -408,43 +409,43 @@ fun PlaylistScreen(
                                 localPlaylist?.thumbnail
                             },
                             imageOptions =
-                                ImageOptions(
-                                    contentScale = ContentScale.FillHeight,
-                                    alignment = Alignment.Center,
-                                ),
+                            ImageOptions(
+                                contentScale = ContentScale.FillHeight,
+                                alignment = Alignment.Center,
+                            ),
                             previewPlaceholder = painterResource(id = R.drawable.holder),
                             component =
-                                rememberImageComponent {
-                                    add(
-                                        CrossfadePlugin(
-                                            duration = 550,
-                                        ),
-                                    )
-                                    add(
-                                        PalettePlugin(
-                                            paletteLoadedListener = {
-                                                palette = it
-                                            },
-                                            useCache = true,
-                                        ),
-                                    )
-                                    +PlaceholderPlugin.Loading(painterResource(id = R.drawable.holder))
-                                    +PlaceholderPlugin.Failure(painterResource(id = R.drawable.holder))
-                                },
-                            modifier =
-                                Modifier
-                                    .height(250.dp)
-                                    .wrapContentWidth()
-                                    .align(Alignment.CenterHorizontally)
-                                    .clip(
-                                        RoundedCornerShape(8.dp),
+                            rememberImageComponent {
+                                add(
+                                    CrossfadePlugin(
+                                        duration = 550,
+                                    ),
+                                )
+                                add(
+                                    PalettePlugin(
+                                        paletteLoadedListener = {
+                                            palette = it
+                                        },
+                                        useCache = true,
                                     ),
+                                )
+                                +PlaceholderPlugin.Loading(painterResource(id = R.drawable.holder))
+                                +PlaceholderPlugin.Failure(painterResource(id = R.drawable.holder))
+                            },
+                            modifier =
+                            Modifier
+                                .height(250.dp)
+                                .wrapContentWidth()
+                                .align(Alignment.CenterHorizontally)
+                                .clip(
+                                    RoundedCornerShape(8.dp),
+                                ),
                         )
                         Box(
                             modifier =
-                                Modifier
-                                    .fillMaxWidth()
-                                    .wrapContentHeight(),
+                            Modifier
+                                .fillMaxWidth()
+                                .wrapContentHeight(),
                         ) {
                             Column(Modifier.padding(horizontal = 32.dp)) {
                                 Spacer(modifier = Modifier.size(25.dp))
@@ -464,21 +465,21 @@ fun PlaylistScreen(
                                     Spacer(modifier = Modifier.height(8.dp))
                                     Text(
                                         text =
-                                            stringResource(
-                                                id = R.string.created_at,
-                                                localPlaylist?.inLibrary?.format(
-                                                    DateTimeFormatter.ofPattern(
-                                                        "kk:mm - dd MMM uuuu",
-                                                    ),
-                                                ) ?: "",
-                                            ),
+                                        stringResource(
+                                            id = R.string.created_at,
+                                            localPlaylist?.inLibrary?.format(
+                                                DateTimeFormatter.ofPattern(
+                                                    "kk:mm - dd MMM uuuu",
+                                                ),
+                                            ) ?: "",
+                                        ),
                                         style = typo.bodyMedium,
                                         color = Color(0xC4FFFFFF),
                                     )
                                 }
                                 Row(
                                     modifier =
-                                        Modifier.fillMaxWidth(),
+                                    Modifier.fillMaxWidth(),
                                     verticalAlignment = Alignment.CenterVertically,
                                 ) {
                                     RippleIconButton(
@@ -500,15 +501,15 @@ fun PlaylistScreen(
                                                     playlistName = "Playlist \"${localPlaylist?.title}\"",
                                                     playlistType = PlaylistType.LOCAL_PLAYLIST,
                                                     continuation =
-                                                        if (offset > 0) {
-                                                            if (filterState == FilterState.OlderFirst) {
-                                                                (ASC + offset.toString())
-                                                            } else {
-                                                                (DESC + offset)
-                                                            }
+                                                    if (offset > 0) {
+                                                        if (filterState == FilterState.OlderFirst) {
+                                                            (ASC + offset.toString())
                                                         } else {
-                                                            null
-                                                        },
+                                                            (DESC + offset)
+                                                        }
+                                                    } else {
+                                                        null
+                                                    },
                                                 ),
                                             )
                                             sharedViewModel.loadMediaItemFromTrack(
@@ -526,27 +527,29 @@ fun PlaylistScreen(
                                             DownloadState.STATE_DOWNLOADED -> {
                                                 Box(
                                                     modifier =
-                                                        Modifier
-                                                            .size(36.dp)
-                                                            .clip(
-                                                                CircleShape,
-                                                            ).clickable {
-                                                                Toast
-                                                                    .makeText(
-                                                                        context,
-                                                                        context.getString(R.string.downloaded),
-                                                                        Toast.LENGTH_SHORT,
-                                                                    ).show()
-                                                            },
+                                                    Modifier
+                                                        .size(36.dp)
+                                                        .clip(
+                                                            CircleShape,
+                                                        )
+                                                        .clickable {
+                                                            Toast
+                                                                .makeText(
+                                                                    context,
+                                                                    context.getString(R.string.downloaded),
+                                                                    Toast.LENGTH_SHORT,
+                                                                )
+                                                                .show()
+                                                        },
                                                 ) {
                                                     Icon(
                                                         painter = painterResource(id = R.drawable.baseline_downloaded),
                                                         tint = Color(0xFF00A0CB),
                                                         contentDescription = "",
                                                         modifier =
-                                                            Modifier
-                                                                .size(36.dp)
-                                                                .padding(2.dp),
+                                                        Modifier
+                                                            .size(36.dp)
+                                                            .padding(2.dp),
                                                     )
                                                 }
                                             }
@@ -554,18 +557,20 @@ fun PlaylistScreen(
                                             DownloadState.STATE_DOWNLOADING -> {
                                                 Box(
                                                     modifier =
-                                                        Modifier
-                                                            .size(36.dp)
-                                                            .clip(
-                                                                CircleShape,
-                                                            ).clickable {
-                                                                Toast
-                                                                    .makeText(
-                                                                        context,
-                                                                        context.getString(R.string.downloading),
-                                                                        Toast.LENGTH_SHORT,
-                                                                    ).show()
-                                                            },
+                                                    Modifier
+                                                        .size(36.dp)
+                                                        .clip(
+                                                            CircleShape,
+                                                        )
+                                                        .clickable {
+                                                            Toast
+                                                                .makeText(
+                                                                    context,
+                                                                    context.getString(R.string.downloading),
+                                                                    Toast.LENGTH_SHORT,
+                                                                )
+                                                                .show()
+                                                        },
                                                 ) {
                                                     LottieAnimation(
                                                         composition,
@@ -592,55 +597,57 @@ fun PlaylistScreen(
                                     AnimatedVisibility(visible = shouldShowSuggestButton) {
                                         Box(
                                             modifier =
-                                                Modifier
-                                                    .size(36.dp)
-                                                    .clip(CircleShape)
-                                                    .graphicsLayer {
-                                                        compositingStrategy =
-                                                            CompositingStrategy.Offscreen
-                                                    }.clickable {
-                                                        shouldShowSuggestions = !shouldShowSuggestions
-                                                    }.drawWithCache {
-                                                        val width = size.width - 10
-                                                        val height = size.height - 10
-
-                                                        val offsetDraw = width * progressAnimated
-                                                        val gradientColors =
-                                                            listOf(
-                                                                Color(0xFF4C82EF),
-                                                                Color(0xFFD96570),
-                                                            )
-                                                        val brush =
-                                                            Brush.linearGradient(
-                                                                colors = gradientColors,
-                                                                start = Offset(offsetDraw, 0f),
-                                                                end =
-                                                                    Offset(
-                                                                        offsetDraw + width,
-                                                                        height,
-                                                                    ),
-                                                            )
+                                            Modifier
+                                                .size(36.dp)
+                                                .clip(CircleShape)
+                                                .graphicsLayer {
+                                                    compositingStrategy =
+                                                        CompositingStrategy.Offscreen
+                                                }
+                                                .clickable {
+                                                    shouldShowSuggestions = !shouldShowSuggestions
+                                                }
+                                                .drawWithCache {
+                                                    val width = size.width - 10
+                                                    val height = size.height - 10
 
-                                                        onDrawBehind {
-                                                            // Destination
-                                                            with(aiPainter) {
-                                                                draw(
-                                                                    size = Size(width, width),
-                                                                )
-                                                            }
+                                                    val offsetDraw = width * progressAnimated
+                                                    val gradientColors =
+                                                        listOf(
+                                                            Color(0xFF4C82EF),
+                                                            Color(0xFFD96570),
+                                                        )
+                                                    val brush =
+                                                        Brush.linearGradient(
+                                                            colors = gradientColors,
+                                                            start = Offset(offsetDraw, 0f),
+                                                            end =
+                                                            Offset(
+                                                                offsetDraw + width,
+                                                                height,
+                                                            ),
+                                                        )
 
-                                                            // Source
-                                                            drawRect(
-                                                                brush = brush,
-                                                                blendMode = BlendMode.SrcIn,
+                                                    onDrawBehind {
+                                                        // Destination
+                                                        with(aiPainter) {
+                                                            draw(
+                                                                size = Size(width, width),
                                                             )
                                                         }
-                                                    },
+
+                                                        // Source
+                                                        drawRect(
+                                                            brush = brush,
+                                                            blendMode = BlendMode.SrcIn,
+                                                        )
+                                                    }
+                                                },
                                         )
                                     }
                                     RippleIconButton(
                                         modifier =
-                                            Modifier.size(36.dp),
+                                        Modifier.size(36.dp),
                                         resId = R.drawable.baseline_shuffle_24,
                                         fillMaxSize = true,
                                     ) {
@@ -665,15 +672,15 @@ fun PlaylistScreen(
                                                     playlistName = "Playlist \"${localPlaylist?.title}\"",
                                                     playlistType = PlaylistType.LOCAL_PLAYLIST,
                                                     continuation =
-                                                        if (offset > 0) {
-                                                            if (filterState == FilterState.OlderFirst) {
-                                                                (ASC + offset.toString())
-                                                            } else {
-                                                                (DESC + offset)
-                                                            }
+                                                    if (offset > 0) {
+                                                        if (filterState == FilterState.OlderFirst) {
+                                                            (ASC + offset.toString())
                                                         } else {
-                                                            null
-                                                        },
+                                                            (DESC + offset)
+                                                        }
+                                                    } else {
+                                                        null
+                                                    },
                                                 ),
                                             )
                                             sharedViewModel.loadMediaItemFromTrack(
@@ -691,7 +698,7 @@ fun PlaylistScreen(
                                     Spacer(Modifier.size(5.dp))
                                     RippleIconButton(
                                         modifier =
-                                            Modifier.size(36.dp),
+                                        Modifier.size(36.dp),
                                         resId = R.drawable.baseline_more_vert_24,
                                         fillMaxSize = true,
                                     ) {
@@ -711,11 +718,11 @@ fun PlaylistScreen(
                                 //                                )
                                 Text(
                                     text =
-                                        stringResource(
-                                            id = R.string.album_length,
-                                            (localPlaylist?.tracks?.size ?: 0).toString(),
-                                            "",
-                                        ),
+                                    stringResource(
+                                        id = R.string.album_length,
+                                        (localPlaylist?.tracks?.size ?: 0).toString(),
+                                        "",
+                                    ),
                                     color = Color.White,
                                     style = typo.bodyMedium,
                                     modifier = Modifier.padding(vertical = 8.dp),
@@ -727,9 +734,9 @@ fun PlaylistScreen(
                                         Spacer(modifier = Modifier.size(8.dp))
                                         Text(
                                             text =
-                                                stringResource(
-                                                    id = R.string.suggest,
-                                                ),
+                                            stringResource(
+                                                id = R.string.suggest,
+                                            ),
                                             color = Color.White,
                                             modifier = Modifier.padding(vertical = 8.dp),
                                         )
@@ -738,10 +745,10 @@ fun PlaylistScreen(
                                             if (it) {
                                                 CenterLoadingBox(
                                                     modifier =
-                                                        Modifier
-                                                            .fillMaxWidth()
-                                                            .height(200.dp)
-                                                            .align(Alignment.CenterHorizontally),
+                                                    Modifier
+                                                        .fillMaxWidth()
+                                                        .height(200.dp)
+                                                        .align(Alignment.CenterHorizontally),
                                                 )
                                             } else {
                                                 Column {
@@ -790,62 +797,62 @@ fun PlaylistScreen(
                                         TextButton(
                                             onClick = { viewModel.reloadSuggestion() },
                                             modifier =
-                                                Modifier
-                                                    .padding(horizontal = 8.dp)
-                                                    .drawWithContent {
-                                                        val strokeWidthPx = 2.dp.toPx()
-                                                        val width = size.width
-                                                        val height = size.height
+                                            Modifier
+                                                .padding(horizontal = 8.dp)
+                                                .drawWithContent {
+                                                    val strokeWidthPx = 2.dp.toPx()
+                                                    val width = size.width
+                                                    val height = size.height
 
-                                                        drawContent()
+                                                    drawContent()
 
-                                                        with(drawContext.canvas.nativeCanvas) {
-                                                            val checkPoint = saveLayer(null, null)
+                                                    with(drawContext.canvas.nativeCanvas) {
+                                                        val checkPoint = saveLayer(null, null)
 
-                                                            // Destination
-                                                            drawRoundRect(
-                                                                cornerRadius = CornerRadius(x = 60f, y = 60f),
-                                                                color = Color.Gray,
-                                                                topLeft = Offset(strokeWidthPx / 2, strokeWidthPx / 2),
-                                                                size = Size(width - strokeWidthPx, height - strokeWidthPx),
-                                                                style = Stroke(strokeWidthPx),
+                                                        // Destination
+                                                        drawRoundRect(
+                                                            cornerRadius = CornerRadius(x = 60f, y = 60f),
+                                                            color = Color.Gray,
+                                                            topLeft = Offset(strokeWidthPx / 2, strokeWidthPx / 2),
+                                                            size = Size(width - strokeWidthPx, height - strokeWidthPx),
+                                                            style = Stroke(strokeWidthPx),
+                                                        )
+                                                        val gradientColors =
+                                                            listOf(
+                                                                Color(0xFF4C82EF),
+                                                                Color(0xFFD96570),
+                                                            )
+                                                        val brush =
+                                                            Brush.linearGradient(
+                                                                colors = gradientColors,
+                                                                start = Offset(2f, 0f),
+                                                                end =
+                                                                Offset(
+                                                                    2 + width,
+                                                                    height,
+                                                                ),
                                                             )
-                                                            val gradientColors =
-                                                                listOf(
-                                                                    Color(0xFF4C82EF),
-                                                                    Color(0xFFD96570),
-                                                                )
-                                                            val brush =
-                                                                Brush.linearGradient(
-                                                                    colors = gradientColors,
-                                                                    start = Offset(2f, 0f),
-                                                                    end =
-                                                                        Offset(
-                                                                            2 + width,
-                                                                            height,
-                                                                        ),
-                                                                )
-
-                                                            // Source
-                                                            rotate(degrees = angle) {
-                                                                drawCircle(
-                                                                    brush = brush,
-                                                                    radius = size.width,
-                                                                    blendMode = BlendMode.SrcIn,
-                                                                )
-                                                            }
 
-                                                            restoreToCount(checkPoint)
+                                                        // Source
+                                                        rotate(degrees = angle) {
+                                                            drawCircle(
+                                                                brush = brush,
+                                                                radius = size.width,
+                                                                blendMode = BlendMode.SrcIn,
+                                                            )
                                                         }
-                                                    },
+
+                                                        restoreToCount(checkPoint)
+                                                    }
+                                                },
                                         ) {
                                             Text(
                                                 text = stringResource(id = R.string.reload),
                                                 color = Color.White,
                                                 modifier =
-                                                    Modifier.align(
-                                                        Alignment.CenterVertically,
-                                                    ),
+                                                Modifier.align(
+                                                    Alignment.CenterVertically,
+                                                ),
                                             )
                                         }
                                         Spacer(modifier = Modifier.size(12.dp))
@@ -859,8 +866,8 @@ fun PlaylistScreen(
                                 ElevatedButton(
                                     contentPadding = PaddingValues(0.dp),
                                     modifier =
-                                        Modifier
-                                            .defaultMinSize(minWidth = 1.dp, minHeight = 1.dp),
+                                    Modifier
+                                        .defaultMinSize(minWidth = 1.dp, minHeight = 1.dp),
                                     onClick = {
                                         viewModel.onUIEvent(LocalPlaylistUIEvent.ChangeFilter)
                                     },
@@ -889,7 +896,10 @@ fun PlaylistScreen(
                 }
             }
         }
-        items(count = trackPagingItems.itemCount) { index ->
+        items(count = trackPagingItems.itemCount, key = { index ->
+            val item = trackPagingItems[index]
+            item?.videoId ?: "item_$index"
+        }) { index ->
             val item = trackPagingItems[index]
             if (item != null) {
                 if (playingTrack?.mediaId == item.videoId && isPlaying) {
@@ -976,19 +986,19 @@ fun PlaylistScreen(
                 onDismiss = { playlistBottomSheetShow = false },
                 localPlaylist = it,
                 onEditTitle =
-                    { newTitle ->
-                        viewModel.updatePlaylistTitle(newTitle, it.id)
-                        if (it.syncedWithYouTubePlaylist == 1) {
-                            viewModel.updateYouTubePlaylistTitle(
-                                newTitle,
-                                it.youtubePlaylistId!!,
-                            )
-                        }
-                    },
+                { newTitle ->
+                    viewModel.updatePlaylistTitle(newTitle, it.id)
+                    if (it.syncedWithYouTubePlaylist == 1) {
+                        viewModel.updateYouTubePlaylistTitle(
+                            newTitle,
+                            it.youtubePlaylistId!!,
+                        )
+                    }
+                },
                 onEditThumbnail =
-                    { thumbUri ->
-                        viewModel.updatePlaylistThumbnail(thumbUri, it.id)
-                    },
+                { thumbUri ->
+                    viewModel.updatePlaylistThumbnail(thumbUri, it.id)
+                },
                 onAddToQueue = {
                     /*
                     Add to queue in LaunchedEffect
@@ -1106,9 +1116,9 @@ fun PlaylistScreen(
                 }
             },
             colors =
-                TopAppBarDefaults.topAppBarColors(
-                    containerColor = Color.Transparent,
-                ),
+            TopAppBarDefaults.topAppBarColors(
+                containerColor = Color.Transparent,
+            ),
             modifier = Modifier.angledGradientBackground(bg, 90f),
         )
     }

From e048eac1dcd4da069245a56c7415997f0ea258f2 Mon Sep 17 00:00:00 2001
From: Ilian Delagrange <iliandelagrange@gmail.com>
Date: Wed, 27 Nov 2024 21:00:12 -0500
Subject: [PATCH 4/6] Fixed merge errors

---
 .../simpmusic/ui/screen/home/HomeScreen.kt    | 45 ++++++++-----------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt b/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
index 70e59c7a..a2863d66 100644
--- a/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/ui/screen/home/HomeScreen.kt
@@ -75,6 +75,7 @@ import com.maxrave.kotlinytmusicscraper.config.Constants
 import com.maxrave.simpmusic.R
 import com.maxrave.simpmusic.common.CHART_SUPPORTED_COUNTRY
 import com.maxrave.simpmusic.common.Config
+import com.maxrave.simpmusic.common.LIMIT_CACHE_SIZE.data
 import com.maxrave.simpmusic.data.model.browse.album.Track
 import com.maxrave.simpmusic.data.model.explore.mood.Mood
 import com.maxrave.simpmusic.data.model.home.HomeItem
@@ -307,16 +308,7 @@ fun HomeScreen(
                                             context.getString(
                                                 R.string.quick_picks,
                                             )
-                                    } != null,
-                            ) {
-                                QuickPicks(
-                                    homeItem =
-                                        homeData.find {
-                                            it.title ==
-                                                context.getString(
-                                                    R.string.quick_picks,
-                                                )
-                                        } ?: return@AnimatedVisibility,
+                                    } ?: return@AnimatedVisibility,
                                     viewModel = viewModel,
                                 )
                             }
@@ -567,23 +559,24 @@ fun QuickPicks(
         ) {
             items(homeItem.contents, key = { it?.videoId ?: "item_${it.hashCode()}" }) {
                 if (it != null) {
-                    QuickPicksItem(onClick = {
-                        val firstQueue: Track = it.toTrack()
-                        viewModel.setQueueData(
-                            QueueData(
-                                listTracks = arrayListOf(firstQueue),
-                                firstPlayedTrack = firstQueue,
-                                playlistId = "RDAMVM${it.videoId}",
-                                playlistName = "\"${it.title}\" Radio",
-                                playlistType = PlaylistType.RADIO,
-                                continuation = null
+                    QuickPicksItem(
+                        onClick = {
+                            val firstQueue: Track = it.toTrack()
+                            viewModel.setQueueData(
+                                QueueData(
+                                    listTracks = arrayListOf(firstQueue),
+                                    firstPlayedTrack = firstQueue,
+                                    playlistId = "RDAMVM${it.videoId}",
+                                    playlistName = "\"${it.title}\" Radio",
+                                    playlistType = PlaylistType.RADIO,
+                                    continuation = null
+                                )
                             )
-                        )
-                        viewModel.loadMediaItem(
-                            firstQueue,
-                            type = Config.SONG_CLICK,
-                        )
-                    },
+                            viewModel.loadMediaItem(
+                                firstQueue,
+                                type = Config.SONG_CLICK,
+                            )
+                        },
                         data = it,
                         widthDp = widthDp,
                     )

From 3caba3969ce4a322d8c9beae7bafb712212dbbc9 Mon Sep 17 00:00:00 2001
From: Ilian Delagrange <iliandelagrange@gmail.com>
Date: Thu, 28 Nov 2024 08:24:07 -0500
Subject: [PATCH 5/6] Removed runConfiguration

---
 .gitignore                  |  2 +-
 .idea/runConfigurations.xml | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.gitignore b/.gitignore
index 64c9069c..86ef308e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@ local.properties
 crowdin.yml
 # Kotlin 2.0
 .kotlin/
-.idea
+.idea/
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 16660f1d..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
-        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
-        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
-        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
-        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
-        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
-        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

From 65b15bbe4f959b797ba98dc5057fb35af9095a67 Mon Sep 17 00:00:00 2001
From: Nguyen Duc Tuan Minh <minhnguyen.31211027595@st.ueh.edu.vn>
Date: Thu, 28 Nov 2024 20:45:59 +0700
Subject: [PATCH 6/6] Fix gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 86ef308e..64c9069c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@ local.properties
 crowdin.yml
 # Kotlin 2.0
 .kotlin/
-.idea/
+.idea