mirror of
https://github.com/alesimula/Murine-launcher.git
synced 2026-10-28 09:43:42 +00:00
THEMING - DRAWER - finish drawer theming - frosted glass theme + no-blur theme
This commit is contained in:
1 parent
0fe5c043ac
commit
d0950366ae
5 files changed
+22
-11
No files matched your search
@@ -18,7 +18,10 @@
|
||||
*/
|
||||
-->
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<color name="drawer_sheet_color_glass">#FFFFFFFF</color> <!-- TODO TBD -->
|
||||
<color name="drawer_sheet_color_glass">#4F403634</color>
|
||||
<color name="drawer_sheet_color_mica">#CC1F1F1F</color>
|
||||
<color name="drawer_sheet_color_none">#CC1F1F1F</color>
|
||||
<color name="drawer_sheet_color_none">#AC2A2A2A</color>
|
||||
|
||||
<color name="drawer_scrim_color_glass">#4B4E4E4E</color>
|
||||
<color name="drawer_scrim_color_none">#4B4E4E4E</color>
|
||||
</resources>
|
||||
@@ -18,7 +18,10 @@
|
||||
*/
|
||||
-->
|
||||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<color name="drawer_sheet_color_glass">#FFFFFFFF</color> <!-- TODO TBD -->
|
||||
<color name="drawer_sheet_color_glass">#4DEBDDDA</color>
|
||||
<color name="drawer_sheet_color_mica">#88F3F3F3</color>
|
||||
<color name="drawer_sheet_color_none">#CCF3F3F3</color>
|
||||
<color name="drawer_sheet_color_none">#ACE3E3E3</color>
|
||||
|
||||
<color name="drawer_scrim_color_glass">#4B4E4E4E</color>
|
||||
<color name="drawer_scrim_color_none">#4B8E8E8E</color>
|
||||
</resources>
|
||||
@@ -99,11 +99,14 @@ class WorkspaceBlurUtils {
|
||||
|
||||
private class DetachedBlurType(radius: Int, blurWorkspace: Boolean): BlurType(radius, blurWorkspace)
|
||||
|
||||
sealed class DrawerBlurType(radius: Int, blurWorkspace: Boolean, val sheetOnly: Boolean, val color: Int) : BlurType(radius, blurWorkspace) {
|
||||
object NONE : DrawerBlurType(0, false, false, R.color.drawer_sheet_color_none)
|
||||
object GLASS : DrawerBlurType(55, true, false, R.color.drawer_sheet_color_glass)
|
||||
sealed class DrawerBlurType(radius: Int, blurWorkspace: Boolean, val sheetOnly: Boolean, val color: Int, val scrimColor: Int) : BlurType(radius, blurWorkspace) {
|
||||
object NONE : DrawerBlurType(0, false, false,
|
||||
R.color.drawer_sheet_color_none, R.color.drawer_scrim_color_none)
|
||||
object GLASS : DrawerBlurType(55, true, false,
|
||||
R.color.drawer_sheet_color_glass, R.color.drawer_scrim_color_glass)
|
||||
|
||||
object MICA : DrawerBlurType(88, false, true, R.color.drawer_sheet_color_mica)
|
||||
object MICA : DrawerBlurType(88, false, true,
|
||||
R.color.drawer_sheet_color_mica, android.R.color.transparent)
|
||||
}
|
||||
|
||||
class MurineLayerDrawable(private val topLayer: PaintDrawable = PaintDrawable()) : LayerDrawable(arrayOf(NO_OP_DRAWABLE, topLayer)) {
|
||||
|
||||
@@ -349,8 +349,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
|
||||
// TODO LStar no blur: 4D, 90D
|
||||
int layerBg = ColorUtils.setAlphaComponent(
|
||||
setColorLStar(getResources().getColor(bg, null), Flags.allAppsBlur() ?
|
||||
(dark ? 32D : 8D) : (dark ? 4D : 90D)),
|
||||
(int) ((Flags.allAppsBlur() ? 0.3f : 0.32f) * 255));
|
||||
(dark ? 36D : 90D) : (dark ? 4D : 90D)),
|
||||
(int) ((Flags.allAppsBlur() ? 0.18f : 0.32f) * 255));
|
||||
mBottomSheetBackgroundColorOverBlur = ColorUtils.compositeColors(layerFg, layerBg);
|
||||
mBottomSheetBackgroundColorBlurFallback = getResources().getColor(fallbackRes);
|
||||
}*/
|
||||
|
||||
@@ -32,6 +32,8 @@ import com.android.launcher3.util.Themes;
|
||||
import com.android.launcher3.views.ActivityContext;
|
||||
import com.android.launcher3.views.ScrimColors;
|
||||
|
||||
import app.murinelauncher.graphics.WorkspaceBlurUtils;
|
||||
|
||||
/**
|
||||
* Definition for AllApps state
|
||||
*/
|
||||
@@ -106,7 +108,7 @@ public class AllAppsState extends LauncherState {
|
||||
@Override
|
||||
public ScrimColors getWorkspaceScrimColor(Launcher launcher) {
|
||||
return new ScrimColors(
|
||||
/* backgroundColor */ Color.TRANSPARENT,
|
||||
/* backgroundColor */ launcher.getResources().getColor(WorkspaceBlurUtils.getDrawerBlur().getScrimColor()),
|
||||
/* foregroundColor */ Color.TRANSPARENT);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user