Merge pull request #52 from stslex/feature/mvi_dagger

feature/mvi dagger

app/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
 dependencies {
     implementation(project(":core:core"))
     implementation(project(":core:ui"))
+
     implementation(project(":core:collection"))
     implementation(project(":core:navigation"))
     implementation(project(":core:network"))

app/src/main/java/st/slex/csplashscreen/SplashApplication.kt

@@ -1,43 +1,25 @@
 package st.slex.csplashscreen
 
 import android.app.Application
-import st.slex.csplashscreen.core.collection.di.ModuleCoreCollection.moduleCoreCollection
-import st.slex.csplashscreen.core.favourite.di.ModuleCoreFavourite.moduleCoreFavourite
-import st.slex.csplashscreen.core.network.di.ModuleCoreNetwork.moduleCoreNetwork
-import st.slex.csplashscreen.core.photos.di.ModuleCorePhotos.moduleCorePhotos
-import st.slex.csplashscreen.feature.collection.di.singleCollectionModule
-import st.slex.csplashscreen.feature.favourite.di.moduleFeatureFavourite
-import st.slex.csplashscreen.feature.feature_photo_detail.di.moduleFeaturePhoto
-import st.slex.csplashscreen.feature.home.di.moduleFeatureHome
-import st.slex.csplashscreen.feature.search.di.moduleFeatureSearchPhotos
-import st.slex.csplashscreen.feature.user.di.moduleFeatureUser
-import org.koin.android.ext.koin.androidContext
-import org.koin.android.ext.koin.androidLogger
-import org.koin.core.context.startKoin
+import st.slex.csplashscreen.core.core.AppApi
+import st.slex.csplashscreen.core.core.ApplicationApiProvider
+import st.slex.csplashscreen.di.app.AppComponent
+import st.slex.csplashscreen.di.app.DaggerAppComponent
 
-class SplashApplication : Application() {
+class SplashApplication : Application(), ApplicationApiProvider {
 
-    override fun onCreate() {
-        setUpKoin()
-        super.onCreate()
+    private val appComponent: AppComponent by lazy {
+        DaggerAppComponent
+            .builder()
+            .context(this)
+            .build()
     }
 
-    private fun setUpKoin() {
-        startKoin {
-            androidLogger()
-            androidContext(this@SplashApplication)
-            modules(
-                singleCollectionModule,
-                moduleCoreCollection,
-                moduleCorePhotos,
-                moduleCoreNetwork,
-                moduleFeaturePhoto,
-                moduleFeatureSearchPhotos,
-                moduleFeatureUser,
-                moduleFeatureHome,
-                moduleCoreFavourite,
-                moduleFeatureFavourite
-            )
-        }
+    override val appApi: AppApi
+        get() = appComponent
+
+    override fun onCreate() {
+        appComponent.inject(this)
+        super.onCreate()
     }
 }

app/src/main/java/st/slex/csplashscreen/di/app/AppComponent.kt

@@ -0,0 +1,24 @@
+package st.slex.csplashscreen.di.app
+
+import android.content.Context
+import dagger.BindsInstance
+import dagger.Component
+import st.slex.csplashscreen.SplashApplication
+import st.slex.csplashscreen.core.core.AppApi
+import javax.inject.Singleton
+
+@Singleton
+@Component
+interface AppComponent : AppApi {
+
+    @Component.Builder
+    interface Builder {
+
+        @BindsInstance
+        fun context(context: Context): Builder
+
+        fun build(): AppComponent
+    }
+
+    fun inject(application: SplashApplication)
+}

app/src/main/java/st/slex/csplashscreen/di/main/MainComponent.kt

@@ -0,0 +1,33 @@
+package st.slex.csplashscreen.di.main
+
+import androidx.lifecycle.ViewModelProvider
+import dagger.Component
+import st.slex.csplashscreen.core.core.AppApi
+import st.slex.csplashscreen.core.ui.di.NavigationApi
+
+@Component(
+    dependencies = [MainDependencies::class],
+    modules = [MainModule::class]
+)
+interface MainComponent {
+
+    @Component.Factory
+    interface Factory {
+        fun create(dependencies: MainDependencies): MainComponent
+    }
+
+    @Component(dependencies = [AppApi::class, NavigationApi::class])
+    interface MainDependenciesComponent : MainDependencies {
+
+        @Component.Factory
+        interface Factory {
+            fun create(
+                appApi: AppApi,
+                navigationApi: NavigationApi
+            ): MainDependenciesComponent
+        }
+    }
+
+    val viewModelFactory: ViewModelProvider.Factory
+}
+

app/src/main/java/st/slex/csplashscreen/di/main/MainComponentBuilder.kt

@@ -0,0 +1,38 @@
+package st.slex.csplashscreen.di.main
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import st.slex.csplashscreen.core.core.AppApi
+import st.slex.csplashscreen.core.core.appApi
+import st.slex.csplashscreen.core.ui.base.daggerViewModel
+import st.slex.csplashscreen.core.ui.di.NavigationApi
+import st.slex.csplashscreen.ui.InitialAppViewModel
+
+object MainComponentBuilder {
+
+    fun build(
+        appApi: AppApi,
+        navigationApi: NavigationApi
+    ): MainComponent = DaggerMainComponent
+        .factory()
+        .create(
+            DaggerMainComponent_MainDependenciesComponent.factory()
+                .create(
+                    appApi = appApi,
+                    navigationApi = navigationApi
+                )
+        )
+}
+
+@Composable
+fun setupMainComponent(navigationApi: NavigationApi): InitialAppViewModel {
+    val context = LocalContext.current
+    return daggerViewModel {
+        MainComponentBuilder
+            .build(
+                appApi = context.appApi,
+                navigationApi = navigationApi
+            )
+            .viewModelFactory
+    }
+}

app/src/main/java/st/slex/csplashscreen/di/main/MainDependencies.kt

@@ -0,0 +1,8 @@
+package st.slex.csplashscreen.di.main
+
+import st.slex.csplashscreen.core.ui.di.Navigator
+
+interface MainDependencies {
+
+    val navigator: Navigator
+}

app/src/main/java/st/slex/csplashscreen/di/main/MainModule.kt

@@ -0,0 +1,22 @@
+package st.slex.csplashscreen.di.main
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.stslex93.notes.core.ui.base.ViewModelFactory
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import st.slex.csplashscreen.core.ui.di.ViewModelKey
+import st.slex.csplashscreen.ui.InitialAppViewModel
+
+@Module
+interface MainModule {
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(InitialAppViewModel::class)
+    fun bindsViewModel(impl: InitialAppViewModel): ViewModel
+
+    @Binds
+    fun bindsFactory(impl: ViewModelFactory): ViewModelProvider.Factory
+}

app/src/main/java/st/slex/csplashscreen/ui/InitialApp.kt

@@ -22,21 +22,21 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import org.koin.androidx.compose.koinViewModel
 import st.slex.csplashscreen.core.navigation.AppDestination
-import st.slex.csplashscreen.navigation.NavigationHost
+import st.slex.csplashscreen.core.navigation.NavigationScreen
+import st.slex.csplashscreen.ui.components.NavigationHost
 import st.slex.csplashscreen.ui.components.bottom_appbar.BottomAppBarResource
 import st.slex.csplashscreen.ui.components.bottom_appbar.MainBottomAppBar
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
 fun InitialApp(
     navController: NavHostController,
+    onBottomAppBarClick: (NavigationScreen) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val systemUiController = rememberSystemUiController()
     val isDarkTheme = isSystemInDarkTheme()
-    val viewModel = koinViewModel<InitialAppViewModel>()
 
     var currentDestination by remember {
         mutableStateOf<AppDestination?>(AppDestination.HOME)
@@ -65,7 +65,7 @@ fun InitialApp(
                 exit = slideOutVertically(tween(300)) { it }
             ) {
                 MainBottomAppBar(
-                    onBottomAppBarClick = viewModel::navigate,
+                    onBottomAppBarClick = onBottomAppBarClick,
                     currentDestination = currentDestination
                 )
             }

app/src/main/java/st/slex/csplashscreen/ui/InitialAppViewModel.kt

@@ -2,13 +2,14 @@ package st.slex.csplashscreen.ui
 
 import androidx.lifecycle.ViewModel
 import st.slex.csplashscreen.core.navigation.NavigationScreen
-import st.slex.csplashscreen.core.navigation.navigator.Navigator
+import st.slex.csplashscreen.core.ui.di.Navigator
+import javax.inject.Inject
 
-class InitialAppViewModel(
+class InitialAppViewModel @Inject constructor(
     private val navigator: Navigator
 ) : ViewModel() {
 
     fun navigate(screen: NavigationScreen) {
-        navigator.navigate(screen)
+        navigator(screen)
     }
 }

app/src/main/java/st/slex/csplashscreen/ui/MainActivity.kt

@@ -3,15 +3,20 @@ package st.slex.csplashscreen.ui
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.core.view.WindowCompat
-import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
-import org.koin.androidx.compose.getKoin
-import st.slex.csplashscreen.core.navigation.di.moduleCoreNavigation
+import st.slex.csplashscreen.core.navigation.di.NavigationComponentBuilder
+import st.slex.csplashscreen.core.ui.di.MainUiApi
+import st.slex.csplashscreen.core.ui.di.NavigationApi
 import st.slex.csplashscreen.core.ui.theme.AppTheme
+import st.slex.csplashscreen.di.main.setupMainComponent
 
-class MainActivity : ComponentActivity() {
+class MainActivity : ComponentActivity(), MainUiApi {
+
+    private var _navigationApi: NavigationApi? = null
+    override val navigationApi: NavigationApi
+        get() = requireNotNull(_navigationApi)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -20,21 +25,19 @@ class MainActivity : ComponentActivity() {
         setContent {
             AppTheme {
                 val navController = rememberNavController()
-                SetupComposeDependencies(navController)
-                InitialApp(navController)
+                _navigationApi = remember(navController) {
+                    NavigationComponentBuilder.build(navController)
+                }
+
+                val viewModel = setupMainComponent(navigationApi)
+
+                InitialApp(
+                    navController = navController,
+                    onBottomAppBarClick = remember {
+                        { viewModel.navigate(it) }
+                    }
+                )
             }
         }
     }
-
-    @Composable
-    private fun SetupComposeDependencies(
-        navController: NavHostController
-    ) {
-        getKoin().loadModules(
-            listOf(
-                moduleCoreNavigation(navController),
-                st.slex.csplashscreen.di.appModule
-            )
-        )
-    }
 }

app/src/main/java/st/slex/csplashscreen/navigation/NavigationHost.kt → app/src/main/java/st/slex/csplashscreen/ui/components/NavigationHost.kt

@@ -1,4 +1,4 @@
-package st.slex.csplashscreen.navigation
+package st.slex.csplashscreen.ui.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

build-logic/dependencies/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -15,6 +15,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
+                apply("com.google.devtools.ksp")
             }
 
             extensions.configure<ApplicationExtension> {