From deea6c722b84aa05e39b786673b04fa7ab8d6762 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 13 Jun 2024 10:42:19 +0930 Subject: [PATCH] Support light dark system setting --- app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt index a206a293bf..a90ff49bf8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.ui import android.content.Context import androidx.annotation.AttrRes import androidx.compose.foundation.background +import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Box import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.selection.LocalTextSelectionColors @@ -71,13 +72,13 @@ private fun SessionColors.toMaterialColors() = Colors( onPrimary = text, onSecondary = text, onBackground = text, - onSurface = background, + onSurface = text, onError = text, isLight = isLight ) -private fun Context.sessionColors() = AppTextSecurePreferences(this).themeState().sessionColors() -private fun ThemeState.sessionColors() = sessionColors(isLight, isClassic, accent) +@Composable private fun Context.sessionColors() = AppTextSecurePreferences(this).themeState().sessionColors() +@Composable private fun ThemeState.sessionColors() = sessionColors(if (followSystem) !isSystemInDarkTheme() else isLight, isClassic, accent) val sessionShapes = Shapes( small = RoundedCornerShape(50)