Merge remote-tracking branch 'refs/remotes/origin/main'

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

@@ -28,7 +28,9 @@ import com.aiosman.riderpro.LocalAnimatedContentScope
 import com.aiosman.riderpro.LocalNavController
 import com.aiosman.riderpro.LocalSharedTransitionScope
 import com.aiosman.riderpro.ui.account.AccountEditScreen2
+import com.aiosman.riderpro.ui.account.ResetPasswordScreen
 import com.aiosman.riderpro.ui.comment.CommentsScreen
+import com.aiosman.riderpro.ui.favourite.FavouriteListPage
 import com.aiosman.riderpro.ui.favourite.FavouriteNoticeScreen
 import com.aiosman.riderpro.ui.follower.FollowerListScreen
 import com.aiosman.riderpro.ui.follower.FollowerNoticeScreen
@@ -80,6 +82,8 @@ sealed class NavigationRoute(
     data object Search : NavigationRoute("Search")
     data object FollowerList : NavigationRoute("FollowerList/{id}")
     data object FollowingList : NavigationRoute("FollowingList/{id}")
+    data object ResetPassword : NavigationRoute("ResetPassword")
+    data object FavouriteList : NavigationRoute("FavouriteList")
 }
 
 
@@ -311,7 +315,20 @@ fun NavigationController(
                 FollowingListScreen(it.arguments?.getInt("id")!!)
             }
         }
-
+        composable(route = NavigationRoute.ResetPassword.route) {
+            CompositionLocalProvider(
+                LocalAnimatedContentScope provides this,
+            ) {
+                ResetPasswordScreen()
+            }
+        }
+        composable(route = NavigationRoute.FavouriteList.route) {
+            CompositionLocalProvider(
+                LocalAnimatedContentScope provides this,
+            ) {
+                FavouriteListPage()
+            }
+        }
     }