Merge pull request #553 from Iliano101/performance

Small performance improvements
maxrave-dev · Nov 28, 2024 · b0a0ce4 · b0a0ce4
2 parents a92c926 + 65b15bb
commit b0a0ce4
Show file tree

Hide file tree

Showing 31 changed files with 325 additions and 239 deletions.
diff --git 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$* { *; }
+-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(...);
+}
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,10 +1,12 @@
 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
 import com.maxrave.simpmusic.data.type.HomeContentType
 
+@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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,10 +1,12 @@
 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
 import com.maxrave.simpmusic.data.type.HomeContentType
 
+@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
@@ -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/.../main/java/com/maxrave/simpmusic/data/model/explore/mood/moodmoments/MoodsMomentObject.kt b/.../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
@@ -1,12 +1,14 @@
 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
 import com.maxrave.simpmusic.data.type.HomeContentType
 
+@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
@@ -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>>,
-) {
-}
+)
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>,