Refactoring for navigation module

mobiledevpro · Dec 2, 2024 · 106a53f · 106a53f
1 parent f214e48
commit 106a53f
Show file tree

Hide file tree

Showing 18 changed files with 464 additions and 302 deletions.
diff --git a/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/ScreenNavigation.kt b/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/ScreenNavigation.kt
diff --git a/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/graph/HomeNavGraph.kt b/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/graph/HomeNavGraph.kt
@@ -22,9 +22,9 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.mobiledevpro.navigation.Screen
-import com.mobiledevpro.navigation.chatListScreen
-import com.mobiledevpro.navigation.peopleNavGraph
-import com.mobiledevpro.navigation.profileScreen
+import com.mobiledevpro.navigation.screen.chatListScreen
+import com.mobiledevpro.navigation.screen.peopleNavGraph
+import com.mobiledevpro.navigation.screen.userProfileScreen
 
 /**
  * Nested navigation graph for Home screen
@@ -46,7 +46,7 @@ fun HomeNavGraph(
 
         chatListScreen()
         peopleNavGraph()
-        profileScreen(onNavigateTo = onNavigateToRoot)
+        userProfileScreen(onNavigateTo = onNavigateToRoot)
 
     }
 }
diff --git a/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/graph/OnBoardingNavGraph.kt b/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/graph/OnBoardingNavGraph.kt
@@ -22,9 +22,9 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.mobiledevpro.navigation.Screen
-import com.mobiledevpro.navigation.onBoardingFirstScreen
-import com.mobiledevpro.navigation.onBoardingSecondScreen
-import com.mobiledevpro.navigation.onBoardingThirdScreen
+import com.mobiledevpro.navigation.screen.onBoardingFirstScreen
+import com.mobiledevpro.navigation.screen.onBoardingSecondScreen
+import com.mobiledevpro.navigation.screen.onBoardingThirdScreen
 
 /**
  * Nested navigation graph for OnBoarding screen

diff --git a/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/graph/PeopleNavGraph.kt b/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/graph/PeopleNavGraph.kt
@@ -25,8 +25,8 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.mobiledevpro.navigation.Screen
 import com.mobiledevpro.navigation.ext.navigateTo
-import com.mobiledevpro.navigation.peopleListScreen
-import com.mobiledevpro.navigation.peopleProfileScreen
+import com.mobiledevpro.navigation.screen.peopleListScreen
+import com.mobiledevpro.navigation.screen.peopleProfileScreen
 
 /**
  *  Nested navigation graph for People screen

diff --git a/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/graph/RootNavGraph.kt b/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/graph/RootNavGraph.kt
@@ -23,9 +23,9 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.mobiledevpro.navigation.Screen
 import com.mobiledevpro.navigation.ext.navigateTo
-import com.mobiledevpro.navigation.homeNavGraph
-import com.mobiledevpro.navigation.onBoardingNavGraph
-import com.mobiledevpro.navigation.subscriptionScreen
+import com.mobiledevpro.navigation.screen.homeScreen
+import com.mobiledevpro.navigation.screen.onBoardingScreen
+import com.mobiledevpro.navigation.screen.subscriptionScreen
 
 /**
  * Top-level navigation host in the app
@@ -52,8 +52,8 @@ fun RootNavGraph(
         }
 
         //Nested Navigation Graphs
-        onBoardingNavGraph(onNavigateToRoot = navController::navigateTo)
-        homeNavGraph(onNavigateToRoot = navController::navigateTo)
+        onBoardingScreen(onNavigateToRoot = navController::navigateTo)
+        homeScreen(onNavigateToRoot = navController::navigateTo)
 
         //Root screens
         subscriptionScreen(onNavigateBack = navigateBack)

diff --git a/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/screen/ChatListScreenNav.kt b/core/navigation/src/main/kotlin/com/mobiledevpro/navigation/screen/ChatListScreenNav.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2024 | Dmitri Chernysh | http://mobile-dev.pro
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package com.mobiledevpro.navigation.screen
+
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import com.mobiledevpro.chatlist.di.featureChatListModule
+import com.mobiledevpro.chatlist.view.ChatListScreen
+import com.mobiledevpro.chatlist.view.ChatListViewModel
+import com.mobiledevpro.di.rememberNavViewModel
+import com.mobiledevpro.navigation.Screen
+
+fun NavGraphBuilder.chatListScreen() {
+    composable(
+        route = Screen.ChatList.route
+    ) {
+
+        val viewModel = rememberNavViewModel<ChatListViewModel>(
+            modules = { listOf(featureChatListModule) }
+        )
+
+        ChatListScreen(
+            state = viewModel.uiState,
+            onClick = { chat ->
+                //TODO: open chat screen
+            }
+        )
+    }
+}