Fix favorite songs screen (#358)

siper · Feb 6, 2025 · 3b159a7 · 3b159a7
1 parent 43fe322
commit 3b159a7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/feature/favorite/list/build.gradle b/feature/favorite/list/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation project(":core:ui")
     implementation project(":core:api")
     implementation project(":shared:player")
+    implementation project(":shared:favorites")
     implementation(libs.bundles.lifecycle)
     implementation(libs.coil.compose)
     implementation(libs.bundles.koin)

diff --git a/.../src/main/java/ru/stresh/youamp/feature/favorite/list/data/FavoriteSongsRepositoryImpl.kt b/.../src/main/java/ru/stresh/youamp/feature/favorite/list/data/FavoriteSongsRepositoryImpl.kt
@@ -2,34 +2,31 @@ package ru.stresh.youamp.feature.favorite.list.data
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import ru.stersh.youamp.core.api.SubsonicApi
-import ru.stersh.youamp.core.api.provider.ApiProvider
 import ru.stresh.youamp.feature.favorite.list.domain.FavoriteSongsRepository
 import ru.stresh.youamp.feature.favorite.list.domain.Favorites
 import ru.stresh.youamp.feature.favorite.list.domain.Song
+import ru.stresh.youamp.shared.favorites.SongFavoritesStorage
 
-internal class FavoriteSongsRepositoryImpl(private val apiProvider: ApiProvider) : FavoriteSongsRepository {
+internal class FavoriteSongsRepositoryImpl(
+    private val songFavoritesStorage: SongFavoritesStorage
+) : FavoriteSongsRepository {
 
     override fun getFavorites(): Flow<Favorites> {
-        return apiProvider
-            .flowApi()
-            .map { api ->
-                val starred = api.getStarred2().starred2Result
+        return songFavoritesStorage
+            .flowSongs()
+            .map { favoriteSongs ->
                 Favorites(
-                    songs = starred
-                        .song
-                        .orEmpty()
-                        .map { it.toDomain(api) }
+                    songs = favoriteSongs.map { it.toDomain() }
                 )
             }
     }
 
-    private fun ru.stersh.youamp.core.api.Song.toDomain(api: SubsonicApi): Song {
+    private fun ru.stresh.youamp.shared.favorites.Song.toDomain(): Song {
         return Song(
             id = id,
             title = title,
             artist = artist,
-            artworkUrl = api.getCoverArtUrl(coverArt),
+            artworkUrl = artworkUrl,
             userRating = userRating
         )
     }

diff --git a/shared/favorites/src/main/java/ru/stresh/youamp/shared/favorites/FavoritesStorageImpl.kt b/shared/favorites/src/main/java/ru/stresh/youamp/shared/favorites/FavoritesStorageImpl.kt
@@ -123,7 +123,8 @@ internal class FavoritesStorageImpl(
                     albumId = it.albumId,
                     artist = it.artist,
                     artistId = it.artistId,
-                    artworkUrl = api.getCoverArtUrl(it.coverArt)
+                    artworkUrl = api.getCoverArtUrl(it.coverArt),
+                    userRating = it.userRating
                 )
             }.orEmpty(),
             albums = newFavorites.starred2Result.album?.map {

diff --git a/shared/favorites/src/main/java/ru/stresh/youamp/shared/favorites/Song.kt b/shared/favorites/src/main/java/ru/stresh/youamp/shared/favorites/Song.kt
@@ -8,4 +8,5 @@ data class Song(
     val artist: String?,
     val artistId: String?,
     val artworkUrl: String?,
+    val userRating: Int?
 )