Fixes dockbar

app/src/main/java/com/vtosters/lite/R.java

@@ -161,7 +161,7 @@ public final class R {
         public static final int language = 0x7f030059;
         public static final int lang_value = 0x7f03005a;
         public static final int start = 0x7f03005b;
-        public static final int start_value = 0x7f03005c;
+        public static final int start_values = 0x7f03005c;
         public static final int proxy = 0x7f03005d;
         public static final int proxy_value = 0x7f03005e;
     }

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

@@ -21,7 +21,7 @@ import ru.vtosters.lite.utils.Helper;
 import ru.vtosters.lite.utils.Themes;
 
 public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditViewHolder>
-                    implements IItemTouchHelper {
+        implements IItemTouchHelper {
 
     public static final int SELECTED_TAB_TYPE = 1;
     public static final int DISABLED_TAB_TYPE = 2;
@@ -131,7 +131,7 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
         int fromViewType = getItemType(fromPosition);
         int toViewType = getItemType(toPosition);
 
-        if (fromPosition < toPosition)  {
+        if (fromPosition < toPosition) {
 
             if (fromViewType != toViewType) {
                 mDockBarManager.swapAndMigrate(this, fromPosition, toPosition);
@@ -142,7 +142,7 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
 
         } else if (toPosition != 0) {
 
-            if (fromViewType != toViewType){
+            if (fromViewType != toViewType) {
                 mDockBarManager.swapAndMigrate(this, fromPosition, toPosition);
             } else {
                 List<DockBarTab> list = fromViewType == 1 ? mDockBarManager.getSelectedTabs() : mDockBarManager.getDisabledTabs();
@@ -163,7 +163,6 @@ public class DockBarAdapter extends RecyclerView.a<DockBarAdapter.DockBarEditVie
     }
 
 
-
     static class DockBarEditViewHolder extends RecyclerView.x {
 
         private LinearLayout mTabContainer;

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

@@ -1,7 +1,11 @@
 package ru.vtosters.lite.ui.fragments.dockbar;
 
+import static ru.vtosters.lite.utils.Themes.color_grishka;
+import static ru.vtosters.lite.utils.Themes.isAndroidMonet;
+
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -25,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 
 import ru.vtosters.lite.utils.Helper;
+import ru.vtosters.lite.utils.Themes;
 
 public class DockBarInjector {
     private static final DockBarManager sManager = DockBarManager.getInstance();
@@ -63,6 +68,9 @@ public class DockBarInjector {
             MenuItem add = menu.add(0, tab.id, 0, tab.titleID);
             Drawable drawable = Helper.GetContext().getResources().getDrawable(tab.iconID);
             ColorStateList colorStateList = Helper.GetContext().getResources().getColorStateList(com.vtosters.lite.R.color.bottom_navigation_item);
+            if (isAndroidMonet()) {
+                colorStateList = ColorStateList.valueOf(Themes.getAccentColor());
+            }
             add.setIcon((Drawable) new RecoloredDrawable(drawable, colorStateList));
             add.setShowAsAction(1);
             add.setCheckable(true);

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

@@ -753,8 +753,10 @@ public class Prefs {
     }
 
     public static Class getStartFragment() {
-        return DockBarManager.getInstance().getSelectedTabs().get(0).fragmentClass;
-        /*String string = ru.vtosters.lite.utils.Helper.GetPreferences().getString("start_value", "");
+        String string = ru.vtosters.lite.utils.Helper.GetPreferences().getString("start_values", "");
+        if (string.equals("default")) {
+            return DockBarManager.getInstance().getSelectedTabs().get(0).fragmentClass;
+        }
         if (string.equals("newsfeed")) {
             return Feed2049.b.c();
         }
@@ -809,7 +811,7 @@ public class Prefs {
         if (string.equals("docs")) {
             return DocumentsViewFragment.class;
         }
-        return string.equals("brtd") ? BirthdaysFragment.class : Feed2049.b.c();*/
+        return string.equals("brtd") ? BirthdaysFragment.class : DockBarManager.getInstance().getSelectedTabs().get(0).fragmentClass;
     }
 
     public static Context BaseContextLocale(Context context) {

smali/res/values-ru/arrays.xml

@@ -445,6 +445,7 @@
         <item>Украинский</item>
     </string-array>
     <string-array name="start">
+        <item>Стандартное</item>
         <item>Новости</item>
         <item>Диалоги</item>
         <item>Меню</item>

smali/res/values/arrays.xml

@@ -585,6 +585,7 @@
         <item>uk</item>
     </string-array>
     <string-array name="start">
+        <item>Default</item>
         <item>Newsfeed</item>
         <item>Dialogs</item>
         <item>Menu</item>
@@ -605,7 +606,8 @@
         <item>Games</item>
         <item>Bookmarks</item>
     </string-array>
-    <string-array name="start_value">
+    <string-array name="start_values">
+        <item>default</item>
         <item>newsfeed</item>
         <item>messenger</item>
         <item>menu</item>

smali/res/values/public.xml

@@ -151,7 +151,7 @@
     <public type="array" name="language" id="0x7f030059" />
     <public type="array" name="lang_value" id="0x7f03005a" />
     <public type="array" name="start" id="0x7f03005b" />
-    <public type="array" name="start_value" id="0x7f03005c" />
+    <public type="array" name="start_values" id="0x7f03005c" />
     <public type="array" name="proxy" id="0x7f03005d" />
     <public type="array" name="proxy_value" id="0x7f03005e" />
     <public type="attr" name="BMSB_auto" id="0x7f040000" />

smali/res/xml/preferences_interface.xml

@@ -8,7 +8,7 @@
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/interfaceglobal">
-        <com.vtosters.lite.ui.SummaryListPreference android:entries="@array/start" android:title="@string/interfacestartfr" android:key="start_value" android:defaultValue="newsfeed" android:dialogTitle="@string/interfacestartfrsum" android:entryValues="@array/start_value" />
+        <com.vtosters.lite.ui.SummaryListPreference android:entries="@array/start" android:title="@string/interfacestartfr" android:key="start_values" android:defaultValue="newsfeed" android:dialogTitle="@string/interfacestartfrsum" android:entryValues="@array/start_values" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfaceglobaldates" android:key="fulltime" android:summary="@string/interfaceglobaldatessum" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfaceglobalnum" android:key="shortinfo" android:summary="@string/interfaceglobalnumsum" android:defaultValue="true" />
         <com.vtosters.lite.ui.MaterialSwitchPreference android:title="@string/interfaceglobalpost" android:key="shortpost" android:summary="@string/interfaceglobalpostsum" android:defaultValue="true" />