From 2056e7f8d4f07e18dc59c2ec472c0c3ff53cec8d Mon Sep 17 00:00:00 2001 From: Leandro Schaguhn Date: Wed, 11 Jun 2025 15:51:41 +0200 Subject: [PATCH] cleanup --- .../java/de/lelehier/keeper/MainActivity.kt | 27 ++----------------- .../de/lelehier/keeper/screens/home_screen.kt | 7 ++--- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/de/lelehier/keeper/MainActivity.kt b/app/src/main/java/de/lelehier/keeper/MainActivity.kt index 029d5ad..6dcc779 100644 --- a/app/src/main/java/de/lelehier/keeper/MainActivity.kt +++ b/app/src/main/java/de/lelehier/keeper/MainActivity.kt @@ -1,39 +1,16 @@ package de.lelehier.keeper -import android.icu.text.StringSearch import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.defaultMinSize -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.material3.Button -import androidx.compose.material3.ElevatedButton -import androidx.compose.material3.FilledIconButton -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.painter.Painter -import androidx.compose.ui.text.input.TextFieldValue -import androidx.compose.ui.tooling.preview.Preview import de.lelehier.keeper.ui.theme.KeeperTheme -import de.lelehier.keeper.screens.Greeting -import de.lelehier.keeper.screens.homeScreen +import de.lelehier.keeper.screens.HomeScreen class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -44,7 +21,7 @@ class MainActivity : ComponentActivity() { var currentScreen by remember { mutableStateOf(0) } Scaffold() { paddingValues -> - homeScreen(paddingValues) + HomeScreen(paddingValues) } } } 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 544e9cf..8a8dbc0 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 @@ -25,6 +25,7 @@ import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable @@ -41,9 +42,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @Composable -fun homeScreen(paddingValues: PaddingValues) { - var currentScreen by rememberSaveable { mutableStateOf(0) } - var nextScreen by rememberSaveable { mutableStateOf(1) } +fun HomeScreen(paddingValues: PaddingValues) { + var currentScreen by rememberSaveable { mutableIntStateOf(0) } + var nextScreen by rememberSaveable { mutableIntStateOf(1) } var serverURL by rememberSaveable { mutableStateOf("") } var username by rememberSaveable { mutableStateOf("") } var password by rememberSaveable { mutableStateOf("") }