From 4ac9612f172d6719d4efd76d5c036ff467616dcd Mon Sep 17 00:00:00 2001 From: tehcneko <88844448+tehcneko@users.noreply.github.com> Date: Sun, 3 Oct 2021 22:48:24 +0800 Subject: [PATCH] [app] Update styles --- .../ui/dialog/BlurBehindDialogBuilder.java | 2 +- .../manager/ui/fragment/HomeFragment.java | 7 +++--- ...meColorPreferenceDialogFragmentCompat.java | 13 +++++------ .../main/res/color/switchbar_text_dark.xml | 23 +++++++++++++++++++ .../main/res/color/switchbar_text_light.xml | 22 ++++++++++++++++++ .../main/res/layout/activity_crash_report.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 6 ++--- app/src/main/res/values-night/colors.xml | 7 ++++-- app/src/main/res/values/colors.xml | 7 ++++-- app/src/main/res/values/themes.xml | 14 +++++------ app/src/main/res/values/themes_override.xml | 10 +++++--- 11 files changed, 83 insertions(+), 30 deletions(-) create mode 100644 app/src/main/res/color/switchbar_text_dark.xml create mode 100644 app/src/main/res/color/switchbar_text_light.xml diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java b/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java index ed50b133..90988d85 100644 --- a/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java @@ -39,7 +39,7 @@ public class BlurBehindDialogBuilder extends MaterialAlertDialogBuilder { private static final boolean supportBlur = getSystemProperty("ro.surface_flinger.supports_background_blur", false) && !getSystemProperty("persist.sys.sf.disable_blurs", false); public BlurBehindDialogBuilder(@NonNull Context context) { - super(context); + super(context, com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered); } @NonNull diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java index 9062c791..36a27464 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java @@ -174,10 +174,11 @@ public class HomeFragment extends BaseFragment { binding.statusIcon.setImageResource(R.drawable.ic_round_error_outline_24); Snackbar.make(binding.snackbar, R.string.lsposed_not_active, Snackbar.LENGTH_INDEFINITE).show(); } - binding.status.setCardBackgroundColor(MaterialColors.harmonizeWithPrimary(activity, cardBackgroundColor)); + cardBackgroundColor = MaterialColors.harmonizeWithPrimary(activity, cardBackgroundColor); + binding.status.setCardBackgroundColor(cardBackgroundColor); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - binding.status.setOutlineSpotShadowColor(MaterialColors.harmonizeWithPrimary(activity, cardBackgroundColor)); - binding.status.setOutlineAmbientShadowColor(MaterialColors.harmonizeWithPrimary(activity, cardBackgroundColor)); + binding.status.setOutlineSpotShadowColor(cardBackgroundColor); + binding.status.setOutlineAmbientShadowColor(cardBackgroundColor); } } diff --git a/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java index 0e9eb7c4..912516a2 100644 --- a/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java +++ b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java @@ -59,6 +59,7 @@ public class ThemeColorPreferenceDialogFragmentCompat extends PreferenceDialogFr private int[] colors; @AttrRes private static final int DEF_STYLE_ATTR = com.google.android.material.R.attr.alertDialogStyle; + @SuppressLint("PrivateResource") @StyleRes private static final int DEF_STYLE_RES = com.google.android.material.R.style.MaterialAlertDialog_MaterialComponents; @AttrRes @@ -94,6 +95,7 @@ public class ThemeColorPreferenceDialogFragmentCompat extends PreferenceDialogFr for (int i = 0; i < themeColors.length; i++) { colors[i] = activity.getColor(themeColors[i].getResourceId()); } + Context context = createMaterialAlertDialogThemedContext(activity); ColorPickerDialog.Params params = new ColorPickerDialog.Params.Builder(context) @@ -115,25 +117,22 @@ public class ThemeColorPreferenceDialogFragmentCompat extends PreferenceDialogFr materialShapeDrawable.initializeElevationOverlay(context); materialShapeDrawable.setFillColor(ColorStateList.valueOf(surfaceColor)); - // dialogCornerRadius first appeared in Android Pie if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { TypedValue dialogCornerRadiusValue = new TypedValue(); theme.resolveAttribute(android.R.attr.dialogCornerRadius, dialogCornerRadiusValue, true); float dialogCornerRadius = - dialogCornerRadiusValue.getDimension(getContext().getResources().getDisplayMetrics()); + dialogCornerRadiusValue.getDimension(activity.getResources().getDisplayMetrics()); if (dialogCornerRadiusValue.type == TypedValue.TYPE_DIMENSION && dialogCornerRadius >= 0) { materialShapeDrawable.setCornerSize(dialogCornerRadius); } } + ColorPickerDialog dialog = new ColorPickerDialog(context, this, params); dialog.setTitle(pref.getDialogTitle()); + Window window = dialog.getWindow(); - /* {@link Window#getDecorView()} should be called before any changes are made to the Window - * as it locks in attributes and affects layout. */ View decorView = window.getDecorView(); - if (materialShapeDrawable instanceof MaterialShapeDrawable) { - ((MaterialShapeDrawable) materialShapeDrawable).setElevation(ViewCompat.getElevation(decorView)); - } + materialShapeDrawable.setElevation(ViewCompat.getElevation(decorView)); Drawable insetDrawable = MaterialDialogs.insetDrawable(materialShapeDrawable, backgroundInsets); window.setBackgroundDrawable(insetDrawable); diff --git a/app/src/main/res/color/switchbar_text_dark.xml b/app/src/main/res/color/switchbar_text_dark.xml new file mode 100644 index 00000000..d77c6d1d --- /dev/null +++ b/app/src/main/res/color/switchbar_text_dark.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/app/src/main/res/color/switchbar_text_light.xml b/app/src/main/res/color/switchbar_text_light.xml new file mode 100644 index 00000000..9d082998 --- /dev/null +++ b/app/src/main/res/color/switchbar_text_light.xml @@ -0,0 +1,22 @@ + + + + + diff --git a/app/src/main/res/layout/activity_crash_report.xml b/app/src/main/res/layout/activity_crash_report.xml index f6c41d00..4157b6b3 100644 --- a/app/src/main/res/layout/activity_crash_report.xml +++ b/app/src/main/res/layout/activity_crash_report.xml @@ -25,6 +25,7 @@ android:clipChildren="false"> + app:tint="@color/primary_text_material_inverse" /> + android:textColor="@color/primary_text_material_inverse" /> + android:textColor="@color/secondary_text_material_inverse" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 4a74743b..8284aa4a 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -26,6 +26,9 @@ @color/material_grey_700 @color/material_grey_600 - @color/abc_primary_text_material_light - @color/abc_secondary_text_material_light + @color/abc_primary_text_material_light + @color/abc_secondary_text_material_light + + @color/abc_primary_text_material_dark + @color/abc_secondary_text_material_dark diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1260a242..44a3ffe5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -29,6 +29,9 @@ @color/material_grey_500 @color/material_grey_300 - @color/abc_primary_text_material_dark - @color/abc_secondary_text_material_dark + @color/abc_primary_text_material_dark + @color/abc_secondary_text_material_dark + + @color/abc_primary_text_material_light + @color/abc_secondary_text_material_light diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 86d55f92..9b52e0aa 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -27,7 +27,8 @@ ?colorPrimary ?colorPrimary @android:color/white - @android:color/white + ?colorPrimary + @android:color/white @color/material_red_500 @color/material_green_500 @color/material_blue_500 @@ -49,7 +50,8 @@ ?colorPrimary ?colorPrimary @android:color/black - @color/google_grey_900 + ?colorPrimary + @android:color/black @color/material_red_200 @color/material_green_200 @color/material_blue_200 @@ -92,12 +94,8 @@ - - - + +