From f500f34e78e78658cc21d35691ce2306498bc163 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 17 May 2022 23:08:12 +0300
Subject: [PATCH] Fixed statusbar and navbar light coloring

---
 .../main/java/ru/vtosters/lite/utils/Themes.java  | 15 +++++++++------
 .../vk/common/view/tips/VKBottomSheetDialog.smali |  2 ++
 .../lite/live/views/broadcast/BroadcastView.smali |  4 ++++
 .../support/design/widget/CoordinatorLayout.smali |  2 ++
 .../navigation/NavigationDelegateBottom$l.smali   |  4 ++++
 .../com/vk/sharing/SharingActivity.smali          |  2 ++
 .../com/vk/video/e/AnimationFeedDialog.smali      |  2 ++
 .../lite/ui/h/NavigationDelegateLeftMenu.smali    |  4 ++++
 .../com/vk/core/extensions/FragmentExt.smali      |  2 ++
 .../com/vk/extensions/ActivityExt.smali           |  2 ++
 .../fave/fragments/FaveTagsEditorFragment.smali   |  2 ++
 .../view/tips/ActionBottomSheetDialog.smali       |  2 ++
 .../vk/poll/fragments/PollEditorFragment.smali    |  2 ++
 .../lite/fragments/LeaderboardFragment.smali      |  2 ++
 .../com/vk/photoviewer/ViewExt.smali              |  4 ++++
 .../vk/wall/thread/CommentThreadFragment.smali    |  2 ++
 .../com/vk/webapp/VkUiConnectFragment$e.smali     |  2 ++
 17 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
index 5118ec9a8..7cf86af7d 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java
@@ -1,5 +1,6 @@
 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.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.color_grishka;
@@ -66,17 +67,18 @@ public class Themes {
         return VKThemeHelper.a(R.attr.header_text);
     }
 
-    public static void setStatusBarTheme(View getview) {
+    public static void setBarTheme(View getview) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            getview.setSystemUiVisibility(getview.getSystemUiVisibility() + getNeededColorStatusbar());
+            getview.setSystemUiVisibility(getNeededColorNavbar() | getNeededColorStatusbar());
         }
     }
 
     public static int getNeededColorStatusbar() {
-        if (VKThemeHelper.d() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            return 8192;
-        }
-        return 0;
+        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() {
@@ -175,6 +177,7 @@ public class Themes {
     public static void setNavbarColor(Window window, int i) {
         if (navbar() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             window.setNavigationBarColor(getTabbarBackground());
+            window.getDecorView().setSystemUiVisibility(getNeededColorNavbar());
         }
     }
 
diff --git a/smali/smali/com/vk/common/view/tips/VKBottomSheetDialog.smali b/smali/smali/com/vk/common/view/tips/VKBottomSheetDialog.smali
index 478d3d38c..8a40afe8f 100644
--- a/smali/smali/com/vk/common/view/tips/VKBottomSheetDialog.smali
+++ b/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
 
diff --git a/smali/smali/com/vtosters/lite/live/views/broadcast/BroadcastView.smali b/smali/smali/com/vtosters/lite/live/views/broadcast/BroadcastView.smali
index 0267beabe..3a0e1ff03 100644
--- a/smali/smali/com/vtosters/lite/live/views/broadcast/BroadcastView.smali
+++ b/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
diff --git a/smali/smali_classes2/android/support/design/widget/CoordinatorLayout.smali b/smali/smali_classes2/android/support/design/widget/CoordinatorLayout.smali
index 37203de3f..fb947a5f7 100644
--- a/smali/smali_classes2/android/support/design/widget/CoordinatorLayout.smali
+++ b/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
diff --git a/smali/smali_classes2/com/vk/navigation/NavigationDelegateBottom$l.smali b/smali/smali_classes2/com/vk/navigation/NavigationDelegateBottom$l.smali
index 982ceae74..5a29b126d 100644
--- a/smali/smali_classes2/com/vk/navigation/NavigationDelegateBottom$l.smali
+++ b/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
diff --git a/smali/smali_classes2/com/vk/sharing/SharingActivity.smali b/smali/smali_classes2/com/vk/sharing/SharingActivity.smali
index 0cac772ee..34ee8931f 100644
--- a/smali/smali_classes2/com/vk/sharing/SharingActivity.smali
+++ b/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
diff --git a/smali/smali_classes2/com/vk/video/e/AnimationFeedDialog.smali b/smali/smali_classes2/com/vk/video/e/AnimationFeedDialog.smali
index bcbcb9718..639836b2d 100644
--- a/smali/smali_classes2/com/vk/video/e/AnimationFeedDialog.smali
+++ b/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
diff --git a/smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali b/smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali
index 493f08c69..ada14b14c 100644
--- a/smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali
+++ b/smali/smali_classes2/com/vtosters/lite/ui/h/NavigationDelegateLeftMenu.smali
@@ -635,6 +635,8 @@
     .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;
@@ -816,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;
diff --git a/smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali b/smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali
index 4d0e06212..61584db87 100644
--- a/smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali
+++ b/smali/smali_classes3/com/vk/core/extensions/FragmentExt.smali
@@ -86,5 +86,7 @@
 
     :cond_2
     :goto_0
+    invoke-static {p1}, Lru/vtosters/lite/utils/Themes;->setBarTheme(Landroid/view/View;)V
+
     return-void
 .end method
diff --git a/smali/smali_classes3/com/vk/extensions/ActivityExt.smali b/smali/smali_classes3/com/vk/extensions/ActivityExt.smali
index a29eab63f..3a372f975 100644
--- a/smali/smali_classes3/com/vk/extensions/ActivityExt.smali
+++ b/smali/smali_classes3/com/vk/extensions/ActivityExt.smali
@@ -85,6 +85,8 @@
 
     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
diff --git a/smali/smali_classes3/com/vk/fave/fragments/FaveTagsEditorFragment.smali b/smali/smali_classes3/com/vk/fave/fragments/FaveTagsEditorFragment.smali
index a8a3ce5bd..15084e1df 100644
--- a/smali/smali_classes3/com/vk/fave/fragments/FaveTagsEditorFragment.smali
+++ b/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
diff --git a/smali/smali_classes4/com/vk/common/view/tips/ActionBottomSheetDialog.smali b/smali/smali_classes4/com/vk/common/view/tips/ActionBottomSheetDialog.smali
index 8c4772d35..c1cc0cf66 100644
--- a/smali/smali_classes4/com/vk/common/view/tips/ActionBottomSheetDialog.smali
+++ b/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
 
diff --git a/smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali b/smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali
index 3cc6d57ee..525a63f86 100644
--- a/smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali
+++ b/smali/smali_classes4/com/vk/poll/fragments/PollEditorFragment.smali
@@ -4607,6 +4607,8 @@
 
     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;
diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/LeaderboardFragment.smali b/smali/smali_classes4/com/vtosters/lite/fragments/LeaderboardFragment.smali
index fe50ee9c9..bf80a9609 100644
--- a/smali/smali_classes4/com/vtosters/lite/fragments/LeaderboardFragment.smali
+++ b/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;
 
diff --git a/smali/smali_classes5/com/vk/photoviewer/ViewExt.smali b/smali/smali_classes5/com/vk/photoviewer/ViewExt.smali
index 617431c36..04d53b5f0 100644
--- a/smali/smali_classes5/com/vk/photoviewer/ViewExt.smali
+++ b/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
diff --git a/smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali b/smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali
index f570d9457..c1361f0a0 100644
--- a/smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali
+++ b/smali/smali_classes5/com/vk/wall/thread/CommentThreadFragment.smali
@@ -769,6 +769,8 @@
 
     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;
 
diff --git a/smali/smali_classes5/com/vk/webapp/VkUiConnectFragment$e.smali b/smali/smali_classes5/com/vk/webapp/VkUiConnectFragment$e.smali
index 4218053ff..4f843c982 100644
--- a/smali/smali_classes5/com/vk/webapp/VkUiConnectFragment$e.smali
+++ b/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