Fixed statusbar and navbar light coloring

app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java

@@ -27,7 +27,6 @@ import java.util.regex.Pattern;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import ru.f0x1d.net.F0x1dRequest;
-import ru.vtosters.lite.utils.Preferences;
 
 public class FoafBase {
     private static final Pattern FOAF_REGEX = Pattern.compile("<ya:created dc:date=\"(.+?)\"\\/>");

app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java

@@ -8,8 +8,8 @@ import static ru.vtosters.lite.utils.Globals.getIdentifier;
 import static ru.vtosters.lite.utils.Globals.getResources;
 import static ru.vtosters.lite.utils.Globals.getString;
 import static ru.vtosters.lite.utils.Themes.getAccentColor;
-import static ru.vtosters.lite.utils.Themes.getNavbarColor;
 import static ru.vtosters.lite.utils.Themes.getSTextAttr;
+import static ru.vtosters.lite.utils.Themes.getTabbarBackground;
 import static ru.vtosters.lite.utils.Themes.getTextAttr;
 import static ru.vtosters.lite.utils.Themes.recolorDrawable;
 
@@ -372,7 +372,7 @@ public class StickersFragment extends ToolbarFragment {
             holder.switchCompat.setOnCheckedChangeListener((buttonView, isChecked) -> stickersService.setPackEnabled(pack, isChecked, false));
             holder.count.setText(pack.stickersCount + " " + getString("stickerscount"));
 
-            holder.layout.setBackgroundColor(getNavbarColor());
+            holder.layout.setBackgroundColor(getTabbarBackground());
 
             // Color костыль
             int color = getTextAttr();

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

@@ -1,7 +1,7 @@
 package ru.vtosters.lite.utils;
 
 import static ru.vtosters.lite.utils.Globals.getContext;
-import static ru.vtosters.lite.utils.Globals.getPreferences;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.BooleanFalse;
 
 import android.content.ContentValues;
@@ -76,7 +76,7 @@ public class DeletedMessagesHandler {
     }
 
     private static String getPreifxUndelete() {
-        String string = getPreferences().getString("undeletemsg_prefix", "");
+        String string = getPrefsValue("undeletemsg_prefix");
         if (string.isEmpty()) {
             return "[Удалено] ";
         }

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

@@ -41,6 +41,10 @@ public class Globals {
         return prefs;
     }
 
+    public static String getPrefsValue(String pref) {
+        return getPreferences().getString(pref, "");
+    }
+
     // Current UserId
     public static int getUserId() {
         return VKAccountManager.b().a();
@@ -162,14 +166,14 @@ public class Globals {
         try {
             if (Build.VERSION.SDK_INT >= 26) {
                 NotificationManager notificationManager = (NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE);
-                boolean z = false;
+                boolean hasMusicChannel = false;
                 try {
                     if (notificationManager.getNotificationChannel("audio_playback_channel") != null) {
-                        z = true;
+                        hasMusicChannel = true;
                     }
                 } catch (Exception ignored) {
                 }
-                if (!z) {
+                if (!hasMusicChannel) {
                     notificationManager.createNotificationChannel(new NotificationChannel("audio_playback_channel", getResources().getString(com.vtosters.lite.R.string.audio_message_play_error), NotificationManager.IMPORTANCE_LOW));
                 }
             }

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

@@ -3,7 +3,7 @@ package ru.vtosters.lite.utils;
 import static java.lang.Long.MAX_VALUE;
 import static ru.vtosters.lite.ui.fragments.dockbar.DockBarManager.getInstance;
 import static ru.vtosters.lite.utils.Globals.getContext;
-import static ru.vtosters.lite.utils.Globals.getPreferences;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.BooleanTrue;
 import static ru.vtosters.lite.utils.Preferences.adsgroup;
 import static ru.vtosters.lite.utils.Preferences.adsstories;
@@ -65,10 +65,10 @@ public class Newsfeed {
         getFilter("default_ad_list", "StandartFilter.txt");
         getFilter("shitposting", "IDontWantToReadIt.txt");
 
-        String string = getPreferences().getString("spamfilters", "");
+        String customfilters = getPrefsValue("spamfilters");
 
-        if (!string.isEmpty()) {
-            mFilters.addAll(Arrays.asList(string.split(", ")));
+        if (!customfilters.isEmpty()) {
+            mFilters.addAll(Arrays.asList(customfilters.split(", ")));
         }
 
     }
@@ -94,11 +94,11 @@ public class Newsfeed {
 
     public static boolean injectFilters(JSONObject jSONObject) {
         String optString = jSONObject.optString(NavigatorKeys.j, "");
-        if (!ads(optString) && !authors_rec(optString) && !recomm(optString) && !friendrecomm(optString)) {
+        if (!ads(optString) && !checkCopyright(optString) && !authors_rec(optString) && !recomm(optString) && !friendrecomm(optString)) {
             String optString2 = jSONObject.optString("post_type", "");
             if (!ads(optString2) && !authors_rec(optString2) && !recomm(optString2) && !friendrecomm(optString2)) {
                 String optString3 = jSONObject.optString("filters", "");
-                if (ads(optString3) || authors_rec(optString3) || recomm(optString3) || friendrecomm(optString3) || isBlockedByFilter(jSONObject.optString(NavigatorKeys.x, "")) || checkCopyright(jSONObject) || captions(jSONObject)) {
+                if (ads(optString3) || authors_rec(optString3) || recomm(optString3) || friendrecomm(optString3) || isBlockedByFilter(jSONObject.optString(NavigatorKeys.x, "")) || captions(jSONObject)) {
                     return false;
                 }
                 return !AD(jSONObject);
@@ -142,8 +142,8 @@ public class Newsfeed {
         return jSONObject.optInt("marked_as_ads", 0) == 1 && adsgroup();
     }
 
-    public static boolean checkCopyright(JSONObject jSONObject) {
-        return jSONObject.optInt("copyright", 0) == 1 && copyright_post();
+    public static boolean checkCopyright(String str) {
+        return str.equals("copyright") && copyright_post();
     }
 
     public static String friendsads() {
@@ -171,7 +171,7 @@ public class Newsfeed {
     }
 
     public static String getCommentsSort(String def) {
-        switch (getPreferences().getString("commentssort", "")) {
+        switch (getPrefsValue("commentssort")) {
             case "new":
                 return "desc";
             case "old":
@@ -182,7 +182,7 @@ public class Newsfeed {
     }
 
     public static long getUpdateNewsfeed(boolean refresh_timeout) {
-        switch (getPreferences().getString("newsupdate", "")) {
+        switch (getPrefsValue("newsupdate")) {
             case "no_update":
                 return MAX_VALUE;
             case "imd_update":
@@ -193,7 +193,7 @@ public class Newsfeed {
     }
 
     public static Class getStartFragment() {
-        switch (getPreferences().getString("start_values", "")) {
+        switch (getPrefsValue("start_values")) {
             case "newsfeed":
                 return newfeed() ? HomeFragment.class : NewsfeedFragment.class;
             case "messenger":

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

@@ -37,18 +37,15 @@ public class OEMDetector {
 
     private static String getSystemProperty(String str) {
         BufferedReader bufferedReader;
-        Throwable th;
-        BufferedReader bufferedReader2 = null;
         try {
             bufferedReader = new BufferedReader(new InputStreamReader(Runtime.getRuntime().exec("getprop " + str).getInputStream()), 1024);
             try {
-                String readLine = bufferedReader.readLine();
                 try {
                     bufferedReader.close();
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
-                return readLine;
+                return bufferedReader.readLine();
             } catch (IOException ignored) {
             }
         } catch (Throwable ignored) {

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

@@ -4,7 +4,7 @@ import static ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager.mig
 import static ru.vtosters.lite.utils.DeletedMessagesHandler.reloadMessagesList;
 import static ru.vtosters.lite.utils.Globals.fixGapps;
 import static ru.vtosters.lite.utils.Globals.getContext;
-import static ru.vtosters.lite.utils.Globals.getPreferences;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.registerActivities;
 import static ru.vtosters.lite.utils.Newsfeed.setupFilters;
 import static ru.vtosters.lite.utils.OpusLoader.LoadLibrary;
@@ -237,6 +237,10 @@ public class Preferences {
         return dnr() ? "messages.markAsRead" : "null";
     }
 
+    public static String copyrightfix() {
+        return copyright_post() ? "copyright" : "ads_easy_promote";
+    }
+
     public static boolean refsfilter() {
         return BooleanFalse("refsfilter");
     }
@@ -298,7 +302,7 @@ public class Preferences {
     }
 
     public static int getMsgCount() {
-        String customvalue = getPreferences().getString("msgcount", "");
+        String customvalue = getPrefsValue("msgcount");
         return customvalue.isEmpty() ? 30 : Integer.parseInt(customvalue);
     }
 
@@ -323,13 +327,11 @@ public class Preferences {
     }
 
     public static String VKVersion() {
-        String string = getPreferences().getString("vkver", "");
-        return !string.isEmpty() ? string : VKVER;
+        return VKVER;
     }
 
     public static int VKVersionBuild() {
-        String string = getPreferences().getString("vkbuild", "");
-        return !string.isEmpty() ? Integer.parseInt(string) : VKBUILD;
+        return VKBUILD;
     }
 
     public static long VKVersionBuildLong() {
@@ -337,7 +339,7 @@ public class Preferences {
     }
 
     public static String getLocale() {
-        String string = getPreferences().getString("lang_value", "");
+        String string = getPrefsValue("lang_value");
         if (string.equals("system")) {
             return Locale.getDefault().getLanguage();
         }

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

@@ -1,25 +1,23 @@
 package ru.vtosters.lite.utils;
 
-import static java.lang.System.*;
-import static ru.vtosters.lite.utils.Globals.*;
-import static ru.vtosters.lite.utils.Preferences.*;
+import static java.lang.System.clearProperty;
+import static java.lang.System.getProperties;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
+import static ru.vtosters.lite.utils.Preferences.BooleanFalse;
 
 import java.util.Properties;
 
 public class Proxy {
     public static String getOauthComAuth() {
-        String oauthComHttps = getOauthComHttps();
-        return oauthComHttps + "/authorize";
+        return getOauthComHttps() + "/authorize";
     }
 
     public static String getOauthComAuthClient() {
-        String oauthComAuth = getOauthComAuth();
-        return oauthComAuth + "?client_id=";
+        return getOauthComAuth() + "?client_id=";
     }
 
     public static String getOauthComBlank() {
-        String oauthComHttps = getOauthComHttps();
-        return oauthComHttps + "/blank.html";
+        return getOauthComHttps() + "/blank.html";
     }
 
     public static String getOauthComBlankRedirect() {
@@ -31,8 +29,7 @@ public class Proxy {
     }
 
     public static String getStaticComSupport() {
-        String staticCom = getStaticCom();
-        return staticCom + "/support";
+        return getStaticCom() + "/support";
     }
 
     public static String oauthFix() {
@@ -40,7 +37,7 @@ public class Proxy {
     }
 
     public static String getApiCom() {
-        String string = getPreferences().getString("proxyapi", "");
+        String string = getPrefsValue("proxyapi");
         if (!proxy() & string.isEmpty()) {
             return "api.vk.com";
         }
@@ -48,7 +45,7 @@ public class Proxy {
     }
 
     public static String getAwayPhpCom() {
-        String string = getPreferences().getString("proxyapi", "");
+        String string = getPrefsValue("proxyapi");
         if (!proxy() & string.isEmpty()) {
             return "m.vk.com";
         }
@@ -56,7 +53,7 @@ public class Proxy {
     }
 
     public static String getOauthCom() {
-        String string = getPreferences().getString("proxyoauth", "");
+        String string = getPrefsValue("proxyoauth");
         if (!proxy() & string.isEmpty()) {
             return "oauth.vk.com";
         }
@@ -64,7 +61,7 @@ public class Proxy {
     }
 
     public static String getStaticCom() {
-        String string = getPreferences().getString("proxystatic", "");
+        String string = getPrefsValue("proxystatic");
         if (!proxy() & string.isEmpty()) {
             return "static.vk.com";
         }
@@ -73,7 +70,7 @@ public class Proxy {
 
     public static String staticFix(String str) {
         String str2;
-        String string = getPreferences().getString("proxystatic", "");
+        String string = getPrefsValue("proxystatic");
         if (!proxy() & string.isEmpty()) {
             return str;
         }
@@ -83,7 +80,7 @@ public class Proxy {
 
     public static void setProxy() {
         Properties properties = getProperties();
-        switch (getPreferences().getString("proxy", "")) {
+        switch (getPrefsValue("proxy")) {
             case "zaborona":
                 properties.setProperty("socksProxyHost", "socks.zaboronahelp.pp.ua");
                 properties.setProperty("socksProxyPort", "1488");
@@ -157,57 +154,57 @@ public class Proxy {
     }
 
     public static String proxyHostHTTP() {
-        String string = getPreferences().getString("proxyHostHTTP", "");
+        String string = getPrefsValue("proxyHostHTTP");
         return string.isEmpty() ? "192.168.0.1" : string;
     }
 
     public static String proxyHostHTTPS() {
-        String string = getPreferences().getString("proxyHostHTTPS", "");
+        String string = getPrefsValue("proxyHostHTTPS");
         return string.isEmpty() ? "192.168.0.1" : string;
     }
 
     public static String proxyHostSocks() {
-        String string = getPreferences().getString("proxyHostSocks", "");
+        String string = getPrefsValue("proxyHostSocks");
         return string.isEmpty() ? "192.168.0.1" : string;
     }
 
     public static String proxyPortHTTP() {
-        String string = getPreferences().getString("proxyPortHTTP", "");
+        String string = getPrefsValue("proxyPortHTTP");
         return string.isEmpty() ? "8888" : string;
     }
 
     public static String proxyPortHTTPS() {
-        String string = getPreferences().getString("proxyPortHTTPS", "");
+        String string = getPrefsValue("proxyPortHTTPS");
         return string.isEmpty() ? "8888" : string;
     }
 
     public static String proxyPortSocks() {
-        String string = getPreferences().getString("proxyPortSocks", "");
+        String string = getPrefsValue("proxyPortSocks");
         return string.isEmpty() ? "8888" : string;
     }
 
     public static String proxyUserHTTP() {
-        String string = getPreferences().getString("proxyUserHTTP", "");
+        String string = getPrefsValue("proxyUserHTTP");
         return string.isEmpty() ? "" : string;
     }
 
     public static String proxyUserHTTPS() {
-        String string = getPreferences().getString("proxyUserHTTPS", "");
+        String string = getPrefsValue("proxyUserHTTPS");
         return string.isEmpty() ? "" : string;
     }
 
     public static String proxyPassHTTP() {
-        String string = getPreferences().getString("proxyPassHTTP", "");
+        String string = getPrefsValue("proxyPassHTTP");
         return string.isEmpty() ? "" : string;
     }
 
     public static String proxyPassHTTPS() {
-        String string = getPreferences().getString("proxyPassHTTPS", "");
+        String string = getPrefsValue("proxyPassHTTPS");
         return string.isEmpty() ? "" : string;
     }
 
     public static boolean proxy() {
-        return getPreferences().getString("proxy", "").equals("apiproxy");
+        return getPrefsValue("proxy").equals("apiproxy");
     }
 
     // Official vk proxy enforcer

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

@@ -1,7 +1,7 @@
 package ru.vtosters.lite.utils;
 
 import static ru.vtosters.lite.utils.About.getBuildNumber;
-import static ru.vtosters.lite.utils.Globals.getPreferences;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Globals.getUserSecret;
 import static ru.vtosters.lite.utils.Globals.getUserToken;
 import static ru.vtosters.lite.utils.Preferences.dev;
@@ -17,7 +17,7 @@ public class SSFS {
     }
 
     public static String SSFSDomain() {
-        String string = getPreferences().getString("ssfscustom", "");
+        String string = getPrefsValue("ssfscustom");
         if (!string.isEmpty()) {
             return string;
         }
@@ -29,8 +29,7 @@ public class SSFS {
     }
 
     public static String getAmoledVKUI() {
-        String string = getPreferences().getString("darktheme", "");
-        return string.equals("amoled") ? "1" : "0";
+        return getPrefsValue("darktheme").equals("amoled") ? "1" : "0";
     }
 
     public static String getUserProxy() {

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

@@ -1,7 +1,8 @@
 package ru.vtosters.lite.utils;
 
+import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
 import static ru.vtosters.lite.utils.Globals.getContext;
-import static ru.vtosters.lite.utils.Globals.getPreferences;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.color_grishka;
 import static ru.vtosters.lite.utils.Preferences.isBGStickersEnabled;
 import static ru.vtosters.lite.utils.Preferences.navbar;
@@ -14,6 +15,7 @@ import android.content.res.Configuration;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.v7.widget.Toolbar;
+import android.view.View;
 import android.view.Window;
 import android.widget.ImageButton;
 
@@ -41,6 +43,10 @@ public class Themes {
         return VKThemeHelper.a(R.attr.tabbar_background);
     }
 
+    public static int getBackgroundContent() {
+        return VKThemeHelper.a(R.attr.background_content);
+    }
+
     public static int getHeaderBackground() {
         return VKThemeHelper.a(R.attr.header_background);
     }
@@ -57,8 +63,30 @@ public class Themes {
         return getContext().getResources().getIdentifier("VkIm.Theme.VkApp.Amoled", "style", getContext().getPackageName());
     }
 
+    public static int getHeaderText() {
+        return VKThemeHelper.a(R.attr.header_text);
+    }
+
+    public static void setBarTheme(View getview) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            getview.setSystemUiVisibility(getNeededColorNavbar() | getNeededColorStatusbar());
+        }
+    }
+
+    public static int getNeededColorStatusbar() {
+        return VKThemeHelper.d() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? 8192 : 0;
+    }
+
+    public static int getNeededColorNavbar() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? VKThemeHelper.d() ? SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR : 0 : 0;
+    }
+
+    public static int getNeededColorStatusbarFix() {
+        return VKThemeHelper.d() ? 8192 : 0;
+    }
+
     public static VKTheme getDarkTheme() {
-        switch (getPreferences().getString("darktheme", "")) {
+        switch (getPrefsValue("darktheme")) {
             case "amoled":
                 return VKTheme.AMOLED;
             default:
@@ -67,7 +95,7 @@ public class Themes {
     }
 
     public static ImTheme getImDarkTheme() {
-        switch (getPreferences().getString("darktheme", "")) {
+        switch (getPrefsValue("darktheme")) {
             case "amoled":
                 return ImTheme.VKAPP_AMOLED;
             default:
@@ -76,14 +104,14 @@ public class Themes {
     }
 
     public static VKTheme getLightTheme() {
-        switch (getPreferences().getString("lighttheme", "")) {
+        switch (getPrefsValue("lighttheme")) {
             default:
                 return VKTheme.DEFAULT_LIGHT;
         }
     }
 
     public static ImTheme getImLightTheme() {
-        switch (getPreferences().getString("lighttheme", "")) {
+        switch (getPrefsValue("lighttheme")) {
             default:
                 return ImTheme.VKAPP_LIGHT;
         }
@@ -93,10 +121,6 @@ public class Themes {
         return VKThemeHelper.a(attr);
     }
 
-    public static int getHeaderText() {
-        return VKThemeHelper.a(R.attr.header_text);
-    }
-
     public static boolean isAndroidMonet() {
         return color_grishka() && Build.VERSION.SDK_INT >= 31;
     }
@@ -152,7 +176,8 @@ public class Themes {
 
     public static void setNavbarColor(Window window, int i) {
         if (navbar() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            window.setNavigationBarColor(getNavbarColor());
+            window.setNavigationBarColor(getTabbarBackground());
+            window.getDecorView().setSystemUiVisibility(getNeededColorNavbar());
         }
     }
 
@@ -187,10 +212,6 @@ public class Themes {
         return vksans() ? R.font.vk_sans_text_regular : R.font.roboto_regular;
     }
 
-    public static int getNavbarColor() {
-        return VKThemeHelper.a(R.attr.tabbar_background);
-    }
-
     public static String getBackgroundStickers() {
         if (isBGStickersEnabled()) {
             return "images_with_background";

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

@@ -1,7 +1,7 @@
 package ru.vtosters.lite.utils;
 
 import static ru.vtosters.lite.utils.Globals.getContext;
-import static ru.vtosters.lite.utils.Globals.getPreferences;
+import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Themes.getColorFromAttr;
 import static ru.vtosters.lite.utils.Themes.hex;
 
@@ -66,7 +66,7 @@ public class VKUIInjector {
     }
 
     public static void inject(WebView webView) {
-        String string = getPreferences().getString("darktheme", "");
+        String string = getPrefsValue("darktheme");
         if (Preferences.BooleanTrue("VKUI_INJ")) {
             if (!isLoaded) {
                 load();

smali/res/drawable/music_section_special2_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
-        android:startColor="#fff8f8f8"
-        android:endColor="#ffffffff"
+        android:startColor="?background_content"
+        android:endColor="?background_content"
         android:angle="90.0" />
 </shape>

smali/res/layout-v21/overlay_toolbar_loader_fragment.xml

@@ -9,7 +9,7 @@
 
     <FrameLayout
         android:id="@id/appkit_loader_content"
-        android:background="#ffffffff"
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
 

smali/res/layout/appkit_error.xml

@@ -6,6 +6,7 @@
 
     <LinearLayout
         android:gravity="center"
+        android:background="?background_content"
         android:layout_gravity="center"
         android:orientation="vertical"
         android:padding="16.0dip"

smali/res/layout/appkit_load_more.xml

@@ -14,6 +14,7 @@
         android:orientation="horizontal"
         android:id="@id/load_more_error"
         android:padding="16.0dip"
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="76.0dip">
 

smali/res/layout/appkit_loading.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:background="?background_content"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <ProgressBar

smali/res/layout/fab_loader_fragment.xml

@@ -10,7 +10,7 @@
 
     <android.support.design.widget.CoordinatorLayout
         android:id="@id/appkit_loader_content"
-        android:background="#ffffffff"
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
 

smali/res/layout/music_fragment_playlist.xml

@@ -55,7 +55,7 @@
 
                     <TextView
                         android:textSize="17.0dip"
-                        android:textColor="?text_primary"
+                        android:textColor="?header_text"
                         android:ellipsize="end"
                         android:gravity="center_horizontal"
                         android:id="@id/playlist_title"

smali/res/layout/music_playlist_item2.xml

@@ -21,7 +21,7 @@
     <TextView
         android:textSize="14.0dip"
         android:textStyle="normal"
-        android:textColor="?text_primary"
+        android:textColor="?header_text"
         android:ellipsize="end"
         android:gravity="center_vertical"
         android:id="@id/playlist_title"

smali/res/layout/music_tablet_playlist_header.xml

@@ -36,7 +36,7 @@
 
     <TextView
         android:textSize="17.0dip"
-        android:textColor="?text_primary"
+        android:textColor="?header_text"
         android:ellipsize="end"
         android:id="@id/playlist_title"
         android:layout_width="0.0dip"

smali/res/layout/overlay_toolbar_loader_fragment.xml

@@ -9,7 +9,7 @@
 
     <FrameLayout
         android:id="@id/appkit_loader_content"
-        android:background="#ffffffff"
+        android:background="?background_content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
 

smali/res/xml/preferences_activity.xml

@@ -3,8 +3,12 @@
     <PreferenceCategory android:title="@string/dnr">
         <Preference
             android:enabled="false"
-            android:summary="Функция позволяет вам не отправлять статус вашего набора/написания сообщения"
+            android:summary="Функция позволяет вам не отправлять статус прочтения вами сообщения собеседника"
             android:title="Что это за функция?" />
+        <Preference
+            android:enabled="false"
+            android:summary="Визуально может работать некорректно (сообщение прочиталось локально), но у собеседника оно прочитано не будет"
+            android:title="Внимание!" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="read_pm"
@@ -22,12 +26,8 @@
     <PreferenceCategory android:title="@string/dnw">
         <Preference
             android:enabled="false"
-            android:summary="Функция позволяет вам не отправлять статус прочтения вами сообщения собеседника"
+            android:summary="Функция позволяет вам не отправлять статус вашего набора/написания сообщения"
             android:title="Что это за функция?" />
-        <Preference
-            android:enabled="false"
-            android:summary="Визуально может работать некорректно (сообщение прочиталось локально), но у собеседника она прочитана не будет"
-            android:title="Внимание!" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="write_pm"
@@ -95,15 +95,5 @@
             android:key="benchmark"
             android:summary="@string/benchapisummary"
             android:title="@string/benchapi" />
-        <EditTextPreference
-            android:defaultValue="7.24"
-            android:key="vkver"
-            android:summary="Требуется перезапуск"
-            android:title="Подмена версии ВК" />
-        <EditTextPreference
-            android:defaultValue="12116"
-            android:key="vkbuild"
-            android:summary="Требуется перезапуск"
-            android:title="Подмена версии билда ВК" />
     </PreferenceCategory>
 </PreferenceScreen>

smali/res/xml/preferences_debug.xml

@@ -3,7 +3,7 @@
     android:key="preferences_debug">
     <Preference
         android:enabled="false"
-        android:summary="Данное меню предназначено только для тестирования работоспособности приложения. Если вы являетесь рядовым юзером, то вам не следует ничего не трогать в данных настройках!"
+        android:summary="Данное меню предназначено только для тестирования работоспособности приложения. Если вы являетесь рядовым юзером, то вам не следует ничего не трогать в данных настройках (пожалуйста)"
         android:title="Внимание!" />
     <com.vtosters.lite.ui.MaterialSwitchPreference
         android:defaultValue="false"

smali/res/xml/preferences_feed.xml

@@ -19,8 +19,13 @@
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="adsstories"
-            android:summary="Реклама при перехеходе между историями"
+            android:summary="Реклама при переходе между историями"
             android:title="@string/vtldas" />
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+            android:defaultValue="false"
+            android:key="copyright_post"
+            android:summary="В большенстве случаев рекламные посты с пометкой источника рекламодателя"
+            android:title="Отключить посты с источником" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/vtlfilters">

smali/res/xml/preferences_interface.xml

@@ -14,7 +14,6 @@
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="true"
             android:key="swipe"
-            android:summary="@string/interfacenewsfeedswipesum"
             android:title="@string/interfacenewsfeedswipe" />
         <com.vtosters.lite.ui.MaterialSectionDividerPreference />
     </PreferenceCategory>

smali/res/xml/preferences_messages.xml

@@ -43,7 +43,7 @@
             android:entries="@array/msgcount_value"
             android:entryValues="@array/msgcount"
             android:key="msgcount"
-            android:title="Количество загружаемых сообщений" />
+            android:title="Количество загружаемых сразу сообщений" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="convUsersOnline"

smali/smali/com/vk/common/view/tips/VKBottomSheetDialog.smali

@@ -79,6 +79,8 @@
     const/16 v1, 0xd04
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setSystemUiVisibility(I)V
+
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 

smali/smali/com/vk/im/engine/commands/dialogs/DialogsHistoryGetArgs.smali

@@ -92,6 +92,10 @@
 
     iput-object p2, p0, Lcom/vk/im/engine/commands/dialogs/DialogsHistoryGetArgs;->c:Lcom/vk/im/engine/models/dialogs/DialogsFilter;
 
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getMsgCount()I
+
+    move-result p3
+
     iput p3, p0, Lcom/vk/im/engine/commands/dialogs/DialogsHistoryGetArgs;->d:I
 
     iput-object p4, p0, Lcom/vk/im/engine/commands/dialogs/DialogsHistoryGetArgs;->e:Lcom/vk/im/engine/models/Source;

smali/smali/com/vk/polls/ui/views/AbstractPollView.smali

@@ -1089,6 +1089,10 @@
     :cond_c
     const v5, -0x8e8a86
 
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getTextAttr()I
+
+    move-result v5
+
     :goto_6
     invoke-virtual {v1, v5}, Landroid/widget/TextView;->setTextColor(I)V
 
@@ -1406,7 +1410,12 @@
     :cond_2
     const v7, -0x8e8a86
 
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getTextAttr()I
+
+    move-result v7
+
     :goto_1
+    .line 180
     invoke-virtual {v6, v7}, Landroid/widget/TextView;->setTextColor(I)V
 
     .line 268
@@ -1532,6 +1541,10 @@
     :cond_7
     const v6, -0xd3d2d2
 
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getTextAttr()I
+
+    move-result v6
+
     :goto_3
     invoke-virtual {v5, v6}, Lcom/vk/core/widget/AdaptiveSizeTextView;->setTextColor(I)V
 
@@ -1580,7 +1593,9 @@
 
     if-eqz v0, :cond_a
 
-    const v2, -0x29000001
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getTextAttr()I
+
+    move-result v2
 
     :cond_a
     invoke-virtual {p1, v2}, Landroid/widget/TextView;->setTextColor(I)V

smali/smali/com/vtosters/lite/live/views/broadcast/BroadcastView.smali

@@ -681,6 +681,8 @@
     .line 249
     invoke-virtual {v0, v1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_0
     return-void
 .end method
@@ -727,6 +729,8 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_0
     return-void
 .end method

smali/smali_classes2/android/support/design/widget/CoordinatorLayout.smali

@@ -2419,6 +2419,8 @@
     .line 3218
     invoke-virtual {p0, v0}, Landroid/support/design/widget/CoordinatorLayout;->setSystemUiVisibility(I)V
 
+    invoke-static {p0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     goto :goto_0
 
     :cond_2

smali/smali_classes2/com/vk/im/engine/commands/messages/MsgMarkAsReadViaBgCmd.smali

@@ -226,6 +226,17 @@
 .method public b(Lcom/vk/im/engine/ImEnvironment;)V
     .locals 6
 
+    iget v0, p0, Lcom/vk/im/engine/commands/messages/MsgMarkAsReadViaBgCmd;->b:I
+
+    invoke-static {v0}, Lru/vtosters/lite/dnr/DNRModule;->isDnrEnabledFor(I)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_beb
+
+    return-void
+
+    :cond_beb
     const-string v0, "env"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->b(Ljava/lang/Object;Ljava/lang/String;)V

smali/smali_classes2/com/vk/im/engine/internal/jobs/msg/MsgMarkAsReadJob.smali

@@ -80,8 +80,19 @@
 .end method
 
 .method public a(Lcom/vk/im/engine/ImEnvironment;Lcom/vk/instantjobs/InstantJob$b;)V
-    .locals 3
+    .locals 4
 
+    iget v0, p0, Lcom/vk/im/engine/internal/jobs/msg/MsgMarkAsReadJob;->b:I
+
+    invoke-static {v0}, Lru/vtosters/lite/dnr/DNRModule;->isDnrEnabledFor(I)Z
+
+    move-result v3
+
+    if-eqz v3, :cond_beb
+
+    return-void
+
+    :cond_beb
     const-string v0, "env"
 
     invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->b(Ljava/lang/Object;Ljava/lang/String;)V

smali/smali_classes2/com/vk/navigation/NavigationDelegateBottom$l.smali

@@ -120,6 +120,8 @@
 
     invoke-virtual {p1, v1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     goto :goto_1
 
     :cond_1
@@ -175,6 +177,8 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_2
     :goto_1
     return-void

smali/smali_classes2/com/vk/sharing/SharingActivity.smali

@@ -663,6 +663,8 @@
     .line 399
     invoke-virtual {v0, v1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     .line 403
     :cond_0
     invoke-virtual {p0, v2, v2}, Lcom/vk/sharing/SharingActivity;->overridePendingTransition(II)V

smali/smali_classes2/com/vk/video/e/AnimationFeedDialog.smali

@@ -42,6 +42,8 @@
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_0
     return-void
 .end method

smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali

@@ -628,11 +628,15 @@
 
     if-eqz v0, :cond_0
 
-    const/16 v0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result v0
 
     .line 158
     invoke-virtual {p1, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     .line 161
     :cond_0
     new-instance v0, Lcom/vtosters/lite/ui/widget/MenuListView;
@@ -814,6 +818,8 @@
 
     invoke-virtual {p1, v0}, Lcom/vtosters/lite/ui/EdgeSlidingPaneLayout;->setSystemUiVisibility(I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     .line 266
     :cond_0
     iget-object p1, p0, Lcom/vtosters/lite/ui/h/NavigationDelegateLeftMenu;->b:Lcom/vtosters/lite/ui/widget/MenuListView;

smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali

@@ -31,7 +31,9 @@
 
     move-result p0
 
-    or-int/lit16 p0, p0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result p0
 
     invoke-virtual {p1, p0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
@@ -62,7 +64,9 @@
 
     move-result p0
 
-    or-int/lit16 p0, p0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result p0
 
     invoke-virtual {p1, p0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
@@ -74,11 +78,15 @@
 
     move-result p0
 
-    and-int/lit16 p0, p0, -0x2001
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result p0
 
     invoke-virtual {p1, p0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
     :cond_2
     :goto_0
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     return-void
 .end method

smali/smali_classes3/com/vk/extensions/ActivityExt.smali

@@ -79,10 +79,14 @@
 
     move-result v0
 
-    or-int/lit16 v0, v0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result v0
 
     invoke-virtual {p0, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_1
     return-void
 .end method

smali/smali_classes3/com/vk/fave/fragments/FaveTagsEditorFragment.smali

@@ -618,6 +618,8 @@
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_1
     return-void
 .end method

smali/smali_classes3/com/vk/polls/ui/views/PollOptionView$a.smali

@@ -65,7 +65,9 @@
     goto :goto_0
 
     :cond_0
-    const/high16 p1, -0x1000000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getTextAttr()I
+
+    move-result p1
 
     :goto_0
     return p1

smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali

@@ -1067,7 +1067,7 @@
 .method public a()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "5.97"
+    const-string v0, "5.111"
 
     return-object v0
 .end method

smali/smali_classes4/com/vk/common/view/tips/ActionBottomSheetDialog.smali

@@ -102,6 +102,8 @@
     const/16 v1, 0xd04
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setSystemUiVisibility(I)V
+
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
     :try_end_0
     .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
 

smali/smali_classes4/com/vk/im/engine/commands/messages/MsgHistoryGetArgs$a.smali

@@ -254,6 +254,10 @@
 
     check-cast v0, Lcom/vk/im/engine/commands/messages/MsgHistoryGetArgs$a;
 
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getMsgCount()I
+
+    move-result p1
+
     iput p1, v0, Lcom/vk/im/engine/commands/messages/MsgHistoryGetArgs$a;->f:I
 
     return-object v0

smali/smali_classes4/com/vk/music/AudioPlayerActivity.smali

@@ -126,7 +126,9 @@
 
     move-result v1
 
-    or-int/lit16 v1, v1, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbarFix()I
+
+    move-result v1
 
     .line 68
     invoke-virtual {v0, v1}, Lcom/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout;->setSystemUiVisibility(I)V

smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali

@@ -4601,10 +4601,14 @@
 
     move-result p2
 
-    add-int/lit16 p2, p2, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result p2
 
     invoke-virtual {p1, p2}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     .line 375
     :cond_2
     invoke-virtual {p0}, Lcom/vk/poll/fragments/PollEditorFragment;->p()Landroid/support/v4/app/FragmentActivity;

smali/smali_classes4/com/vtosters/lite/fragments/LeaderboardFragment.smali

@@ -165,6 +165,8 @@
 
     invoke-virtual {v0, v1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     .line 96
     invoke-virtual {p0}, Lcom/vtosters/lite/fragments/LeaderboardFragment;->p()Landroid/support/v4/app/FragmentActivity;
 

smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali

@@ -1433,7 +1433,9 @@
 
     :cond_26
     :goto_15
-    const-string v2, "ads_easy_promote"
+    invoke-static {}, Lru/vtosters/lite/utils/Preferences;->copyrightfix()Ljava/lang/String;
+
+    move-result-object v2
 
     .line 373
     invoke-virtual {v0, v2}, Lorg/json/JSONObject;->optJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;

smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesGetConversationsApiCmd.smali

@@ -244,7 +244,6 @@
 
     move-result-object v1
 
-
     .line 49
     const-string v2, "filter"
 

smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali

@@ -80,8 +80,18 @@
 
     move-result v3
 
-    if-nez v3, :cond_beb
+    if-eqz v3, :cond_beb
 
+    const/4 p1, 0x0
+
+    .line 24
+    invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+    move-result-object p1
+
+    return-object p1
+
+    :cond_beb
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
     move-result-object v2
@@ -127,8 +137,6 @@
 
     invoke-virtual {p1, v0}, Lcom/vk/api/sdk/VKApiManager;->a(Lcom/vk/api/sdk/VKMethodCall;)V
 
-    :cond_beb
-
     const/4 p1, 0x1
 
     .line 24

smali/smali_classes5/com/vk/photoviewer/ViewExt.smali

@@ -190,6 +190,8 @@
     .line 131
     invoke-virtual {p0, v1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_1
     return-void
 .end method
@@ -535,6 +537,8 @@
     .line 139
     invoke-virtual {p0, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_0
     return-void
 .end method

smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali

@@ -763,10 +763,14 @@
 
     move-result v0
 
-    add-int/lit16 v0, v0, 0x2000
+    invoke-static {}, Lru/vtosters/lite/utils/Themes;->getNeededColorStatusbar()I
+
+    move-result v0
 
     invoke-virtual {p1, v0}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     .line 181
     invoke-virtual {p0}, Lcom/vk/wall/thread/CommentThreadFragment;->p()Landroid/support/v4/app/FragmentActivity;
 

smali/smali_classes5/com/vk/webapp/VkUiConnectFragment$e.smali

@@ -115,6 +115,8 @@
 
     invoke-virtual {v0, p1}, Landroid/view/View;->setSystemUiVisibility(I)V
 
+    invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     :cond_2
     return-void
 .end method

smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali

@@ -712,7 +712,7 @@
 .method public a()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "5.97"
+    const-string v0, "5.111"
 
     return-object v0
 .end method