origin/JetpackCompose

app/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 
 android {
     namespace = "com.example.playlistmaker"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.example.playlistmaker"
@@ -47,6 +47,10 @@ android {
         checkReleaseBuilds = false
         abortOnError = false
     }
+    buildFeatures { compose = true }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.10"
+    }
 }
 
 dependencies {
@@ -77,4 +81,17 @@ dependencies {
     implementation("androidx.room:room-runtime:2.6.1")
     kapt("androidx.room:room-compiler:2.6.1")
     implementation("androidx.room:room-ktx:2.6.1")
+    val composeBom = platform("androidx.compose:compose-bom:2024.06.00")
+    implementation(composeBom)
+    androidTestImplementation(composeBom)
+    implementation("androidx.activity:activity-compose:1.8.0")
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.ui:ui-tooling-preview")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    implementation("androidx.compose.runtime:runtime-livedata")
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.0")
+    implementation("io.coil-kt:coil-compose:2.7.0")
+    implementation("androidx.compose.material:material")
+    implementation("androidx.compose.material:material-icons-extended")
 }

app/src/main/java/com/example/playlistmaker/App.kt

@@ -6,6 +6,7 @@ import com.example.playlistmaker.di.DomainModule
 import com.example.playlistmaker.di.dataModule
 import com.example.playlistmaker.di.repositoryModule
 import com.example.playlistmaker.di.interactorModule
+import com.example.playlistmaker.di.mediaLibraryComposeModule
 import com.example.playlistmaker.di.mediaModule
 import com.example.playlistmaker.di.viewModelModule
 import com.example.playlistmaker.di.navigationModule
@@ -29,7 +30,8 @@ class App : Application() {
                 mediaModule,
                 navigationModule,
                 DomainModule,
-                playlistWorkModule
+                playlistWorkModule,
+                mediaLibraryComposeModule
             )
         }
 

app/src/main/java/com/example/playlistmaker/di/ViewModelModule.kt

@@ -1,14 +1,20 @@
 package com.example.playlistmaker.di
 
+import com.example.playlistmaker.media.domain.interactor.PlaylistInteractor
+import com.example.playlistmaker.media.ui.MediaLibraryViewModel
+import com.example.playlistmaker.media.ui.PlaylistUi
 import com.example.playlistmaker.media.ui.viewmodel.CreatePlaylistViewModel
 import com.example.playlistmaker.media.ui.viewmodel.FavoritesViewModel
 import com.example.playlistmaker.media.ui.viewmodel.PlaylistViewModel
 import com.example.playlistmaker.media.ui.viewmodel.PlaylistsViewModel
-import com.example.playlistmaker.search.ui.viewmodel.SearchViewModel
+import com.example.playlistmaker.player.domain.interactor.FavoritesInteractor
 import com.example.playlistmaker.player.ui.viewmodel.PlayerViewModel
 import com.example.playlistmaker.search.domain.model.Track
+import com.example.playlistmaker.search.ui.viewmodel.SearchViewModel
 import com.example.playlistmaker.settings.ui.viewmodel.SettingsViewModel
+import kotlinx.coroutines.flow.first
 import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val viewModelModule = module {
@@ -21,7 +27,6 @@ val viewModelModule = module {
         )
     }
 
-
     viewModel {
         SettingsViewModel(
             getTheme = get(),
@@ -40,17 +45,8 @@ val viewModelModule = module {
         )
     }
 
-    viewModel {
-        FavoritesViewModel(
-            favoritesInteractor = get()
-        )
-    }
+    viewModel { FavoritesViewModel(favoritesInteractor = get()) }
+    viewModel { CreatePlaylistViewModel(get()) }
+    viewModel { PlaylistsViewModel(get()) }
 
-    viewModel {
-        CreatePlaylistViewModel(get())
-    }
-
-    viewModel {
-        PlaylistsViewModel(get())
-    }
 }

app/src/main/java/com/example/playlistmaker/di/mediaLibraryComposeModule.kt

@@ -0,0 +1,38 @@
+package com.example.playlistmaker.di
+
+import com.example.playlistmaker.media.domain.interactor.PlaylistInteractor
+import com.example.playlistmaker.media.ui.MediaLibraryViewModel
+import com.example.playlistmaker.media.ui.PlaylistUi
+import com.example.playlistmaker.player.domain.interactor.FavoritesInteractor
+import com.example.playlistmaker.search.domain.model.Track
+import kotlinx.coroutines.flow.first
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.qualifier.named
+import org.koin.dsl.module
+
+val mediaLibraryComposeModule = module {
+
+    single<suspend () -> List<Track>>(named("getFavoritesOnce")) {
+        suspend { get<FavoritesInteractor>().observeFavorites().first() }
+    }
+
+    single<suspend () -> List<PlaylistUi>>(named("getPlaylistsOnce")) {
+        suspend {
+            get<PlaylistInteractor>().observeAll().first().map { p ->
+                PlaylistUi(
+                    id = p.id,
+                    title = p.name,
+                    trackCount = p.trackCount,
+                    coverUrl = p.coverPath
+                )
+            }
+        }
+    }
+
+    viewModel {
+        MediaLibraryViewModel(
+            getFavoritesOnce = get(named("getFavoritesOnce")),
+            getPlaylistsOnce = get(named("getPlaylistsOnce")),
+        )
+    }
+}