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 +4 -7
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9ac70f0aec - Show all commits

5
app/src/main/java/de/lelehier/keeper/MainActivity.kt
View file

@ -42,11 +42,6 @@ class MainActivity : ComponentActivity() {
setContent {
KeeperTheme {
var currentScreen by remember { mutableStateOf(0) }
var nextScreen by remember { mutableStateOf(1) }
var serverURL = ""
var username by remember { mutableStateOf("") }
var password by remember { mutableStateOf("") }
var apiKey by remember { mutableStateOf("") }
Scaffold() { paddingValues ->
homeScreen(paddingValues)

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

@ -67,7 +67,7 @@ fun homeScreen(paddingValues: PaddingValues) {
) { targetState -> when(targetState) {
0 -> serverDialog(serverURL, {newServerURL -> serverURL = newServerURL })
1 -> passwordDialog(username, password)
1 -> passwordDialog(username, password, {newUsername -> username = newUsername}, {newPassword -> password = newPassword })
}
}
@ -151,7 +151,7 @@ fun isValidUrl(url: String): Boolean {
}
@Composable
fun passwordDialog(username: String, password: String) {
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 {
@ -161,6 +161,7 @@ fun passwordDialog(username: String, password: String) {
value = username,
onValueChange = { text ->
username = text
updateUsername(username)
});
OutlinedTextField(
label = { Text(text = "Password") },
@ -168,6 +169,7 @@ fun passwordDialog(username: String, password: String) {
value = password,
onValueChange = { text ->
password = text
updatePassword(password)
}
)