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 +22 -17
1 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 59158e10c7 - Show all commits

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

@ -11,6 +11,7 @@ import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
@ -64,7 +65,7 @@ fun HomeScreen(paddingValues: PaddingValues) {
.padding(paddingValues)
.fillMaxSize()
.imePadding()
.padding(all = 56.dp),
.padding(start = 56.dp, end = 56.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center) {
Greeting(serverURL, currentScreen);
@ -84,10 +85,10 @@ fun HomeScreen(paddingValues: PaddingValues) {
}
}
AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
Row(
horizontalArrangement = Arrangement.SpaceBetween
) {
AnimatedVisibility(currentScreen == "passwordDialog") {
OutlinedButton(
onClick = { currentScreen = "serverDialog" },
modifier = Modifier.padding(top = 24.dp)
@ -96,14 +97,17 @@ fun HomeScreen(paddingValues: PaddingValues) {
Text(text = "Change Server")
}
}
}
Spacer(modifier = Modifier.width(12.dp))
AnimatedVisibility(currentScreen == "passwordDialog") {
OutlinedButton(
onClick = {
when (currentScreen) {
"passwordDialog" -> {currentScreen = "apiDialog"}
"apidialog" -> {currentScreen = "passwordDialog"}
"passwordDialog" -> {
currentScreen = "apiDialog"
}
"apidialog" -> {
currentScreen = "passwordDialog"
}
}
},
modifier = Modifier.padding(top = 24.dp)
@ -124,7 +128,8 @@ fun HomeScreen(paddingValues: PaddingValues) {
"apiDialog" -> currentScreen = "loadingDialog"
"loadingDialog" -> currentScreen = "loadingDialog"
}},
modifier = Modifier.padding(top = 24.dp)
modifier = Modifier
.padding(top = 24.dp)
.fillMaxWidth()
.height(128.dp),
enabled = when(currentScreen) {