[app] Remove colorpicker (#1233)

2021-10-07 16:20:11 +08:00 · 2021-10-07 16:20:11 +08:00 · d5482f2386
parent 4a1fb57d86
commit d5482f2386
44 changed files with 105 additions and 548 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -166,7 +166,7 @@ dependencies {
    annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
    implementation("androidx.activity:activity:1.3.1")
    implementation("androidx.browser:browser:1.3.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.1")
    implementation("androidx.core:core:1.6.0")
    implementation("androidx.fragment:fragment:1.3.6")
    implementation("androidx.navigation:navigation-fragment:$navVersion")
@ -178,7 +178,6 @@ dependencies {
    implementation("com.google.android.material:material:1.5.0-alpha04")
    implementation("com.google.code.gson:gson:2.8.8")
    implementation("com.takisoft.preferencex:preferencex:1.1.0")
-    implementation("com.takisoft.preferencex:preferencex-colorpicker:1.1.0")
    implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:$okhttpVersion")
    implementation("com.squareup.okhttp3:logging-interceptor:$okhttpVersion")
--- a/app/src/main/java/org/lsposed/manager/App.java
+++ b/app/src/main/java/org/lsposed/manager/App.java
@ -35,7 +35,6 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;

-import com.google.android.material.color.DynamicColors;
 import com.google.gson.JsonParser;

 import org.lsposed.hiddenapibypass.HiddenApiBypass;
@ -43,7 +42,7 @@ import org.lsposed.manager.repo.RepoLoader;
 import org.lsposed.manager.ui.activity.CrashReportActivity;
 import org.lsposed.manager.util.DoHDNS;
 import org.lsposed.manager.util.ModuleUtil;
-import org.lsposed.manager.util.theme.ThemeUtil;
+import org.lsposed.manager.util.ThemeUtil;

 import java.io.ByteArrayOutputStream;
 import java.io.File;
@ -171,9 +170,6 @@ public class App extends Application {
        DayNightDelegate.setApplicationContext(this);
        DayNightDelegate.setDefaultNightMode(ThemeUtil.getDarkTheme());
        LocaleDelegate.setDefaultLocale(getLocale());
-        if (ThemeUtil.isSystemAccent()) {
-            DynamicColors.applyToActivitiesIfAvailable(this);
-        }

        registerReceiver(new BroadcastReceiver() {
            @Override
--- a/app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java
+++ b/app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java
@ -28,13 +28,14 @@ import android.view.Window;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

+import com.google.android.material.color.DynamicColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;

 import org.lsposed.manager.BuildConfig;
 import org.lsposed.manager.ConfigManager;
 import org.lsposed.manager.R;
 import org.lsposed.manager.util.NavUtil;
-import org.lsposed.manager.util.theme.ThemeUtil;
+import org.lsposed.manager.util.ThemeUtil;

 import rikka.core.util.ResourceUtils;
 import rikka.material.app.MaterialActivity;
@ -44,6 +45,9 @@ public class BaseActivity extends MaterialActivity {
    @Override
    public void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        if (ThemeUtil.isSystemAccent()) {
+            DynamicColors.applyIfAvailable(this);
+        }
        // make sure the versions are consistent
        if (BuildConfig.DEBUG) return;
        if (!ConfigManager.isBinderAlive()) return;
@ -63,7 +67,9 @@ public class BaseActivity extends MaterialActivity {
    @Override
    public void onApplyUserThemeResource(@NonNull Resources.Theme theme, boolean isDecorView) {
        theme.applyStyle(ThemeUtil.getNightThemeStyleRes(this), true);
-        theme.applyStyle(ThemeUtil.getColorThemeStyleRes(), true);
+        if (!ThemeUtil.isSystemAccent()) {
+            theme.applyStyle(ThemeUtil.getColorThemeStyleRes(), true);
+        }
    }

    @Override
--- a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java
+++ b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java
@ -51,7 +51,7 @@ import org.lsposed.manager.databinding.FragmentSettingsBinding;
 import org.lsposed.manager.ui.activity.MainActivity;
 import org.lsposed.manager.util.BackupUtils;
 import org.lsposed.manager.util.NavUtil;
-import org.lsposed.manager.util.theme.ThemeUtil;
+import org.lsposed.manager.util.ThemeUtil;

 import java.time.LocalDateTime;
 import java.util.ArrayList;
--- a/app/src/main/java/org/lsposed/manager/util/theme/ThemeUtil.java
+++ b/app/src/main/java/org/lsposed/manager/util/theme/ThemeUtil.java
@ -17,12 +17,11 @@
 * Copyright (C) 2021 LSPosed Contributors
 */

-package org.lsposed.manager.util.theme;
+package org.lsposed.manager.util;

 import android.content.Context;
 import android.content.SharedPreferences;

-import androidx.annotation.ColorRes;
 import androidx.annotation.StyleRes;

 import com.google.android.material.color.DynamicColors;
@ -47,6 +46,7 @@ public class ThemeUtil {
    static {
        preferences = App.getPreferences();
        colorThemeMap.put("COLOR_PRIMARY", R.style.ThemeOverlay_color_primary);
+        colorThemeMap.put("SAKURA", R.style.ThemeOverlay_sakura);
        colorThemeMap.put("MATERIAL_RED", R.style.ThemeOverlay_material_red);
        colorThemeMap.put("MATERIAL_PINK", R.style.ThemeOverlay_material_pink);
        colorThemeMap.put("MATERIAL_PURPLE", R.style.ThemeOverlay_material_purple);
@ -76,7 +76,7 @@ public class ThemeUtil {
    }

    public static boolean isSystemAccent() {
-        return preferences.getBoolean("follow_system_accent", true);
+        return DynamicColors.isDynamicColorAvailable() && preferences.getBoolean("follow_system_accent", true);
    }

    public static String getNightTheme(Context context) {
@ -99,17 +99,10 @@ public class ThemeUtil {
    }

    public static String getColorTheme() {
-        if (DynamicColors.isDynamicColorAvailable() && isSystemAccent()) {
-            return "system";
+        if (isSystemAccent()) {
+            return "SYSTEM";
        }
-        String primaryColorEntryName = "COLOR_PRIMARY";
-        String colorPrimary = preferences.getString("theme_color", "COLOR_PRIMARY");
-        for (CustomThemeColors color : CustomThemeColors.values()) {
-            if (color.toString().equals(colorPrimary)) {
-                primaryColorEntryName = color.toString();
-            }
-        }
-        return primaryColorEntryName;
+        return preferences.getString("theme_color", "COLOR_PRIMARY");
    }

    @StyleRes
@ -121,40 +114,6 @@ public class ThemeUtil {
        return theme;
    }

-    public enum CustomThemeColors {
-        COLOR_PRIMARY(R.color.color_primary),
-        MATERIAL_RED(R.color.material_red),
-        MATERIAL_PINK(R.color.material_pink),
-        MATERIAL_PURPLE(R.color.material_purple),
-        MATERIAL_DEEP_PURPLE(R.color.material_deep_purple),
-        MATERIAL_INDIGO(R.color.material_indigo),
-        MATERIAL_BLUE(R.color.material_blue),
-        MATERIAL_LIGHT_BLUE(R.color.material_light_blue),
-        MATERIAL_CYAN(R.color.material_cyan),
-        MATERIAL_TEAL(R.color.material_teal),
-        MATERIAL_GREEN(R.color.material_green),
-        MATERIAL_LIGHT_GREEN(R.color.material_light_green),
-        MATERIAL_LIME(R.color.material_lime),
-        MATERIAL_YELLOW(R.color.material_yellow),
-        MATERIAL_AMBER(R.color.material_amber),
-        MATERIAL_ORANGE(R.color.material_orange),
-        MATERIAL_DEEP_ORANGE(R.color.material_deep_orange),
-        MATERIAL_BROWN(R.color.material_brown),
-        MATERIAL_GREY(R.color.material_grey),
-        MATERIAL_BLUE_GREY(R.color.material_blue_grey);
-
-        @ColorRes
-        int resourceId;
-
-        CustomThemeColors(@ColorRes int resourceId) {
-            this.resourceId = resourceId;
-        }
-
-        public int getResourceId() {
-            return resourceId;
-        }
-    }
-
    public static int getDarkTheme(String mode) {
        switch (mode) {
            case MODE_NIGHT_FOLLOW_SYSTEM:
--- a/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreference.java
+++ b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreference.java
@ -1,183 +0,0 @@
-/*
- * This file is part of LSPosed.
- *
- * LSPosed is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LSPosed is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
- *
- * Copyright (C) 2021 LSPosed Contributors
- */
-
-package org.lsposed.manager.util.theme;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.widget.ImageView;
-
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.DialogPreference;
-import androidx.preference.PreferenceViewHolder;
-
-import com.takisoft.preferencex.PreferenceFragmentCompat;
-
-public class ThemeColorPreference extends DialogPreference {
-
-    static {
-        PreferenceFragmentCompat.registerPreferenceFragment(ThemeColorPreference.class,
-                ThemeColorPreferenceDialogFragmentCompat.class);
-    }
-
-    private final ThemeUtil.CustomThemeColors[] colors;
-    private ThemeUtil.CustomThemeColors color;
-
-    private ImageView colorWidget;
-
-    public ThemeColorPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-
-        colors = ThemeUtil.CustomThemeColors.values();
-
-        setWidgetLayoutResource(com.takisoft.preferencex.colorpicker.R.layout.preference_widget_color_swatch);
-    }
-
-    public ThemeColorPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        this(context, attrs, defStyleAttr, 0);
-    }
-
-    @SuppressLint("RestrictedApi")
-    public ThemeColorPreference(Context context, AttributeSet attrs) {
-        this(context, attrs, TypedArrayUtils.getAttr(context, androidx.preference.R.attr.dialogPreferenceStyle,
-                android.R.attr.dialogPreferenceStyle));
-    }
-
-    public ThemeColorPreference(Context context) {
-        this(context, null);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-
-        colorWidget = (ImageView) holder.findViewById(com.takisoft.preferencex.colorpicker.R.id.color_picker_widget);
-        setColorOnWidget(color);
-    }
-
-    private void setColorOnWidget(ThemeUtil.CustomThemeColors color) {
-        if (colorWidget == null) {
-            return;
-        }
-        Drawable drawable = getContext().getDrawable(com.takisoft.preferencex.colorpicker.R.drawable.colorpickerpreference_pref_swatch);
-        drawable.setTint(getContext().getColor(color.getResourceId()));
-        colorWidget.setImageDrawable(drawable);
-    }
-
-    public ThemeUtil.CustomThemeColors[] getColors() {
-        return colors;
-    }
-
-    private void setInternalColor(ThemeUtil.CustomThemeColors color, boolean force) {
-        ThemeUtil.CustomThemeColors oldColor = ThemeUtil.CustomThemeColors.valueOf(getPersistedString("COLOR_PRIMARY"));
-
-        boolean changed = !oldColor.equals(color);
-
-        if (changed || force) {
-            this.color = color;
-
-            persistString(color.toString());
-
-            setColorOnWidget(color);
-
-            notifyChanged();
-        }
-    }
-
-    public ThemeUtil.CustomThemeColors getColor() {
-        return color;
-    }
-
-    public void setColor(ThemeUtil.CustomThemeColors color) {
-        setInternalColor(color, false);
-    }
-
-    @Override
-    protected Object onGetDefaultValue(TypedArray a, int index) {
-        return a.getString(index);
-    }
-
-    @Override
-    protected void onSetInitialValue(Object defaultValueObj) {
-        setInternalColor(ThemeUtil.CustomThemeColors.valueOf(getPersistedString(ThemeUtil.CustomThemeColors.COLOR_PRIMARY.toString())), true);
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        final Parcelable superState = super.onSaveInstanceState();
-        if (isPersistent()) {
-            // No need to save instance state since it's persistent
-            return superState;
-        }
-
-        final SavedState myState = new SavedState(superState);
-        myState.color = color.toString();
-        return myState;
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if (state == null || !state.getClass().equals(SavedState.class)) {
-            // Didn't save state for us in onSaveInstanceState
-            super.onRestoreInstanceState(state);
-            return;
-        }
-
-        SavedState myState = (SavedState) state;
-        super.onRestoreInstanceState(myState.getSuperState());
-        setColor(ThemeUtil.CustomThemeColors.valueOf(myState.color));
-    }
-
-    private static class SavedState extends BaseSavedState {
-        private String color;
-
-        public SavedState(Parcel source) {
-            super(source);
-            color = source.readString();
-        }
-
-        public SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            super.writeToParcel(dest, flags);
-            dest.writeString(color);
-        }
-
-        public static final Parcelable.Creator<SavedState> CREATOR =
-                new Parcelable.Creator<>() {
-                    @Override
-                    public SavedState createFromParcel(Parcel in) {
-                        return new SavedState(in);
-                    }
-
-                    @Override
-                    public SavedState[] newArray(int size) {
-                        return new SavedState[size];
-                    }
-                };
-    }
-}
--- a/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java
@ -1,167 +0,0 @@
-/*
- * This file is part of LSPosed.
- *
- * LSPosed is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LSPosed is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
- *
- * Copyright (C) 2021 LSPosed Contributors
- */
-
-package org.lsposed.manager.util.theme;
-
-import static com.google.android.material.theme.overlay.MaterialThemeOverlay.wrap;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.Window;
-
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.StyleRes;
-import androidx.appcompat.view.ContextThemeWrapper;
-import androidx.core.view.ViewCompat;
-import androidx.preference.PreferenceDialogFragmentCompat;
-
-import com.google.android.material.color.MaterialColors;
-import com.google.android.material.dialog.InsetDialogOnTouchListener;
-import com.google.android.material.dialog.MaterialDialogs;
-import com.google.android.material.resources.MaterialAttributes;
-import com.google.android.material.shape.MaterialShapeDrawable;
-import com.takisoft.colorpicker.ColorPickerDialog;
-import com.takisoft.colorpicker.OnColorSelectedListener;
-
-@SuppressLint("RestrictedApi")
-public class ThemeColorPreferenceDialogFragmentCompat extends PreferenceDialogFragmentCompat implements OnColorSelectedListener {
-
-    private int pickedColor;
-    ThemeUtil.CustomThemeColors[] themeColors;
-    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
-    private static final int MATERIAL_ALERT_DIALOG_THEME_OVERLAY = com.google.android.material.R.attr.materialAlertDialogTheme;
-
-    private static int getMaterialAlertDialogThemeOverlay(@NonNull Context context) {
-        TypedValue materialAlertDialogThemeOverlay =
-                MaterialAttributes.resolve(context, MATERIAL_ALERT_DIALOG_THEME_OVERLAY);
-        if (materialAlertDialogThemeOverlay == null) {
-            return 0;
-        }
-        return materialAlertDialogThemeOverlay.data;
-    }
-
-    private static Context createMaterialAlertDialogThemedContext(@NonNull Context context) {
-        int themeOverlayId = getMaterialAlertDialogThemeOverlay(context);
-        Context themedContext = wrap(context, null, DEF_STYLE_ATTR, DEF_STYLE_RES);
-        if (themeOverlayId == 0) {
-            return themedContext;
-        }
-        return new ContextThemeWrapper(themedContext, themeOverlayId);
-    }
-
-    @NonNull
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        ThemeColorPreference pref = getColorPickerPreference();
-        Activity activity = getActivity();
-        assert activity != null;
-        int selectedColor = activity.getColor(pref.getColor().getResourceId());
-        themeColors = pref.getColors();
-        colors = new int[themeColors.length];
-        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)
-                .setSelectedColor(selectedColor)
-                .setColors(colors)
-                .setSize(ColorPickerDialog.SIZE_SMALL)
-                .setSortColors(false)
-                .setColumns(0)
-                .build();
-
-        Resources.Theme theme = context.getTheme();
-
-        Rect backgroundInsets = MaterialDialogs.getDialogBackgroundInsets(context, DEF_STYLE_ATTR, DEF_STYLE_RES);
-
-        int surfaceColor =
-                MaterialColors.getColor(context, com.google.android.material.R.attr.colorSurface, getClass().getCanonicalName());
-        MaterialShapeDrawable materialShapeDrawable =
-                new MaterialShapeDrawable(context, null, DEF_STYLE_ATTR, DEF_STYLE_RES);
-        materialShapeDrawable.initializeElevationOverlay(context);
-        materialShapeDrawable.setFillColor(ColorStateList.valueOf(surfaceColor));
-
-        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(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();
-        View decorView = window.getDecorView();
-        materialShapeDrawable.setElevation(ViewCompat.getElevation(decorView));
-
-        Drawable insetDrawable = MaterialDialogs.insetDrawable(materialShapeDrawable, backgroundInsets);
-        window.setBackgroundDrawable(insetDrawable);
-        decorView.setOnTouchListener(new InsetDialogOnTouchListener(dialog, backgroundInsets));
-
-        return dialog;
-    }
-
-    @Override
-    public void onDialogClosed(boolean positiveResult) {
-        ThemeColorPreference preference = getColorPickerPreference();
-
-        if (positiveResult && preference.callChangeListener(pickedColor)) {
-            for (int i = 0; i < colors.length; i++) {
-                if (colors[i] == pickedColor) {
-                    preference.setColor(themeColors[i]);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onColorSelected(int color) {
-        this.pickedColor = color;
-
-        super.onClick(getDialog(), DialogInterface.BUTTON_POSITIVE);
-    }
-
-    ThemeColorPreference getColorPickerPreference() {
-        return (ThemeColorPreference) getPreference();
-    }
-}
--- a/app/src/main/res/animator/alpha_animator.xml
+++ b/app/src/main/res/animator/alpha_animator.xml
@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ This file is part of LSPosed.
-  ~
-  ~ LSPosed is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ LSPosed is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
-  ~
-  ~ Copyright (C) 2020 EdXposed Contributors
-  ~ Copyright (C) 2021 LSPosed Contributors
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_raised="true">
-        <set>
-            <objectAnimator
-                android:duration="@android:integer/config_mediumAnimTime"
-                android:propertyName="alpha"
-                android:valueTo="0.9"
-                android:valueType="floatType" />
-        </set>
-    </item>
-    <item>
-        <set>
-            <objectAnimator
-                android:duration="@android:integer/config_mediumAnimTime"
-                android:propertyName="alpha"
-                android:valueTo="1"
-                android:valueType="floatType" />
-        </set>
-    </item>
-</selector>
--- a/app/src/main/res/drawable/item_background_round_nopadding.xml
+++ b/app/src/main/res/drawable/item_background_round_nopadding.xml
@ -1,4 +1,4 @@
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
  ~ This file is part of LSPosed.
  ~
  ~ LSPosed is free software: you can redistribute it and/or modify
@ -14,19 +14,19 @@
  ~ You should have received a copy of the GNU General Public License
  ~ along with LSPosed.  If not, see <https://www.gnu.org/licenses/>.
  ~
-  ~ Copyright (C) 2020 EdXposed Contributors
  ~ Copyright (C) 2021 LSPosed Contributors
  -->
-
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:color="?colorControlHighlight"
-    tools:ignore="PrivateResource">
-
-    <item android:id="@android:id/mask">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <corners android:radius="8dp" />
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="?attr/colorSurface"/>
+            <corners android:radius="?popupBackgroundRadius" />
        </shape>
    </item>
-</ripple>
+    <item>
+        <shape>
+            <solid android:color="@color/m3_popupmenu_overlay_color"/>
+            <corners android:radius="?popupBackgroundRadius" />
+        </shape>
+    </item>
+</layer-list>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -161,8 +161,6 @@
    <string name="dns_over_http">DNS عبر HTTPS</string>
    <string name="dns_over_http_summary">حل بديل لتسمم DNS في بعض الدول</string>
    <string name="theme_color">لون الموضوع</string>
-    <string name="theme_color_summary">اللون الذي يظهر بشكل متكرر في التطبيق</string>
-    <string name="theme_color_system_accent">لون لكنة النظام</string>
    <string name="settings_show_hidden_icon_apps_enabled">إجبار التطبيقات على إظهار أيقونات المشغل</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">بعد أندرويد 10، لا يسمح للتطبيقات بإخفاء أيقونات المشغل. قم بإيقاف تشغيل التبديل لتعطيل ميزة النظام هذه.</string>
    <string name="settings_group_system">نظام</string>
@ -170,7 +168,6 @@
    <string name="settings_translation_contributors">المساهمون بالترجمة</string>
    <string name="settings_translation">المشاركة في الترجمة</string>
    <string name="settings_translation_summary">ساعدنا على ترجمة %s إلى لغتك</string>
-    <string name="settings_translation_summary_percentage">" (%s مترجم)"</string>
    <!-- Module Repo -->
    <string name="module_readme">إقرأني</string>
    <string name="module_releases">إصدارات</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -152,8 +152,6 @@
    <string name="dns_over_http">DNS via HTTPS</string>
    <string name="dns_over_http_summary">Problemumgehung für DNS-Vergiftungen in einigen Ländern</string>
    <string name="theme_color">Themenfarbe</string>
-    <string name="theme_color_summary">Farbe, die am häufigsten in der App angezeigt wird</string>
-    <string name="theme_color_system_accent">System Akzentfarbe</string>
    <string name="settings_show_hidden_icon_apps_enabled">Apps erzwingen Launcher-Symbole anzuzeigen</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Ab Android 10 dürfen Apps ihre Launcher-Symbole nicht ausblenden. Schalten Sie den Schalter aus, um diese System-Funktion zu deaktivieren.</string>
    <string name="settings_group_system">System</string>
@ -161,7 +159,6 @@
    <string name="settings_translation_contributors">Übersetzer</string>
    <string name="settings_translation">An der Übersetzung beteiligen</string>
    <string name="settings_translation_summary">Helfen Sie uns, %s in Ihre Sprache zu übersetzen</string>
-    <string name="settings_translation_summary_percentage">" (%s sind übersetzt)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Liesmich</string>
    <string name="module_releases">Veröffentlichungen</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -133,8 +133,6 @@
    <string name="dns_over_http">DNS sobre HTTPS</string>
    <string name="dns_over_http_summary">Solución alternativa al ataque de DNS en algunos países</string>
    <string name="theme_color">Color del tema</string>
-    <string name="theme_color_summary">El color que aparece de manera más frecuente en la aplicación</string>
-    <string name="theme_color_system_accent">Color de acentuación del sistema</string>
    <string name="settings_show_hidden_icon_apps_enabled">Forzar a las aplicaciones a mostrar los íconos del ejecutable</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">En versiones posteriores a Android 10 no se permite a las aplicaciones (especialmente los módulos de Xposed) a ocultar el logo de su ejecutable. Desactiva la opción para desactivar esta característica.</string>
    <string name="settings_group_system">Sistema</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -152,8 +152,6 @@
    <string name="dns_over_http">DNS از طریق HTTPS</string>
    <string name="dns_over_http_summary">راه حل مسدودیت با DNS در برخی کشورها</string>
    <string name="theme_color">رنگ تم</string>
-    <string name="theme_color_summary">رنگی که بیشتر در برنامه ظاهر می شود</string>
-    <string name="theme_color_system_accent">رنگ لهجه سیستم</string>
    <string name="settings_show_hidden_icon_apps_enabled">برنامه ها را مجبور به نمایش نمادهای راه انداز کنید</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">پس از Android 10 ، برنامه ها مجاز نیستند نمادهای راه انداز خود را مخفی کنند. برای غیرفعال کردن این ویژگی سیستم ، خاموش کنید.</string>
    <string name="settings_group_system">سیستم</string>
@ -161,7 +159,6 @@
    <string name="settings_translation_contributors">مترجم همکار</string>
    <string name="settings_translation">کمک در ترجمه</string>
    <string name="settings_translation_summary">به ما کمک کنید %s به زبان شما ترجمه کنیم</string>
-    <string name="settings_translation_summary_percentage">" (%s ترجمه شده)"</string>
    <!-- Module Repo -->
    <string name="module_readme">منو بخون</string>
    <string name="module_releases">انتشار‌ها</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -155,8 +155,6 @@
    <string name="dns_over_http">DNS sur HTTPS</string>
    <string name="dns_over_http_summary">Contourner la censure DNS dans certains pays</string>
    <string name="theme_color">Couleure du thème</string>
-    <string name="theme_color_summary">Couleure apparaissant fréquemment dans l\’application</string>
-    <string name="theme_color_system_accent">Couleure d\’accentuation du système</string>
    <string name="settings_show_hidden_icon_apps_enabled">Forcer les applications à afficher les icônes dans le lanceur</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Après Android 10, les applications (notamment les modules Xposed) ne sont pas autorisées à masquer leurs icônes des lanceurs. Désactiver le commutateur pour désactiver cette fonctionnalité.</string>
    <string name="settings_group_system">Système</string>
@ -164,7 +162,6 @@
    <string name="settings_translation_contributors">Contributeurs de traduction</string>
    <string name="settings_translation">Participer à la traduction</string>
    <string name="settings_translation_summary">Aidez nous à traduire %s dans votre langue</string>
-    <string name="settings_translation_summary_percentage">" (%s sont traduites)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Lisez moi</string>
    <string name="module_releases">Versions</string>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -114,7 +114,6 @@
    <string name="group_network">רשת</string>
    <string name="dns_over_http">DNS על פני HTTPS</string>
    <string name="theme_color">צבע ערכת נושא</string>
-    <string name="theme_color_summary">הצבע שמופיע הכי הרבה באפליקציה</string>
    <!-- Module Repo -->
    <string name="module_readme">קרא אותי</string>
    <string name="module_releases">גרסאות</string>
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@ -156,8 +156,6 @@
    <string name="dns_over_http">DNS over HTTPS</string>
    <string name="dns_over_http_summary">Mengatasi peracunan DNS di beberapa negara</string>
    <string name="theme_color">Warna tema</string>
-    <string name="theme_color_summary">Warna yang paling sering muncul di aplikasi</string>
-    <string name="theme_color_system_accent">Warna aksen sistem</string>
    <string name="settings_show_hidden_icon_apps_enabled">Paksa aplikasi untuk menampilkan ikon peluncur</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Setelah Android 10, aplikasi tidak diizinkan menyembunyikan ikon peluncurnya. Matikan untuk menonaktifkan fitur sistem ini.</string>
    <string name="settings_group_system">Sistem</string>
@ -165,7 +163,6 @@
    <string name="settings_translation_contributors">Kontributor terjemahan</string>
    <string name="settings_translation">Berpartisipasi dalam terjemahan</string>
    <string name="settings_translation_summary">Bantu kami menerjemahkan %s kedalam bahasamu</string>
-    <string name="settings_translation_summary_percentage">" (%s diterjemahkan)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Baca aku</string>
    <string name="module_releases">Rilis</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -31,7 +31,6 @@
    <string name="module_repo">Gudang</string>
    <string name="module_repo_summary">Gudang Modul (Beta)</string>
    <string name="about_view_source_code"><![CDATA[Lihat kode sumber di %1$s<br/>Bergabunglah dengan kami %2$s saluran]]></string>
-    <string name="about_translators">Penerjemah: %s</string>
    <string name="install">Pasang</string>
    <string name="install_summary">Ketuk untuk memasang LSPosed</string>
    <string name="not_installed">Tidak terpasang</string>
@ -150,8 +149,6 @@
    <string name="dns_over_http">DNS over HTTPS</string>
    <string name="dns_over_http_summary">Mengatasi peracunan DNS di beberapa negara</string>
    <string name="theme_color">Warna tema</string>
-    <string name="theme_color_summary">Warna yang paling sering muncul di aplikasi</string>
-    <string name="theme_color_system_accent">Warna aksen sistem</string>
    <string name="settings_show_hidden_icon_apps_enabled">Paksa aplikasi untuk menampilkan ikon peluncur</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Setelah Android 10, aplikasi tidak diizinkan menyembunyikan ikon peluncurnya. Matikan untuk menonaktifkan fitur sistem ini.</string>
    <string name="settings_group_system">Sistem</string>
@ -159,7 +156,6 @@
    <string name="settings_translation_contributors">Kontributor Terjemahan</string>
    <string name="settings_translation">Berpartisipasi dalam terjemahan</string>
    <string name="settings_translation_summary">Bantu kami terjemahkan %s kedalam bahasamu</string>
-    <string name="settings_translation_summary_percentage">" (%s diterjemahkan)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Baca aku</string>
    <string name="module_releases">Rilis</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -152,8 +152,6 @@
    <string name="dns_over_http">DNS su HTTPS</string>
    <string name="dns_over_http_summary">Soluzione alternativa all\'avvelenamento della cache DNS in alcune nazioni</string>
    <string name="theme_color">Colore del tema</string>
-    <string name="theme_color_summary">Colore che appare più frequentemente nell\'app</string>
-    <string name="theme_color_system_accent">Colore primario del sistema</string>
    <string name="settings_show_hidden_icon_apps_enabled">Costringi le app a mostrare le icone nel launcher</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">A partire da Android 10, le app non possono più nascondere le loro icone nel launcher. Disabilita l\'opzione per disattivare questa funzionalità.</string>
    <string name="settings_group_system">Sistema</string>
@ -161,7 +159,6 @@
    <string name="settings_translation_contributors">Contributori alla traduzione</string>
    <string name="settings_translation">Partecipa alla traduzione</string>
    <string name="settings_translation_summary">Aiutaci a tradurre %s nella tua lingua</string>
-    <string name="settings_translation_summary_percentage">" (%s sono tradotti)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Leggimi</string>
    <string name="module_releases">Versioni</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -113,7 +113,6 @@
    <string name="group_network">רשת</string>
    <string name="dns_over_http">DNS על פני HTTPS</string>
    <string name="theme_color">צבע ערכת נושא</string>
-    <string name="theme_color_summary">הצבע שמופיע הכי הרבה באפליקציה</string>
    <!-- Module Repo -->
    <string name="module_readme">קרא אותי</string>
    <string name="module_releases">גרסאות</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -151,8 +151,6 @@
    <string name="dns_over_http">HTTPS 経由の DNS</string>
    <string name="dns_over_http_summary">一部の国向けの DNSポイズニング 回避策</string>
    <string name="theme_color">テーマカラー</string>
-    <string name="theme_color_summary">本アプリで最も表示される色</string>
-    <string name="theme_color_system_accent">システムアクセントカラー</string>
    <string name="settings_show_hidden_icon_apps_enabled">ランチャーアイコンを強制的に表示</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Android 10 以降ではアプリ(特に Xposed モジュール)ではランチャーアイコンを隠すことが出来ません。本機能を無効にするには、トグルをオフにして下さい。</string>
    <string name="settings_group_system">システム</string>
@ -160,7 +158,6 @@
    <string name="settings_translation_contributors">翻訳貢献者</string>
    <string name="settings_translation">翻訳に参加する</string>
    <string name="settings_translation_summary">%s をあなたの言語に翻訳するのを手伝ってください</string>
-    <string name="settings_translation_summary_percentage">" (%s は翻訳済み)"</string>
    <!-- Module Repo -->
    <string name="module_readme">読み取り</string>
    <string name="module_releases">リリース</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -140,8 +140,6 @@
    <string name="dns_over_http">DNS over HTTPS</string>
    <string name="dns_over_http_summary">일부 국가의 DNS 포이즈닝 문제를 해결합니다</string>
    <string name="theme_color">테마 색</string>
-    <string name="theme_color_summary">앱에서 가장 자주 나타나는 색</string>
-    <string name="theme_color_system_accent">System 강조 색</string>
    <string name="settings_show_hidden_icon_apps_enabled">앱에서 시작 프로그램 아이콘 표시</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Android 10 이후 앱(특히 Xposed 모듈)은 시작 프로그램 아이콘을 숨길 수 없습니다. 이 기능을 비활성화하려면 토글을 끄십시오.</string>
    <string name="settings_language">언어</string>
--- a/app/src/main/res/values-night/colors_custom.xml
+++ b/app/src/main/res/values-night/colors_custom.xml
@ -32,11 +32,12 @@
    <color name="material_green">@color/material_green_200</color>
    <color name="material_light_green">@color/material_light_green_200</color>
    <color name="material_lime">@color/material_lime_200</color>
-    <color name="material_yellow">#ffa0ab</color>
+    <color name="material_yellow">@color/material_yellow_200</color>
    <color name="material_amber">@color/material_amber_200</color>
    <color name="material_orange">@color/material_orange_200</color>
    <color name="material_deep_orange">@color/material_deep_orange_200</color>
    <color name="material_brown">@color/material_brown_200</color>
    <color name="material_grey">@color/material_grey_200</color>
    <color name="material_blue_grey">@color/material_blue_grey_200</color>
+    <color name="sakura">#ffa0ab</color>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -152,8 +152,6 @@
    <string name="dns_over_http">DNS via HTTPS</string>
    <string name="dns_over_http_summary">Tijdelijke oplossing voor DNS-vergiftiging in sommige landen</string>
    <string name="theme_color">Thema kleur</string>
-    <string name="theme_color_summary">Kleur die het meest voorkomt in de app</string>
-    <string name="theme_color_system_accent">Systeem accentkleur</string>
    <string name="settings_show_hidden_icon_apps_enabled">Forceer apps om launcher-pictogrammen weer te geven</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Na Android 10 mogen apps (vooral Xposed-modules) hun opstartpictogrammen niet verbergen. Schakel de schakelaar uit om deze functie uit te schakelen.</string>
    <string name="settings_group_system">Systeem</string>
@ -161,7 +159,6 @@
    <string name="settings_translation_contributors">Bijdragers van vertalingen</string>
    <string name="settings_translation">Deelnemen aan vertaling</string>
    <string name="settings_translation_summary">Help ons %s te vertalen in uw taal</string>
-    <string name="settings_translation_summary_percentage">" (%s zijn vertaald)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Leesmij</string>
    <string name="module_releases">Publicaties</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -154,8 +154,6 @@
    <string name="dns_over_http">DNS przez HTTPS</string>
    <string name="dns_over_http_summary">Obejście zatruwania DNA w niektórych krajach</string>
    <string name="theme_color">Kolor motywu</string>
-    <string name="theme_color_summary">Kolor, który pojawia się najczęściej w aplikacji</string>
-    <string name="theme_color_system_accent">Kolor akcentu systemowego</string>
    <string name="settings_show_hidden_icon_apps_enabled">Wymuś aplikacjom pokazywanie ikon launchera</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Po Android 10 aplikacje nie mogą ukrywać swoich ikon launchera. Wyłącz przełącznik, aby zablokować tę funkcję systemową.</string>
    <string name="settings_group_system">System</string>
@ -163,7 +161,6 @@
    <string name="settings_translation_contributors">Tłumacze</string>
    <string name="settings_translation">Weź udział w tłumaczeniu</string>
    <string name="settings_translation_summary">Pomóż nam przetłumaczyć %s na Twój język</string>
-    <string name="settings_translation_summary_percentage">" (%s są przetłumaczone)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Przeczytaj</string>
    <string name="module_releases">Wersje</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -155,8 +155,6 @@
    <string name="dns_over_http">DNS sobre HTTPS</string>
    <string name="dns_over_http_summary">Solução alternativa para envenenamento de DNS em alguns países</string>
    <string name="theme_color">Cor do tema</string>
-    <string name="theme_color_summary">Cor que aparece com mais frequência no app</string>
-    <string name="theme_color_system_accent">Cor de realce do sistema</string>
    <string name="settings_show_hidden_icon_apps_enabled">Forçar apps à exibirem ícones do lançador</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Após o Android 10, alguns aplicativos não estão autorizados à ocultarem seus ícones do lançador. Desative esta opção para desligar este recurso do sistema.</string>
    <string name="settings_group_system">Sistema</string>
@ -164,7 +162,6 @@
    <string name="settings_translation_contributors">Contribuidores de tradução</string>
    <string name="settings_translation">Participar da tradução</string>
    <string name="settings_translation_summary">Ajude-nos a traduzir %s para o seu idioma</string>
-    <string name="settings_translation_summary_percentage">" (%s estão traduzidas)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Leia-me</string>
    <string name="module_releases">Lançamentos</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -28,7 +28,6 @@
    <string name="module_repo">Repositório</string>
    <string name="module_repo_summary">Repositorio de módulos (Beta)</string>
    <string name="about_view_source_code"><![CDATA[Ver código fonte em %1$s<br/>Entre no nosso canal %2$s]]></string>
-    <string name="about_translators">Tradutores: %s</string>
    <string name="install">Instalar</string>
    <string name="install_summary">Toque para instalar LSPosed</string>
    <string name="not_installed">Não instalado</string>
@ -97,8 +96,6 @@
    <string name="dns_over_http">DNS sobre HTTPS</string>
    <string name="dns_over_http_summary">Burla envenenamento de DNS em algumas nações</string>
    <string name="theme_color">Cor do tema</string>
-    <string name="theme_color_summary">Cor que aparece com mais frequência no app</string>
-    <string name="theme_color_system_accent">Cor de destaque do sistema</string>
    <string name="settings_show_hidden_icon_apps_enabled">Forçar aplicativos a mostrar ícones no launcher</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Depois do Android 10, os apps não têm permissão para ocultar seus ícones de lançador. Desative a opção para desativar este recurso de sistema.</string>
    <string name="settings_group_system">Sistema</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -97,8 +97,6 @@
    <string name="dns_over_http">DNS sobre HTTPS</string>
    <string name="dns_over_http_summary">Burla envenenamento de DNS em algumas nações</string>
    <string name="theme_color">Cor do tema</string>
-    <string name="theme_color_summary">Cor que aparece com mais frequência no app</string>
-    <string name="theme_color_system_accent">Cor de destaque do sistema</string>
    <string name="settings_show_hidden_icon_apps_enabled">Forçar aplicativos a mostrar ícones no launcher</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Depois do Android 10, os apps não têm permissão para ocultar seus ícones de lançador. Desative a opção para desativar este recurso de sistema.</string>
    <string name="settings_group_system">Sistema</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -159,8 +159,6 @@
    <string name="dns_over_http">DNS через HTTPS</string>
    <string name="dns_over_http_summary">Протокол для выполнения разрешения DNS по протоколу HTTPS. Целью этого метода является повышение конфиденциальности и безопасности пользователей путем предотвращения перехвата и манипулирования данными DNS с помощью атак типа «Атака посредника»</string>
    <string name="theme_color">Акцент темы</string>
-    <string name="theme_color_summary">Цвет, который чаще всего появляется в приложении</string>
-    <string name="theme_color_system_accent">Системный цвет акцента</string>
    <string name="settings_show_hidden_icon_apps_enabled">Принудительно показывать иконку модуля</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">После Android 10, модули не могут скрывать иконку в лаунчер. Выключите переключатель, чтобы отключить эту системную функцию</string>
    <string name="settings_group_system">Система</string>
@ -168,7 +166,6 @@
    <string name="settings_translation_contributors">Автор перевода</string>
    <string name="settings_translation">Принять участие в переводе</string>
    <string name="settings_translation_summary">Помогите нам перевести %s на ваш язык</string>
-    <string name="settings_translation_summary_percentage">" (%s переведено)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Описание</string>
    <string name="module_releases">Версии</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -151,8 +151,6 @@
    <string name="dns_over_http">HTTPS üzerinden DNS</string>
    <string name="dns_over_http_summary">Bazı ülkelerde DNS zehirlenmesi için geçici çözümdür</string>
    <string name="theme_color">Tema rengi</string>
-    <string name="theme_color_summary">Uygulamada en sık görünen reni seçin</string>
-    <string name="theme_color_system_accent">Sistem vurgu rengi</string>
    <string name="settings_show_hidden_icon_apps_enabled">Uygulamaları başlatıcı simgelerini göstermeye zorla</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Android 10\'dan sonra, uygulamaların başlatıcı simgelerini gizlenmesine izin verilmez. Bu sistem özelliğini devre dışı bırakmak için düğmeyi kapatın.</string>
    <string name="settings_group_system">Sistem</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -153,8 +153,6 @@
    <string name="dns_over_http">DNS поверх HTTPS</string>
    <string name="dns_over_http_summary">Вирішення проблем із погіршенням DNS у деяких країнах</string>
    <string name="theme_color">Колір теми</string>
-    <string name="theme_color_summary">Колір, який з’являється найбільш часто у додатку</string>
-    <string name="theme_color_system_accent">Колір акцентів системи</string>
    <string name="settings_show_hidden_icon_apps_enabled">Примусово показувати значки запуску</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Після Android 10 програмам не дозволяється приховати свої лаунчери. Вимкніть перемикач, щоб вимкнути цю систему функцію.</string>
    <string name="settings_group_system">Система</string>
@ -162,7 +160,6 @@
    <string name="settings_translation_contributors">Автори перекладу</string>
    <string name="settings_translation">Брати участь в перекладі</string>
    <string name="settings_translation_summary">Допоможіть нам перекласти %s на вашу мову</string>
-    <string name="settings_translation_summary_percentage">" (%s перекладено)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Опис</string>
    <string name="module_releases">Релізи</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -151,8 +151,6 @@
    <string name="dns_over_http">DNS qua HTTPS</string>
    <string name="dns_over_http_summary">Giải pháp khắc phục tình trạng giả mạo DNS ở một số quốc gia</string>
    <string name="theme_color">Màu chủ đề</string>
-    <string name="theme_color_summary">Màu xuất hiện thường xuyên nhất trong ứng dụng</string>
-    <string name="theme_color_system_accent">Màu nhấn hệ thống</string>
    <string name="settings_show_hidden_icon_apps_enabled">Buộc các ứng dụng hiển thị biểu tượng trên launcher</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">Sau Android 10, các ứng dụng không được phép ẩn biểu tượng trên launcher. Tắt lựa chọn này để vô hiệu tính năng này của hệ thống.</string>
    <string name="settings_group_system">Hệ thống</string>
@ -160,7 +158,6 @@
    <string name="settings_translation_contributors">Cộng tác viên phiên dịch</string>
    <string name="settings_translation">Tham gia phiên dịch</string>
    <string name="settings_translation_summary">Giúp chúng tôi dịch %s về ngôn ngữ của bạn</string>
-    <string name="settings_translation_summary_percentage">" (%s đã được dịch)"</string>
    <!-- Module Repo -->
    <string name="module_readme">Readme</string>
    <string name="module_releases">Bản phát hành</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -156,8 +156,7 @@
    <string name="dns_over_http">安全 DNS（DoH）</string>
    <string name="dns_over_http_summary">解决某些地区的 DNS 污染问题</string>
    <string name="theme_color">主题颜色</string>
-    <string name="theme_color_summary">应用中最常见的颜色</string>
-    <string name="theme_color_system_accent">系统强调色</string>
+    <string name="theme_color_system">系统主题色</string>
    <string name="settings_show_hidden_icon_apps_enabled">强制应用在启动器中显示图标</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">在 Android 10 之后，应用不被允许隐藏启动器图标。关闭本选项可禁用此系统功能。</string>
    <string name="settings_group_system">系统</string>
@ -165,7 +164,6 @@
    <string name="settings_translation_contributors">翻译贡献者</string>
    <string name="settings_translation">参与翻译</string>
    <string name="settings_translation_summary">帮助我们把 %s 翻译到你的语言</string>
-    <string name="settings_translation_summary_percentage">"（%s 已被翻译）"</string>
    <!-- Module Repo -->
    <string name="module_readme">自述文件</string>
    <string name="module_releases">版本</string>
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@ -151,8 +151,6 @@
    <string name="dns_over_http">安全 DNS（DoH）</string>
    <string name="dns_over_http_summary">解決某些地區的 DNS 污染問題</string>
    <string name="theme_color">主題顏色</string>
-    <string name="theme_color_summary">應用程式中最常見的顏色</string>
-    <string name="theme_color_system_accent">系統強調色</string>
    <string name="settings_show_hidden_icon_apps_enabled">強制應用顯示其啟動器圖標</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">在Android 10之後，應用不再允許隱藏桌面圖標。關閉該選項以禁用該系統功能。</string>
    <string name="settings_group_system">系統</string>
@ -160,7 +158,6 @@
    <string name="settings_translation_contributors">翻譯貢獻者</string>
    <string name="settings_translation">參與翻譯</string>
    <string name="settings_translation_summary">幫助我們翻譯 %s 到您的語言</string>
-    <string name="settings_translation_summary_percentage">"（%s 已翻譯）"</string>
    <!-- Module Repo -->
    <string name="module_readme">讀我檔案</string>
    <string name="module_releases">版本</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -151,8 +151,6 @@
    <string name="dns_over_http">安全 DNS（DoH）</string>
    <string name="dns_over_http_summary">解決某些地區的 DNS 汙染問題</string>
    <string name="theme_color">主題強調色</string>
-    <string name="theme_color_summary">應用程式中最常見的顏色</string>
-    <string name="theme_color_system_accent">系統強調色</string>
    <string name="settings_show_hidden_icon_apps_enabled">強制應用程式在啟動器中顯示圖示</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">在 Android 10 之後，應用（特別是 Xposed 模組）不被允許隱藏啟動器圖示。關閉本選項以停用此功能。</string>
    <string name="settings_group_system">系統</string>
@ -160,7 +158,6 @@
    <string name="settings_translation_contributors">譯者</string>
    <string name="settings_translation">參與翻譯</string>
    <string name="settings_translation_summary">幫助我們翻譯 %s 到您的語言</string>
-    <string name="settings_translation_summary_percentage">"（%s 已翻譯）"</string>
    <!-- Module Repo -->
    <string name="module_readme">自述檔案</string>
    <string name="module_releases">版本</string>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@ -36,4 +36,52 @@
        <item>@string/follow_system</item>
    </string-array>

+    <string-array name="color_values" translatable="false">
+        <item>COLOR_PRIMARY</item>
+        <item>SAKURA</item>
+        <item>MATERIAL_RED</item>
+        <item>MATERIAL_PINK</item>
+        <item>MATERIAL_PURPLE</item>
+        <item>MATERIAL_DEEP_PURPLE</item>
+        <item>MATERIAL_INDIGO</item>
+        <item>MATERIAL_BLUE</item>
+        <item>MATERIAL_LIGHT_BLUE</item>
+        <item>MATERIAL_CYAN</item>
+        <item>MATERIAL_TEAL</item>
+        <item>MATERIAL_GREEN</item>
+        <item>MATERIAL_LIGHT_GREEN</item>
+        <item>MATERIAL_LIME</item>
+        <item>MATERIAL_YELLOW</item>
+        <item>MATERIAL_AMBER</item>
+        <item>MATERIAL_ORANGE</item>
+        <item>MATERIAL_DEEP_ORANGE</item>
+        <item>MATERIAL_BROWN</item>
+        <item>MATERIAL_GREY</item>
+        <item>MATERIAL_BLUE_GREY</item>
+    </string-array>
+
+    <string-array name="color_texts" translatable="false">
+        <item>Pixel blue</item>
+        <item>Sakura</item>
+        <item>Red</item>
+        <item>Pink</item>
+        <item>Purple</item>
+        <item>Deep purple</item>
+        <item>Indigo</item>
+        <item>Blue</item>
+        <item>Light blue</item>
+        <item>Cyan</item>
+        <item>Teal</item>
+        <item>Green</item>
+        <item>Light green</item>
+        <item>Lime</item>
+        <item>Yellow</item>
+        <item>Amber</item>
+        <item>Orange</item>
+        <item>Deep orange</item>
+        <item>Brown</item>
+        <item>Grey</item>
+        <item>Blue grey</item>
+    </string-array>
+
 </resources>
--- a/app/src/main/res/values/colors_custom.xml
+++ b/app/src/main/res/values/colors_custom.xml
@ -32,11 +32,12 @@
    <color name="material_green">@color/material_green_500</color>
    <color name="material_light_green">@color/material_light_green_500</color>
    <color name="material_lime">@color/material_lime_500</color>
-    <color name="material_yellow">#ff9ca8</color>
+    <color name="material_yellow">@color/material_yellow_500</color>
    <color name="material_amber">@color/material_amber_500</color>
    <color name="material_orange">@color/material_orange_500</color>
    <color name="material_deep_orange">@color/material_deep_orange_500</color>
    <color name="material_brown">@color/material_brown_500</color>
    <color name="material_grey">@color/material_grey_500</color>
    <color name="material_blue_grey">@color/material_blue_grey_500</color>
+    <color name="sakura">#ff9ca8</color>
 </resources>
--- a/app/src/main/res/values/colors_google.xml
+++ b/app/src/main/res/values/colors_google.xml
@ -21,5 +21,4 @@
 <resources>
    <color name="google_blue_600">#1A73E8</color>
    <color name="google_blue_300">#8AB4F8</color>
-    <color name="google_grey_900">#202124</color>
-</resources>
+</resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@ -21,7 +21,6 @@
 <resources>
    <dimen name="app_icon_size">48dp</dimen>
    <dimen name="tab_layout_height">48dp</dimen>
-    <dimen name="colorpickerpreference_widget_size">32dp</dimen>

    <dimen name="home_primary_elevation">6dp</dimen>
    <dimen name="home_secondary_elevation">2dp</dimen>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -18,7 +18,7 @@
  ~ Copyright (C) 2021 LSPosed Contributors
  -->

-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:keep="@string/xposed_module_updated_notification_*,@string/module_is_not_activated_*">
    <!-- MainActivity -->
    <string name="info">Info</string>
    <string name="Modules">Modules</string>
@ -164,8 +164,7 @@
    <string name="dns_over_http">DNS over HTTPS</string>
    <string name="dns_over_http_summary">Workaround DNS poisoning in some nations</string>
    <string name="theme_color">Theme color</string>
-    <string name="theme_color_summary">Color that appears most frequently in the app</string>
-    <string name="theme_color_system_accent">System accent color</string>
+    <string name="theme_color_system">System theme color</string>
    <string name="settings_show_hidden_icon_apps_enabled">Force apps to show launcher icons</string>
    <string name="settings_show_hidden_icon_apps_enabled_summary">After Android 10, apps are not allowed to hide their launcher icons. Turn off the toggle to disable this system feature.</string>
    <string name="settings_group_system">System</string>
@ -173,7 +172,6 @@
    <string name="settings_translation_contributors">Translation contributors</string>
    <string name="settings_translation">Participate in translation</string>
    <string name="settings_translation_summary">Help us translate %s into your language</string>
-    <string name="settings_translation_summary_percentage">" (%s are translated)"</string>

    <!-- Module Repo -->
    <string name="module_readme">Readme</string>
--- a/app/src/main/res/values/themes_custom.xml
+++ b/app/src/main/res/values/themes_custom.xml
@ -98,4 +98,8 @@
    <style name="ThemeOverlay.material_blue_grey">
        <item name="colorPrimary">@color/material_blue_grey</item>
    </style>
+
+    <style name="ThemeOverlay.sakura">
+        <item name="colorPrimary">@color/sakura</item>
+    </style>
 </resources>
--- a/app/src/main/res/values/themes_overlay.xml
+++ b/app/src/main/res/values/themes_overlay.xml
@ -21,7 +21,7 @@
    <style name="ThemeOverlay" />

    <style name="ThemeOverlay.Black">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorSurface">@android:color/black</item>
        <item name="android:colorBackground">@android:color/black</item>
    </style>
-</resources>
+</resources>
--- a/app/src/main/res/xml-v29/prefs.xml
+++ b/app/src/main/res/xml-v29/prefs.xml
@ -53,14 +53,15 @@
        <SwitchPreference
            android:defaultValue="true"
            android:key="follow_system_accent"
-            android:title="@string/theme_color_system_accent"
+            android:title="@string/theme_color_system"
            app:isPreferenceVisible="false" />
-        <org.lsposed.manager.util.theme.ThemeColorPreference
-            android:defaultValue=""
-            android:dialogTitle="@string/theme_color"
+        <rikka.preference.SimpleMenuPreference
+            android:defaultValue="COLOR_PRIMARY"
+            android:entries="@array/color_texts"
+            android:entryValues="@array/color_values"
            android:icon="@drawable/ic_outline_palette_24"
            android:key="theme_color"
-            android:summary="@string/theme_color_summary"
+            android:summary="%s"
            android:title="@string/theme_color" />
        <rikka.preference.SimpleMenuPreference
            android:defaultValue="MODE_NIGHT_FOLLOW_SYSTEM"
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@ -54,14 +54,15 @@
        <SwitchPreference
            android:defaultValue="true"
            android:key="follow_system_accent"
-            android:title="@string/theme_color_system_accent"
+            android:title="@string/theme_color_system"
            app:isPreferenceVisible="false" />
-        <org.lsposed.manager.util.theme.ThemeColorPreference
-            android:defaultValue=""
-            android:dialogTitle="@string/theme_color"
+        <rikka.preference.SimpleMenuPreference
+            android:defaultValue="COLOR_PRIMARY"
+            android:entries="@array/color_texts"
+            android:entryValues="@array/color_values"
            android:icon="@drawable/ic_outline_palette_24"
            android:key="theme_color"
-            android:summary="@string/theme_color_summary"
+            android:summary="%s"
            android:title="@string/theme_color" />
        <rikka.preference.SimpleMenuPreference
            android:defaultValue="MODE_NIGHT_FOLLOW_SYSTEM"
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -27,7 +27,7 @@ buildscript {
    dependencies {
        classpath("com.android.tools.build:gradle:7.0.2")
        classpath("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r")
-        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-alpha08")
+        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-alpha10")
    }
 }