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
Showing only changes of commit 8403bcf9c7 - Show all commits

View file

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