dockbar and superapp editor moved

app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java

@@ -3,15 +3,20 @@ package ru.vtosters.lite.ui.fragments;
 import static ru.vtosters.lite.utils.AndroidUtils.*;
 import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
 
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 
 import androidx.preference.Preference;
 
+import com.vk.core.fragments.FragmentImpl;
+import com.vk.navigation.Navigator;
 import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 
+import ru.vtosters.lite.ui.components.SuperAppEditorManager;
 import ru.vtosters.lite.ui.dialogs.RoundingSeekbarDialog;
+import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.Preferences;
 import ru.vtosters.lite.utils.ThemesUtils;
 
@@ -35,6 +40,14 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
+        var superappeditor = findPreference("superappeditor");
+        superappeditor.setSummary(AndroidUtils.getString(R.string.elements_hidden_count) + ": " + SuperAppEditorManager.getInstance().getDisabledTabs().size());
+        superappeditor.setVisible(!Preferences.vkme() && !isTablet() && Preferences.superapp());
+        superappeditor.setOnPreferenceClickListener(preference -> {
+            switchFragment(SuperAppEditorFragment.class);
+            return true;
+        });
+
         if (isTablet()) {
             findPreference("menusett").setVisible(false);
             findPreference("swipe").setVisible(false);
@@ -78,4 +91,11 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment {
             return InterfaceFragment.this.restart(preference);
         }
     }
+
+    private void switchFragment(Class< ? extends FragmentImpl> fragmentClz) {
+        var intent = new Navigator(fragmentClz)
+                .b(requireContext())
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        requireContext().startActivity(intent);
+    }
 }

app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java

@@ -14,6 +14,7 @@ import com.vtosters.lite.R;
 import com.vtosters.lite.general.fragments.MaterialPreferenceToolbarFragment;
 import ru.vtosters.lite.themes.ThemesCore;
 import ru.vtosters.lite.themes.palettes.PalettesManager;
+import ru.vtosters.lite.ui.components.DockBarEditorManager;
 import ru.vtosters.lite.ui.dialogs.PalettesBottomSheetDialog;
 import ru.vtosters.lite.ui.views.rarepebble.ColorPickerView;
 import ru.vtosters.lite.ui.wallpapers.WallpaperMenuFragment;
@@ -42,6 +43,13 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
+        var dockbarEditor = findPreference("dockbareditor");
+        dockbarEditor.setSummary(AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size());
+        dockbarEditor.setOnPreferenceClickListener(preference -> {
+            switchFragment(DockBarEditorFragment.class);
+            return true;
+        });
+
         var navBarPreference = findPreference("navbar");
         navBarPreference.setOnPreferenceClickListener(preference -> {
             restart();
@@ -116,10 +124,15 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment {
             return true;
         });
 
+        if (Preferences.vkme()) {
+            findPreference("dockbareditor").setVisible(false);
+        }
+
         if(AndroidUtils.isTablet()) {
             PreferenceCategory dockbarSettingsPreferenceCategory = (PreferenceCategory) findPreference("dockbarsett");
             dockbarSettingsPreferenceCategory.setVisible(false);
             findPreference("alteremoji").setVisible(false);
+            findPreference("dockbareditor").setVisible(false);
         }
     }
 

app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java

@@ -51,10 +51,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
         return AndroidUtils.getString(R.string.vtlssfssumm) + ": " + AndroidUtils.getString(R.string.vtlsettverifno);
     }
 
-    public static String getDocksumm() {
-        return AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size();
-    }
-
     public static String getTGSsumm() {
         return AndroidUtils.getString(R.string.vtltgssumm) + ": " + TelegramStickersService.getInstance(AndroidUtils.getGlobalContext()).getActivePacksListReference().size();
     }
@@ -88,10 +84,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
         return AndroidUtils.getString("current_theme") + ": " + str;
     }
 
-    public static String getSuperappsumm() {
-        return AndroidUtils.getString(R.string.elements_hidden_count) + ": " + SuperAppEditorManager.getInstance().getDisabledTabs().size();
-    }
-
     private void switchTheme(boolean isDarkTheme) {
         ThemesUtils.setTheme(isDarkTheme ? ThemesUtils.getDarkTheme() : ThemesUtils.getLightTheme(), requireActivity());
     }
@@ -481,36 +473,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment implements Tel
                 }
         );
 
-        if(!Preferences.vkme()) {
-            if(!AndroidUtils.isTablet()) {
-                PreferenceFragmentUtils.addPreference(
-                        getPreferenceScreen(),
-                        "",
-                        requireContext().getString(R.string.dockbar_editor),
-                        getDocksumm(),
-                        R.drawable.ic_list_outline_28,
-                        preference -> {
-                            launchFragment(DockBarEditorFragment.class);
-                            return false;
-                        }
-                );
-
-                if(Preferences.milkshake() && Preferences.superapp()) {
-                    PreferenceFragmentUtils.addPreference(
-                            getPreferenceScreen(),
-                            "",
-                            requireContext().getString(R.string.superapp_editor),
-                            getSuperappsumm(),
-                            R.drawable.ic_services_outline_28,
-                            (preference) -> {
-                                launchFragment(SuperAppEditorFragment.class);
-                                return true;
-                            }
-                    );
-                }
-            }
-        }
-
         PreferenceFragmentUtils.addPreference(
                 getPreferenceScreen(),
                 "",

smali/res/xml/preferences_interface.xml

@@ -64,6 +64,9 @@
                 android:title="@string/postsredesign_title"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/menu" android:key="menusett">
+        <Preference
+                android:key="superappeditor"
+                android:title="@string/superapp_editor"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
                 android:defaultValue="true"
                 android:key="miniapps"

smali/res/xml/preferences_themes.xml

@@ -45,6 +45,9 @@
     <PreferenceCategory
             android:key="dockbarsett"
             android:title="@string/vtl_settings_dockbar_title">
+        <Preference
+                android:key="dockbareditor"
+                android:title="@string/dockbar_editor"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
                 android:defaultValue="true"
                 android:key="dockbar_tab_titles"