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

Add outline variant and scrim colors to preference proto schema

Browse Source
This commit is contained in:
MM20 2022-08-02 17:11:03 +02:00
parent 70575376fb
commit 6bbc04a33a
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt
View File

@ -1,6 +1,7 @@
package de.mm20.launcher2.preferences package de.mm20.launcher2.preferences
import android.content.Context import android.content.Context
import android.graphics.Color
import scheme.Scheme import scheme.Scheme
fun createFactorySettings(context: Context): Settings { fun createFactorySettings(context: Context): Settings {
@ -195,6 +196,9 @@ internal val DefaultLightCustomColorScheme: Settings.AppearanceSettings.CustomCo
.setInverseOnSurface(scheme.inverseOnSurface) .setInverseOnSurface(scheme.inverseOnSurface)
.setInversePrimary(scheme.inversePrimary) .setInversePrimary(scheme.inversePrimary)
.setOutline(scheme.outline) .setOutline(scheme.outline)
//TODO: handle outline variant and scrim properly
.setScrim(Color.BLACK)
.setOutlineVariant(scheme.surfaceVariant)
.build() .build()
} }
@ -228,5 +232,8 @@ internal val DefaultDarkCustomColorScheme: Settings.AppearanceSettings.CustomCol
.setInverseOnSurface(scheme.inverseOnSurface) .setInverseOnSurface(scheme.inverseOnSurface)
.setInversePrimary(scheme.inversePrimary) .setInversePrimary(scheme.inversePrimary)
.setOutline(scheme.outline) .setOutline(scheme.outline)
//TODO: handle outline variant and scrim properly
.setScrim(Color.BLACK)
.setOutlineVariant(scheme.surfaceVariant)
.build() .build()
} }

2
preferences/src/main/proto/settings.proto
View File

@ -58,6 +58,8 @@ message Settings {
uint32 on_error = 24; uint32 on_error = 24;
uint32 error_container = 25; uint32 error_container = 25;
uint32 on_error_container = 26; uint32 on_error_container = 26;
uint32 outline_variant = 27;
uint32 scrim = 28;
} }
Scheme light_scheme = 3; Scheme light_scheme = 3;
Scheme dark_scheme = 4; Scheme dark_scheme = 4;

2
ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt
View File

@ -33,5 +33,7 @@ fun CustomColorScheme(colors: Settings.AppearanceSettings.CustomColors.Scheme) :
onError = Color(colors.onError), onError = Color(colors.onError),
errorContainer = Color(colors.errorContainer), errorContainer = Color(colors.errorContainer),
onErrorContainer = Color(colors.onErrorContainer), onErrorContainer = Color(colors.onErrorContainer),
outlineVariant = Color(colors.outlineVariant),
scrim = Color(colors.scrim),
) )
} }

3
ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt
View File

@ -43,5 +43,8 @@ fun MaterialYouCompatScheme(wallpaperColors: WallpaperColors, darkTheme: Boolean
onError = Color(scheme.onError), onError = Color(scheme.onError),
errorContainer = Color(scheme.errorContainer), errorContainer = Color(scheme.errorContainer),
onErrorContainer = Color(scheme.onErrorContainer), onErrorContainer = Color(scheme.onErrorContainer),
//TODO: handle outline variant and scrim properly
scrim = Color.Black,
outlineVariant = Color(scheme.surfaceVariant),
) )
} }