Migrate to "parent-child" components

androidbroadcast · Oct 7, 2024 · 9ddfe3a · 9ddfe3a
1 parent c60c9a6
commit 9ddfe3a
Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/core/platform/src/commonMain/kotlin/dev/androidbroadcast/news/core/AppComponent.kt b/core/platform/src/commonMain/kotlin/dev/androidbroadcast/news/core/AppComponent.kt
@@ -38,8 +38,6 @@ public abstract class AppComponent(
 
     public abstract val articlesRepository: ArticlesRepository
 
-    public abstract val newsDatabase: NewsDatabase
-
     @ExperimentalSerializationApi
     @Singleton
     @Provides

diff --git a/...gic/src/androidMain/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.android.kt b/...gic/src/androidMain/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.android.kt
@@ -3,5 +3,5 @@ package dev.androidbroadcast.news.main.di
 import dev.androidbroadcast.news.core.AppComponent
 
 actual fun createNewsMainComponent(component: AppComponent): NewsMainComponent {
-    return NewsMainComponent::class.create(component.articlesRepository)
+    return NewsMainComponent::class.create(component)
 }
diff --git a/...ain/ui-logic/src/commonMain/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.kt b/...ain/ui-logic/src/commonMain/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.kt
@@ -1,17 +1,15 @@
 package dev.androidbroadcast.news.main.di
 
 import dev.androidbroadcast.news.core.AppComponent
-import dev.androidbroadcast.news.data.ArticlesRepository
 import dev.androidbroadcast.news.main.NewsMainViewModel
 import me.tatarka.inject.annotations.Component
-import me.tatarka.inject.annotations.Provides
 
 public expect fun createNewsMainComponent(component: AppComponent): NewsMainComponent
 
 @Component
 @NewsMainScope
 public abstract class NewsMainComponent(
-    @get:Provides val articlesRepository: ArticlesRepository
+    @Component val appComponent: AppComponent
 ) {
 
     abstract val newsMainViewModel: NewsMainViewModel

diff --git a/...c/src/iosArm64Main/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.iosArm64.kt b/...c/src/iosArm64Main/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.iosArm64.kt
@@ -3,5 +3,5 @@ package dev.androidbroadcast.news.main.di
 import dev.androidbroadcast.news.core.AppComponent
 
 actual fun createNewsMainComponent(component: AppComponent): NewsMainComponent {
-    return NewsMainComponent::class.create(component.articlesRepository)
+    return NewsMainComponent::class.create(component)
 }
diff --git a/...Arm64Main/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.iosSimulatorArm64.kt b/...Arm64Main/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.iosSimulatorArm64.kt
@@ -3,5 +3,5 @@ package dev.androidbroadcast.news.main.di
 import dev.androidbroadcast.news.core.AppComponent
 
 actual fun createNewsMainComponent(component: AppComponent): NewsMainComponent {
-    return NewsMainComponent::class.create(component.articlesRepository)
+    return NewsMainComponent::class.create(component)
 }
diff --git a/...in/ui-logic/src/jvmMain/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.jvm.kt b/...in/ui-logic/src/jvmMain/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.jvm.kt
@@ -3,5 +3,5 @@ package dev.androidbroadcast.news.main.di
 import dev.androidbroadcast.news.core.AppComponent
 
 actual fun createNewsMainComponent(component: AppComponent): NewsMainComponent {
-    return NewsMainComponent::class.create(component.articlesRepository)
+    return NewsMainComponent::class.create(component)
 }