Merge pull request #86 from stslex/dev

update libraries

Author: stslex

.gitignore

@@ -11,4 +11,4 @@
 local.properties
 play_config.*
 keystore.*
-Gemfile.lock
+Gemfile.lock

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

@@ -16,10 +16,10 @@ class SplashApplication : Application() {
 
     private fun initKoin() {
         startKoin {
+            androidContext(this@SplashApplication)
             androidLogger(
                 level = if (BuildConfig.DEBUG) Level.ERROR else Level.NONE
             )
-            androidContext(this@SplashApplication)
             modules(AppModules)
         }
     }

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

@@ -1,6 +1,6 @@
 package st.slex.csplashscreen.di
 
-import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 import st.slex.csplashscreen.core.collection.di.moduleCoreCollection
 import st.slex.csplashscreen.core.core.di.moduleCore
@@ -10,8 +10,8 @@ import st.slex.csplashscreen.core.network.di.moduleCoreNetwork
 import st.slex.csplashscreen.core.photos.di.moduleCorePhotos
 import st.slex.csplashscreen.feature.collection.di.moduleFeatureSingleCollection
 import st.slex.csplashscreen.feature.favourite.di.moduleFeatureFavourite
-import st.slex.csplashscreen.feature.feature_photo_detail.di.moduleFeatureImageDetail
 import st.slex.csplashscreen.feature.home.di.moduleFeatureHome
+import st.slex.csplashscreen.feature.photo_detail.di.moduleFeatureImageDetail
 import st.slex.csplashscreen.feature.search.di.moduleFeatureSearchPhotos
 import st.slex.csplashscreen.feature.user.di.moduleFeatureUser
 import st.slex.csplashscreen.ui.InitialAppViewModel
@@ -33,5 +33,6 @@ val AppModules = listOf(
     moduleFeatureHome,
     moduleFeatureImageDetail,
     moduleFeatureSearchPhotos,
-    moduleFeatureUser
+    moduleFeatureUser,
+    moduleCoreNavigation
 )

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

@@ -0,0 +1,18 @@
+package st.slex.csplashscreen.di
+
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import st.slex.csplashscreen.core.navigation.navigator.Navigator
+import st.slex.csplashscreen.core.navigation.navigator.NavigatorImpl
+import st.slex.csplashscreen.core.navigation.navigator.holder.NavigatorHolder
+import st.slex.csplashscreen.navigation.BaseNavigationHolder
+import st.slex.csplashscreen.navigation.NavigatorHolderImpl
+
+val moduleCoreNavigation = module {
+    val navigatorHolder = NavigatorHolderImpl()
+    single<NavigatorHolder> { navigatorHolder }
+    single<BaseNavigationHolder> { navigatorHolder }
+
+    singleOf(::NavigatorImpl) { bind<Navigator>() }
+}

app/src/main/java/st/slex/csplashscreen/navigation/BaseNavigationHolder.kt

@@ -0,0 +1,10 @@
+package st.slex.csplashscreen.navigation
+
+import st.slex.csplashscreen.core.navigation.navigator.holder.NavigatorHolder
+import st.slex.csplashscreen.ui.components.NavHostControllerHolder
+
+interface BaseNavigationHolder : NavigatorHolder {
+
+    fun setNavController(navHostController: NavHostControllerHolder)
+
+}

app/src/main/java/st/slex/csplashscreen/navigation/NavigatorHolderImpl.kt

@@ -0,0 +1,17 @@
+package st.slex.csplashscreen.navigation
+
+import androidx.navigation.NavHostController
+import st.slex.csplashscreen.ui.components.NavHostControllerHolder
+
+class NavigatorHolderImpl : BaseNavigationHolder {
+
+    private var _navigator: NavHostController? = null
+
+    override val navigator: NavHostController
+        get() = requireNotNull(_navigator) { "NavController is not initialized" }
+
+    override fun setNavController(navHostController: NavHostControllerHolder) {
+        _navigator = navHostController.navController
+    }
+
+}

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

@@ -3,15 +3,13 @@ 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.Stable
 import androidx.compose.runtime.remember
 import androidx.core.view.WindowCompat
 import androidx.navigation.compose.rememberNavController
-import org.koin.androidx.compose.getKoin
 import org.koin.androidx.compose.koinViewModel
-import st.slex.csplashscreen.core.navigation.di.moduleCoreNavigation
+import org.koin.compose.getKoin
 import st.slex.csplashscreen.core.ui.theme.AppTheme
+import st.slex.csplashscreen.navigation.BaseNavigationHolder
 import st.slex.csplashscreen.ui.components.NavHostControllerHolder
 
 class MainActivity : ComponentActivity() {
@@ -23,13 +21,10 @@ class MainActivity : ComponentActivity() {
         setContent {
             AppTheme {
                 val navHostControllerHolder = NavHostControllerHolder(rememberNavController())
-                SetupComposeDependencies(navHostControllerHolder)
+                getKoin().get<BaseNavigationHolder>().setNavController(navHostControllerHolder)
 
                 val viewModel = koinViewModel<InitialAppViewModel>()
                 InitialApp(
-                    /*TODO AFTER reconfiguration controller in VM don't change it State,
-                       so it need to have latest instance.
-                       Need Research to find more efficient way */
                     navControllerHolder = navHostControllerHolder,
                     onBottomAppBarClick = remember {
                         { screen ->
@@ -40,16 +35,4 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
-
-    @Composable
-    @Stable
-    private fun SetupComposeDependencies(
-        holder: NavHostControllerHolder
-    ) {
-        getKoin().loadModules(
-            listOf(
-                moduleCoreNavigation(holder.navController),
-            )
-        )
-    }
 }

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

@@ -12,7 +12,7 @@ import st.slex.csplashscreen.core.navigation.Screen
 import st.slex.csplashscreen.core.ui.theme.LocalSharedTransitionScope
 import st.slex.csplashscreen.feature.collection.navigation.singleCollectionGraph
 import st.slex.csplashscreen.feature.favourite.navigation.favouriteGraph
-import st.slex.csplashscreen.feature.feature_photo_detail.navigation.imageDetailGraph
+import st.slex.csplashscreen.feature.photo_detail.navigation.imageDetailGraph
 import st.slex.csplashscreen.feature.home.navigation.homeGraph
 import st.slex.csplashscreen.feature.search.navigation.searchPhotosGraph
 import st.slex.csplashscreen.feature.user.navigation.userGraph

app/src/test/kotlin/di/AppModuleTest.kt

@@ -1,7 +1,6 @@
 package di
 
 import android.content.Context
-import androidx.navigation.NavHostController
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.StandardTestDispatcher
@@ -17,7 +16,6 @@ import org.koin.test.KoinTest
 import org.koin.test.check.checkModules
 import org.koin.test.mock.MockProviderRule
 import org.mockito.Mockito
-import st.slex.csplashscreen.core.navigation.di.moduleCoreNavigation
 import st.slex.csplashscreen.di.AppModules
 
 class AppModuleTest : KoinTest {
@@ -33,13 +31,8 @@ class AppModuleTest : KoinTest {
 
     @Test
     fun `check koin configuration`() {
-        val navController = Mockito.mock(NavHostController::class.java)
-
         koinApplication {
-            modules(
-                listOf(moduleCoreNavigation(navController)) +
-                        AppModules
-            )
+            modules(AppModules)
             checkModules {
                 withInstance<Context>()
             }

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

@@ -6,6 +6,8 @@ import org.gradle.kotlin.dsl.getByType
 
 object AppExt {
 
+    const val APP_PREFIX = "st.slex.csplashscreen"
+
     /**
      * Get the version catalog for the project
      * */