Merge remote-tracking branch 'origin/main'

- MainActivity.kt übernommen
- MainScreen.kt übernommen
  - fun MainScreen
  - fun ContentScreen
  - fun AppTopBar
  - fun ReportOverlay

.idea/gradle.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">

app/build.gradle.kts

@@ -50,6 +50,7 @@ dependencies {
     implementation(libs.androidx.compose.ui.graphics)
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.material3)
+    implementation(libs.androidx.material3)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -57,4 +58,6 @@ dependencies {
     androidTestImplementation(libs.androidx.compose.ui.test.junit4)
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
+    implementation("androidx.compose.material:material-icons-core")
+    implementation("androidx.compose.material:material-icons-extended")
 }

app/src/main/AndroidManifest.xml

@@ -2,6 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"

app/src/main/java/com/example/snapandsolve/MainActivity.kt

@@ -17,31 +17,11 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+
         setContent {
             SnapAndSolveTheme {
-                Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
+                MainScreen(application=application)
-                    Greeting(
-                        name = "Android",
-                        modifier = Modifier.padding(innerPadding)
-                    )
             }
         }
     }
 }
-}
-
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    SnapAndSolveTheme {
-        Greeting("Android")
-    }
-}

app/src/main/java/com/example/snapandsolve/MainScreen.kt

@@ -0,0 +1,221 @@
+package com.example.snapandsolve
+
+import android.app.Application
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material3.BottomAppBar
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonColors
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardColors
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FabPosition
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.FloatingActionButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LargeFloatingActionButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.MediumTopAppBar
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarColors
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import com.example.snapandsolve.ui.theme.AppColor
+import com.example.snapandsolve.ui.theme.ButtonColor
+import com.example.snapandsolve.ui.theme.WidgetColor
+
+
+@Composable
+fun MainScreen(modifier: Modifier = Modifier, application: Application) {
+    var showReport by rememberSaveable { mutableStateOf(false) }
+
+    Scaffold(
+        modifier = Modifier.fillMaxSize(),
+        topBar = {
+            AppTopBar()
+        },
+        bottomBar = {
+            BottomAppBar(
+                modifier = Modifier.height(120.dp),
+                containerColor = AppColor,
+                // contentColor = AppColor
+            ) {
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(start = 16.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    IconButton(
+                        onClick = {
+                            /*TODO*/
+                        },
+                        modifier = Modifier.padding(bottom = 8.dp) // Abstand "in" der Bar
+                    ) {
+                        Icon(
+                            Icons.Default.Menu,
+                            contentDescription = "Menu",
+
+                        )
+                    }
+                    Spacer(Modifier.weight(1f))
+                }
+            }
+        },
+        floatingActionButton = {
+            LargeFloatingActionButton(
+                onClick = {
+                    showReport = true
+                },
+                modifier = Modifier.offset(y = 64.dp),
+                containerColor = ButtonColor
+            ) {
+                Icon(Icons.Default.Add, contentDescription = "Add")
+            }
+        },
+        floatingActionButtonPosition = FabPosition.Center,
+    ) {
+        innerPadding ->
+        ContentScreen(
+            modifier = Modifier.padding(innerPadding),
+            application,
+            showReport = showReport,
+            onDismissReport = { showReport = false })
+    }
+}
+
+@Composable
+fun ContentScreen(
+    modifier: Modifier = Modifier,
+    application: Application,
+    showReport: Boolean,
+    onDismissReport: () -> Unit
+) {
+    val mapViewModel = remember { MapViewModel(application) }
+    Box(modifier = modifier.fillMaxSize()) {
+
+        // 2) Overlay
+        if (showReport) {
+            ReportOverlay(
+                onCancel = onDismissReport,
+                onAdd = { /* später */ }
+            )
+        }
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AppTopBar(
+    modifier: Modifier = Modifier
+) {
+    MediumTopAppBar(
+        title = {
+            Text("Scan And Solve")
+        },
+        colors = TopAppBarDefaults.mediumTopAppBarColors(
+            containerColor = AppColor,
+            titleContentColor = Color.White
+        )
+
+    )
+}
+
+@Composable
+fun ReportOverlay(
+    onCancel: () -> Unit,
+    onAdd: () -> Unit
+) {
+    // leichter Dim-Hintergrund
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.Black.copy(alpha = 0.25f)),
+        contentAlignment = Alignment.Center
+    ) {
+        Card(
+            modifier = Modifier
+                .fillMaxWidth(0.9f)
+                .heightIn(min = 400.dp),
+            shape = RoundedCornerShape(24.dp),
+            colors = CardColors(
+                containerColor = WidgetColor,
+                contentColor = ButtonColor,
+                disabledContainerColor = Color.White,
+                disabledContentColor = Color.White
+            )
+        ) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(20.dp),
+                verticalArrangement = Arrangement.spacedBy(16.dp)
+            ) {
+                Text("Schadensbeschreibung:",
+                    color = Color.Black
+                )
+
+                // Platzhalter fürs Textfeld / Icons etc.
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(220.dp)
+                        .background(Color.White, RoundedCornerShape(12.dp))
+                )
+
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween
+                ) {
+                    OutlinedButton(
+                        onClick = onCancel,
+                        colors = ButtonColors(
+                            containerColor = ButtonColor,
+                            contentColor = Color.White,
+                            disabledContainerColor = Color.White,
+                            disabledContentColor = Color.White
+                        )
+                    ) { Text(
+                        "Abbrechen",
+                        color = Color.Black
+                    ) }
+                    Button(onClick = onAdd) { Text("Hinzufügen") }
+                }
+            }
+        }
+    }
+}
+
+
+

app/src/main/java/com/example/snapandsolve/MapViewModel.kt

@@ -0,0 +1,8 @@
+package com.example.snapandsolve
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+
+class MapViewModel(application: Application ): AndroidViewModel(application) {
+
+}

app/src/main/java/com/example/snapandsolve/ui/theme/Color.kt

@@ -1,7 +1,11 @@
 package com.example.snapandsolve.ui.theme
 
+import androidx.compose.material3.CardColors
 import androidx.compose.ui.graphics.Color
 
+val AppColor = Color(0xFF7CBE64)
+val ButtonColor = Color(0xFFE6E6E6)
+val WidgetColor: Color = Color(0xFFDBCCCC)
 val Purple80 = Color(0xFFD0BCFF)
 val PurpleGrey80 = Color(0xFFCCC2DC)
 val Pink80 = Color(0xFFEFB8C8)

gradle/libs.versions.toml

@@ -8,6 +8,7 @@ espressoCore = "3.7.0"
 lifecycleRuntimeKtx = "2.10.0"
 activityCompose = "1.12.1"
 composeBom = "2024.09.00"
+material3 = "1.4.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -24,6 +25,7 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u
 androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }