From 0e472e985b2bbde6cc151b1510111cba04c4972a Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 13 Jul 2022 18:41:41 +0300 Subject: [PATCH] fixed crash + added notifs about verif --- .../lite/ui/fragments/IconsFragment.java | 15 ++- .../ui/wallpapers/WallpaperMenuFragment.java | 110 ++++++++++-------- .../java/ru/vtosters/lite/utils/Globals.java | 2 + smali/res/xml/preferences_themes.xml | 1 + 4 files changed, 76 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java index 3b35a5bad..a3a392efe 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/IconsFragment.java @@ -23,6 +23,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.util.TypedValue; import android.widget.RadioButton; @@ -49,6 +50,13 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment{ int vtosterXml = getIdentifier("empty", "xml"); this.addPreferencesFromResource(vtosterXml); + if (!hasVerification()) { + PreferencesUtil.addPreference(this, "", "Доступны не все иконки!", "Для разблокировки необходимо сделать пожертование от 99р", "ic_about_outline_28", preference -> { + getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://vtosters.app"))); + return false; + }); + } + PreferencesUtil.addPreferenceCategory(this, "Иконочки"); for (var i = 0; i < icons().size(); i++) { @@ -58,8 +66,6 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment{ String icon = iconsValues().get(i); PreferencesUtil.addPreference(this, icon, iconname, "", "ic_bug_outline_28", preference -> { - sendToast(icon); - callSelectDialog(this.getContext(), icon); return false; }); @@ -76,7 +82,10 @@ public class IconsFragment extends MaterialPreferenceToolbarFragment{ rg.addView(rgDefault); rg.addView(rgVK); - rg.addView(rgVKontakte); + + if (hasVerification()) { + rg.addView(rgVKontakte); + } rgDefault.setTextSize(TypedValue.COMPLEX_UNIT_PX, convertDpToPixel(14f)); rgVK.setTextSize(TypedValue.COMPLEX_UNIT_PX, convertDpToPixel(14f)); diff --git a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java index 6d3605c7b..093044967 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperMenuFragment.java @@ -8,10 +8,12 @@ import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.requestUpdateWallpa import static ru.vtosters.lite.utils.CacheUtils.deleteCache; import static ru.vtosters.lite.utils.Globals.edit; import static ru.vtosters.lite.utils.Globals.getIdentifier; +import static ru.vtosters.lite.utils.Preferences.hasVerification; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.net.Uri; import android.os.Bundle; import android.widget.Toast; @@ -75,6 +77,13 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment{ PreferencesUtil.addPreferenceCategory(this, "Фильтры"); + if (!hasVerification()) { + PreferencesUtil.addPreference(this, "", "Доступны не все фильтры!", "Для разблокировки необходимо сделать пожертование от 99р", null, preference -> { + getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://vtosters.app"))); + return false; + }); + } + PreferencesUtil.addListPreference(this, "msg_blur_radius", "disabled", "Размытие фона сообщений", new CharSequence[] { "Отключено", "Низкое (15px)", "Среднее (25px)", "Высокое (50px)" }, new String[] { @@ -87,67 +96,70 @@ public class WallpaperMenuFragment extends MaterialPreferenceToolbarFragment{ "off", "dim_black", "dim_white" }); + PreferencesUtil.addListPreference(this, "msg_mosaic", "disabled", "Мозаика", new CharSequence[] { "Отключено", "Низкое", "Среднее", "Высокое" }, new String[] { "disabled", "low", "med", "high" }); - PreferencesUtil.addMaterialSwitchPreference(this, "msg_monochrome", "Черно-белый фон", "", null, false, (preference, o) -> { - boolean value = (boolean) o; - edit().putBoolean("msg_monochrome", value).commit(); - requestUpdateWallpaper(); - mWPPreviewPref.redraw(); - return true; - }); + if (hasVerification()) { + PreferencesUtil.addMaterialSwitchPreference(this, "msg_monochrome", "Черно-белый фон", "", null, false, (preference, o) -> { + boolean value = (boolean) o; + edit().putBoolean("msg_monochrome", value).commit(); + requestUpdateWallpaper(); + mWPPreviewPref.redraw(); + return true; + }); - PreferencesUtil.addMaterialSwitchPreference(this, "msg_invert", "Инвертировать цвета", "", null, false, (preference, o) -> { - boolean value = (boolean) o; - edit().putBoolean("msg_invert", value).commit(); - requestUpdateWallpaper(); - mWPPreviewPref.redraw(); - return true; - }); + PreferencesUtil.addMaterialSwitchPreference(this, "msg_invert", "Инвертировать цвета", "", null, false, (preference, o) -> { + boolean value = (boolean) o; + edit().putBoolean("msg_invert", value).commit(); + requestUpdateWallpaper(); + mWPPreviewPref.redraw(); + return true; + }); - PreferencesUtil.addMaterialSwitchPreference(this, "msg_sepia", "Эффект сепии", "", null, false, (preference, o) -> { - boolean value = (boolean) o; - edit().putBoolean("msg_sepia", value).commit(); - requestUpdateWallpaper(); - mWPPreviewPref.redraw(); - return true; - }); + PreferencesUtil.addMaterialSwitchPreference(this, "msg_sepia", "Эффект сепии", "", null, false, (preference, o) -> { + boolean value = (boolean) o; + edit().putBoolean("msg_sepia", value).commit(); + requestUpdateWallpaper(); + mWPPreviewPref.redraw(); + return true; + }); - PreferencesUtil.addMaterialSwitchPreference(this, "msg_emboss", "Emboss фильтр", "Возможна нагрузка на устройство", null, false, (preference, o) -> { - boolean value = (boolean) o; - edit().putBoolean("msg_emboss", value).commit(); - requestUpdateWallpaper(); - mWPPreviewPref.redraw(); - return true; - }); + PreferencesUtil.addMaterialSwitchPreference(this, "msg_emboss", "Emboss фильтр", "Возможна нагрузка на устройство", null, false, (preference, o) -> { + boolean value = (boolean) o; + edit().putBoolean("msg_emboss", value).commit(); + requestUpdateWallpaper(); + mWPPreviewPref.redraw(); + return true; + }); - PreferencesUtil.addMaterialSwitchPreference(this, "msg_engrave", "Engrave фильтр", "Возможна нагрузка на устройство", null, false, (preference, o) -> { - boolean value = (boolean) o; - edit().putBoolean("msg_engrave", value).commit(); - requestUpdateWallpaper(); - mWPPreviewPref.redraw(); - return true; - }); + PreferencesUtil.addMaterialSwitchPreference(this, "msg_engrave", "Engrave фильтр", "Возможна нагрузка на устройство", null, false, (preference, o) -> { + boolean value = (boolean) o; + edit().putBoolean("msg_engrave", value).commit(); + requestUpdateWallpaper(); + mWPPreviewPref.redraw(); + return true; + }); - PreferencesUtil.addMaterialSwitchPreference(this, "msg_flea", "Flea фильтр", "", null, false, (preference, o) -> { - boolean value = (boolean) o; - edit().putBoolean("msg_flea", value).commit(); - requestUpdateWallpaper(); - mWPPreviewPref.redraw(); - return true; - }); + PreferencesUtil.addMaterialSwitchPreference(this, "msg_flea", "Flea фильтр", "", null, false, (preference, o) -> { + boolean value = (boolean) o; + edit().putBoolean("msg_flea", value).commit(); + requestUpdateWallpaper(); + mWPPreviewPref.redraw(); + return true; + }); - PreferencesUtil.addMaterialSwitchPreference(this, "msg_snow", "Эффект снега", "", null, false, (preference, o) -> { - boolean value = (boolean) o; - edit().putBoolean("msg_snow", value).commit(); - requestUpdateWallpaper(); - mWPPreviewPref.redraw(); - return true; - }); + PreferencesUtil.addMaterialSwitchPreference(this, "msg_snow", "Эффект снега", "", null, false, (preference, o) -> { + boolean value = (boolean) o; + edit().putBoolean("msg_snow", value).commit(); + requestUpdateWallpaper(); + mWPPreviewPref.redraw(); + return true; + }); + } ListPreference blur = (ListPreference) findPreference("msg_blur_radius"); ListPreference dim = (ListPreference) findPreference("msg_dim"); diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java index 6509e4078..fef811a98 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -355,6 +355,8 @@ public class Globals{ } // Network check public static boolean isNetworkIsSlow(){ + if (!isNetworkConnected()) return true; + var isConnectionSucks = false; var cm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE); var nc = cm.getNetworkCapabilities(cm.getActiveNetwork()); diff --git a/smali/res/xml/preferences_themes.xml b/smali/res/xml/preferences_themes.xml index 30721ced1..41361d3a2 100644 --- a/smali/res/xml/preferences_themes.xml +++ b/smali/res/xml/preferences_themes.xml @@ -28,6 +28,7 @@