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 +3 -3
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7e47c7fb23 - Show all commits

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)
} }
} }
} }

2
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("") }