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

Compare commits

base: lele:7668743a1f96892279cf065992bec94eb212e658
Branches Tags
lele:master
..
compare: lele:2056e7f8d4f07e18dc59c2ec472c0c3ff53cec8d
Branches Tags
lele:master

No commits in common. "7668743a1f96892279cf065992bec94eb212e658" and "2056e7f8d4f07e18dc59c2ec472c0c3ff53cec8d" have entirely different histories.
7668743a1f ... 2056e7f8d4

1 changed files with 23 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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