diff --git a/app/src/main/java/de/webfussel/soulecho/ui/theme/Theme.kt b/app/src/main/java/de/webfussel/soulecho/ui/theme/Theme.kt index 6d635fa..6b19dee 100644 --- a/app/src/main/java/de/webfussel/soulecho/ui/theme/Theme.kt +++ b/app/src/main/java/de/webfussel/soulecho/ui/theme/Theme.kt @@ -1,14 +1,10 @@ package de.webfussel.soulecho.ui.theme -import android.os.Build -import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.ColorScheme import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.dynamicDarkColorScheme -import androidx.compose.material3.dynamicLightColorScheme 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 @@ -40,23 +36,25 @@ private val AnxiousColorTheme = createEmotionColorScheme(AnxiousFg, AnxiousBg) private val NervousColorTheme = createEmotionColorScheme(NervousFg, NervousBg) private val PanicColorTheme = createEmotionColorScheme(PanicFg, PanicBg) +private fun getThemeForMood (mood: PossibleMood) : ColorScheme = when (mood) { + PossibleMood.HAPPY -> HappyColorTheme + PossibleMood.RELAXED -> RelaxedColorTheme + PossibleMood.CONTENT -> ContentColorTheme + PossibleMood.SAD -> SadColorTheme + PossibleMood.ANGRY -> AngryColorTheme + PossibleMood.DISAPPOINTED -> DisappointedColorTheme + PossibleMood.EMPTY -> EmptyColorTheme + PossibleMood.ANXIOUS -> AnxiousColorTheme + PossibleMood.NERVOUS -> NervousColorTheme + PossibleMood.PANIC -> PanicColorTheme +} + @Composable fun SoulEchoTheme( content: @Composable () -> Unit ) { - val currentTheme = LocalMoodState.current.mood - val colorScheme = when (currentTheme) { - PossibleMood.HAPPY -> HappyColorTheme - PossibleMood.RELAXED -> RelaxedColorTheme - PossibleMood.CONTENT -> ContentColorTheme - PossibleMood.SAD -> SadColorTheme - PossibleMood.ANGRY -> AngryColorTheme - PossibleMood.DISAPPOINTED -> DisappointedColorTheme - PossibleMood.EMPTY -> EmptyColorTheme - PossibleMood.ANXIOUS -> AnxiousColorTheme - PossibleMood.NERVOUS -> NervousColorTheme - PossibleMood.PANIC -> PanicColorTheme - } + val currentMood = LocalMoodState.current.mood + val colorScheme = getThemeForMood(currentMood) MaterialTheme( colorScheme = colorScheme, diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..44f74b9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,4 @@ - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file + #00000000 + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index f640fda..ebf804a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,4 +1,7 @@ - \ No newline at end of file