Fixed statusbar and navbar light coloring
This commit is contained in:
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user