Updated dark theme colors (#1484)

This changes to a red base instead of a yellow/mustard base for the dark theme. The stripe shader has a stronger multiplier added to transition from red to the background color.
android · Oct 13, 2024 · bc2f4f1 · bc2f4f1
2 parents abdaea3 + d718a66
commit bc2f4f1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/JetLagged/app/src/main/java/com/example/jetlagged/backgrounds/StripesShaderBackground.kt b/JetLagged/app/src/main/java/com/example/jetlagged/backgrounds/StripesShaderBackground.kt
@@ -120,7 +120,7 @@ private val SHADER = """
     float calculateColorMultiplier(float yCoord, float factor, bool fadeToDark) {
         float result = step(yCoord, 1.0 + factor * 2.0) - step(yCoord, factor - 0.1);
         if (fadeToDark) {
-            result *= -1.2;
+            result *= -2.4;
         }
         return result;
     }

diff --git a/JetLagged/app/src/main/java/com/example/jetlagged/sleep/SleepBar.kt b/JetLagged/app/src/main/java/com/example/jetlagged/sleep/SleepBar.kt
@@ -69,7 +69,6 @@ import androidx.compose.ui.graphics.drawscope.clipPath
 import androidx.compose.ui.graphics.drawscope.translate
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.drawText
 import androidx.compose.ui.text.rememberTextMeasurer
@@ -211,7 +210,6 @@ private fun SleepRoundedBar(
     )
 }
 
-@OptIn(ExperimentalTextApi::class)
 private fun DrawScope.drawSleepBar(
     roundedRectPath: Path,
     sleepGraphPath: Path,

diff --git a/JetLagged/app/src/main/java/com/example/jetlagged/ui/theme/Color.kt b/JetLagged/app/src/main/java/com/example/jetlagged/ui/theme/Color.kt
@@ -23,24 +23,24 @@ val Black = Color(0xFF000000)
 val Lilac = Color(0xFFCCB6DC)
 val DarkLilac = Color(0xFF715386)
 val Yellow = Color(0xFFFFCB66)
-val DarkYellow = Color(0xFF926A1B)
+val Red = Color(0xFFB40000)
 val YellowVariant = Color(0xFFFFDE9F)
-val DarkYellowVariant = Color(0xFF91733A)
+val RedVariant = Color(0xFFF30D0D)
 val Coral = Color(0xFFF3A397)
-val DarkCoral = Color(0xFF8f554c)
+val DarkCoral = Color(0xFF8F554C)
 val MintGreen = Color(0xFFACD6B8)
 val DarkMintGreen = Color(0xFF537C5E)
 val LightBlue = Color(0xFFBBDEFB)
 val DarkBlue = Color(0xFF56738B)
 
 val SleepAwake = Color(0xFFFFEAC1)
-val SleepAwakeDark = Color(0xFFCF9932)
+val SleepAwakeDark = Color(0xFFEB3F00)
 val SleepRem = Color(0xFFFFDD9A)
-val SleepRemDark = Color(0xFFB09C7B)
+val SleepRemDark = Color(0xFFFF8248)
 val SleepLight = Color(0xFFFFCB66)
-val SleepLightDark = Color(0xFFBE9545)
+val SleepLightDark = Color(0xFFFD4D4D)
 val SleepDeep = Color(0xFFFF973C)
-val SleepDeepDark = Color(0xFF803C00)
+val SleepDeepDark = Color(0xFFB40003)
 
 val Pink = Color(0xFFEAA8A9)
 val DarkPink = Color(0xFF93595A)

diff --git a/JetLagged/app/src/main/java/com/example/jetlagged/ui/theme/Theme.kt b/JetLagged/app/src/main/java/com/example/jetlagged/ui/theme/Theme.kt
@@ -36,10 +36,10 @@ private val LightColorScheme = lightColorScheme(
     surface = White
 )
 private val DarkColorScheme = darkColorScheme(
-    primary = DarkYellow,
+    primary = Red,
     secondary = DarkMintGreen,
     tertiary = DarkCoral,
-    secondaryContainer = DarkYellow,
+    secondaryContainer = Red,
     surface = Black
 )
 
@@ -79,16 +79,16 @@ private val LightExtraColors = JetLaggedExtraColors(
     sleepDeep = SleepDeep,
 )
 private val DarkExtraColors = JetLaggedExtraColors(
-    header = DarkYellow,
+    header = Red,
     cardBackground = Black,
     bed = DarkLilac,
     sleep = DarkMintGreen,
     wellness = DarkBlue,
     heart = DarkCoral,
     heartWave = listOf(DarkPink, DarkPurple, DarkGreen),
     heartWaveBackground = DarkCoral.copy(alpha = 0.4f),
-    sleepChartPrimary = DarkYellow,
-    sleepChartSecondary = DarkYellowVariant,
+    sleepChartPrimary = Red,
+    sleepChartSecondary = RedVariant,
     sleepAwake = SleepAwakeDark,
     sleepRem = SleepRemDark,
     sleepLight = SleepLightDark,