Compare commits

...

2 commits

Author SHA1 Message Date
7668743a1f added api login button 2025-06-11 18:56:42 +02:00
0d44832747 fixed state on rotation 2025-06-11 18:50:20 +02:00

View file

@ -21,6 +21,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.Button import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -67,22 +68,34 @@ fun HomeScreen(paddingValues: PaddingValues) {
}, },
) { targetState -> when(targetState) { ) { targetState -> when(targetState) {
0 -> serverDialog(serverURL, {newServerURL -> serverURL = newServerURL }) 0 -> ServerDialog(serverURL, {newServerURL -> serverURL = newServerURL })
1 -> passwordDialog(username, password, {newUsername -> username = newUsername}, {newPassword -> password = newPassword }) 1 -> PasswordDialog(username, password, {newUsername -> username = newUsername}, {newPassword -> password = newPassword })
} }
} }
Button( Row {
onClick = {currentScreen = nextScreen}, AnimatedVisibility(currentScreen == 1) {
modifier = Modifier.padding(top = 24.dp), OutlinedButton (
enabled = when(currentScreen) { onClick = {currentScreen = nextScreen},
0 -> isValidUrl(serverURL) modifier = Modifier.padding(top = 24.dp)
1 -> username.isNotEmpty() && password.isNotEmpty() ) {
else -> false Row() {
}, Text(text = "Use API Key")
}
}
}
Button(
onClick = {currentScreen = nextScreen},
modifier = Modifier.padding(top = 24.dp),
enabled = when(currentScreen) {
0 -> isValidUrl(serverURL)
1 -> username.isNotEmpty() && password.isNotEmpty()
else -> false
},
) { ) {
Row() { Row() {
Text(text = "Next") Text(text = "Next")
}
} }
} }
} }
@ -119,15 +132,15 @@ fun Greeting(serverURL: String, currentScreen: Int) {
@Composable @Composable
fun serverDialog(serverURL: String, updateServerURL: (newServerURL: String) -> Unit) { fun ServerDialog(serverURL: String, updateServerURL: (newServerURL: String) -> Unit) {
var serverURL by remember { mutableStateOf("") } var dialogServerURL by remember { mutableStateOf("") }
OutlinedTextField( OutlinedTextField(
label = { Text(text = "Server URL") }, label = { Text(text = "Server URL") },
textStyle = MaterialTheme.typography.bodySmall, textStyle = MaterialTheme.typography.bodySmall,
value = serverURL, value = serverURL,
onValueChange = { text -> onValueChange = { text ->
serverURL = text dialogServerURL = text
updateServerURL(serverURL) updateServerURL(dialogServerURL)
}, },
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri), keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri),
supportingText = { supportingText = {
@ -152,25 +165,25 @@ fun isValidUrl(url: String): Boolean {
} }
@Composable @Composable
fun passwordDialog(username: String, password: String, updateUsername: (newUsername: String) -> Unit, updatePassword: (newPassword: String) -> Unit) { fun PasswordDialog(username: String, password: String, updateUsername: (newUsername: String) -> Unit, updatePassword: (newPassword: String) -> Unit) {
var username by remember { mutableStateOf("") } var dialogUsername by remember { mutableStateOf("") }
var password by remember { mutableStateOf("") } var dialogPassword by remember { mutableStateOf("") }
Column { Column {
OutlinedTextField( OutlinedTextField(
label = { Text(text = "Username") }, label = { Text(text = "Username") },
textStyle = MaterialTheme.typography.bodySmall, textStyle = MaterialTheme.typography.bodySmall,
value = username, value = username,
onValueChange = { text -> onValueChange = { text ->
username = text dialogUsername = text
updateUsername(username) updateUsername(dialogUsername)
}); });
OutlinedTextField( OutlinedTextField(
label = { Text(text = "Password") }, label = { Text(text = "Password") },
textStyle = MaterialTheme.typography.bodySmall, textStyle = MaterialTheme.typography.bodySmall,
value = password, value = password,
onValueChange = { text -> onValueChange = { text ->
password = text dialogPassword = text
updatePassword(password) updatePassword(dialogPassword)
} }
) )