Scope Injected ScreenModels in DI graph properly

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/di/DealsFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.DealsFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@DealsFeatureScope
+abstract class DealsFeatureComponent(
+    @Component val parent: HostActivityComponent
+) : SharedDealsFeatureComponent

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/di/DiscoverFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.DiscoverFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@DiscoverFeatureScope
+abstract class DiscoverFeatureComponent(
+    @Component val parent: HostActivityComponent
+) : SharedDiscoverFeatureComponent

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/di/HostActivityComponent.kt

@@ -1,11 +1,15 @@
 package com.mr3y.ludi.shared.di
 
 import android.app.Activity
+import com.mr3y.ludi.shared.ui.navigation.PreferencesType
+import com.mr3y.ludi.shared.ui.presenter.EditPreferencesViewModel
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides
 
 @Component
 abstract class HostActivityComponent(
     @get:Provides val activity: Activity,
     @Component val parent: AndroidApplicationComponent
-) : ScreenModelsComponent
+) {
+    abstract val editPreferencesViewModelFactory: (PreferencesType) -> EditPreferencesViewModel
+}

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/di/NewsFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.NewsFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@NewsFeatureScope
+abstract class NewsFeatureComponent(
+    @Component val parent: HostActivityComponent
+) : SharedNewsFeatureComponent

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/di/OnboardingFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.OnboardingFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@OnboardingFeatureScope
+abstract class OnboardingFeatureComponent(
+    @Component val parent: HostActivityComponent
+) : SharedOnboardingFeatureComponent

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/di/SettingsFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.SettingsFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@SettingsFeatureScope
+abstract class SettingsFeatureComponent(
+    @Component val parent: HostActivityComponent
+) : SharedSettingsFeatureComponent

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/di/VoyagerIntegration.android.kt

@@ -6,7 +6,12 @@ import cafe.adriel.voyager.core.model.ScreenModel
 import cafe.adriel.voyager.core.model.rememberScreenModel
 import cafe.adriel.voyager.core.screen.Screen
 import com.mr3y.ludi.shared.ui.navigation.PreferencesType
+import com.mr3y.ludi.shared.ui.presenter.DealsViewModel
+import com.mr3y.ludi.shared.ui.presenter.DiscoverViewModel
 import com.mr3y.ludi.shared.ui.presenter.EditPreferencesViewModel
