diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt b/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt index 2ad79f26..7fc9e8e2 100644 --- a/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt +++ b/preferences/src/main/java/de/mm20/launcher2/preferences/Defaults.kt @@ -1,6 +1,7 @@ package de.mm20.launcher2.preferences import android.content.Context +import android.graphics.Color import scheme.Scheme fun createFactorySettings(context: Context): Settings { @@ -195,6 +196,9 @@ internal val DefaultLightCustomColorScheme: Settings.AppearanceSettings.CustomCo .setInverseOnSurface(scheme.inverseOnSurface) .setInversePrimary(scheme.inversePrimary) .setOutline(scheme.outline) + //TODO: handle outline variant and scrim properly + .setScrim(Color.BLACK) + .setOutlineVariant(scheme.surfaceVariant) .build() } @@ -228,5 +232,8 @@ internal val DefaultDarkCustomColorScheme: Settings.AppearanceSettings.CustomCol .setInverseOnSurface(scheme.inverseOnSurface) .setInversePrimary(scheme.inversePrimary) .setOutline(scheme.outline) + //TODO: handle outline variant and scrim properly + .setScrim(Color.BLACK) + .setOutlineVariant(scheme.surfaceVariant) .build() } \ No newline at end of file diff --git a/preferences/src/main/proto/settings.proto b/preferences/src/main/proto/settings.proto index 12464537..a0841842 100644 --- a/preferences/src/main/proto/settings.proto +++ b/preferences/src/main/proto/settings.proto @@ -58,6 +58,8 @@ message Settings { uint32 on_error = 24; uint32 error_container = 25; uint32 on_error_container = 26; + uint32 outline_variant = 27; + uint32 scrim = 28; } Scheme light_scheme = 3; Scheme dark_scheme = 4; diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt index c55f4e90..366dce10 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt @@ -33,5 +33,7 @@ fun CustomColorScheme(colors: Settings.AppearanceSettings.CustomColors.Scheme) : onError = Color(colors.onError), errorContainer = Color(colors.errorContainer), onErrorContainer = Color(colors.onErrorContainer), + outlineVariant = Color(colors.outlineVariant), + scrim = Color(colors.scrim), ) } \ No newline at end of file diff --git a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt b/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt index f0e405a9..cec4e0d8 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Wallpaper.kt @@ -43,5 +43,8 @@ fun MaterialYouCompatScheme(wallpaperColors: WallpaperColors, darkTheme: Boolean onError = Color(scheme.onError), errorContainer = Color(scheme.errorContainer), onErrorContainer = Color(scheme.onErrorContainer), + //TODO: handle outline variant and scrim properly + scrim = Color.Black, + outlineVariant = Color(scheme.surfaceVariant), ) } \ No newline at end of file