UI调整

app/src/main/java/com/aiosman/ravenow/ui/Navi.kt

@@ -35,7 +35,6 @@ import com.aiosman.ravenow.ui.agent.AddAgentScreen
 import com.aiosman.ravenow.ui.group.CreateGroupChatScreen
 import com.aiosman.ravenow.ui.chat.ChatAiScreen
 import com.aiosman.ravenow.ui.chat.ChatScreen
-import com.aiosman.ravenow.ui.group.GroupChatInfoScreen
 import com.aiosman.ravenow.ui.chat.GroupChatScreen
 import com.aiosman.ravenow.ui.comment.CommentsScreen
 import com.aiosman.ravenow.ui.comment.notice.CommentNoticeScreen
@@ -48,6 +47,7 @@ import com.aiosman.ravenow.ui.follower.FollowingListScreen
 import com.aiosman.ravenow.ui.gallery.OfficialGalleryScreen
 import com.aiosman.ravenow.ui.gallery.OfficialPhotographerScreen
 import com.aiosman.ravenow.ui.gallery.ProfileTimelineScreen
+import com.aiosman.ravenow.ui.group.GroupChatInfoScreen
 import com.aiosman.ravenow.ui.index.IndexScreen
 import com.aiosman.ravenow.ui.index.tabs.message.NotificationsScreen
 import com.aiosman.ravenow.ui.index.tabs.search.SearchScreen
@@ -97,13 +97,13 @@ sealed class NavigationRoute(
     data object Chat : NavigationRoute("Chat/{id}")
     data object ChatAi : NavigationRoute("ChatAi/{id}")
     data object ChatGroup : NavigationRoute("ChatGroup/{id}/{name}/{avatar}")
-    data object GroupChatInfo : NavigationRoute("GroupChatInfo/{groupId}")
     data object CommentNoticeScreen : NavigationRoute("CommentNoticeScreen")
     data object ImageCrop : NavigationRoute("ImageCrop")
     data object AccountSetting : NavigationRoute("AccountSetting")
     data object AboutScreen : NavigationRoute("AboutScreen")
     data object AddAgent : NavigationRoute("AddAgent")
     data object CreateGroupChat : NavigationRoute("CreateGroupChat")
+    data object GroupInfo : NavigationRoute("GroupInfo/{id}")
 }
 
 
@@ -406,19 +406,6 @@ fun NavigationController(
             }
         }
 
-        composable(
-            route = NavigationRoute.GroupChatInfo.route,
-            arguments = listOf(navArgument("groupId") { type = NavType.StringType })
-        ) {
-            val encodedId = it.arguments?.getString("groupId")
-            val decodedId = encodedId?.let { java.net.URLDecoder.decode(it, "UTF-8") }
-            CompositionLocalProvider(
-                LocalAnimatedContentScope provides this,
-            ) {
-                GroupChatInfoScreen(decodedId?:"")
-            }
-        }
-
 
         composable(route = NavigationRoute.CommentNoticeScreen.route) {
             CompositionLocalProvider(
@@ -460,6 +447,20 @@ fun NavigationController(
             CreateGroupChatScreen()
         }
 
+        composable(
+            route = NavigationRoute.GroupInfo.route,
+            arguments = listOf(navArgument("id") { type = NavType.StringType })
+        ) {
+            val encodedId = it.arguments?.getString("id")
+            val decodedId = encodedId?.let { java.net.URLDecoder.decode(it, "UTF-8") }
+            CompositionLocalProvider(
+                LocalAnimatedContentScope provides this,
+            ) {
+                GroupChatInfoScreen(decodedId?:"")
+            }
+        }
+
+
     }
 
 }
@@ -531,15 +532,17 @@ fun NavHostController.navigateToGroupChat(id: String,name:String,avatar:String)
 
 fun NavHostController.navigateToGroupInfo(id: String) {
     val encodedId = java.net.URLEncoder.encode(id, "UTF-8")
+
     navigate(
-        route = NavigationRoute.GroupChatInfo.route
-            .replace("{groupId}", encodedId)
+        route = NavigationRoute.ChatGroup.route
+            .replace("{id}", encodedId)
 
     )
 }
 
 
 
+
 fun NavHostController.goTo(
     route: NavigationRoute
 ) {