update

Author: wzq

app/src/main/java/com/wzq/jd/compose/app/page/MainActivity.kt

@@ -9,6 +9,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.rememberNavController
+import com.wzq.jd.compose.app.page.route.MainNavGraph
 import com.wzq.jd.compose.app.ui.theme.JetpackDemoTheme
 
 class MainActivity : ComponentActivity() {

app/src/main/java/com/wzq/jd/compose/app/page/categories/CategoryScreen.kt

@@ -34,7 +34,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import com.wzq.jd.compose.app.page.ErrorScreen
-import com.wzq.jd.compose.app.page.NavActions
+import com.wzq.jd.compose.app.page.route.NavActions
 import com.wzq.jd.compose.app.page.home.ArticleItemPage
 import kotlinx.coroutines.launch
 

app/src/main/java/com/wzq/jd/compose/app/page/home/HomeScreen.kt

@@ -28,7 +28,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import com.wzq.jd.compose.app.page.NavActions
+import com.wzq.jd.compose.app.page.route.NavActions
 import kotlinx.coroutines.launch
 
 /**

…/wzq/jd/compose/app/page/MainNavGraph.kt …d/compose/app/page/route/MainNavGraph.ktapp/src/main/java/com/wzq/jd/compose/app/page/MainNavGraph.kt renamed to app/src/main/java/com/wzq/jd/compose/app/page/route/MainNavGraph.kt app/src/main/java/com/wzq/jd/compose/app/page/MainNavGraph.kt renamed to app/src/main/java/com/wzq/jd/compose/app/page/route/MainNavGraph.kt

@@ -1,4 +1,4 @@
-package com.wzq.jd.compose.app.page
+package com.wzq.jd.compose.app.page.route
 
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -10,7 +10,6 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import com.wzq.jd.compose.app.data.model.Categories
 import com.wzq.jd.compose.app.page.categories.CategoryScreen
 import com.wzq.jd.compose.app.page.home.HomeScreen
 import com.wzq.jd.compose.app.page.search.SearchScreen

…/wzq/jd/compose/app/page/ScreenRouter.kt …/jd/compose/app/page/route/NavActions.ktapp/src/main/java/com/wzq/jd/compose/app/page/ScreenRouter.kt renamed to app/src/main/java/com/wzq/jd/compose/app/page/route/NavActions.kt app/src/main/java/com/wzq/jd/compose/app/page/ScreenRouter.kt renamed to app/src/main/java/com/wzq/jd/compose/app/page/route/NavActions.kt

@@ -1,44 +1,9 @@
-package com.wzq.jd.compose.app.page
+package com.wzq.jd.compose.app.page.route
 
 import androidx.core.os.bundleOf
-import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavController
-import androidx.navigation.NavType
-import androidx.navigation.navArgument
 import com.wzq.jd.compose.app.data.model.Categories
 
-/**
- * create by wzq on 2023/11/27
- *
- */
-sealed class ScreenPath(
-    val route: String, val namedNavArguments: List<NamedNavArgument> = emptyList()
-) {
-
-    data object Home : ScreenPath("home")
-
-    data object Web : ScreenPath("web?url={url}") {
-        fun createPath(url: String?) = "web?url=${url}"
-    }
-
-    data object Search : ScreenPath("search")
-
-    data object Category :
-        ScreenPath(
-            "category?position={position}",
-            listOf(
-                navArgument("position") {
-                    type = NavType.IntType
-                },
-            ),
-        ) {
-
-        fun createPath(position: Int) = "category?position=${position}"
-    }
-
-    data object Setting: ScreenPath("setting")
-}
-
 interface CommonActions {
     fun goBack(): Boolean
 }
@@ -68,9 +33,4 @@ class NavActions(private val navController: NavController) : CommonActions {
     }
 
     override fun goBack() = navController.navigateUp()
-}
-
-
-
-
-
+}

app/src/main/java/com/wzq/jd/compose/app/page/route/ScreenRouter.kt

@@ -0,0 +1,42 @@
+package com.wzq.jd.compose.app.page.route
+
+import androidx.navigation.NamedNavArgument
+import androidx.navigation.NavType
+import androidx.navigation.navArgument
+
+/**
+ * create by wzq on 2023/11/27
+ *
+ */
+sealed class ScreenPath(
+    val route: String, val namedNavArguments: List<NamedNavArgument> = emptyList()
+) {
+
+    data object Home : ScreenPath("home")
+
+    data object Web : ScreenPath("web?url={url}") {
+        fun createPath(url: String?) = "web?url=${url}"
+    }
+
+    data object Search : ScreenPath("search")
+
+    data object Category :
+        ScreenPath(
+            "category?position={position}",
+            listOf(
+                navArgument("position") {
+                    type = NavType.IntType
+                },
+            ),
+        ) {
+
+        fun createPath(position: Int) = "category?position=${position}"
+    }
+
+    data object Setting: ScreenPath("setting")
+}
+
+
+
+
+

app/src/main/java/com/wzq/jd/compose/app/page/search/SearchScreen.kt

@@ -27,7 +27,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.wzq.jd.compose.app.data.model.ArticleItem
 import com.wzq.jd.compose.app.data.model.HotWords
-import com.wzq.jd.compose.app.page.CommonActions
+import com.wzq.jd.compose.app.page.route.CommonActions
 import com.wzq.jd.compose.app.page.PageState
 import com.wzq.jd.compose.app.page.home.ArticleItemPage
 

app/src/main/java/com/wzq/jd/compose/app/page/setting/SettingScreen.kt

@@ -29,7 +29,7 @@ import androidx.compose.ui.unit.dp
 import coil.Coil
 import coil.annotation.ExperimentalCoilApi
 import com.wzq.jd.compose.app.AppContainer
-import com.wzq.jd.compose.app.page.NavActions
+import com.wzq.jd.compose.app.page.route.NavActions
 import kotlinx.coroutines.launch
 
 /**

app/src/main/java/com/wzq/jd/compose/app/page/web/WebScreen.kt

@@ -27,7 +27,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
-import com.wzq.jd.compose.app.page.CommonActions
+import com.wzq.jd.compose.app.page.route.CommonActions
 import com.wzq.jd.compose.app.page.ErrorScreen
 
 /**