dockbar editor moved to dockbar settings in appearance sett

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

@@ -1,19 +1,10 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.isTablet;
-import static ru.vtosters.lite.utils.LifecycleUtils.restartApplicationWithTimer;
-
 import android.os.Bundle;
-
 import com.vtosters.lite.R;
-
-import ru.vtosters.lite.ui.components.DockBarEditorManager;
 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.NavigatorUtils;
-import ru.vtosters.lite.utils.Preferences;
-import ru.vtosters.lite.utils.ThemesUtils;
+import ru.vtosters.lite.utils.*;
 
 public class InterfaceFragment extends TrackedMaterialPreferenceToolbarFragment {
     @Override
@@ -25,56 +16,45 @@ public class InterfaceFragment extends TrackedMaterialPreferenceToolbarFragment
 
     private void prefs() {
         findPreference("stories").setOnPreferenceClickListener(preference -> {
-            restartApplicationWithTimer();
+            LifecycleUtils.restartApplicationWithTimer();
 
             return true;
         });
         findPreference("swipe").setOnPreferenceClickListener(preference -> {
-            restartApplicationWithTimer();
+            LifecycleUtils.restartApplicationWithTimer();
 
             return true;
         });
         findPreference("is_likes_on_right").setOnPreferenceClickListener(preference -> {
-            restartApplicationWithTimer();
+            LifecycleUtils.restartApplicationWithTimer();
 
             return true;
         });
         findPreference("superapp").setOnPreferenceClickListener(preference -> {
-            restartApplicationWithTimer();
+            LifecycleUtils.restartApplicationWithTimer();
 
             return true;
         });
 
         findPreference("dateformat").setOnPreferenceChangeListener((preference, o) -> {
             Preferences.getPreferences().edit().putString("dateformat", o.toString()).commit();
-            restartApplicationWithTimer();
+            LifecycleUtils.restartApplicationWithTimer();
             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.setVisible(!Preferences.vkme() && !AndroidUtils.isTablet() && Preferences.superapp());
         superappeditor.setOnPreferenceClickListener(preference -> {
             NavigatorUtils.switchFragment(requireContext(), SuperAppEditorFragment.class);
             return true;
         });
 
-        if (isTablet()) {
+        if (AndroidUtils.isTablet()) {
             findPreference("menusett").setVisible(false);
             findPreference("swipe").setVisible(false);
         }
 
-        if (Preferences.vkme() || isTablet()) {
-            findPreference("dockbareditor").setVisible(false);
-        }
-
-        var dockbarEditor = findPreference("dockbareditor");
-        dockbarEditor.setSummary(AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size());
-        dockbarEditor.setOnPreferenceClickListener(preference -> {
-            NavigatorUtils.switchFragment(requireContext(), DockBarEditorFragment.class);
-            return true;
-        });
-
         if (ThemesUtils.isMilkshake() && Preferences.superapp()) {
             findPreference("miniapps").setVisible(false);
 

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

@@ -1,8 +1,5 @@
 package ru.vtosters.lite.ui.fragments;
 
-import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
-import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable;
-
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Build;
@@ -20,6 +17,7 @@ import ru.vtosters.lite.concurrent.VTExecutors;
 import ru.vtosters.lite.themes.ThemesCore;
 import ru.vtosters.lite.themes.ThemesManager;
 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;
@@ -47,7 +45,7 @@ public class ThemesFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("systememoji").setSummary(getGlobalContext().getString(R.string.systememojisum) + " \uD83D\uDE00\uD83D\uDE01\uD83E\uDD11\uD83E\uDD75\uD83D\uDC4D");
+        findPreference("systememoji").setSummary(AndroidUtils.getGlobalContext().getString(R.string.systememojisum) + " \uD83D\uDE00\uD83D\uDE01\uD83E\uDD11\uD83E\uDD75\uD83D\uDC4D");
 
         var invalidateThemeCache = findPreference("invalidate_theme_cache");
         if (ThemesUtils.getReservedAccent() != Color.TRANSPARENT && Preferences.dev() && ThemesUtils.useNewColorEngine())
@@ -117,10 +115,9 @@ public class ThemesFragment extends TrackedMaterialPreferenceToolbarFragment {
         findPreference("accentprefs").setVisible(!ThemesUtils.isMonetTheme());
 
         var wp = findPreference("wallpapers");
-        wp.setIcon(recolorDrawable(getGlobalContext().getDrawable(R.drawable.ic_media_outline_28)));
+        wp.setIcon(ThemesUtils.recolorDrawable(AndroidUtils.getGlobalContext().getDrawable(R.drawable.ic_media_outline_28)));
         wp.setOnPreferenceClickListener(preference -> {
             NavigatorUtils.switchFragment(requireContext(), WallpaperMenuFragment.class);
-
             return true;
         });
 
@@ -129,6 +126,17 @@ public class ThemesFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
+        var dockbarEditor = findPreference("dockbareditor");
+        dockbarEditor.setSummary(AndroidUtils.getString(R.string.vtldocksumm) + ": " + DockBarEditorManager.getInstance().getSelectedTabs().size());
+        dockbarEditor.setOnPreferenceClickListener(preference -> {
+            NavigatorUtils.switchFragment(requireContext(), DockBarEditorFragment.class);
+            return true;
+        });
+
+        if (Preferences.vkme() || AndroidUtils.isTablet()) {
+            dockbarEditor.setVisible(false);
+        }
+
         if (AndroidUtils.isTablet()) {
             PreferenceCategory dockbarSettingsPreferenceCategory = (PreferenceCategory) findPreference("dockbarsett");
             dockbarSettingsPreferenceCategory.setVisible(false);

smali/res/xml/preferences_interface.xml

@@ -35,9 +35,6 @@
         <Preference
                 android:key="customrounding"
                 android:title="@string/customrounding_title"/>
-        <Preference
-                android:key="dockbareditor"
-                android:title="@string/dockbar_editor"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/interfacenewsfeed">
         <com.vtosters.lite.ui.MaterialSwitchPreference

smali/res/xml/preferences_themes.xml

@@ -47,6 +47,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"