RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: change setup/ route graph to login/

This commit is contained in:
Infi 2022-12-11 01:01:57 +01:00
parent da8463cf82
commit 92f8626658
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/chat/revolt/MainActivity.kt
View File

@ -44,7 +44,7 @@ fun AppEntrypoint() {
AnimatedNavHost(
navController = navController,
startDestination = "setup/greeting",
startDestination = "login/greeting",
enterTransition = {
slideIntoContainer(
AnimatedContentScope.SlideDirection.Left,
@ -70,9 +70,9 @@ fun AppEntrypoint() {
) + fadeOut(animationSpec = tween(400))
}
) {
composable("setup/greeting") { GreeterScreen(navController) }
composable("setup/login") { LoginScreen(navController) }
composable("setup/mfa/{mfaTicket}/{allowedAuthTypes}") { backStackEntry ->
composable("login/greeting") { GreeterScreen(navController) }
composable("login/login") { LoginScreen(navController) }
composable("login/mfa/{mfaTicket}/{allowedAuthTypes}") { backStackEntry ->
val mfaTicket = backStackEntry.arguments?.getString("mfaTicket") ?: ""
val allowedAuthTypes =
backStackEntry.arguments?.getString("allowedAuthTypes") ?: ""

2
app/src/main/java/chat/revolt/screens/chat/HomeScreen.kt
View File

@ -62,7 +62,7 @@ fun HomeScreen(navController: NavController) {
Button(
onClick = {
RevoltAPI.logout()
navController.navigate("setup/greeting") {
navController.navigate("login/greeting") {
popUpTo("chat/home") {
inclusive = true
}

4
app/src/main/java/chat/revolt/screens/login/GreeterScreen.kt
View File

@ -61,7 +61,7 @@ class GreeterViewModel() : ViewModel() {
fun GreeterScreen(navController: NavController, viewModel: GreeterViewModel = viewModel()) {
if (viewModel.skipLogin) {
navController.navigate("chat/home") {
popUpTo("setup/greeting") {
popUpTo("login/greeting") {
inclusive = true
}
}
@ -131,7 +131,7 @@ fun GreeterScreen(navController: NavController, viewModel: GreeterViewModel = vi
}
Button(
onClick = { navController.navigate("setup/login") },
onClick = { navController.navigate("login/login") },
modifier = Modifier.fillMaxWidth()
) {
Text(text = stringResource(R.string.login))

4
app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
View File

@ -95,7 +95,7 @@ fun LoginScreen(
) {
if (viewModel.navigateTo == "mfa") {
navController.navigate(
"setup/mfa/${viewModel.mfaResponse!!.mfaSpec!!.ticket}/${
"login/mfa/${viewModel.mfaResponse!!.mfaSpec!!.ticket}/${
viewModel.mfaResponse!!.mfaSpec!!.allowedMethods.joinToString(
","
)
@ -104,7 +104,7 @@ fun LoginScreen(
viewModel.navigationComplete()
} else if (viewModel.navigateTo == "home") {
navController.navigate("chat/home") {
popUpTo("setup/greeting") { inclusive = true }
popUpTo("login/greeting") { inclusive = true }
}
viewModel.navigationComplete()
}

2
app/src/main/java/chat/revolt/screens/login/MfaScreen.kt
View File

@ -110,7 +110,7 @@ fun MfaScreen(
if (viewModel.navigateToHome) {
navController.navigate("chat/home") {
popUpTo("setup/greeting") { inclusive = true }
popUpTo("login/greeting") { inclusive = true }
}
viewModel.navigationComplete()
}