lele/Keeper
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lele:81661b327088d130d1d70c152ffd377364f70d68
Branches Tags
lele:master
...
compare: lele:b8d6c098ac7a3202a46e48def0f562e6dea86ea5
Branches Tags
lele:master

2 commits
81661b3270 ... b8d6c098ac

Author SHA1 Message Date
Leandro Schaguhn
b8d6c098ac remove button on loading screen 2025-06-13 15:18:19 +02:00
Leandro Schaguhn
7e47c7fb23 renamed HomeScreen to LoginScreen 2025-06-13 14:28:14 +02:00
2 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/de/lelehier/keeper/MainActivity.kt
View file

@ -10,7 +10,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import de.lelehier.keeper.ui.theme.KeeperTheme import de.lelehier.keeper.ui.theme.KeeperTheme
import de.lelehier.keeper.screens.HomeScreen import de.lelehier.keeper.screens.LoginScreen
class MainActivity : ComponentActivity() { class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -21,7 +21,7 @@ class MainActivity : ComponentActivity() {
var currentScreen by remember { mutableStateOf(0) } var currentScreen by remember { mutableStateOf(0) }
Scaffold() { paddingValues -> Scaffold() { paddingValues ->
HomeScreen(paddingValues) LoginScreen(paddingValues)
} }
} }
} }

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

@ -53,7 +53,7 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
@Composable @Composable
fun HomeScreen(paddingValues: PaddingValues) { fun LoginScreen(paddingValues: PaddingValues) {
var currentScreen by rememberSaveable { mutableStateOf("serverDialog") } var currentScreen by rememberSaveable { mutableStateOf("serverDialog") }
var serverURL by rememberSaveable { mutableStateOf("") } var serverURL by rememberSaveable { mutableStateOf("") }
var username by rememberSaveable { mutableStateOf("") } var username by rememberSaveable { mutableStateOf("") }
@ -88,7 +88,8 @@ fun HomeScreen(paddingValues: PaddingValues) {
AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") { AnimatedVisibility(currentScreen == "passwordDialog" || currentScreen == "apiDialog") {
Row( Row(
modifier = Modifier.padding(bottom = 12.dp) modifier = Modifier
.padding(bottom = 12.dp)
.fillMaxWidth(), .fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
) { ) {
@ -124,25 +125,37 @@ fun HomeScreen(paddingValues: PaddingValues) {
} }
} }
} }
Button( AnimatedVisibility(currentScreen != "loadingDialog") {
onClick = {when(currentScreen) { Button(
"serverDialog" -> currentScreen = "passwordDialog" onClick = {
"passwordDialog" -> currentScreen = "loadingDialog" when (currentScreen) {
"apiDialog" -> currentScreen = "loadingDialog" "serverDialog" -> currentScreen = "passwordDialog"
"loadingDialog" -> currentScreen = "loadingDialog" "passwordDialog" -> currentScreen = "loadingDialog"
}}, "apiDialog" -> currentScreen = "loadingDialog"
modifier = Modifier "loadingDialog" -> currentScreen = "loadingDialog"
.fillMaxWidth() }
.height(96.dp), },
enabled = when(currentScreen) { modifier = Modifier
"serverDialog" -> isValidUrl(serverURL) .fillMaxWidth()
"passwordDialog" -> username.isNotEmpty() && password.isNotEmpty() .height(96.dp),
"apiDialog" -> apiKey.isNotEmpty() enabled = when (currentScreen) {
else -> false "serverDialog" -> isValidUrl(serverURL)
}, "passwordDialog" -> username.isNotEmpty() && password.isNotEmpty()
) { "apiDialog" -> apiKey.isNotEmpty()
Row() { else -> false
Text(text = "Next") },
) {
Row() {
Text(
text = when (currentScreen) {
"serverDialog" -> "Next"
"passwordDialog" -> "Login"
"apiDialog" -> "Login"
else -> ""
}
)
}
} }
} }
} }