+import com.mr3y.ludi.shared.ui.presenter.NewsViewModel
+import com.mr3y.ludi.shared.ui.presenter.OnBoardingViewModel
+import com.mr3y.ludi.shared.ui.presenter.SettingsViewModel
 
 /**
  * Provide a [ScreenModel] getting from kotlin-inject graph.
@@ -19,14 +24,29 @@ actual inline fun <reified T : ScreenModel> Screen.getScreenModel(
 ): T {
     val hostActivityComponent = (LocalContext.current as HostActivityComponentOwner).hostActivityComponent
     return rememberScreenModel(tag) {
-        val screenModels = hostActivityComponent.screenModels
-        val model = screenModels[T::class]?.invoke()
-            ?: error(
-                "${T::class} not found in kotlin-inject graph.\nPlease, check if you have a Multibinding " +
-                    "declaration to your ScreenModel using @IntoMap with " +
-                    "key ${T::class.qualifiedName}::class)"
-            )
-        model as T
+        when {
+            T::class.java.isAssignableFrom(OnBoardingViewModel::class.java) -> {
+                OnboardingFeatureComponent::class.create(hostActivityComponent).bind as T
+            }
+            T::class.java.isAssignableFrom(DiscoverViewModel::class.java) -> {
+                DiscoverFeatureComponent::class.create(hostActivityComponent).bind as T
+            }
+            T::class.java.isAssignableFrom(NewsViewModel::class.java) -> {
+                NewsFeatureComponent::class.create(hostActivityComponent).bind as T
+            }
+            T::class.java.isAssignableFrom(DealsViewModel::class.java) -> {
+                DealsFeatureComponent::class.create(hostActivityComponent).bind as T
+            }
+            T::class.java.isAssignableFrom(SettingsViewModel::class.java) -> {
+                SettingsFeatureComponent::class.create(hostActivityComponent).bind as T
+            }
+            else -> {
+                error(
+                    "${T::class} not found in kotlin-inject graph.\nPlease, check if you have declared a Feature Component " +
+                        "for your ScreenModel & its required dependencies"
+                )
+            }
+        }
     }
 }
 

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/SharedDealsFeatureComponent.kt

@@ -0,0 +1,15 @@
+package com.mr3y.ludi.shared.di
+
+import cafe.adriel.voyager.core.model.ScreenModel
+import com.mr3y.ludi.shared.di.annotations.DealsFeatureScope
+import com.mr3y.ludi.shared.ui.presenter.DealsViewModel
+import me.tatarka.inject.annotations.Provides
+
+interface SharedDealsFeatureComponent {
+
+    val bind: ScreenModel
+
+    @Provides
+    @DealsFeatureScope
+    fun DealsViewModel.provideDealsViewModelInstance(): ScreenModel = this
+}

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/SharedDiscoverFeatureComponent.kt

@@ -0,0 +1,21 @@
+package com.mr3y.ludi.shared.di
+
+import cafe.adriel.voyager.core.model.ScreenModel
+import com.mr3y.ludi.shared.di.annotations.DiscoverFeatureScope
+import com.mr3y.ludi.shared.ui.presenter.DefaultDiscoverPagingFactory
+import com.mr3y.ludi.shared.ui.presenter.DiscoverPagingFactory
+import com.mr3y.ludi.shared.ui.presenter.DiscoverViewModel
+import me.tatarka.inject.annotations.Provides
+
+interface SharedDiscoverFeatureComponent {
+
+    val bind: ScreenModel
+
+    @Provides
+    @DiscoverFeatureScope
+    fun DiscoverViewModel.provideDiscoverViewModelInstance(): ScreenModel = this
+
+    @Provides
+    @DiscoverFeatureScope
+    fun DefaultDiscoverPagingFactory.bind(): DiscoverPagingFactory = this
+}

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/SharedNewsFeatureComponent.kt

@@ -0,0 +1,15 @@
+package com.mr3y.ludi.shared.di
+
+import cafe.adriel.voyager.core.model.ScreenModel
+import com.mr3y.ludi.shared.di.annotations.NewsFeatureScope
+import com.mr3y.ludi.shared.ui.presenter.NewsViewModel
+import me.tatarka.inject.annotations.Provides
+
+interface SharedNewsFeatureComponent {
+
+    val bind: ScreenModel
+
+    @Provides
+    @NewsFeatureScope
+    fun NewsViewModel.provideNewsViewModelInstance(): ScreenModel = this
+}

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/SharedOnboardingFeatureComponent.kt

@@ -0,0 +1,15 @@
+package com.mr3y.ludi.shared.di
+
+import cafe.adriel.voyager.core.model.ScreenModel
+import com.mr3y.ludi.shared.di.annotations.OnboardingFeatureScope
+import com.mr3y.ludi.shared.ui.presenter.OnBoardingViewModel
+import me.tatarka.inject.annotations.Provides
+
+interface SharedOnboardingFeatureComponent {
+
+    val bind: ScreenModel
+
+    @Provides
+    @OnboardingFeatureScope
+    fun OnBoardingViewModel.provideOnboardingViewModelInstance(): ScreenModel = this
+}

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/SharedSettingsFeatureComponent.kt

@@ -0,0 +1,15 @@
+package com.mr3y.ludi.shared.di
+
+import cafe.adriel.voyager.core.model.ScreenModel
+import com.mr3y.ludi.shared.di.annotations.SettingsFeatureScope
+import com.mr3y.ludi.shared.ui.presenter.SettingsViewModel
+import me.tatarka.inject.annotations.Provides
+
+interface SharedSettingsFeatureComponent {
+
+    val bind: ScreenModel
+
+    @Provides
+    @SettingsFeatureScope
+    fun SettingsViewModel.provideSettingsViewModelInstance(): ScreenModel = this
+}

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/annotations/DealsFeatureScope.kt

@@ -0,0 +1,7 @@
+package com.mr3y.ludi.shared.di.annotations
+
+import me.tatarka.inject.annotations.Scope
+
+@Scope
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER)
+annotation class DealsFeatureScope

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/annotations/DiscoverFeatureScope.kt

@@ -0,0 +1,7 @@
+package com.mr3y.ludi.shared.di.annotations
+
+import me.tatarka.inject.annotations.Scope
+
+@Scope
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER)
+annotation class DiscoverFeatureScope

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/annotations/NewsFeatureScope.kt

@@ -0,0 +1,7 @@
+package com.mr3y.ludi.shared.di.annotations
+
+import me.tatarka.inject.annotations.Scope
+
+@Scope
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER)
+annotation class NewsFeatureScope

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/annotations/OnboardingFeatureScope.kt

@@ -0,0 +1,7 @@
+package com.mr3y.ludi.shared.di.annotations
+
+import me.tatarka.inject.annotations.Scope
+
+@Scope
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER)
+annotation class OnboardingFeatureScope

shared/src/commonMain/kotlin/com/mr3y/ludi/shared/di/annotations/SettingsFeatureScope.kt

@@ -0,0 +1,7 @@
+package com.mr3y.ludi.shared.di.annotations
+
+import me.tatarka.inject.annotations.Scope
+
+@Scope
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER)
+annotation class SettingsFeatureScope

shared/src/desktopMain/kotlin/com/mr3y/ludi/shared/di/DealsFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.DealsFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@DealsFeatureScope
+abstract class DealsFeatureComponent(
+    @Component val parent: HostWindowComponent
+) : SharedDealsFeatureComponent

shared/src/desktopMain/kotlin/com/mr3y/ludi/shared/di/DiscoverFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.DiscoverFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@DiscoverFeatureScope
+abstract class DiscoverFeatureComponent(
+    @Component val parent: HostWindowComponent
+) : SharedDiscoverFeatureComponent

shared/src/desktopMain/kotlin/com/mr3y/ludi/shared/di/HostWindowComponent.kt

@@ -2,13 +2,17 @@ package com.mr3y.ludi.shared.di
 
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.awt.ComposeWindow
+import com.mr3y.ludi.shared.ui.navigation.PreferencesType
+import com.mr3y.ludi.shared.ui.presenter.EditPreferencesViewModel
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides
 
 @Component
 abstract class HostWindowComponent(
     @get:Provides val window: ComposeWindow,
     @Component val parent: DesktopApplicationComponent
-) : ScreenModelsComponent
+) {
+    abstract val editPreferencesViewModelFactory: (PreferencesType) -> EditPreferencesViewModel
+}
 
 val LocalHostWindowComponent = staticCompositionLocalOf<HostWindowComponent> { error("HostWindowComponent isn't provided!") }

shared/src/desktopMain/kotlin/com/mr3y/ludi/shared/di/NewsFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.NewsFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@NewsFeatureScope
+abstract class NewsFeatureComponent(
+    @Component val parent: HostWindowComponent
+) : SharedNewsFeatureComponent

shared/src/desktopMain/kotlin/com/mr3y/ludi/shared/di/OnboardingFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.OnboardingFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@OnboardingFeatureScope
+abstract class OnboardingFeatureComponent(
+    @Component val parent: HostWindowComponent
+) : SharedOnboardingFeatureComponent

shared/src/desktopMain/kotlin/com/mr3y/ludi/shared/di/SettingsFeatureComponent.kt

@@ -0,0 +1,10 @@
+package com.mr3y.ludi.shared.di
+
+import com.mr3y.ludi.shared.di.annotations.SettingsFeatureScope
+import me.tatarka.inject.annotations.Component
+
+@Component
+@SettingsFeatureScope
+abstract class SettingsFeatureComponent(
+    @Component val parent: HostWindowComponent
+) : SharedSettingsFeatureComponent