Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -6,9 +6,7 @@ import androidx.navigation.NavHostController
|
||||
import androidx.navigation.compose.NavHost
|
||||
import androidx.navigation.compose.composable
|
||||
import com.novayaplaneta.ui.screens.ai.AIScreen
|
||||
import com.novayaplaneta.ui.screens.auth.ForgotPasswordScreen
|
||||
import com.novayaplaneta.ui.screens.auth.LoginScreen
|
||||
import com.novayaplaneta.ui.screens.auth.RegistrationScreen
|
||||
import com.novayaplaneta.ui.screens.rewards.RewardsScreen
|
||||
import com.novayaplaneta.ui.screens.schedule.ScheduleScreen
|
||||
import com.novayaplaneta.ui.screens.settings.SettingsScreen
|
||||
@@ -29,12 +27,12 @@ fun NewPlanetNavigation(
|
||||
composable("login") {
|
||||
LoginScreen(navController = navController)
|
||||
}
|
||||
composable("registration") {
|
||||
RegistrationScreen(navController = navController)
|
||||
}
|
||||
composable("forgot_password") {
|
||||
ForgotPasswordScreen(navController = navController)
|
||||
}
|
||||
// composable("registration") {
|
||||
// RegistrationScreen(navController = navController)
|
||||
// }
|
||||
// composable("forgot_password") {
|
||||
// ForgotPasswordScreen(navController = navController)
|
||||
// }
|
||||
composable("schedule") {
|
||||
ScheduleScreen(navController = navController)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user