Develop (#32)

* Refactor/mapper (#26)

* refactor mappers injection

* add tests

* add tests

* add tests

* refactoring (#28)

* Refactor/modules structure (#29)

* refactoring

* refactor catalogs and modules structure

* refactor

* merge changes

* refactor navigation on one screen (#31)

Co-authored-by: stslex <[email protected]>

Author: stslex

.idea/compiler.xml

@@ -3,40 +3,62 @@ package com.stslex.cnotes
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.Color
 import androidx.core.view.WindowCompat
+import androidx.navigation.NavHostController
+import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import com.google.accompanist.systemuicontroller.SystemUiController
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.stslex.cnotes.di.ActivityComponent
 import com.stslex.cnotes.ui.AppCreator
 import com.stslex.cnotes.utils.ShortcutBuilder
 import com.stslex.core_firebase.utils.abstraction.FirebaseAppInitialisationUtil
 import org.koin.android.ext.android.inject
+import org.koin.core.context.loadKoinModules
 
 class MainActivity : ComponentActivity() {
 
     private val firebaseAppInitialisationUtil: FirebaseAppInitialisationUtil by inject()
     private val shortcutBuilder: ShortcutBuilder by inject()
 
-    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
+    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class, ExperimentalAnimationApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
-        firebaseAppInitialisationUtil.invoke()
+        firebaseAppInitialisationUtil()
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         setContent {
-            val systemUiController: SystemUiController = rememberSystemUiController()
-            val iconsDark = !isSystemInDarkTheme()
-            SideEffect {
-                systemUiController.setSystemBarsColor(
-                    color = Color.Transparent,
-                    darkIcons = iconsDark
-                )
-            }
-            AppCreator(calculateWindowSizeClass(this))
+            SetUpUIEffects()
+            val navController = rememberAnimatedNavController()
+            setUpDependencies(navController)
+            AppCreator(
+                windowSizeClass = calculateWindowSizeClass(this),
+                navController = navController
+            )
         }
         shortcutBuilder.invoke()
     }
+
+    private fun setUpDependencies(navController: NavHostController) {
+        val component = ActivityComponent()
+        val moduleNavigation = component.module(navController)
+        loadKoinModules(moduleNavigation)
+    }
+
+    @Composable
+    private fun SetUpUIEffects() {
+        val systemUiController: SystemUiController = rememberSystemUiController()
+        val iconsDark = !isSystemInDarkTheme()
+        SideEffect {
+            systemUiController.setSystemBarsColor(
+                color = Color.Transparent,
+                darkIcons = iconsDark
+            )
+        }
+    }
 }

.idea/gradle.xml

@@ -0,0 +1,18 @@
+package com.stslex.cnotes.di
+
+import androidx.navigation.NavController
+import androidx.navigation.NavHostController
+import org.koin.core.annotation.Single
+import org.koin.core.module.Module
+import org.koin.dsl.module
+
+@Single
+class ActivityComponent {
+
+    val module: (navController: NavHostController) -> Module
+        get() = { navController ->
+            module {
+                single<NavController> { navController }
+            }
+        }
+}

.idea/inspectionProfiles/Project_Default.xml

@@ -5,11 +5,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
+import com.google.accompanist.navigation.animation.AnimatedNavHost
+import com.stslex.core_navigation.destinations.AuthCodeDestination
+import com.stslex.core_navigation.destinations.NoteListDestination
+import com.stslex.core_navigation.destinations.PhoneNumberDestination
+import com.stslex.core_navigation.destinations.ProfileDestination
 import com.stslex.feature_auth_code.navigation.authCodeGraph
 import com.stslex.feature_auth_phonenumber.navigation.authPhoneNumberGraph
 import com.stslex.feature_note_list.navigation.noteListGraph
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.stslex.core_navigation.destinations.*
 import com.stslex.feature_profile.navigation.profileGraph
 import com.stslex.feature_single_note.navigation.singleNoteGraph
 import com.stslex.feature_todo.navigation.todoGraph
@@ -26,11 +29,7 @@ fun NavigationHost(
         navController = navController,
         startDestination = startDestination
     ) {
-        noteListGraph(
-            openSingleNote = { navController.navigate("${SingleNoteDestination.route}/$it") },
-            openProfile = { navController.navigate(ProfileDestination.route) },
-            openAuthPhoneNumber = { navController.navigate(PhoneNumberDestination.route) }
-        ) {
+        noteListGraph {
             singleNoteGraph(popBackStack = { navController.popBackStack() })
         }
         todoGraph()

.idea/kotlinc.xml

@@ -12,6 +12,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.navigation.NavController
+import androidx.navigation.NavHostController
 import androidx.navigation.compose.currentBackStackEntryAsState
 import com.stslex.feature_note_list.navigation.noteListTopLevelDestination
 import com.google.accompanist.navigation.animation.rememberAnimatedNavController
@@ -34,9 +36,11 @@ private val listOfDestinations = listOf(
     ExperimentalAnimationApi::class
 )
 @Composable
-fun AppCreator(windowSizeClass: WindowSizeClass) {
+fun AppCreator(
+    windowSizeClass: WindowSizeClass,
+    navController: NavHostController
+) {
     AppTheme(dynamicColor = Build.VERSION.SDK_INT > 30) {
-        val navController = rememberAnimatedNavController()
         val niaTopLevelNavigation = remember(navController) {
             AppTopLevelNavigation(navController)
         }

.idea/misc.xml

@@ -1,26 +1,34 @@
 package com.stslex.feature_note_list.di
 
 import androidx.paging.PagingConfig
-import com.stslex.feature_note_list.ui.NotesViewModel
 import com.stslex.core_model.common.MapperName
 import com.stslex.feature_note_list.data.abstraction.NoteListRepository
 import com.stslex.feature_note_list.data.realisation.NoteListRepositoryImpl
+import com.stslex.feature_note_list.navigation.NoteListRouter
+import com.stslex.feature_note_list.navigation.NoteListRouterImpl
+import com.stslex.feature_note_list.ui.NotesViewModel
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.factoryOf
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 class NoteListModule {
+
     val module = module {
+
         single { PagingConfig(10) }
+
         factoryOf(::NoteListRepositoryImpl) { bind<NoteListRepository>() }
 
+        factoryOf(::NoteListRouterImpl) { bind<NoteListRouter>() }
+
         viewModel {
             NotesViewModel(
                 noteRepository = get(),
                 noteMapper = get(named(MapperName.PAGING_ENTITY_DYNAMIC)),
-                dispatchers = get()
+                dispatchers = get(),
+                router = get()
             )
         }
     }