some dockbar fixes + accent

app/src/main/java/com/vtosters/lite/ui/bottomnavigation/BottomNavigationItemView.java

@@ -1,5 +1,7 @@
 package com.vtosters.lite.ui.bottomnavigation;
 
+import static ru.vtosters.lite.utils.Themes.getCSTDock;
+
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
@@ -75,7 +77,7 @@ public class BottomNavigationItemView extends FrameLayout implements MenuView.It
         this.mIcon.getLayoutParams().width = V.a(28.0F);
         this.mIcon.getLayoutParams().height = V.a(28.0F);
 
-        var colorStateList = getResources().getColorStateList(R.color.bottom_navigation_item);
+        var colorStateList = getCSTDock();
         this.mSmallLabel = this.findViewById(R.id.smallLabel);
         mSmallLabel.setTextColor(colorStateList);
 

app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.hooks;
 
+import static android.graphics.Color.*;
 import static com.vtosters.lite.R.id.menu_fave;
 import static com.vtosters.lite.R.id.menu_feedback;
 import static com.vtosters.lite.R.id.menu_friends;
@@ -19,6 +20,7 @@ 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 static ru.vtosters.lite.utils.Themes.getCSTDock;
 
 import android.annotation.SuppressLint;
 import android.content.res.ColorStateList;
@@ -91,18 +93,7 @@ public class DockBarInjector {
             MenuItem add = menu.add(0, tab.id, 0, tab.titleID);
             Drawable drawable = getResources().getDrawable(tab.iconID);
 
-            ColorStateList dockcolors = new ColorStateList(
-                    new int[][]{
-                            new int[]{android.R.attr.state_checked},
-                            new int[]{-android.R.attr.state_checked}
-                    },
-                    new int[]{
-                            Color.parseColor("#ff528bcc"),
-                            Color.parseColor("#ffaaaeb3")
-                    }
-            );
-
-            add.setIcon(new RecoloredDrawable(drawable, dockcolors));
+            add.setIcon(new RecoloredDrawable(drawable, getCSTDock()));
             add.setTitle(getContext().getString(tab.titleID));
             add.setCheckable(true);
         }

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

@@ -25,7 +25,6 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment{
     private void prefs(){
         findPreference("stories").setOnPreferenceClickListener(new restart());
         findPreference("swipe").setOnPreferenceClickListener(new restart());
-        findPreference("dockcounter").setOnPreferenceClickListener(new restart());
     }
 
     public boolean restart(Preference preference){

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

@@ -38,6 +38,8 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment{
 //            restartApplication();
 //            return false;
 //        });
+        findPreference("dockbar_accent").setOnPreferenceClickListener(new restart());
+        findPreference("dockcounter").setOnPreferenceClickListener(new restart());
     }
 
     public class openicons implements Preference.OnPreferenceClickListener{

app/src/main/java/ru/vtosters/lite/utils/Preferences.java

@@ -202,6 +202,10 @@ public class Preferences{
         return getBoolValue("friendsblock", false);
     }
 
+    public static boolean dockbar_accent(){
+        return getBoolValue("dockbar_accent", false);
+    }
+
     public static boolean milkshake(){
         return getBoolValue("milkshake", false);
     }

app/src/main/java/ru/vtosters/lite/utils/Themes.java

@@ -1,5 +1,6 @@
 package ru.vtosters.lite.utils;
 
+import static android.graphics.Color.parseColor;
 import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
 import static ru.vtosters.lite.hooks.VKUIHook.isLoaded;
 import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaper;
@@ -10,6 +11,7 @@ import static ru.vtosters.lite.utils.Globals.getIdentifier;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.getResources;
 import static ru.vtosters.lite.utils.Preferences.color_grishka;
+import static ru.vtosters.lite.utils.Preferences.dockbar_accent;
 import static ru.vtosters.lite.utils.Preferences.milkshake;
 import static ru.vtosters.lite.utils.Preferences.navbar;
 import static ru.vtosters.lite.utils.Preferences.systemtheme;
@@ -367,6 +369,19 @@ public class Themes{
         return vkme() ? VKME : Default;
     }
 
+    public static ColorStateList getCSTDock(){
+        return new ColorStateList(
+                new int[][]{
+                        new int[]{android.R.attr.state_checked},
+                        new int[]{-android.R.attr.state_checked}
+                },
+                new int[]{
+                        dockbar_accent() ? parseColor("#ff528bcc") : (isDarkTheme() ? parseColor("#ffefefef") : parseColor("#ff545454")),
+                        dockbar_accent() ? parseColor("#ffaaaeb3") : (isDarkTheme() ? parseColor("#ff8a8d92") : parseColor("#ffaaaeb3"))
+                }
+        );
+    }
+
     public static void systemThemeChanger(Activity activity){ // ded
         boolean isDarkTheme = isDarkTheme();
 

smali/res/xml/preferences_interface.xml

@@ -60,11 +60,6 @@
             android:key="showmenu"
             android:summary="@string/menucuttersum"
             android:title="@string/menucutter" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="dockcounter"
-            android:summary="@string/docknumberssum"
-            android:title="@string/docknumbers" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="disableSettingsSumms"

smali/res/xml/preferences_themes.xml

@@ -25,11 +25,22 @@
             android:key="lighttheme"
             android:title="@string/appearance_theme_light_theme" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/vtlother">
+    <PreferenceCategory android:title="Докбар">
 <!--        <com.vtosters.lite.ui.MaterialSwitchPreference-->
 <!--            android:defaultValue="false"-->
 <!--            android:key="dockbar_tab_titles"-->
 <!--            android:title="@string/dockbar_tab_titles" />-->
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="dockbar_accent"
+            android:title="Использовать акцент для иконок" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="true"
+            android:key="dockcounter"
+            android:summary="@string/docknumberssum"
+            android:title="@string/docknumbers" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/vtlother">
         <Preference
             android:key="iconmanager"
             android:summary="Большой выбор иконок для приложения"