From abfac93510c8f89ce72777acd6197981f051c879 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Wed, 13 Apr 2022 20:12:40 +0800 Subject: [PATCH] Adjusting the dialog style & better RTL support (#1838) * Adjusting the dialog style * Fix alignment * Separate appPackageName and appVersionName from appDescription --- .../manager/adapters/ScopeAdapter.java | 30 +++---- .../ui/dialog/BlurBehindDialogBuilder.java | 38 ++++----- .../manager/ui/dialog/FlashDialogBuilder.java | 2 +- .../manager/ui/dialog/ShortcutDialog.java | 2 +- .../ui/fragment/CompileDialogFragment.java | 1 + .../manager/ui/fragment/ModulesFragment.java | 7 +- .../fragment/RecyclerViewDialogFragment.java | 2 +- .../manager/ui/fragment/RepoFragment.java | 6 +- .../manager/ui/fragment/RepoItemFragment.java | 7 +- app/src/main/res/layout/item_module.xml | 78 +++++++++++++++---- app/src/main/res/layout/item_onlinemodule.xml | 45 ++++++++--- app/src/main/res/layout/item_repo_release.xml | 7 +- .../layout/item_repo_title_description.xml | 18 +++-- app/src/main/res/values-af/strings.xml | 1 - app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-iw/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-ku/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-no/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-ur/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 20 ++++- app/src/main/res/values/themes.xml | 2 - 51 files changed, 188 insertions(+), 115 deletions(-) diff --git a/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java b/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java index 1d62dd04..c5647953 100644 --- a/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java +++ b/app/src/main/java/org/lsposed/manager/adapters/ScopeAdapter.java @@ -50,7 +50,6 @@ import android.widget.Filterable; import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -257,7 +256,7 @@ public class ScopeAdapter extends EmptyStateRecyclerView.EmptyStateAdapter checkRecommended()) .setNegativeButton(android.R.string.cancel, null) @@ -328,7 +327,7 @@ public class ScopeAdapter extends EmptyStateRecyclerView.EmptyStateAdapter ConfigManager.forceStopPackage(info.packageName, info.uid / 100000)) @@ -416,12 +415,15 @@ public class ScopeAdapter extends EmptyStateRecyclerView.EmptyStateAdapter checkRecommended()); @@ -674,7 +678,7 @@ public class ScopeAdapter extends EmptyStateRecyclerView.EmptyStateAdapter { moduleUtil.setModuleEnabled(module.packageName, false); - Toast.makeText(activity, activity.getString(R.string.module_disabled_no_selection, module.getAppName()), Toast.LENGTH_LONG).show(); + fragment.showHint(activity.getString(R.string.module_disabled_no_selection, module.getAppName()), true); fragment.getNavController().navigateUp(); }); builder.show(); diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java b/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java index 8b041419..2d273c33 100644 --- a/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/BlurBehindDialogBuilder.java @@ -44,7 +44,11 @@ public class BlurBehindDialogBuilder extends MaterialAlertDialogBuilder { private static final boolean supportBlur = getSystemProperty("ro.surface_flinger.supports_background_blur", false) && !getSystemProperty("persist.sys.sf.disable_blurs", false); public BlurBehindDialogBuilder(@NonNull Context context) { - super(context, com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered); + super(context); + } + + public BlurBehindDialogBuilder(@NonNull Context context, int overrideThemeResId) { + super(context, overrideThemeResId); } @NonNull @@ -57,16 +61,15 @@ public class BlurBehindDialogBuilder extends MaterialAlertDialogBuilder { private void setBackgroundBlurRadius(AlertDialog dialog) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - ValueAnimator animator = ValueAnimator.ofInt(1, 150); - animator.setInterpolator(new DecelerateInterpolator()); - animator.setDuration(150); Window window = dialog.getWindow(); - View view = window.getDecorView(); if (Build.VERSION.SDK_INT >= 31) { window.addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND); - window.getAttributes().setBlurBehindRadius(50); + window.getAttributes().setBlurBehindRadius(53); //android.R.styleable.Window_windowBlurBehindRadius window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND); } else if (supportBlur) { + View view = window.getDecorView(); + ValueAnimator animator = ValueAnimator.ofInt(1, 153); + animator.setInterpolator(new DecelerateInterpolator()); try { Object viewRootImpl = view.getClass().getMethod("getViewRootImpl").invoke(view); if (viewRootImpl == null) { @@ -87,19 +90,18 @@ public class BlurBehindDialogBuilder extends MaterialAlertDialogBuilder { } catch (Throwable t) { Log.e(App.TAG, "Blur behind dialog builder", t); } + view.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { + @Override + public void onViewAttachedToWindow(View v) { + } + + @Override + public void onViewDetachedFromWindow(View v) { + animator.cancel(); + } + }); + animator.start(); } - view.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { - @Override - public void onViewAttachedToWindow(View v) { - - } - - @Override - public void onViewDetachedFromWindow(View v) { - animator.cancel(); - } - }); - animator.start(); } } diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/FlashDialogBuilder.java b/app/src/main/java/org/lsposed/manager/ui/dialog/FlashDialogBuilder.java index 807853f7..b95f2f03 100644 --- a/app/src/main/java/org/lsposed/manager/ui/dialog/FlashDialogBuilder.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/FlashDialogBuilder.java @@ -36,7 +36,7 @@ public class FlashDialogBuilder extends BlurBehindDialogBuilder { private final BorderNestedScrollView rootView; public FlashDialogBuilder(@NonNull Context context, DialogInterface.OnClickListener cancel) { - super(context); + super(context, R.style.ThemeOverlay_MaterialAlertDialog_Centered_FullWidthButtons); var pref = App.getPreferences(); var notes = pref.getString("release_notes", ""); this.zipPath = pref.getString("zip_file", null); diff --git a/app/src/main/java/org/lsposed/manager/ui/dialog/ShortcutDialog.java b/app/src/main/java/org/lsposed/manager/ui/dialog/ShortcutDialog.java index 6052a90f..9f3ef73d 100644 --- a/app/src/main/java/org/lsposed/manager/ui/dialog/ShortcutDialog.java +++ b/app/src/main/java/org/lsposed/manager/ui/dialog/ShortcutDialog.java @@ -39,7 +39,7 @@ public class ShortcutDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - return new BlurBehindDialogBuilder(requireContext()) + return new BlurBehindDialogBuilder(requireContext(), R.style.ThemeOverlay_MaterialAlertDialog_Centered_FullWidthButtons) .setTitle(R.string.parasitic_recommend) .setMessage(R.string.parasitic_recommend_summary) .setNegativeButton(R.string.never_show, (dialog, which) -> diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java index 939b2010..f1758e55 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/CompileDialogFragment.java @@ -63,6 +63,7 @@ public class CompileDialogFragment extends AppCompatDialogFragment { FragmentCompileDialogBinding binding = FragmentCompileDialogBinding.inflate(LayoutInflater.from(requireActivity()), null, false); final PackageManager pm = requireContext().getPackageManager(); var builder = new BlurBehindDialogBuilder(requireActivity()) + .setIcon(appInfo.loadIcon(pm)) .setTitle(appInfo.loadLabel(pm)) .setView(binding.getRoot()); diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java index f0bfa37c..a96baa1e 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/ModulesFragment.java @@ -264,7 +264,7 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi } void installModuleToUser(ModuleUtil.InstalledModule module, UserInfo user) { - new BlurBehindDialogBuilder(requireActivity()) + new BlurBehindDialogBuilder(requireActivity(), R.style.ThemeOverlay_MaterialAlertDialog_Centered_FullWidthButtons) .setTitle(getString(R.string.install_to_user, user.name)) .setMessage(getString(R.string.install_to_user_message, module.getAppName(), user.name)) .setPositiveButton(android.R.string.ok, (dialog, which) -> @@ -308,7 +308,8 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi ConfigManager.startActivityAsUserWithFeature(new Intent(ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", selectedModule.packageName, null)), selectedModule.userId); return true; } else if (itemId == R.id.menu_uninstall) { - new BlurBehindDialogBuilder(requireActivity()) + new BlurBehindDialogBuilder(requireActivity(), R.style.ThemeOverlay_MaterialAlertDialog_FullWidthButtons) + .setIcon(selectedModule.app.loadIcon(pm)) .setTitle(selectedModule.getAppName()) .setMessage(R.string.module_uninstall_message) .setPositiveButton(android.R.string.ok, (dialog, which) -> @@ -541,7 +542,7 @@ public class ModulesFragment extends BaseFragment implements ModuleUtil.ModuleLi sb.append(getString(R.string.module_empty_description)); } holder.appDescription.setText(sb); - + holder.appDescription.setVisibility(View.VISIBLE); sb = new SpannableStringBuilder(); int installXposedVersion = ConfigManager.getXposedApiVersion(); diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/RecyclerViewDialogFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/RecyclerViewDialogFragment.java index d876916e..5a49c8d7 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/RecyclerViewDialogFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/RecyclerViewDialogFragment.java @@ -65,7 +65,7 @@ public class RecyclerViewDialogFragment extends AppCompatDialogFragment { pickAdaptor.refresh(); var title = DialogTitleBinding.inflate(getLayoutInflater()).getRoot(); title.setText(getString(R.string.install_to_user, user.name)); - var dialog = new BlurBehindDialogBuilder(requireActivity()) + var dialog = new BlurBehindDialogBuilder(requireActivity(), R.style.ThemeOverlay_MaterialAlertDialog_FullWidthButtons) .setCustomTitle(title) .setView(binding.getRoot()) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java index 2fb88fbd..4e7499c0 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/RepoFragment.java @@ -282,12 +282,12 @@ public class RepoFragment extends BaseFragment implements RepoLoader.RepoListene public void onBindViewHolder(@NonNull RepoAdapter.ViewHolder holder, int position) { OnlineModule module = showList.get(position); holder.appName.setText(module.getDescription()); + holder.appPackageName.setText(module.getName()); - SpannableStringBuilder sb = new SpannableStringBuilder(module.getName()); + SpannableStringBuilder sb = new SpannableStringBuilder(); String summary = module.getSummary(); if (summary != null) { - sb.append("\n"); sb.append(summary); } holder.appDescription.setVisibility(View.VISIBLE); @@ -389,6 +389,7 @@ public class RepoFragment extends BaseFragment implements RepoLoader.RepoListene class ViewHolder extends RecyclerView.ViewHolder { ConstraintLayout root; TextView appName; + TextView appPackageName; TextView appDescription; TextView hint; @@ -396,6 +397,7 @@ public class RepoFragment extends BaseFragment implements RepoLoader.RepoListene super(binding.getRoot()); root = binding.itemRoot; appName = binding.appName; + appPackageName=binding.appPackageName; appDescription = binding.description; hint = binding.hint; } diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/RepoItemFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/RepoItemFragment.java index ec99f0ac..68e4e30a 100644 --- a/app/src/main/java/org/lsposed/manager/ui/fragment/RepoItemFragment.java +++ b/app/src/main/java/org/lsposed/manager/ui/fragment/RepoItemFragment.java @@ -337,8 +337,11 @@ public class RepoItemFragment extends BaseFragment implements RepoLoader.RepoLis public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { var args = getArguments(); if (args == null) throw new IllegalArgumentException(); - return new BlurBehindDialogBuilder(requireActivity()) - .setItems(args.getCharSequenceArray("names"), (dialog, which) -> NavUtil.startURL(requireActivity(), args.getStringArrayList("urls").get(which))) + return new BlurBehindDialogBuilder(requireActivity(), R.style.ThemeOverlay_MaterialAlertDialog_Centered_FullWidthButtons) + .setTitle(R.string.module_release_view_assets) + .setPositiveButton(android.R.string.cancel, null) + .setItems(args.getCharSequenceArray("names"), + (dialog, which) -> NavUtil.startURL(requireActivity(), args.getStringArrayList("urls").get(which))) .create(); } diff --git a/app/src/main/res/layout/item_module.xml b/app/src/main/res/layout/item_module.xml index 8768c66b..33980f66 100644 --- a/app/src/main/res/layout/item_module.xml +++ b/app/src/main/res/layout/item_module.xml @@ -34,8 +34,7 @@ + android:layout_height="wrap_content"> + app:layout_constraintWidth_max="wrap" + tools:text="LSPosed Manager" /> - + app:layout_constraintWidth_max="wrap" + tools:text="com.lsposed.manager" /> + + + + + android:layout_gravity="center"> + + + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/app_Package_Name" + app:layout_constraintWidth_max="wrap" + tools:ignore="RtlCompat" + tools:text="A very very very very very very very very very very very very \n long string" /> diff --git a/app/src/main/res/layout/item_repo_release.xml b/app/src/main/res/layout/item_repo_release.xml index bfaea2a1..158de771 100644 --- a/app/src/main/res/layout/item_repo_release.xml +++ b/app/src/main/res/layout/item_repo_release.xml @@ -37,19 +37,20 @@ android:id="@+id/item_root" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - tools:ignore="RtlSymmetry"> + android:layout_gravity="center"> + android:layout_gravity="center"> diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index af9e1f44..c62dc2f1 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -127,7 +127,6 @@ Modules Ontkenlys Kon nie omvanglys stoor nie - %1$s\nWeergawe %2$s Aanbeveel Jy het geen toepassing gekies nie. Kies aanbevole programme? Kies aanbevole programme? diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 0208598c..6925f9b5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -136,7 +136,6 @@ Ali Samir وحدات قائمة الرفض فشل في حفظ قائمة النطاق - %1$s\nإصدار %2$s مُوصى به أنت لم تحدد أي تطبيق. تحديد التطبيقات الموصى بها؟ تحديد التطبيقات الموصى بها؟ diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 337b106c..ae58a631 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -127,7 +127,6 @@ Mòduls Llista de denegació No s\'ha pogut desar la llista d\'àmbits - %1$s\nVersió %2$s Recomanat No heu seleccionat cap aplicació. Seleccioneu aplicacions recomanades? Vols seleccionar aplicacions recomanades? diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 32368430..71a597ec 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -131,7 +131,6 @@ Moduly Seznam zakázaných Nepodařilo se uložit seznam - %1$s\nVerze %2$s Zvolit doporučené Nevybrali jste žádnou aplikaci. Vybrat doporučené aplikace? Vybrat doporučené aplikace? diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 185355a9..f78120ef 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -127,7 +127,6 @@ Moduler Denylist Kunne ikke gemme scope-liste - %1$s\nVersion %2$s Anbefalet Du valgte ikke nogen app. Vælg anbefalede apps? Vælg anbefalede apps? diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f386b242..689f557a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -128,7 +128,6 @@ JJ108 Module Verweigerungsliste Das Speichern der Scope-Liste ist fehlgeschlagen - %1$s\nVersion %2$s Empfohlen Sie haben keine App ausgewählt. Empfohlene Apps auswählen? Empfohlene Apps auswählen? diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 541b0bf9..d355a8cf 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -127,7 +127,6 @@ Πρόσθετα Denylist Αποτυχία αποθήκευσης της λίστας πεδίου - %1$s\nΈκδοση %2$s Προτεινόμενο Δεν έχετε επιλέξει καμία εφαρμογή. Επιλέξτε τις προτεινόμενες εφαρμογές? Επιλέξτε προτεινόμενες εφαρμογές? diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 17403c04..27dcbd60 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -127,7 +127,6 @@ Módulos Lista de denegación Fallo al guardar la lista de scopes - %1$s\nVersión %2$s Recomendado No seleccionaste ninguna aplicación. ¿Quieres seleccionar las aplicaciones recomendadas? ¿Quieres seleccionar las aplicaciones recomendadas? diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 9a1a0d32..39328731 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -127,7 +127,6 @@ ماژول ها انکار کننده ناموفق در ذخیره لیست محدوده - %1$s\n نسخه %2$s نیازمنده شما هیچ برنامه ای را انتخاب نکردید. انتخاب برنامه های نیازمند؟ انتخاب برنامه های نیازمند؟ diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c868cd2b..d9fddc19 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -127,7 +127,6 @@ Moduulit Denylist Valmistelulistan tallentaminen epäonnistui - %1$s\nVersio %2$s Suositeltu Et valinnut yhtään sovellusta. Valitse suositellut sovellukset? Valitse suositellut sovellukset? diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index a4b1ee4f..6f69757d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -128,7 +128,6 @@ https://github.com/tclement0922 Modules Liste de refus Échec de l\'enregistrement de la liste des périmètres d\'applications - %1$s\nVersion %2$s Recommandé Vous n\'avez sélectionné aucune application. Sélectionner les applications recommandées ? Sélectionner les applications recommandées ? diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 95c30ac9..33b7f97f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -128,7 +128,6 @@ Modulok Denylist Nem sikerült elmenteni a hatókör listát - %1$s\nVerzió %2$s Ajánlott Nem választott ki egyetlen alkalmazást sem. Válassza ki az ajánlott alkalmazásokat? Válassza ki az ajánlott alkalmazásokat? diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index afcd19cc..e7b675ec 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -125,7 +125,6 @@ Modul Penyangkalan Gagal menyimpan ke daftar cakupan - %1$s\nVersi %2$s Direkomendasikan Anda tidak memilih aplikasi apapun. Pilih aplikasi yang disarankan? Pilih aplikasi yang disarankan? diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 94f90986..84ac02eb 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -127,7 +127,6 @@ Moduli Lista di blocco Impossibile salvare l\'elenco delle attivazioni - %1$s\nVersione %2$s Seleziona consigliate Non hai selezionato nessuna app. Selezionare le app consigliate? Selezionare le app consigliate? diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index d530c1fe..3d07f0f4 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -132,7 +132,6 @@ מודולים רשימת דחיה נכשל לשמור רשימת תחומים - %1$s\nגרסה %2$s מומלץ אתה לא בחרת שום אפליקציה. לבחור אפליקציות מומלצות? בחר אפליקציות מומלצות? diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 40cb5a87..a58ec806 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -125,7 +125,6 @@ モジュール 拒否リスト スコープリストの保存に失敗 - %1$s\nバージョン %2$s おすすめ アプリが選択されていません。おすすめのアプリを選択しますか？ おすすめのアプリを選択しますか？ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 65792712..f2da2a5f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -125,7 +125,6 @@ 모듈 거부자 범위 목록 저장에 실패했습니다. - %1$s\n버전 %2$s 권장된 앱을 선택하지 않았습니다. 권장 앱을 선택하시겠습니까? 권장 앱을 선택하시겠습니까? diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml index 11878381..0ccb6e34 100644 --- a/app/src/main/res/values-ku/strings.xml +++ b/app/src/main/res/values-ku/strings.xml @@ -127,7 +127,6 @@ Modules Denylist Hilbijartina navnîşa çarçovê bi ser neket - %1$s\nGuhertoya %2$s Pêşniyar kirin Te tu sepanê hilnebijart. Serlêdanên pêşniyarkirî hilbijêrin? Serlêdanên pêşniyarkirî hilbijêrin? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 54207fa7..671b2389 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -131,7 +131,6 @@ Moduliai Denylist Nepavyko išsaugoti srities sąrašo - %1$s\nVersija %2$s Rekomenduojama Nepasirinkote jokios programos. Pasirinkti rekomenduojamas programas? Pasirinkite rekomenduojamas programas? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 39d5fbb8..cb176b40 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -127,7 +127,6 @@ Modules Weigerlijst Scopelijst opslaan is mislukt - %1$s\nVersie %2$s Aanbevolen U heeft geen app geselecteerd. Aanbevolen apps selecteren? Aanbevolen apps selecteren? diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 33e32956..f97affa6 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -127,7 +127,6 @@ Moduler Denylist Kan ikke lagre områdeliste - %1$s\nVersjon %2$s Anbefalt Du valgte ingen applikasjoner. Velg anbefalte apper? Velg anbefalte apper? diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d284db6a..24455f1d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -131,7 +131,6 @@ Moduły Lista zabronionych Nie udało się zapisać listy zakresu - %1$s\nWersja %2$s Rekomendowane Nie wybrałeś żadnej aplikacji. Wybrać rekomendowane aplikacje? Wybrać rekomendowane aplikacje? diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 99affc2d..1113dedb 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -127,7 +127,6 @@ Módulos Lista de Negação Falha ao salvar lista de escopos - %1$s\nVersão %2$s Recomendações Você não selecionou nenhum aplicativo. Deseja selecionar os aplicativos recomendados? Selecionar os aplicativos recomendados? diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c93805da..553f8268 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -127,7 +127,6 @@ Módulos Lista de Negação Falha ao salvar lista de escopos - %1$s\nVersão %2$s Recomendações Você não selecionou nenhum aplicativo. Deseja selecionar os aplicativos recomendados? Selecionar os aplicativos recomendados? diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 34e8b904..1c7a07a7 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -129,7 +129,6 @@ Module Denylist Salvare eșuată listă de scop - %1$s\nVersiunea %2$s Recomandate Nu ați selectat nicio aplicație. Selectați aplicațiile recomandate? Selectaţi aplicaţiile recomandate? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e81acc51..09ffacf7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -131,7 +131,6 @@ Мои модули DenyList Не удалось сохранить список выбранных приложений для модуля - %1$s\nВерсия: %2$s Рекомендуемые Вы не выбрали ни одного приложения. Выбрать рекомендуемые приложения? Выбрать рекомендуемые приложения? diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d0495b61..8e12002b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -127,7 +127,6 @@ Moduler Neka Det gick inte att spara omfattningslistan - %1$s\nVersion %2$s Rekommenderad Du valde inte någon app. Välj rekommenderade appar? Välj rekommenderade appar? diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 55f88b5b..cd03be5b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -125,7 +125,6 @@ โมดูล ปฏิเสธ ไม่สามารถบันทึกรายการขอบเขต - %1$s\nเวอร์ชัน %2$s ที่แนะนำ คุณไม่ได้เลือกแอพใด ๆ เลือกแอพที่แนะนำ? เลือกแอพที่แนะนำ? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 09fb43b5..1478eb55 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -127,7 +127,6 @@ Modüller Reddetme Listesi Kapsam listesi kaydedilemedi - %1$s\nSürüm %2$s Önerilen Herhangi bir uygulama seçmediniz. Önerilen uygulamalar seçilsin mi? Önerilen uygulamalar seçilsin mi? diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7a7fc790..57d04481 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -131,7 +131,6 @@ Модулі Показати чорний список Не вдалося зберегти список областей - %1$s\nВерсія %2$s Рекомендовано Ви не вибрали жодної програми. Вибрати рекомендовані програми? Вибрати рекомендовані програми? diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index dfb9d9fd..309fbfc2 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -127,7 +127,6 @@ ماڈیولز انکار کرنے والا دائرہ کار کی فہرست کو محفوظ کرنے میں ناکام - %1$s\nورژن %2$s سفارش کریں۔ آپ نے کوئی ایپ منتخب نہیں کی۔ تجویز کردہ ایپس کو منتخب کریں؟ تجویز کردہ ایپس کو منتخب کریں? diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index b972d7f1..842a9617 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -125,7 +125,6 @@ Mô-đun Danh sách từ chối Lưu danh sách phạm vi thất bại - %1$s\nPhiên bản %2$s Được khuyến cáo Bạn đã không lựa chọn bất kỳ ứng dụng nào. Lựa chọn những ứng dụng được khuyến nghị? Lựa chọn những ứng dụng được khuyến cáo? diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bce6c9ef..9fa15c79 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -125,7 +125,7 @@ 模块 排除列表 作用域列表保存失败 - %1$s\n版本：%2$s + 版本：%1$s 勾选推荐 未选择任何应用。选择推荐的应用？ 选择推荐的应用？ diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index cb87b429..d8448f35 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -127,7 +127,6 @@ 模組 拒絕名單 作用域名單保存失敗 - %1$s\n版本：%2$s 推薦應用程式 未選擇任何應用程式。選擇推薦的？ 選擇推薦的應用程式? diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4f8bc64c..b5107a12 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -125,7 +125,6 @@ 模組 Magisk 排除列表 作用域列表儲存失敗 - %1$s\n版本 %2$s 推薦程式 未選擇任何程式，選擇推薦的程式？ 選擇推薦的程式？ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f51a58f..b125c77f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -131,7 +131,7 @@ Modules Denylist Failed to save scope list - %1$s\nVersion %2$s + Version: %1$s Recommended You did not select any app. Select recommended apps? Select recommended apps? diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b4a15b8f..3597fa5c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -34,5 +34,23 @@ - + + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 5f61e670..23d97cca 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -35,7 +35,6 @@ ?colorPrimary ?colorPrimary - viewStart