From 6db84cbc12c1b9d59ccbfea508d0013d8526ce15 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 26 Jul 2022 19:09:38 +0300
Subject: [PATCH] default prefs + fix default fragment

---
 .../java/ru/vtosters/lite/hooks/DockBarInjector.java   |  2 +-
 .../main/java/ru/vtosters/lite/utils/Preferences.java  | 10 +++++-----
 smali/res/xml/preferences_feed.xml                     |  8 ++++----
 smali/res/xml/preferences_interface.xml                |  2 +-
 smali/res/xml/preferences_themes.xml                   |  8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
index 129aacf17..cbe3924e3 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
@@ -97,7 +97,7 @@ public class DockBarInjector {
             add.setTitle(getContext().getString(tab.titleID));
             add.setCheckable(true);
         }
-        if (getBoolValue("dockbar_tab_titles", false)) {
+        if (getBoolValue("dockbar_tab_titles", true)) {
             var menuView = (BottomNavigationMenuView) navigationView.getChildAt(0);
             for (int i = 0; i < menuView.getChildCount(); i++) {
                 var item = (com.vtosters.lite.ui.bottomnavigation.BottomNavigationItemView) menuView.getChildAt(i);
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
index 1e86df56c..451a6ac85 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -102,11 +102,11 @@ public class Preferences{
     }
 
     public static boolean ads(){
-        return getBoolValue("__dbg_no_ads", false);
+        return getBoolValue("__dbg_no_ads", true);
     }
 
     public static boolean adsgroup(){
-        return getBoolValue("adsgroup", false);
+        return getBoolValue("adsgroup", true);
     }
 
     public static boolean vkme(){
@@ -114,11 +114,11 @@ public class Preferences{
     }
 
     public static boolean adsslider(){
-        return getBoolValue("__dbg_no_slider_ads", false);
+        return getBoolValue("__dbg_no_slider_ads", true);
     }
 
     public static boolean adsstories(){
-        return getBoolValue("adsstories", false);
+        return getBoolValue("adsstories", true);
     }
 
     public static boolean videofeed(){
@@ -207,7 +207,7 @@ public class Preferences{
     }
 
     public static boolean milkshake(){
-        return getBoolValue("milkshake", false);
+        return getBoolValue("milkshake", true);
     }
 
     public static boolean musicnewcatalog(){
diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml
index e3b1b3e6f..6f603bf2f 100644
--- a/smali/res/xml/preferences_feed.xml
+++ b/smali/res/xml/preferences_feed.xml
@@ -2,22 +2,22 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/vtad">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="__dbg_no_ads"
             android:summary="@string/feed_ads_regular_summary"
             android:title="@string/vtldads" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="adsgroup"
             android:summary="@string/vtldgadssummary"
             android:title="@string/vtldgads" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="__dbg_no_slider_ads"
             android:summary="@string/feed_ads_carousel_summary"
             android:title="@string/vtldca" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="adsstories"
             android:summary="@string/feed_ads_stories_summary"
             android:title="@string/vtldas" />
diff --git a/smali/res/xml/preferences_interface.xml b/smali/res/xml/preferences_interface.xml
index 83a0b8cc5..ace298ee3 100644
--- a/smali/res/xml/preferences_interface.xml
+++ b/smali/res/xml/preferences_interface.xml
@@ -18,7 +18,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/interfaceglobal">
         <com.vtosters.lite.ui.SummaryListPreference
-            android:defaultValue="newsfeed"
+            android:defaultValue="default"
             android:dialogTitle="@string/interfacestartfrsum"
             android:entries="@array/start"
             android:entryValues="@array/start_values"
diff --git a/smali/res/xml/preferences_themes.xml b/smali/res/xml/preferences_themes.xml
index febcf2918..3759d0523 100644
--- a/smali/res/xml/preferences_themes.xml
+++ b/smali/res/xml/preferences_themes.xml
@@ -2,10 +2,10 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/vtlthemes">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="milkshake"
-            android:summary="Глобальный редизайн ВКонтакте"
-            android:title="Milkshake тема" />
+            android:summary="Глобальный редизайн ВКонтакте как на новых версиях"
+            android:title="Милкшейк" />
         <Preference
             android:enabled="false"
             android:summary="@string/appearance_theme_info_summary"
@@ -27,7 +27,7 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="Докбар">
         <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="dockbar_tab_titles"
             android:title="@string/dockbar_tab_titles" />
         <com.vtosters.lite.ui.MaterialSwitchPreference