lele/Keeper
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

merge feat/welcome-screen into screen #2

Merged
lele merged 19 commits from feat/welcome-screen into master 2025-06-19 16:28:14 +02:00
Conversation 0 Commits 19 Files changed 8 +33 -20
1 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b8d6c098ac - Show all commits

23
app/src/main/java/de/lelehier/keeper/screens/home_screen.kt
View file

@ -88,7 +88,8 @@ fun LoginScreen(paddingValues: PaddingValues) {
AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") { AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
Row( Row(
modifier = Modifier.padding(bottom = 12.dp) modifier = Modifier
.padding(bottom = 12.dp)
.fillMaxWidth(), .fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
) { ) {
@ -124,17 +125,20 @@ fun LoginScreen(paddingValues: PaddingValues) {
} }
} }
} }
AnimatedVisibility(currentScreen != "loadingDialog") {
Button( Button(
onClick = {when(currentScreen) { onClick = {
when (currentScreen) {
"serverDialog" -> currentScreen = "passwordDialog" "serverDialog" -> currentScreen = "passwordDialog"
"passwordDialog" -> currentScreen = "loadingDialog" "passwordDialog" -> currentScreen = "loadingDialog"
"apiDialog" -> currentScreen = "loadingDialog" "apiDialog" -> currentScreen = "loadingDialog"
"loadingDialog" -> currentScreen = "loadingDialog" "loadingDialog" -> currentScreen = "loadingDialog"
}}, }
},
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(96.dp), .height(96.dp),
enabled = when(currentScreen) { enabled = when (currentScreen) {
"serverDialog" -> isValidUrl(serverURL) "serverDialog" -> isValidUrl(serverURL)
"passwordDialog" -> username.isNotEmpty() && password.isNotEmpty() "passwordDialog" -> username.isNotEmpty() && password.isNotEmpty()
"apiDialog" -> apiKey.isNotEmpty() "apiDialog" -> apiKey.isNotEmpty()
@ -142,7 +146,16 @@ fun LoginScreen(paddingValues: PaddingValues) {
}, },
) { ) {
Row() { Row() {
Text(text = "Next") Text(
text = when (currentScreen) {
"serverDialog" -> "Next"
"passwordDialog" -> "Login"
"apiDialog" -> "Login"
else -> ""
}
)
}
} }
} }
} }