合并冲突

2024-07-13 20:37:09 +08:00
parent e3aae7e05f 7a89453eb0
commit 722843b155
5 changed files with 615 additions and 4 deletions
--- a/app/src/main/java/com/aiosman/riderpro/MainActivity.kt
+++ b/app/src/main/java/com/aiosman/riderpro/MainActivity.kt
@@ -95,6 +95,12 @@ fun NavigationController(navController: NavHostController) {
        composable(route="OfficialPhoto") {
            OfficialGalleryPage()
        }
+        composable(route="OfficialPhotographer") {
+            OfficialPhotographer()
+        }
+        composable(route="Post") {
+            PostPage()
+        }
    }
 }