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

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

@ -70,6 +70,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
verticalArrangement = Arrangement.Center) {
Greeting(serverURL, currentScreen);
AnimatedContent(
modifier = Modifier.padding(bottom = 24.dp),
targetState = currentScreen,
transitionSpec = {
fadeIn(
@ -87,11 +88,13 @@ fun HomeScreen(paddingValues: PaddingValues) {
AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
Row(
modifier = Modifier.padding(bottom = 12.dp)
.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween
) {
OutlinedButton(
onClick = { currentScreen = "serverDialog" },
modifier = Modifier.padding(top = 24.dp)
modifier = Modifier.weight(1f)
) {
Row() {
Text(text = "Change Server")
@ -99,6 +102,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
}
Spacer(modifier = Modifier.width(12.dp))
OutlinedButton(
modifier = Modifier.weight(1f),
onClick = {
when (currentScreen) {
"passwordDialog" -> {
@ -110,7 +114,6 @@ fun HomeScreen(paddingValues: PaddingValues) {
}
}
},
modifier = Modifier.padding(top = 24.dp)
) {
Row() {
when (currentScreen) {
@ -129,9 +132,8 @@ fun HomeScreen(paddingValues: PaddingValues) {
"loadingDialog" -> currentScreen = "loadingDialog"
}},
modifier = Modifier
.padding(top = 24.dp)
.fillMaxWidth()
.height(128.dp),
.height(96.dp),
enabled = when(currentScreen) {
"serverDialog" -> isValidUrl(serverURL)
"passwordDialog" -> username.isNotEmpty() && password.isNotEmpty()