From 26a5640987c0e6ad6fd5724c6b033fb949c52921 Mon Sep 17 00:00:00 2001
From: webfussel <fiona@webfussel.de>
Date: Fri, 1 Aug 2025 19:11:27 +0200
Subject: [PATCH] ADD: info for mood

---
 app/src/main/java/de/webfussel/soulecho/MainActivity.kt   | 7 ++++---
 app/src/main/java/de/webfussel/soulecho/mood/Choice.kt    | 4 ++--
 app/src/main/java/de/webfussel/soulecho/mood/Model.kt     | 5 +++++
 app/src/main/java/de/webfussel/soulecho/mood/Section.kt   | 8 ++++----
 .../main/java/de/webfussel/soulecho/navigation/Drawer.kt  | 4 ----
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/de/webfussel/soulecho/MainActivity.kt b/app/src/main/java/de/webfussel/soulecho/MainActivity.kt
index f2d1896..981849b 100644
--- a/app/src/main/java/de/webfussel/soulecho/MainActivity.kt
+++ b/app/src/main/java/de/webfussel/soulecho/MainActivity.kt
@@ -11,6 +11,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.tooling.preview.Preview
 import de.webfussel.soulecho.mood.MoodSection
+import de.webfussel.soulecho.mood.MoodWithInfo
 import de.webfussel.soulecho.mood.PossibleMood
 import de.webfussel.soulecho.navigation.Drawer
 import de.webfussel.soulecho.ui.theme.SoulEchoTheme
@@ -18,11 +19,11 @@ import de.webfussel.soulecho.ui.theme.SoulEchoTheme
 @Composable
 fun SoulEchoApp() {
     var currentMood by remember {
-        mutableStateOf(PossibleMood.HAPPY)
+        mutableStateOf(MoodWithInfo(mood = PossibleMood.HAPPY, info = ""))
     }
-    SoulEchoTheme (currentTheme = currentMood) {
+    SoulEchoTheme (currentTheme = currentMood.mood) {
         Drawer (
-            currentMood = currentMood,
+            currentMood = currentMood.mood,
         ) {
             MoodSection(
                 currentMood = currentMood,
diff --git a/app/src/main/java/de/webfussel/soulecho/mood/Choice.kt b/app/src/main/java/de/webfussel/soulecho/mood/Choice.kt
index 0729f74..a872c08 100644
--- a/app/src/main/java/de/webfussel/soulecho/mood/Choice.kt
+++ b/app/src/main/java/de/webfussel/soulecho/mood/Choice.kt
@@ -43,7 +43,7 @@ import de.webfussel.soulecho.ui.theme.getColorForMood
 @Composable
 fun MoodChoice (
     onDismiss: () -> Unit = {},
-    onConfirm: (PossibleMood) -> Unit = {},
+    onConfirm: (MoodWithInfo) -> Unit = {},
 ) {
     var selectedMood by remember { mutableStateOf(PossibleMood.HAPPY) }
     var info by remember { mutableStateOf("") }
@@ -111,7 +111,7 @@ fun MoodChoice (
                 TextButton(onClick = onDismiss) {
                     Text("Abbrechen", color = Color(0xFFAA0000))
                 }
-                TextButton(onClick = { onConfirm(selectedMood) }) {
+                TextButton(onClick = { onConfirm(MoodWithInfo(mood = selectedMood, info = info)) }) {
                     Text("Bestätigen", color = Color(0xFF007AFF))
                 }
             }
diff --git a/app/src/main/java/de/webfussel/soulecho/mood/Model.kt b/app/src/main/java/de/webfussel/soulecho/mood/Model.kt
index 0446005..d89bc08 100644
--- a/app/src/main/java/de/webfussel/soulecho/mood/Model.kt
+++ b/app/src/main/java/de/webfussel/soulecho/mood/Model.kt
@@ -22,6 +22,11 @@ data class Mood(
     @DrawableRes val icon: Int
 )
 
+data class MoodWithInfo(
+    val mood: PossibleMood,
+    val info: String
+)
+
 object Moods {
     private val happy = Mood(
         label = "Glücklich",
diff --git a/app/src/main/java/de/webfussel/soulecho/mood/Section.kt b/app/src/main/java/de/webfussel/soulecho/mood/Section.kt
index 18058db..f9d416f 100644
--- a/app/src/main/java/de/webfussel/soulecho/mood/Section.kt
+++ b/app/src/main/java/de/webfussel/soulecho/mood/Section.kt
@@ -27,8 +27,8 @@ import de.webfussel.soulecho.R
 
 @Composable
 fun MoodSection(
-    currentMood: PossibleMood = PossibleMood.HAPPY,
-    onMoodChange: (PossibleMood) -> Unit = {}
+    currentMood: MoodWithInfo = MoodWithInfo(mood = PossibleMood.HAPPY, info = ""),
+    onMoodChange: (MoodWithInfo) -> Unit = {}
 ) {
     var dialogOpen by remember { mutableStateOf(false) }
     val theme = MaterialTheme.colorScheme
@@ -38,7 +38,7 @@ fun MoodSection(
             verticalArrangement = Arrangement.Center,
             modifier = Modifier.fillMaxSize()
         ) {
-            val mood = getMoodById(currentMood)
+            val mood = getMoodById(currentMood.mood)
             Icon(
                 painter = painterResource(mood.icon),
                 contentDescription = "Mood",
@@ -47,7 +47,7 @@ fun MoodSection(
             )
             Spacer(modifier = Modifier.size(16.dp))
             Text(mood.label, fontWeight = FontWeight.Bold, fontSize = 32.sp)
-            Text("Läuft jetzt nativ")
+            Text(currentMood.info)
         }
         FloatingActionButton(
             containerColor = theme.primary,
diff --git a/app/src/main/java/de/webfussel/soulecho/navigation/Drawer.kt b/app/src/main/java/de/webfussel/soulecho/navigation/Drawer.kt
index 4e719a4..14e93df 100644
--- a/app/src/main/java/de/webfussel/soulecho/navigation/Drawer.kt
+++ b/app/src/main/java/de/webfussel/soulecho/navigation/Drawer.kt
@@ -13,8 +13,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -22,8 +20,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalDrawerSheet
 import androidx.compose.material3.ModalNavigationDrawer
-import androidx.compose.material3.NavigationDrawerItem
-import androidx.compose.material3.NavigationDrawerItemDefaults
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text