lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update legacy compose theme

Browse Source
This commit is contained in:
MM20 2021-12-06 23:06:48 +01:00
parent 0baf6525ed
commit 201cbe7959
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/de/mm20/launcher2/LauncherApplication.kt
View File

@ -26,6 +26,7 @@ import kotlinx.coroutines.*
import org.koin.android.ext.koin.androidContext import org.koin.android.ext.koin.androidContext
import org.koin.android.ext.koin.androidLogger import org.koin.android.ext.koin.androidLogger
import org.koin.core.context.startKoin import org.koin.core.context.startKoin
import org.koin.core.logger.Level
import java.text.Collator import java.text.Collator
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
@ -50,7 +51,7 @@ class LauncherApplication : Application(), CoroutineScope {
) )
startKoin { startKoin {
androidLogger() androidLogger(if (BuildConfig.DEBUG) Level.ERROR else Level.NONE)
androidContext(this@LauncherApplication) androidContext(this@LauncherApplication)
modules( modules(
listOf( listOf(

58
ui/src/main/java/de/mm20/launcher2/ui/LegacyAppTheme.kt
View File

@ -90,26 +90,74 @@ fun LegacyLauncherTheme(content: @Composable () -> Unit) {
theme.resolveAttribute(R.attr.colorSurfaceVariant, colorSurfaceVariant, true) theme.resolveAttribute(R.attr.colorSurfaceVariant, colorSurfaceVariant, true)
val colorPrimary = TypedValue() 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( MaterialTheme(
typography = legacyTypography, typography = legacyTypography,
colorScheme = if (isSystemInDarkTheme()) darkColorScheme( colorScheme = if (isSystemInDarkTheme()) darkColorScheme(
surface = Color(colorSurface.data), 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( ) else lightColorScheme(
surface = Color(colorSurface.data), 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( Material2Theme(
colors = if (isSystemInDarkTheme()) darkColors( colors = if (isSystemInDarkTheme()) darkColors(
surface = Color(colorSurface.data), surface = Color(colorSurface.data),
primary = Color(colorSurface.data), primary = Color(colorPrimary.data),
) else lightColors( ) else lightColors(
surface = Color(colorSurface.data), surface = Color(colorSurface.data),
primary = Color(colorSurface.data), primary = Color(colorPrimary.data),
), ),
content = content content = content
) )

4
ui/src/main/java/de/mm20/launcher2/ui/widget/MusicWidget.kt
View File

@ -131,7 +131,7 @@ fun MusicWidget() {
.conditional( .conditional(
albumArt == null, albumArt == null,
Modifier.background( Modifier.background(
LocalColorScheme.current.primary.shade80 MaterialTheme.colorScheme.primaryContainer,
) )
), ),
contentAlignment = Alignment.Center contentAlignment = Alignment.Center
@ -149,7 +149,7 @@ fun MusicWidget() {
Icon( Icon(
imageVector = Icons.Rounded.MusicNote, imageVector = Icons.Rounded.MusicNote,
contentDescription = null, contentDescription = null,
tint = LocalColorScheme.current.primary.shade40, tint = MaterialTheme.colorScheme.onPrimaryContainer,
modifier = Modifier.size(56.dp) modifier = Modifier.size(56.dp)
) )
} }