FIX: Drawer colors

app/src/main/java/de/webfussel/soulecho/MainActivity.kt

@@ -5,30 +5,31 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 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
 
+val LocalMoodState = compositionLocalOf<MoodWithInfo> { error("No MoodState provided") }
+
 @Composable
 fun SoulEchoApp() {
-    var currentMood by remember {
-        mutableStateOf(MoodWithInfo(mood = PossibleMood.HAPPY, info = ""))
-    }
-    SoulEchoTheme (currentTheme = currentMood.mood) {
-        Drawer (
-            currentMood = currentMood.mood,
-        ) {
-            MoodSection(
-                currentMood = currentMood,
-                onMoodChange = { currentMood = it }
-            )
+    var currentMood by remember { mutableStateOf(MoodWithInfo(mood = PossibleMood.HAPPY, info = "")) }
+
+    CompositionLocalProvider(LocalMoodState provides currentMood) {
+        SoulEchoTheme () {
+            Drawer () {
+                MoodSection(
+                    onMoodChange = { currentMood = it }
+                )
+            }
         }
     }
 }
@@ -41,10 +42,4 @@ class MainActivity : ComponentActivity() {
             SoulEchoApp()
         }
     }
-}
-
-@Preview(showBackground = true)
-@Composable
-fun DefaultPreview() {
-    SoulEchoApp()
 }

app/src/main/java/de/webfussel/soulecho/mood/Section.kt

