From c145b644412533e84407e3fffc1056537e24ca9f Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 20 Jul 2022 15:50:37 +0300
Subject: [PATCH] some dockbar and superapp editor fixes
---
.../vtosters/lite/hooks/DockBarInjector.java | 9 +++++----
.../ui/components/SuperAppEditorManager.java | 4 +++-
.../lite/ui/fragments/InterfaceFragment.java | 8 --------
.../lite/ui/fragments/ThemesFragment.java | 9 +++++++++
.../lite/ui/fragments/VTSettings.java | 20 +++++++++----------
smali/res/xml/preferences_interface.xml | 4 ----
smali/res/xml/preferences_themes.xml | 4 ++++
7 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
index fa8bc01e3..b9c43b71b 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
@@ -18,6 +18,7 @@ import static com.vtosters.lite.R.id.tab_messages;
import static com.vtosters.lite.R.id.tab_news;
import static ru.vtosters.lite.utils.Globals.getContext;
import static ru.vtosters.lite.utils.Globals.getResources;
+import static ru.vtosters.lite.utils.Preferences.*;
import android.annotation.SuppressLint;
import android.content.res.ColorStateList;
@@ -105,7 +106,7 @@ public class DockBarInjector {
add.setTitle(getContext().getString(tab.titleID));
add.setCheckable(true);
}
- if (Globals.getPreferences().getBoolean("dockbar_tab_titles", true)) {
+ if (getBoolValue("dockbar_tab_titles", false)) {
var menuView = (BottomNavigationMenuView) navigationView.getChildAt(0);
for (int i = 0; i < menuView.getChildCount(); i++) {
var item = (com.vtosters.lite.ui.bottomnavigation.BottomNavigationItemView) menuView.getChildAt(i);
@@ -196,7 +197,7 @@ public class DockBarInjector {
@SuppressLint("NonConstantResourceId")
private static CharSequence counters(int tabId) {
- if (!Preferences.dockcounter()) return null;
+ if (!dockcounter()) return null;
int val = 0;
switch (tabId) {
@@ -219,11 +220,11 @@ public class DockBarInjector {
val = MenuCountersState.n();
break;
case tab_feedback:
- if (Preferences.milkshake())
+ if (milkshake())
val = MenuCountersState.k();
break;
case menu_friends:
- if (!Preferences.milkshake())
+ if (!milkshake())
val = MenuCountersState.k();
break;
}
diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java
index 24db0f8d8..bbffeb542 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java
@@ -56,7 +56,7 @@ public class SuperAppEditorManager {
public void reset() {
Globals.getPreferences()
.edit()
- .putString("superapp_items", "promo,miniapps,vkpay_slim,greeting,holiday,weather,sport,games,informer,food,event,music,vk_run")
+ .putString("superapp_items", "menu,promo,vkpay_slim,greeting,holiday,informer,event,miniapps,weather,sport,games,food,music,vk_run")
.commit();
}
@@ -70,6 +70,8 @@ public class SuperAppEditorManager {
private SuperAppItem getItemByTag(String tag) {
switch (tag) {
+ case "menu":
+ return SuperAppItem.valuesOf("menu", "Меню приложения");
case "promo":
return SuperAppItem.valuesOf("promo", "Mini Apps: промо");
case "miniapps":
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
index a67b3414c..7c2afeca7 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
@@ -26,14 +26,6 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment{
findPreference("stories").setOnPreferenceClickListener(new restart());
findPreference("swipe").setOnPreferenceClickListener(new restart());
findPreference("dockcounter").setOnPreferenceClickListener(new restart());
- findPreference("dockbar_tab_titles").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object o) {
- getPreferences().edit().putBoolean("dockbar_tab_titles", (boolean) o).commit();
- Globals.restartApplication();
- return false;
- }
- });
}
public boolean restart(Preference preference){
diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
index d03f8ab98..edc3979cc 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
@@ -1,7 +1,9 @@
package ru.vtosters.lite.ui.fragments;
+import static ru.vtosters.lite.utils.Globals.*;
import static ru.vtosters.lite.utils.Globals.edit;
import static ru.vtosters.lite.utils.Globals.getIdentifier;
+import static ru.vtosters.lite.utils.Globals.getPreferences;
import static ru.vtosters.lite.utils.Globals.restartApplicationWithTimer;
import android.content.Context;
@@ -13,6 +15,8 @@ import androidx.preference.Preference;
import com.vk.navigation.Navigator;
import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
+import ru.vtosters.lite.utils.Globals;
+
public class ThemesFragment extends MaterialPreferenceToolbarFragment{
@@ -29,6 +33,11 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment{
findPreference("darktheme").setOnPreferenceChangeListener(new restartdark());
findPreference("lighttheme").setOnPreferenceChangeListener(new restartlight());
findPreference("iconmanager").setOnPreferenceClickListener(new openicons());
+ findPreference("dockbar_tab_titles").setOnPreferenceChangeListener((preference, o) -> {
+ getPreferences().edit().putBoolean("dockbar_tab_titles", (boolean) o).commit();
+ restartApplication();
+ return false;
+ });
}
public class openicons implements Preference.OnPreferenceClickListener{
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 05972a447..5cfdcfdc2 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
@@ -313,6 +313,16 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{
context.startActivity(intent);
return false;
});
+
+ if (milkshake() && superapp()) {
+ addPreference(this, "", "Редактор Superapp", superapp, "ic_explore_outline_28", (preference) -> {
+ Context context = getContext();
+ Intent intent = new Navigator(SuperAppEditorFragment.class).b(context);
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(intent);
+ return true;
+ });
+ }
}
addPreference(this, "", Globals.getString("vtlmedia"), mediasumm, "ic_media_outline_28", preference -> {
@@ -363,16 +373,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{
return false;
});
- if (milkshake() && superapp()) {
- addPreference(this, "", "Настроить Superapp", superapp, "ic_explore_outline_28", (preference) -> {
- Context context = getContext();
- Intent intent = new Navigator(SuperAppEditorFragment.class).b(context);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(intent);
- return true;
- });
- }
-
addPreference(this, "", Globals.getString("vtlproxy"), proxysumm, !DoNotUseOldIcons() ? "ic_globe_20" : "ic_globe_outline_28", preference -> {
Context context = getContext();
Intent a2 = new Navigator(ProxySettingsFragment.class).b(context);
diff --git a/smali/res/xml/preferences_interface.xml b/smali/res/xml/preferences_interface.xml
index 45269c838..89f57798e 100644
--- a/smali/res/xml/preferences_interface.xml
+++ b/smali/res/xml/preferences_interface.xml
@@ -65,10 +65,6 @@
android:key="dockcounter"
android:summary="@string/docknumberssum"
android:title="@string/docknumbers" />
-
+