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 a5e474c89..fe8be52d6 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -70,31 +70,31 @@ public class Themes { } public static int getAccentColor() { - return getColorFromAttr(R.attr.accent); + return getColorFromAttr(getAttrId("accent")); } // Color accent public static int getTextAttr() { - return getColorFromAttr(R.attr.text_primary); + return getColorFromAttr(getAttrId("text_primary")); } // Text Primary color public static int getSTextAttr() { - return getColorFromAttr(R.attr.text_secondary); + return getColorFromAttr(getAttrId("text_secondary")); } // Text Secondary color public static int getTabbarBackground() { - return getColorFromAttr(R.attr.tabbar_background); + return getColorFromAttr(getAttrId("tabbar_background")); } // Tabbar/Navbar background public static int getBackgroundContent() { - return getColorFromAttr(R.attr.background_content); + return getColorFromAttr(getAttrId("background_content")); } // Background color in app public static int getHeaderBackground() { - return getColorFromAttr(R.attr.header_background); + return getColorFromAttr(getAttrId("header_background")); } // Toolbar/Header background public static int getHeaderText() { - return getColorFromAttr(R.attr.header_text); + return getColorFromAttr(getAttrId("header_text")); } // Header/Toolbar color text public static int getAmoledTheme() { @@ -185,10 +185,8 @@ public class Themes { } // Accent colors public static void themeMonetToolbar(ImageButton imageButton, Toolbar toolbar) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - imageButton.setImageTintList(ColorStateList.valueOf(getHeaderText())); - toolbar.setElevation(0.0f); - } + imageButton.setImageTintList(ColorStateList.valueOf(getHeaderText())); + toolbar.setElevation(0.0f); } public static Drawable recolorDrawable(Drawable drawable) { @@ -306,10 +304,7 @@ public class Themes { if (isColorRefAccented(i) && isAndroidMonet()) { return getAccentColor(); } - if (Build.VERSION.SDK_INT >= 23) { - return context.getColor(i); - } - return getResources().getColor(i); + return context.getColor(i); } // Android Support color injector + accent color checker public static int getColor2(int i) { @@ -320,7 +315,7 @@ public class Themes { } // Android Support color injector + accent color checker public static void setNavbarColor(Window window, int i) { - if (navbar() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (navbar()) { window.setNavigationBarColor(getTabbarBackground()); window.getDecorView().setSystemUiVisibility(getNeededColorNavbar()); } diff --git a/smali/assets/version.properties b/smali/assets/version.properties index 7c588e8e1..51123f288 100644 --- a/smali/assets/version.properties +++ b/smali/assets/version.properties @@ -1,12 +1,12 @@ -VERSION_BUILD=4d3f262 +VERSION_BUILD=6187eec VERSION_BRANCH=vtl-remaster VERSION_BASE= VERSION_BRANCHID=vtl-remaster VERSION_BRANCHTYPE=vtl-remaster -VERSION_COMMIT=4d3f262d59dbf763288636607d920e7093f7d793 +VERSION_COMMIT=6187eecac5a727c7325e4b30d0b6a1b08dd5dc7f VERSION_GRADLE= -VERSION_DISPLAY=vtl-remaster-4d3f262-dirty -VERSION_FULL=vtl-remaster-4d3f262-dirty +VERSION_DISPLAY=vtl-remaster-6187eec-dirty +VERSION_FULL=vtl-remaster-6187eec-dirty VERSION_SCM=git VERSION_TAG= VERSION_LAST_TAG=v0.2.9-beta2 diff --git a/smali/smali_classes2/com/my/target/ClickHandler$f.smali b/smali/smali_classes2/com/my/target/ClickHandler$f.smali index 53f479fb3..1a2cb07bf 100644 --- a/smali/smali_classes2/com/my/target/ClickHandler$f.smali +++ b/smali/smali_classes2/com/my/target/ClickHandler$f.smali @@ -147,6 +147,8 @@ .line 11 invoke-virtual {p2, v0}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p2, v0}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 12 :cond_0 new-instance p2, Lcom/my/target/WebViewBrowser; diff --git a/smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali b/smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali index 512c6019c..2d8ef8b3d 100644 --- a/smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali +++ b/smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali @@ -846,6 +846,8 @@ invoke-virtual {v8, v4}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v8, v4}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 37 :cond_3 iget-object v4, v0, Lcom/vk/attachpicker/PhotoVideoAttachActivity;->L:Lcom/vk/attachpicker/widget/AttachCounterView; diff --git a/smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali b/smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali index 05f6b5fdb..6112bd225 100644 --- a/smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali +++ b/smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali @@ -188,6 +188,8 @@ .line 13 invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + const/4 v1, 0x0 if-eqz p1, :cond_0 @@ -221,6 +223,8 @@ .line 15 invoke-virtual {v0, p1}, Landroid/view/Window;->setNavigationBarColor(I)V + invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 16 new-instance v1, Landroid/graphics/drawable/ColorDrawable; diff --git a/smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali b/smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali index ea450a0d8..89144a2cb 100644 --- a/smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali +++ b/smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali @@ -96,6 +96,8 @@ :cond_0 invoke-virtual {p0, p1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_1 return-void .end method @@ -157,6 +159,8 @@ :goto_0 invoke-virtual {p0, p1}, Landroid/view/Window;->setNavigationBarColor(I)V + invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_1 return-void .end method @@ -220,6 +224,8 @@ invoke-virtual {p0, p2}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p0, p2}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 20 invoke-static {}, Lcom/vk/core/util/OsUtil;->b()Z diff --git a/smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali b/smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali index a2c0e59f7..a1c49f20e 100644 --- a/smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali +++ b/smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali @@ -620,6 +620,8 @@ .line 31 invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p1, v0}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 32 iget-boolean v0, p0, Lcom/vk/core/tips/TipTextWindow;->l:Z diff --git a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali index 782c73307..f959ddd8b 100644 --- a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali +++ b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali @@ -979,6 +979,8 @@ invoke-virtual {p0, p1}, Landroid/view/Window;->setNavigationBarColor(I)V + invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + return-void .line 68 @@ -999,6 +1001,8 @@ .line 70 invoke-virtual {p0, p1}, Landroid/view/Window;->setNavigationBarColor(I)V + invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + const/4 p0, 0x1 if-nez p1, :cond_2 diff --git a/smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali b/smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali index cfdd0e8f1..96c2c2aa8 100644 --- a/smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali +++ b/smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali @@ -153,6 +153,8 @@ .line 15 invoke-virtual {v0, p3}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, p3}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_2 return-void .end method diff --git a/smali/smali_classes2/com/vk/extensions/ActivityExt.smali b/smali/smali_classes2/com/vk/extensions/ActivityExt.smali index d166f23b1..c6a0772fd 100644 --- a/smali/smali_classes2/com/vk/extensions/ActivityExt.smali +++ b/smali/smali_classes2/com/vk/extensions/ActivityExt.smali @@ -223,6 +223,8 @@ invoke-virtual {p0, p1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 6 :cond_0 invoke-static {}, Lcom/vk/extensions/ActivityExt;->a()Z diff --git a/smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali b/smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali index b059dc0c5..0da469f7d 100644 --- a/smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali +++ b/smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali @@ -357,6 +357,8 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_2 return-void .end method diff --git a/smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali b/smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali index 76c79c000..5f0f365d4 100644 --- a/smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali +++ b/smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali @@ -164,6 +164,8 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 9 :cond_2 invoke-static {p0}, Lcom/vk/core/ui/themes/VKThemeHelper;->d(Landroid/app/Activity;)V diff --git a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali index 288ee076c..030e7234c 100644 --- a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali +++ b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali @@ -2473,6 +2473,8 @@ :goto_2 invoke-virtual {v1, v3}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v1, v3}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 46 instance-of v1, p1, Lcom/vk/navigation/b0/FragmentWithCustomNavigationBar; diff --git a/smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali b/smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali index 5c8d74ff5..b1eed7254 100644 --- a/smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali +++ b/smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali @@ -561,6 +561,8 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p1, v0}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 14 invoke-virtual {p0}, Landroid/app/Activity;->getWindow()Landroid/view/Window; diff --git a/smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali b/smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali index 132af9750..573c692e4 100644 --- a/smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali +++ b/smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali @@ -144,6 +144,8 @@ .line 5 invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + const/4 v0, 0x0 if-eqz p1, :cond_0 diff --git a/smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali b/smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali index be4061651..2334c89e1 100644 --- a/smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali +++ b/smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali @@ -183,6 +183,8 @@ .line 6 invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + const/4 v0, 0x0 if-eqz p1, :cond_0 diff --git a/smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali b/smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali index e3da74ff2..2dd3d907e 100644 --- a/smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali +++ b/smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali @@ -304,6 +304,8 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_0 const/4 v0, 0x0 @@ -373,6 +375,8 @@ :goto_0 invoke-virtual {v0, v2}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v2}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + const/4 v0, 0x1 .line 4 diff --git a/smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali b/smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali index d16fe3bfa..df3da9883 100644 --- a/smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali +++ b/smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali @@ -1165,6 +1165,8 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 4 :cond_0 iget-object v0, p0, Lcom/vk/wall/thread/CommentThreadFragment;->R:Lcom/vtosters/lite/o0/CommentsAdapter; diff --git a/smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali b/smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali index ef2a80e2a..055789fc3 100644 --- a/smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali +++ b/smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali @@ -196,6 +196,8 @@ :cond_0 invoke-virtual {p1, p2}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p1, p2}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_1 return-void .end method @@ -261,6 +263,8 @@ :goto_0 invoke-virtual {p1, p2}, Landroid/view/Window;->setNavigationBarColor(I)V + invoke-static {p1, p2}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_1 return-void .end method diff --git a/smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali b/smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali index 3ed8ab9c3..b24a8206b 100644 --- a/smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali @@ -791,6 +791,8 @@ invoke-virtual {v0, v1}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, v1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + .line 3 :cond_0 invoke-super {p0, p1}, Lcom/vtosters/lite/VKActivity;->onActionModeFinished(Landroid/view/ActionMode;)V @@ -839,6 +841,8 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p1, v0}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_0 return-void .end method diff --git a/smali/smali_classes4/com/vtosters/lite/VKActivity.smali b/smali/smali_classes4/com/vtosters/lite/VKActivity.smali index a8d16df19..061eaf1ca 100644 --- a/smali/smali_classes4/com/vtosters/lite/VKActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/VKActivity.smali @@ -309,6 +309,8 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p1, v0}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_0 return-void .end method @@ -348,6 +350,8 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p1, v0}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + :cond_0 return-void .end method diff --git a/smali/smali_classes4/com/vtosters/lite/ViewUtils.smali b/smali/smali_classes4/com/vtosters/lite/ViewUtils.smali index 92563214b..3845ff6ed 100644 --- a/smali/smali_classes4/com/vtosters/lite/ViewUtils.smali +++ b/smali/smali_classes4/com/vtosters/lite/ViewUtils.smali @@ -746,6 +746,8 @@ .line 66 invoke-virtual {p0, p1}, Landroid/view/Window;->setStatusBarColor(I)V + + invoke-static {p0, p1}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali index ae35f34c8..69857a722 100644 --- a/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali +++ b/smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali @@ -84,6 +84,8 @@ invoke-virtual {p1, v0}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {p1, v0}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + return-void .end method diff --git a/smali/smali_classes5/ru/mail/libverify/notifications/h.smali b/smali/smali_classes5/ru/mail/libverify/notifications/h.smali index 50cb776f2..f57a44b18 100644 --- a/smali/smali_classes5/ru/mail/libverify/notifications/h.smali +++ b/smali/smali_classes5/ru/mail/libverify/notifications/h.smali @@ -434,6 +434,8 @@ invoke-virtual {v0, p3}, Landroid/view/Window;->setStatusBarColor(I)V + invoke-static {v0, p3}, Lru/vtosters/lite/utils/Themes;->setNavbarColor(Landroid/view/Window;I)V + goto :goto_0 :cond_0