From 201cbe7959d6c7036bb409e08f6272fe712626ec Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Mon, 6 Dec 2021 23:06:48 +0100 Subject: [PATCH] Update legacy compose theme --- .../de/mm20/launcher2/LauncherApplication.kt | 3 +- .../de/mm20/launcher2/ui/LegacyAppTheme.kt | 58 +++++++++++++++++-- .../mm20/launcher2/ui/widget/MusicWidget.kt | 4 +- 3 files changed, 57 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt b/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt index a6ebd991..421d663d 100644 --- a/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt +++ b/app/src/main/java/de/mm20/launcher2/LauncherApplication.kt @@ -26,6 +26,7 @@ import kotlinx.coroutines.* import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidLogger import org.koin.core.context.startKoin +import org.koin.core.logger.Level import java.text.Collator import kotlin.coroutines.CoroutineContext @@ -50,7 +51,7 @@ class LauncherApplication : Application(), CoroutineScope { ) startKoin { - androidLogger() + androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE) androidContext(this@LauncherApplication) modules( listOf( diff --git a/ui/src/main/java/de/mm20/launcher2/ui/LegacyAppTheme.kt b/ui/src/main/java/de/mm20/launcher2/ui/LegacyAppTheme.kt index bd82a7f0..499f3156 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/LegacyAppTheme.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/LegacyAppTheme.kt @@ -90,26 +90,74 @@ fun LegacyLauncherTheme(content: @Composable () -> Unit) { theme.resolveAttribute(R.attr.colorSurfaceVariant, colorSurfaceVariant, true) val colorPrimary = TypedValue() - theme.resolveAttribute(R.attr.colorPrimary, colorSurfaceVariant, true) + theme.resolveAttribute(R.attr.colorPrimary, colorPrimary, true) + val colorOnPrimary = TypedValue() + theme.resolveAttribute(R.attr.colorOnPrimary, colorOnPrimary, true) + val colorPrimaryContainer = TypedValue() + theme.resolveAttribute(R.attr.colorPrimaryContainer, colorPrimaryContainer, true) + val colorOnPrimaryContainer = TypedValue() + theme.resolveAttribute(R.attr.colorOnPrimaryContainer, colorOnPrimaryContainer, true) + + val colorSecondary = TypedValue() + theme.resolveAttribute(R.attr.colorSecondary, colorSecondary, true) + val colorOnSecondary = TypedValue() + theme.resolveAttribute(R.attr.colorOnSecondary, colorOnSecondary, true) + val colorSecondaryContainer = TypedValue() + theme.resolveAttribute(R.attr.colorSecondaryContainer, colorSecondaryContainer, true) + val colorOnSecondaryContainer = TypedValue() + theme.resolveAttribute(R.attr.colorOnSecondaryContainer, colorOnSecondaryContainer, true) + + val colorTertiary = TypedValue() + theme.resolveAttribute(R.attr.colorTertiary, colorTertiary, true) + val colorOnTertiary = TypedValue() + theme.resolveAttribute(R.attr.colorOnTertiary, colorOnTertiary, true) + val colorTertiaryContainer = TypedValue() + theme.resolveAttribute(R.attr.colorTertiaryContainer, colorTertiaryContainer, true) + val colorOnTertiaryContainer = TypedValue() + theme.resolveAttribute(R.attr.colorOnTertiaryContainer, colorOnTertiaryContainer, true) MaterialTheme( typography = legacyTypography, colorScheme = if (isSystemInDarkTheme()) darkColorScheme( surface = Color(colorSurface.data), - primary = Color(colorSurface.data), + surfaceVariant = Color(colorSurfaceVariant.data), + primary = Color(colorPrimary.data), + onPrimary = Color(colorOnPrimary.data), + primaryContainer = Color(colorPrimaryContainer.data), + onPrimaryContainer = Color(colorOnPrimaryContainer.data), + secondary = Color(colorSecondary.data), + onSecondary = Color(colorOnSecondary.data), + secondaryContainer = Color(colorSecondaryContainer.data), + onSecondaryContainer = Color(colorOnSecondaryContainer.data), + tertiary = Color(colorTertiary.data), + onTertiary = Color(colorOnTertiary.data), + tertiaryContainer = Color(colorTertiaryContainer.data), + onTertiaryContainer = Color(colorOnTertiaryContainer.data), ) else lightColorScheme( surface = Color(colorSurface.data), - primary = Color(colorSurface.data), + surfaceVariant = Color(colorSurfaceVariant.data), + primary = Color(colorPrimary.data), + onPrimary = Color(colorOnPrimary.data), + primaryContainer = Color(colorPrimaryContainer.data), + onPrimaryContainer = Color(colorOnPrimaryContainer.data), + secondary = Color(colorSecondary.data), + onSecondary = Color(colorOnSecondary.data), + secondaryContainer = Color(colorSecondaryContainer.data), + onSecondaryContainer = Color(colorOnSecondaryContainer.data), + tertiary = Color(colorTertiary.data), + onTertiary = Color(colorOnTertiary.data), + tertiaryContainer = Color(colorTertiaryContainer.data), + onTertiaryContainer = Color(colorOnTertiaryContainer.data), ) ) { Material2Theme( colors = if (isSystemInDarkTheme()) darkColors( surface = Color(colorSurface.data), - primary = Color(colorSurface.data), + primary = Color(colorPrimary.data), ) else lightColors( surface = Color(colorSurface.data), - primary = Color(colorSurface.data), + primary = Color(colorPrimary.data), ), content = content ) diff --git a/ui/src/main/java/de/mm20/launcher2/ui/widget/MusicWidget.kt b/ui/src/main/java/de/mm20/launcher2/ui/widget/MusicWidget.kt index c0e6638d..18023d26 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/widget/MusicWidget.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/widget/MusicWidget.kt @@ -131,7 +131,7 @@ fun MusicWidget() { .conditional( albumArt == null, Modifier.background( - LocalColorScheme.current.primary.shade80 + MaterialTheme.colorScheme.primaryContainer, ) ), contentAlignment = Alignment.Center @@ -149,7 +149,7 @@ fun MusicWidget() { Icon( imageVector = Icons.Rounded.MusicNote, contentDescription = null, - tint = LocalColorScheme.current.primary.shade40, + tint = MaterialTheme.colorScheme.onPrimaryContainer, modifier = Modifier.size(56.dp) ) }