From e7086791c8ff5b0ce12d2029b232898d792909fa Mon Sep 17 00:00:00 2001 From: Leandro Schaguhn Date: Wed, 11 Jun 2025 13:26:15 +0200 Subject: [PATCH] show domain url on title screen --- .../de/lelehier/keeper/screens/home_screen.kt | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt b/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt index 8537d1b..b00eedd 100644 --- a/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt +++ b/app/src/main/java/de/lelehier/keeper/screens/home_screen.kt @@ -56,7 +56,7 @@ fun homeScreen(paddingValues: PaddingValues) { .imePadding(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { - Greeting(serverURL); + Greeting(serverURL, currentScreen); AnimatedContent( targetState = currentScreen, transitionSpec = { @@ -66,7 +66,7 @@ fun homeScreen(paddingValues: PaddingValues) { }, ) { targetState -> when(targetState) { - 0 -> serverDialog(serverURL) + 0 -> serverDialog(serverURL, {newServerURL -> serverURL = newServerURL }) 1 -> passwordDialog(username, password) } } @@ -80,13 +80,15 @@ fun homeScreen(paddingValues: PaddingValues) { } @Composable -fun Greeting(serverURL: String) { +fun Greeting(serverURL: String, currentScreen: Int) { Column (horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.padding(bottom = 24.dp)) { - Text( - text = "Welcome to", - style = MaterialTheme.typography.headlineLarge, - textAlign = TextAlign.Center - ) + AnimatedVisibility (currentScreen == 0) { + Text( + text = "Welcome to", + style = MaterialTheme.typography.headlineLarge, + textAlign = TextAlign.Center + ) + } Text( text = "Keeper", style = TextStyle( @@ -95,13 +97,20 @@ fun Greeting(serverURL: String) { brush = Brush.linearGradient(listOf(MaterialTheme.colorScheme.onPrimaryContainer, MaterialTheme.colorScheme.onSecondaryContainer))), textAlign = TextAlign.Center, ) + AnimatedVisibility(currentScreen != 0) { + Text( + text = "@$serverURL", + style = MaterialTheme.typography.titleSmall, + textAlign = TextAlign.Center + ) + } } } @Composable -fun serverDialog(serverURL: String) { +fun serverDialog(serverURL: String, updateServerURL: (newServerURL: String) -> Unit) { var serverURL by remember { mutableStateOf("") } OutlinedTextField( label = { Text(text = "Server URL") }, @@ -109,6 +118,7 @@ fun serverDialog(serverURL: String) { value = serverURL, onValueChange = { text -> serverURL = text + updateServerURL(serverURL) }, keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri), supportingText = {