更新界面

app/src/main/java/com/aiosman/riderpro/MainActivity.kt

@@ -5,16 +5,16 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.animation.AnimatedContentScope
+import androidx.compose.animation.ExperimentalSharedTransitionApi
+import androidx.compose.animation.SharedTransitionLayout
+import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
@@ -22,27 +22,17 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBarsPadding
-import androidx.compose.foundation.pager.HorizontalPager
-import androidx.compose.foundation.pager.PagerState
-import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.NavigationBarItemColors
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Tab
-import androidx.compose.material3.TabRow
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -50,20 +40,19 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowCompat
-import androidx.navigation.NavGraph
-import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
+import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
 import com.aiosman.riderpro.ui.theme.RiderProTheme
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.google.android.libraries.places.api.Places
-import kotlinx.coroutines.launch
-
 
 class MainActivity : ComponentActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
@@ -81,38 +70,32 @@ val LocalNavController = compositionLocalOf<NavHostController> {
     error("NavController not provided")
 }
 
+@OptIn(ExperimentalSharedTransitionApi::class)
+val LocalSharedTransitionScope = compositionLocalOf<SharedTransitionScope> {
+    error("SharedTransitionScope not provided")
+}
+
+val LocalAnimatedContentScope = compositionLocalOf<AnimatedContentScope> {
+    error("AnimatedContentScope not provided")
+}
+
+@OptIn(ExperimentalSharedTransitionApi::class)
 @Composable
 fun NavigationController(navController: NavHostController) {
     val navigationBarHeight = with(LocalDensity.current) {
         WindowInsets.navigationBars.getBottom(this).toDp()
     }
+
     NavHost(
         navController = navController,
         startDestination = "Index",
     ) {
-        // 带底部导航栏的路由：
-//        listOf(
-//            NavigationItem.Home,
-//            NavigationItem.Street,
-//            NavigationItem.Add,
-//            NavigationItem.Message,
-//            NavigationItem.Profile
-//        ).forEach { item ->
-//            composable(route = item.route) {
-//                ScaffoldWithNavigationBar(navController) {
-//                    when (item) {
-//                        NavigationItem.Home -> Home()
-//                        NavigationItem.Street -> Street()
-//                        NavigationItem.Add -> Add()
-//                        NavigationItem.Message -> Video()
-//                        NavigationItem.Profile -> Profile()
-//                        else -> {} // 由于过滤，这里不会发生
-//                    }
-//                }
-//            }
-//        }
         composable(route = "Index") {
-            ScaffoldWithNavigationBar2()
+            CompositionLocalProvider(
+                LocalAnimatedContentScope provides this,
+            ) {
+                ScaffoldWithNavigationBar2()
+            }
         }
         composable(route = "ProfileTimeline") {
             GalleryPage()
@@ -130,26 +113,30 @@ fun NavigationController(navController: NavHostController) {
         composable(route = "OfficialPhotographer") {
             OfficialPhotographer()
         }
-        composable(route = "Post") {
-
-            PostPage()
-
+        composable(
+            route = "Post/{id}",
+            arguments = listOf(navArgument("id") { type = NavType.StringType })
+        ) { backStackEntry ->
+            CompositionLocalProvider(
+                LocalAnimatedContentScope provides this,
+            ) {
+                val id = backStackEntry.arguments?.getString("id")
+                PostPage(
+                    id!!
+                )
+            }
         }
         composable(route = "ModificationList") {
             ModificationListScreen()
         }
         composable(route = "MyMessage") {
-
             NotificationsScreen()
-
         }
         composable(route = "Comments") {
             CommentsScreen()
         }
         composable(route = "Likes") {
-
             LikePage()
-
         }
         composable(route = "Followers") {
             FollowerPage()
@@ -165,14 +152,22 @@ fun NavigationController(navController: NavHostController) {
             }
         }
     }
+
+
 }
 
+@OptIn(ExperimentalSharedTransitionApi::class)
 @Composable
 fun Navigation() {
     val navController = rememberNavController()
-    CompositionLocalProvider(LocalNavController provides navController) {
-        Box {
-            NavigationController(navController = navController)
+    SharedTransitionLayout {
+        CompositionLocalProvider(
+            LocalNavController provides navController,
+            LocalSharedTransitionScope provides this@SharedTransitionLayout,
+        ) {
+            Box {
+                NavigationController(navController = navController)
+            }
         }
     }
 }
@@ -271,9 +266,9 @@ fun ScaffoldWithNavigationBar(
     }
 }
 
+@OptIn(ExperimentalSharedTransitionApi::class)
 @Composable
-fun ScaffoldWithNavigationBar2(
-) {
+fun ScaffoldWithNavigationBar2() {
     val model = IndexViewModel
     val navigationBarHeight = with(LocalDensity.current) {
         WindowInsets.navigationBars.getBottom(this).toDp()
@@ -344,7 +339,10 @@ fun ScaffoldWithNavigationBar2(
             when (model.tabIndex) {
                 0 -> Box(
                     modifier = Modifier.padding(innerPadding)
-                ) { Home() }
+                ) {
+                    Home()
+                }
+
                 1 -> Street()
                 2 -> Box(
                     modifier = Modifier.padding(innerPadding)