kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "app: add dynamic colors support to Compose"

Browse source 
This reverts commit 2a9d2177a5.
This commit is contained in:
Aditya Wasan 2021-11-03 18:09:38 +05:30
parent a3f3ad184b
commit 2cf3ddf2aa
No known key found for this signature in database
GPG key ID: 6D6DF3BF15DE79B5
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/dev/msfjarvis/aps/ui/theme/Theme.kt
View file

@ -1,11 +1,8 @@
package dev.msfjarvis.aps.ui.theme package dev.msfjarvis.aps.ui.theme
import android.content.Context
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.material3.lightColorScheme import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -67,16 +64,12 @@ private val DarkThemeColors =
) )
@Composable @Composable
fun APSTheme( fun APSTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
useDynamicColors: Boolean = true,
useDarkTheme: Boolean = isSystemInDarkTheme(),
context: Context,
content: @Composable () -> Unit,
) {
val colors = val colors =
when (useDarkTheme) { if (!useDarkTheme) {
true -> if (useDynamicColors) dynamicDarkColorScheme(context) else DarkThemeColors LightThemeColors
false -> if (useDynamicColors) dynamicLightColorScheme(context) else LightThemeColors } else {
DarkThemeColors
} }
MaterialTheme(colorScheme = colors, typography = AppTypography, content = content) MaterialTheme(colorScheme = colors, typography = AppTypography, content = content)