mini refactoring

app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java

@@ -3,7 +3,7 @@ package ru.vtosters.lite.ui.fragments.dockbar;
 import static ru.vtosters.lite.utils.Globals.getContext;
 import static ru.vtosters.lite.utils.Globals.getString;
 import static ru.vtosters.lite.utils.Preferences.newfeed;
-import static ru.vtosters.lite.utils.Preferences.olddock;
+import static ru.vtosters.lite.utils.Preferences.oldicons;
 
 import com.vk.apps.AppsFragment;
 import com.vk.discover.DiscoverFragment;
@@ -79,11 +79,11 @@ public class DockBarManager {
         File dockbar = new File(getContext().getFilesDir(), "dockbar.json");
 
         if (!dockbar.exists()) {
-            mSelectedTabs.add(new DockBarTab("tab_news", olddock() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? HomeFragment.class : NewsfeedFragment.class));
-            mSelectedTabs.add(new DockBarTab("tab_discover", olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, DiscoverFragment.class ));
-            mSelectedTabs.add(new DockBarTab("tab_messages", olddock() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class));
-            mSelectedTabs.add(new DockBarTab("tab_feedback", olddock() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class));
-            mSelectedTabs.add(new DockBarTab("tab_menu", olddock() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_news", oldicons() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? HomeFragment.class : NewsfeedFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_discover", oldicons() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, DiscoverFragment.class ));
+            mSelectedTabs.add(new DockBarTab("tab_messages", oldicons() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_feedback", oldicons() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class));
+            mSelectedTabs.add(new DockBarTab("tab_menu", oldicons() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class));
 
             mDisabledTabs.add(new DockBarTab("tab_friends", R.drawable.ic_user_24, R.string.friends, R.id.menu_friends, FriendsFragment.class));
             mDisabledTabs.add(new DockBarTab("tab_groups", R.drawable.ic_users_24, R.string.groups, R.id.menu_groups, GroupsFragment.class));

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

@@ -113,8 +113,8 @@ public class Preferences {
         return getBoolValue("adsgroup", false);
     }
 
-    public static boolean olddock() {
-        return getBoolValue("olddock", false);
+    public static boolean oldicons() {
+        return getBoolValue("oldicons", false);
     }
 
     public static boolean adsslider() {

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

@@ -229,6 +229,13 @@ public class Themes {
         return Color.argb(Color.alpha(color), red, green, blue);
     }
 
+    public static int fixTextColor(int resid) {
+        if (resid == R.color.music_action_button_gray || resid == R.color.cool_grey || resid == R.color.accent_blue){
+            return isDarkTheme()? R.color.white : R.color.cool_grey;
+        }
+        return resid;
+    }
+
     public static int halfAlpha(int src) {
         return ColorUtils.setAlphaComponent(src, 169);
     }

smali/res/values-ru/strings.xml

@@ -4290,7 +4290,7 @@
     <string name="appearance_other_color_webview_summary">Покраска страниц, таких как VKID, под тему приложения</string>
 
     <string name="interface_global_old_icons">Старые иконки</string>
-    <string name="interface_global_old_icons_summary">Использовать старые иконки в докбаре. Необходимо сбросить настройки докбара для применения изменений</string>
+    <string name="interface_global_old_icons_summary">Необходимо сбросить настройки докбара для применения изменений</string>
 
     <string name="activity_what_is_it">Что это за функция?</string>
     <string name="activity_dnr_summary">Функция позволяет вам не отправлять статус прочтения вами сообщения собеседника</string>

smali/res/values/strings.xml

@@ -4414,7 +4414,7 @@ May look like a fake leaving the online"</string>
     <string name="appearance_other_color_webview_summary">Color pages such as VKID in app theme</string>
 
     <string name="interface_global_old_icons">Old icons</string>
-    <string name="interface_global_old_icons_summary">Use old icons in dockbar. You should reset its setting to apply changes</string>
+    <string name="interface_global_old_icons_summary">You should reset its setting to apply changes</string>
 
     <string name="activity_what_is_it">What is it?</string>
     <string name="activity_dnr_summary">Function lets you don\'t send read message status</string>

smali/res/xml/preferences_interface.xml

@@ -39,11 +39,6 @@
             android:entryValues="@array/dateformat"
             android:key="dateformat"
             android:title="@string/interfaceglobaldates" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
-            android:key="olddock"
-            android:summary="@string/interface_global_old_icons_summary"
-            android:title="@string/interface_global_old_icons" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="shortinfo"

smali/res/xml/preferences_themes.xml

@@ -24,6 +24,11 @@
             android:key="systemtheme"
             android:summary="@string/appearance_theme_use_system_summary"
             android:title="@string/appearance_theme_use_system" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="oldicons"
+            android:summary="@string/interface_global_old_icons_summary"
+            android:title="@string/interface_global_old_icons" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vticon">

smali/smali_classes5/com/vk/video/a/VideoMenuActionsBuilder.smali

@@ -170,7 +170,6 @@
     .line 31
     invoke-virtual {p0, p1, v0, v1, v2}, Lcom/vk/video/a/VideoMenuActionsBuilder;->a(IIII)V
 
-
     :cond_8
     const p1, 0x7f0a0bcf