From da87e6cb224e0369282eb447b6db9437ea958b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Ahlers?= Date: Thu, 6 Nov 2025 10:48:06 +0100 Subject: [PATCH] Refactor MainActivity to use MainScreen with scaffold and navigation setup --- .../strassenschadenpro2/MainActivity.kt | 15 +-------- .../jadehs/strassenschadenpro2/MainScreen.kt | 31 +++++++++++++++++++ .../de/jadehs/strassenschadenpro2/NavItem.kt | 8 +++++ 3 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 app/src/main/java/de/jadehs/strassenschadenpro2/MainScreen.kt create mode 100644 app/src/main/java/de/jadehs/strassenschadenpro2/NavItem.kt diff --git a/app/src/main/java/de/jadehs/strassenschadenpro2/MainActivity.kt b/app/src/main/java/de/jadehs/strassenschadenpro2/MainActivity.kt index 927e592..ccfe148 100644 --- a/app/src/main/java/de/jadehs/strassenschadenpro2/MainActivity.kt +++ b/app/src/main/java/de/jadehs/strassenschadenpro2/MainActivity.kt @@ -36,20 +36,7 @@ class MainActivity : ComponentActivity() { enableEdgeToEdge() setContent { StrassenSchadenPro2Theme { - //var count = 0 - var count by remember { mutableStateOf(0) } - Column(modifier = Modifier.fillMaxSize(), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally) { - Text(text= count.toString()) - Button(onClick = { - count++ - Log.d("MainActivity", "Button clicked $count") - - }) { - Text("Click me") - } - } + MainScreen() } } } diff --git a/app/src/main/java/de/jadehs/strassenschadenpro2/MainScreen.kt b/app/src/main/java/de/jadehs/strassenschadenpro2/MainScreen.kt new file mode 100644 index 0000000..551d930 --- /dev/null +++ b/app/src/main/java/de/jadehs/strassenschadenpro2/MainScreen.kt @@ -0,0 +1,31 @@ +package de.jadehs.strassenschadenpro2 + +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Place +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier + +@Composable +fun MainScreen(modifier: Modifier = Modifier) { + + val navItemList = listOf( + NavItem("Karte",Icons.Default.Place) + ) + + Scaffold(modifier = Modifier.fillMaxSize(), + bottomBar = { + NavigationBar { + + } + }) { + innerPadding -> + Text(text = "Hello World", + modifier = Modifier.padding(innerPadding) + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/de/jadehs/strassenschadenpro2/NavItem.kt b/app/src/main/java/de/jadehs/strassenschadenpro2/NavItem.kt new file mode 100644 index 0000000..0f38cd9 --- /dev/null +++ b/app/src/main/java/de/jadehs/strassenschadenpro2/NavItem.kt @@ -0,0 +1,8 @@ +package de.jadehs.strassenschadenpro2 + +import androidx.compose.ui.graphics.vector.ImageVector + +data class NavItem( + val label: String, + val icon: ImageVector +)