auth to server-V96
This commit is contained in:
parent
d9f5efc680
commit
54ba82ebeb
2 changed files with 14 additions and 4 deletions
|
|
@ -63,7 +63,8 @@ import kotlin.text.ifEmpty
|
||||||
@Composable
|
@Composable
|
||||||
fun AddAccountScreen(
|
fun AddAccountScreen(
|
||||||
paddingValues: PaddingValues,
|
paddingValues: PaddingValues,
|
||||||
viewModel: AuthViewModel = hiltViewModel()
|
viewModel: AuthViewModel = hiltViewModel(),
|
||||||
|
onBack: () -> Unit,
|
||||||
){
|
){
|
||||||
|
|
||||||
val uiState by viewModel.loginState.collectAsStateWithLifecycle()
|
val uiState by viewModel.loginState.collectAsStateWithLifecycle()
|
||||||
|
|
|
||||||
|
|
@ -46,9 +46,15 @@ fun AppNavGraph(
|
||||||
paddingValues = paddingValues
|
paddingValues = paddingValues
|
||||||
)
|
)
|
||||||
|
|
||||||
AppScreen.AddAccount -> AddAccountScreen(
|
AppScreen.AddAccount -> {
|
||||||
paddingValues = paddingValues
|
BackHandler {
|
||||||
)
|
appViewModel.goTo(AppScreen.ScreensTab)
|
||||||
|
}
|
||||||
|
AddAccountScreen(
|
||||||
|
paddingValues = paddingValues,
|
||||||
|
onBack = { appViewModel.goTo(AppScreen.ScreensTab) }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
AppScreen.Register -> {
|
AppScreen.Register -> {
|
||||||
//back to pre_reg
|
//back to pre_reg
|
||||||
|
|
@ -72,6 +78,9 @@ fun AppNavGraph(
|
||||||
AppScreen.ScreensTab -> MainScreen_tab()
|
AppScreen.ScreensTab -> MainScreen_tab()
|
||||||
|
|
||||||
AppScreen.AccountSwitch -> {
|
AppScreen.AccountSwitch -> {
|
||||||
|
BackHandler {
|
||||||
|
appViewModel.goTo(AppScreen.ScreensTab)
|
||||||
|
}
|
||||||
AccountSwitchScreen(
|
AccountSwitchScreen(
|
||||||
// 點擊「登入另一個帳號」就跳轉到 Login 頁面
|
// 點擊「登入另一個帳號」就跳轉到 Login 頁面
|
||||||
onAddAccountClick = { appViewModel.goTo(AppScreen.AddAccount) },
|
onAddAccountClick = { appViewModel.goTo(AppScreen.AddAccount) },
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue