diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c5ff5de8..5bb6165a 100644 --- 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") diff --git a/app/src/main/java/org/lsposed/manager/App.java b/app/src/main/java/org/lsposed/manager/App.java index 8612757b..289c9aae 100644 --- 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 diff --git 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 index a92cedff..067a4d20 100644 --- 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 diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java index 88b27eba..79132d17 100644 --- 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; diff --git a/app/src/main/java/org/lsposed/manager/util/theme/ThemeUtil.java b/app/src/main/java/org/lsposed/manager/util/ThemeUtil.java similarity index 71% rename from app/src/main/java/org/lsposed/manager/util/theme/ThemeUtil.java rename to app/src/main/java/org/lsposed/manager/util/ThemeUtil.java index 468cbfe2..d0ae0c97 100644 --- a/app/src/main/java/org/lsposed/manager/util/theme/ThemeUtil.java +++ b/app/src/main/java/org/lsposed/manager/util/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: diff --git a/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreference.java b/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreference.java deleted file mode 100644 index ba6fe8d4..00000000 --- a/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreference.java +++ /dev/null @@ -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 . - * - * 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 CREATOR = - new Parcelable.Creator<>() { - @Override - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - @Override - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; - } -} 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 deleted file mode 100644 index 912516a2..00000000 --- a/app/src/main/java/org/lsposed/manager/util/theme/ThemeColorPreferenceDialogFragmentCompat.java +++ /dev/null @@ -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 . - * - * 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(); - } -} diff --git a/app/src/main/res/animator/alpha_animator.xml b/app/src/main/res/animator/alpha_animator.xml deleted file mode 100644 index d0a6872c..00000000 --- a/app/src/main/res/animator/alpha_animator.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/item_background_round_nopadding.xml b/app/src/main/res/drawable/simple_menu_background.xml similarity index 62% rename from app/src/main/res/drawable/item_background_round_nopadding.xml rename to app/src/main/res/drawable/simple_menu_background.xml index ccb1f4fc..05f09c23 100644 --- a/app/src/main/res/drawable/item_background_round_nopadding.xml +++ b/app/src/main/res/drawable/simple_menu_background.xml @@ -1,4 +1,4 @@ - - - - - - - - + + + + + - \ No newline at end of file + + + + + + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index ad9e35d7..8d6e6725 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -161,8 +161,6 @@ DNS عبر HTTPS حل بديل لتسمم DNS في بعض الدول لون الموضوع - اللون الذي يظهر بشكل متكرر في التطبيق - لون لكنة النظام إجبار التطبيقات على إظهار أيقونات المشغل بعد أندرويد 10، لا يسمح للتطبيقات بإخفاء أيقونات المشغل. قم بإيقاف تشغيل التبديل لتعطيل ميزة النظام هذه. نظام @@ -170,7 +168,6 @@ المساهمون بالترجمة المشاركة في الترجمة ساعدنا على ترجمة %s إلى لغتك - " (%s مترجم)" إقرأني إصدارات diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d1330b29..7413fd13 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -152,8 +152,6 @@ DNS via HTTPS Problemumgehung für DNS-Vergiftungen in einigen Ländern Themenfarbe - Farbe, die am häufigsten in der App angezeigt wird - System Akzentfarbe Apps erzwingen Launcher-Symbole anzuzeigen Ab Android 10 dürfen Apps ihre Launcher-Symbole nicht ausblenden. Schalten Sie den Schalter aus, um diese System-Funktion zu deaktivieren. System @@ -161,7 +159,6 @@ Übersetzer An der Übersetzung beteiligen Helfen Sie uns, %s in Ihre Sprache zu übersetzen - " (%s sind übersetzt)" Liesmich Veröffentlichungen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 16dc58b8..d184e8dc 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -133,8 +133,6 @@ DNS sobre HTTPS Solución alternativa al ataque de DNS en algunos países Color del tema - El color que aparece de manera más frecuente en la aplicación - Color de acentuación del sistema Forzar a las aplicaciones a mostrar los íconos del ejecutable 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. Sistema diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index bd19e701..a68f8373 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -152,8 +152,6 @@ DNS از طریق HTTPS راه حل مسدودیت با DNS در برخی کشورها رنگ تم - رنگی که بیشتر در برنامه ظاهر می شود - رنگ لهجه سیستم برنامه ها را مجبور به نمایش نمادهای راه انداز کنید پس از Android 10 ، برنامه ها مجاز نیستند نمادهای راه انداز خود را مخفی کنند. برای غیرفعال کردن این ویژگی سیستم ، خاموش کنید. سیستم @@ -161,7 +159,6 @@ مترجم همکار کمک در ترجمه به ما کمک کنید %s به زبان شما ترجمه کنیم - " (%s ترجمه شده)" منو بخون انتشار‌ها diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f8cb12a4..a98a08e3 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -155,8 +155,6 @@ DNS sur HTTPS Contourner la censure DNS dans certains pays Couleure du thème - Couleure apparaissant fréquemment dans l\’application - Couleure d\’accentuation du système Forcer les applications à afficher les icônes dans le lanceur 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é. Système @@ -164,7 +162,6 @@ Contributeurs de traduction Participer à la traduction Aidez nous à traduire %s dans votre langue - " (%s sont traduites)" Lisez moi Versions diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 1d902a97..46fb3a8f 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -114,7 +114,6 @@ רשת DNS על פני HTTPS צבע ערכת נושא - הצבע שמופיע הכי הרבה באפליקציה קרא אותי גרסאות diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 139e8041..93634b72 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -156,8 +156,6 @@ DNS over HTTPS Mengatasi peracunan DNS di beberapa negara Warna tema - Warna yang paling sering muncul di aplikasi - Warna aksen sistem Paksa aplikasi untuk menampilkan ikon peluncur Setelah Android 10, aplikasi tidak diizinkan menyembunyikan ikon peluncurnya. Matikan untuk menonaktifkan fitur sistem ini. Sistem @@ -165,7 +163,6 @@ Kontributor terjemahan Berpartisipasi dalam terjemahan Bantu kami menerjemahkan %s kedalam bahasamu - " (%s diterjemahkan)" Baca aku Rilis diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 948d1a8d..91798764 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -31,7 +31,6 @@ Gudang Gudang Modul (Beta) Bergabunglah dengan kami %2$s saluran]]> - Penerjemah: %s Pasang Ketuk untuk memasang LSPosed Tidak terpasang @@ -150,8 +149,6 @@ DNS over HTTPS Mengatasi peracunan DNS di beberapa negara Warna tema - Warna yang paling sering muncul di aplikasi - Warna aksen sistem Paksa aplikasi untuk menampilkan ikon peluncur Setelah Android 10, aplikasi tidak diizinkan menyembunyikan ikon peluncurnya. Matikan untuk menonaktifkan fitur sistem ini. Sistem @@ -159,7 +156,6 @@ Kontributor Terjemahan Berpartisipasi dalam terjemahan Bantu kami terjemahkan %s kedalam bahasamu - " (%s diterjemahkan)" Baca aku Rilis diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 2d104350..252c1770 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -152,8 +152,6 @@ DNS su HTTPS Soluzione alternativa all\'avvelenamento della cache DNS in alcune nazioni Colore del tema - Colore che appare più frequentemente nell\'app - Colore primario del sistema Costringi le app a mostrare le icone nel launcher A partire da Android 10, le app non possono più nascondere le loro icone nel launcher. Disabilita l\'opzione per disattivare questa funzionalità. Sistema @@ -161,7 +159,6 @@ Contributori alla traduzione Partecipa alla traduzione Aiutaci a tradurre %s nella tua lingua - " (%s sono tradotti)" Leggimi Versioni diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index c5da3e48..e24648fc 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -113,7 +113,6 @@ רשת DNS על פני HTTPS צבע ערכת נושא - הצבע שמופיע הכי הרבה באפליקציה קרא אותי גרסאות diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 99a7f012..04f7f73a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -151,8 +151,6 @@ HTTPS 経由の DNS 一部の国向けの DNSポイズニング 回避策 テーマカラー - 本アプリで最も表示される色 - システムアクセントカラー ランチャーアイコンを強制的に表示 Android 10 以降ではアプリ(特に Xposed モジュール)ではランチャーアイコンを隠すことが出来ません。本機能を無効にするには、トグルをオフにして下さい。 システム @@ -160,7 +158,6 @@ 翻訳貢献者 翻訳に参加する %s をあなたの言語に翻訳するのを手伝ってください - " (%s は翻訳済み)" 読み取り リリース diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 76d47083..dfacae9a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -140,8 +140,6 @@ DNS over HTTPS 일부 국가의 DNS 포이즈닝 문제를 해결합니다 테마 색 - 앱에서 가장 자주 나타나는 색 - System 강조 색 앱에서 시작 프로그램 아이콘 표시 Android 10 이후 앱(특히 Xposed 모듈)은 시작 프로그램 아이콘을 숨길 수 없습니다. 이 기능을 비활성화하려면 토글을 끄십시오. 언어 diff --git a/app/src/main/res/values-night/colors_custom.xml b/app/src/main/res/values-night/colors_custom.xml index 4e422a04..4e7d9bcd 100644 --- 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/material_green_200 @color/material_light_green_200 @color/material_lime_200 - #ffa0ab + @color/material_yellow_200 @color/material_amber_200 @color/material_orange_200 @color/material_deep_orange_200 @color/material_brown_200 @color/material_grey_200 @color/material_blue_grey_200 + #ffa0ab diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 928252e9..f092196f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -152,8 +152,6 @@ DNS via HTTPS Tijdelijke oplossing voor DNS-vergiftiging in sommige landen Thema kleur - Kleur die het meest voorkomt in de app - Systeem accentkleur Forceer apps om launcher-pictogrammen weer te geven Na Android 10 mogen apps (vooral Xposed-modules) hun opstartpictogrammen niet verbergen. Schakel de schakelaar uit om deze functie uit te schakelen. Systeem @@ -161,7 +159,6 @@ Bijdragers van vertalingen Deelnemen aan vertaling Help ons %s te vertalen in uw taal - " (%s zijn vertaald)" Leesmij Publicaties diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 75e9dfc9..aea1cc1d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -154,8 +154,6 @@ DNS przez HTTPS Obejście zatruwania DNA w niektórych krajach Kolor motywu - Kolor, który pojawia się najczęściej w aplikacji - Kolor akcentu systemowego Wymuś aplikacjom pokazywanie ikon launchera Po Android 10 aplikacje nie mogą ukrywać swoich ikon launchera. Wyłącz przełącznik, aby zablokować tę funkcję systemową. System @@ -163,7 +161,6 @@ Tłumacze Weź udział w tłumaczeniu Pomóż nam przetłumaczyć %s na Twój język - " (%s są przetłumaczone)" Przeczytaj Wersje diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f1502391..6e89be90 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -155,8 +155,6 @@ DNS sobre HTTPS Solução alternativa para envenenamento de DNS em alguns países Cor do tema - Cor que aparece com mais frequência no app - Cor de realce do sistema Forçar apps à exibirem ícones do lançador 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. Sistema @@ -164,7 +162,6 @@ Contribuidores de tradução Participar da tradução Ajude-nos a traduzir %s para o seu idioma - " (%s estão traduzidas)" Leia-me Lançamentos diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 662dde04..0fd1a670 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -28,7 +28,6 @@ Repositório Repositorio de módulos (Beta) Entre no nosso canal %2$s]]> - Tradutores: %s Instalar Toque para instalar LSPosed Não instalado @@ -97,8 +96,6 @@ DNS sobre HTTPS Burla envenenamento de DNS em algumas nações Cor do tema - Cor que aparece com mais frequência no app - Cor de destaque do sistema Forçar aplicativos a mostrar ícones no launcher 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. Sistema diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d74b7340..1b7e62af 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -97,8 +97,6 @@ DNS sobre HTTPS Burla envenenamento de DNS em algumas nações Cor do tema - Cor que aparece com mais frequência no app - Cor de destaque do sistema Forçar aplicativos a mostrar ícones no launcher 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. Sistema diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index dbad53d7..d833156e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -159,8 +159,6 @@ DNS через HTTPS Протокол для выполнения разрешения DNS по протоколу HTTPS. Целью этого метода является повышение конфиденциальности и безопасности пользователей путем предотвращения перехвата и манипулирования данными DNS с помощью атак типа «Атака посредника» Акцент темы - Цвет, который чаще всего появляется в приложении - Системный цвет акцента Принудительно показывать иконку модуля После Android 10, модули не могут скрывать иконку в лаунчер. Выключите переключатель, чтобы отключить эту системную функцию Система @@ -168,7 +166,6 @@ Автор перевода Принять участие в переводе Помогите нам перевести %s на ваш язык - " (%s переведено)" Описание Версии diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1e6a2153..35a661bd 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -151,8 +151,6 @@ HTTPS üzerinden DNS Bazı ülkelerde DNS zehirlenmesi için geçici çözümdür Tema rengi - Uygulamada en sık görünen reni seçin - Sistem vurgu rengi Uygulamaları başlatıcı simgelerini göstermeye zorla 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. Sistem diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 67a50057..7ffe4030 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -153,8 +153,6 @@ DNS поверх HTTPS Вирішення проблем із погіршенням DNS у деяких країнах Колір теми - Колір, який з’являється найбільш часто у додатку - Колір акцентів системи Примусово показувати значки запуску Після Android 10 програмам не дозволяється приховати свої лаунчери. Вимкніть перемикач, щоб вимкнути цю систему функцію. Система @@ -162,7 +160,6 @@ Автори перекладу Брати участь в перекладі Допоможіть нам перекласти %s на вашу мову - " (%s перекладено)" Опис Релізи diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 54659f83..914a77b7 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -151,8 +151,6 @@ DNS qua HTTPS Giải pháp khắc phục tình trạng giả mạo DNS ở một số quốc gia Màu chủ đề - Màu xuất hiện thường xuyên nhất trong ứng dụng - Màu nhấn hệ thống Buộc các ứng dụng hiển thị biểu tượng trên launcher 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. Hệ thống @@ -160,7 +158,6 @@ Cộng tác viên phiên dịch Tham gia phiên dịch Giúp chúng tôi dịch %s về ngôn ngữ của bạn - " (%s đã được dịch)" Readme Bản phát hành diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 79aa7db4..031c2e38 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -156,8 +156,7 @@ 安全 DNS（DoH） 解决某些地区的 DNS 污染问题 主题颜色 - 应用中最常见的颜色 - 系统强调色 + 系统主题色 强制应用在启动器中显示图标 在 Android 10 之后，应用不被允许隐藏启动器图标。关闭本选项可禁用此系统功能。 系统 @@ -165,7 +164,6 @@ 翻译贡献者 参与翻译 帮助我们把 %s 翻译到你的语言 - "（%s 已被翻译）" 自述文件 版本 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 8f5e45ac..dd3d846f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -151,8 +151,6 @@ 安全 DNS（DoH） 解決某些地區的 DNS 污染問題 主題顏色 - 應用程式中最常見的顏色 - 系統強調色 強制應用顯示其啟動器圖標 在Android 10之後，應用不再允許隱藏桌面圖標。關閉該選項以禁用該系統功能。 系統 @@ -160,7 +158,6 @@ 翻譯貢獻者 參與翻譯 幫助我們翻譯 %s 到您的語言 - "（%s 已翻譯）" 讀我檔案 版本 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b5bb0505..9b6ee56a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -151,8 +151,6 @@ 安全 DNS（DoH） 解決某些地區的 DNS 汙染問題 主題強調色 - 應用程式中最常見的顏色 - 系統強調色 強制應用程式在啟動器中顯示圖示 在 Android 10 之後，應用（特別是 Xposed 模組）不被允許隱藏啟動器圖示。關閉本選項以停用此功能。 系統 @@ -160,7 +158,6 @@ 譯者 參與翻譯 幫助我們翻譯 %s 到您的語言 - "（%s 已翻譯）" 自述檔案 版本 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 70474066..d12303b2 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -36,4 +36,52 @@ @string/follow_system + + COLOR_PRIMARY + SAKURA + MATERIAL_RED + MATERIAL_PINK + MATERIAL_PURPLE + MATERIAL_DEEP_PURPLE + MATERIAL_INDIGO + MATERIAL_BLUE + MATERIAL_LIGHT_BLUE + MATERIAL_CYAN + MATERIAL_TEAL + MATERIAL_GREEN + MATERIAL_LIGHT_GREEN + MATERIAL_LIME + MATERIAL_YELLOW + MATERIAL_AMBER + MATERIAL_ORANGE + MATERIAL_DEEP_ORANGE + MATERIAL_BROWN + MATERIAL_GREY + MATERIAL_BLUE_GREY + + + + Pixel blue + Sakura + Red + Pink + Purple + Deep purple + Indigo + Blue + Light blue + Cyan + Teal + Green + Light green + Lime + Yellow + Amber + Orange + Deep orange + Brown + Grey + Blue grey + + diff --git a/app/src/main/res/values/colors_custom.xml b/app/src/main/res/values/colors_custom.xml index 5e93ab0a..8e2eb29a 100644 --- a/app/src/main/res/values/colors_custom.xml +++ b/app/src/main/res/values/colors_custom.xml @@ -32,11 +32,12 @@ @color/material_green_500 @color/material_light_green_500 @color/material_lime_500 - #ff9ca8 + @color/material_yellow_500 @color/material_amber_500 @color/material_orange_500 @color/material_deep_orange_500 @color/material_brown_500 @color/material_grey_500 @color/material_blue_grey_500 + #ff9ca8 diff --git a/app/src/main/res/values/colors_google.xml b/app/src/main/res/values/colors_google.xml index 9544d3de..964f6bb5 100644 --- a/app/src/main/res/values/colors_google.xml +++ b/app/src/main/res/values/colors_google.xml @@ -21,5 +21,4 @@ #1A73E8 #8AB4F8 - #202124 - \ No newline at end of file + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a330a316..3cb0e458 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -21,7 +21,6 @@ 48dp 48dp - 32dp 6dp 2dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9489ce35..75fcce50 100644 --- 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 --> - + Info Modules @@ -164,8 +164,7 @@ DNS over HTTPS Workaround DNS poisoning in some nations Theme color - Color that appears most frequently in the app - System accent color + System theme color Force apps to show launcher icons After Android 10, apps are not allowed to hide their launcher icons. Turn off the toggle to disable this system feature. System @@ -173,7 +172,6 @@ Translation contributors Participate in translation Help us translate %s into your language - " (%s are translated)" Readme diff --git a/app/src/main/res/values/themes_custom.xml b/app/src/main/res/values/themes_custom.xml index 5589fcf3..c669aab1 100644 --- a/app/src/main/res/values/themes_custom.xml +++ b/app/src/main/res/values/themes_custom.xml @@ -98,4 +98,8 @@ + + diff --git a/app/src/main/res/values/themes_overlay.xml b/app/src/main/res/values/themes_overlay.xml index ecd2c8e3..3512ffe8 100644 --- a/app/src/main/res/values/themes_overlay.xml +++ b/app/src/main/res/values/themes_overlay.xml @@ -21,7 +21,7 @@ - \ No newline at end of file + diff --git a/app/src/main/res/xml-v29/prefs.xml b/app/src/main/res/xml-v29/prefs.xml index e811a675..f46537d2 100644 --- a/app/src/main/res/xml-v29/prefs.xml +++ b/app/src/main/res/xml-v29/prefs.xml @@ -53,14 +53,15 @@ - -