@@ -22,16 +22,18 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import de.webfussel.soulecho.LocalMoodState
 import de.webfussel.soulecho.mood.Moods.getMoodById
 import de.webfussel.soulecho.R
 
 @Composable
 fun MoodSection(
-    currentMood: MoodWithInfo = MoodWithInfo(mood = PossibleMood.HAPPY, info = ""),
     onMoodChange: (MoodWithInfo) -> Unit = {}
 ) {
+    val currentMood = LocalMoodState.current
     var dialogOpen by remember { mutableStateOf(false) }
     val theme = MaterialTheme.colorScheme
+
     Box(modifier = Modifier.fillMaxSize()) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,

app/src/main/java/de/webfussel/soulecho/navigation/Drawer.kt

@@ -2,11 +2,13 @@ package de.webfussel.soulecho.navigation
 import de.webfussel.soulecho.R
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -42,6 +44,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import de.webfussel.soulecho.LocalMoodState
 import de.webfussel.soulecho.mood.Moods.getMoodById
 import de.webfussel.soulecho.mood.PossibleMood
 import kotlinx.coroutines.launch
@@ -53,14 +56,14 @@ fun CustomNavigationDrawerItem(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
-    contentPadding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 8.dp)
+    contentPadding: PaddingValues = PaddingValues(horizontal = 16.dp, vertical = 8.dp)
 ) {
     Surface(
         selected = selected,
         onClick = onClick,
         modifier = modifier.fillMaxWidth(),
-        color = if (selected) MaterialTheme.colorScheme.primary else Color.Transparent,
-        shape = RoundedCornerShape(12.dp)
+        color = if (selected) MaterialTheme.colorScheme.background else Color.Transparent,
+        shape = RoundedCornerShape(8.dp)
     ) {
         Row(
             modifier = Modifier.padding(contentPadding),
@@ -78,16 +81,15 @@ fun NavigationBlock (
     items : List<NavigationEntry>,
     currentNavigation: NavigationEntry,
     onNavigationItemClicked: (NavigationEntry) -> Unit = {},
-    currentMood: PossibleMood = PossibleMood.HAPPY,
 ) {
-    val theme = MaterialTheme.colorScheme
+    val currentMood = LocalMoodState.current.mood
 
     for (item in items) {
         CustomNavigationDrawerItem(
             icon = {
                 Icon(
                     painterResource(
-                        if (item.id == "current")  getMoodById(currentMood).icon else item.icon
+                        if (item.id == "current") getMoodById(currentMood).icon else item.icon
                     ),
                     contentDescription = item.label,
                     modifier = Modifier.size(20.dp),
@@ -120,11 +122,11 @@ fun DrawerTop() {
                 .align(Alignment.BottomStart)
                 .padding(bottom = 16.dp, start = 16.dp),
             style = TextStyle(
-                fontSize = 24.sp,
+                fontSize = 32.sp,
                 shadow = Shadow(
                     color = Color.Black,
-                    offset = Offset(2f, 5f),
-                    blurRadius = 2f,
+                    offset = Offset(0f, 0f),
+                    blurRadius = 8f,
                 )
             ),
             color = Color.White,
@@ -133,14 +135,13 @@ fun DrawerTop() {
 }
 
 @Composable
-fun DrawerContent (
-    currentMood: PossibleMood = PossibleMood.HAPPY,
-) {
+fun DrawerContent () {
     var currentNavigation by remember {
         mutableStateOf(Navigation.getTopNavigation()[0])
     }
 
     ModalDrawerSheet(
+        drawerContainerColor = MaterialTheme.colorScheme.surface,
         modifier = Modifier.width(224.dp)
     ) {
         Column {
@@ -151,7 +152,6 @@ fun DrawerContent (
                 items = Navigation.getTopNavigation(),
                 currentNavigation = currentNavigation,
                 onNavigationItemClicked = { currentNavigation = it },
-                currentMood = currentMood,
             )
             Spacer(Modifier.weight(1f))
             NavigationBlock(
@@ -166,7 +166,6 @@ fun DrawerContent (
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun Drawer (
-    currentMood: PossibleMood = PossibleMood.HAPPY,
     content: @Composable (PaddingValues) -> Unit
 ) {
     val state = rememberDrawerState(initialValue = DrawerValue.Closed)
@@ -175,8 +174,8 @@ fun Drawer (
     var currentPage by remember { mutableStateOf("Stimmung") }
 
     ModalNavigationDrawer(
-        drawerContent = { DrawerContent(currentMood = currentMood) },
-        drawerState = state
+        drawerContent = { DrawerContent() },
+        drawerState = state,
     ) {
         Scaffold (
             topBar = {
@@ -202,18 +201,4 @@ fun Drawer (
             innerPadding -> content(innerPadding)
         }
     }
-}
-
-@Preview
-@Composable
-fun DrawerPreview() {
-    Drawer {
-        Text("Test", modifier = Modifier.padding(it))
-    }
-}
-
-@Preview
-@Composable
-fun DrawerContentPreview() {
-    DrawerContent()
 }

app/src/main/java/de/webfussel/soulecho/ui/theme/Theme.kt

@@ -9,10 +9,12 @@ import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import de.webfussel.soulecho.LocalMoodState
 import de.webfussel.soulecho.mood.PossibleMood
 
 // Base-Konfiguration für alle Themes
 private val BaseColorConfig = object {
+    val surface = Color.White
     val onPrimary = Color.White
 }
 
@@ -20,7 +22,7 @@ private val BaseColorConfig = object {
 private fun createEmotionColorScheme(fgColor: Color, bgColor: Color) = lightColorScheme(
     primary = fgColor,
     background = bgColor,
-    surface = bgColor,
+    surface = BaseColorConfig.surface,
     onPrimary = BaseColorConfig.onPrimary,
     onBackground = fgColor,
     onSurface = fgColor,
@@ -40,9 +42,9 @@ private val PanicColorTheme = createEmotionColorScheme(PanicFg, PanicBg)
 
 @Composable
 fun SoulEchoTheme(
-    currentTheme: PossibleMood = PossibleMood.HAPPY,
     content: @Composable () -> Unit
 ) {
+    val currentTheme = LocalMoodState.current.mood
     val colorScheme = when (currentTheme) {
         PossibleMood.HAPPY -> HappyColorTheme
         PossibleMood.RELAXED -> RelaxedColorTheme