diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index 9b1998e8f..ba3497129 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -25,6 +25,7 @@ import static ru.vtosters.lite.utils.Preferences.isValidSignature; import static ru.vtosters.lite.utils.Preferences.milkshake; import static ru.vtosters.lite.utils.Preferences.navbar; import static ru.vtosters.lite.utils.Preferences.offline; +import static ru.vtosters.lite.utils.Preferences.preferences; import static ru.vtosters.lite.utils.Preferences.shortinfo; import static ru.vtosters.lite.utils.Preferences.vkme; import static ru.vtosters.lite.utils.Themes.getDarkTheme; @@ -68,6 +69,7 @@ import ru.vtosters.lite.utils.SSFS; import ru.vtosters.lite.utils.VKUIwrapper; public class VTSettings extends MaterialPreferenceToolbarFragment{ + public static int hideitems = 0; public static String getValAsString(String stringid, Boolean value){ if(disableSettingsSumms()) return null; @@ -124,6 +126,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ String activitysumm = getValAsString("vtlactivitysumm", offline()); String themessumm = getValAsString("vtlthemessumm", navbar()); String tgssumm = getTGSsumm(); + String superapp = "Скрыто элементов" + ": " + preferences.getInt("superappitems", 0); String interfacesumm = getValAsString("vtlinterfacesumm", shortinfo()); String proxysumm = getProxysumm(); String othersumm = getValAsString("vtlothersumm", vtverif()); @@ -350,7 +353,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ }); if(milkshake()) { - PreferencesUtil.addPreference(this, "", "Настроить Superapp", null, "ic_explore_outline_28", (preference) -> { + PreferencesUtil.addPreference(this, "", "Настроить Superapp", superapp, "ic_explore_outline_28", (preference) -> { callEditorPopup(); return true; }); @@ -423,6 +426,8 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ } private void callEditorPopup(){ + hideitems = 0; + List list = Arrays.asList( new VBListItem("promo", "Mini Apps: промо"), new VBListItem("miniapps", "Mini Apps: виджет"), @@ -449,6 +454,10 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ () -> { for(VBListItem item : list) { edit().putBoolean("superapp_" + item.id, item.checked).commit(); + if(item.checked){ + hideitems++; + edit().putInt("superappitems", hideitems).commit(); + } } } ) diff --git a/app/src/main/java/ru/vtosters/lite/utils/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/utils/JsonInjectors.java index 727c7c8d8..83f5311a5 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/JsonInjectors.java +++ b/app/src/main/java/ru/vtosters/lite/utils/JsonInjectors.java @@ -3,13 +3,11 @@ package ru.vtosters.lite.utils; import static ru.vtosters.lite.f0x1d.VTVerifications.isDeveloper; import static ru.vtosters.lite.f0x1d.VTVerifications.isPrometheus; import static ru.vtosters.lite.f0x1d.VTVerifications.isVerified; -import static ru.vtosters.lite.utils.Base64Utils.*; +import static ru.vtosters.lite.utils.Base64Utils.decode; import static ru.vtosters.lite.utils.Preferences.dev; import static ru.vtosters.lite.utils.Preferences.getBoolValue; import static ru.vtosters.lite.utils.Preferences.hasVerification; -import android.util.Log; - import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -87,11 +85,11 @@ public class JsonInjectors{ public static JSONObject superapp(JSONObject json) throws JSONException{ var oldItems = json.optJSONArray("items"); var newItems = new JSONArray(); - if (oldItems != null) { - for (int i = 0; i < oldItems.length(); i++) { + if(oldItems != null){ + for(int i = 0; i < oldItems.length(); i++) { var item = oldItems.optJSONObject(i); var type = item.optString("type"); - if (!getBoolValue("superapp_" + type, false)) + if(!getBoolValue("superapp_" + type, false)) newItems.put(item); } }