From 2cf3ddf2aadad011f62ecafbbbf939fd0104cb43 Mon Sep 17 00:00:00 2001 From: Aditya Wasan Date: Wed, 3 Nov 2021 18:09:38 +0530 Subject: Revert "app: add dynamic colors support to Compose" This reverts commit 2a9d2177a5985a76020a5dc6b9248343d18e26bc. --- app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt b/app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt index b4f47cb2..55fb600d 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt @@ -1,11 +1,8 @@ package dev.msfjarvis.aps.ui.theme -import android.content.Context import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.dynamicDarkColorScheme -import androidx.compose.material3.dynamicLightColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable @@ -67,16 +64,12 @@ private val DarkThemeColors = ) @Composable -fun APSTheme( - useDynamicColors: Boolean = true, - useDarkTheme: Boolean = isSystemInDarkTheme(), - context: Context, - content: @Composable () -> Unit, -) { +fun APSTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) { val colors = - when (useDarkTheme) { - true -> if (useDynamicColors) dynamicDarkColorScheme(context) else DarkThemeColors - false -> if (useDynamicColors) dynamicLightColorScheme(context) else LightThemeColors + if (!useDarkTheme) { + LightThemeColors + } else { + DarkThemeColors } MaterialTheme(colorScheme = colors, typography = AppTypography, content = content) -- cgit v1.2.3