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 +23 -10
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7668743a1f - Show all commits

33
app/src/main/java/de/lelehier/keeper/screens/home_screen.kt
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
@ -72,17 +73,29 @@ fun HomeScreen(paddingValues: PaddingValues) {
} }
} }
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")
}
} }
} }
} }