y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

navbar coloring (s0v@ killer tbh)

Browse Source
This commit is contained in:
gdlbo
2022-06-22 12:37:44 +03:00
parent 59d243bb5b
commit 76e768dda8
24 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/utils/Themes.java
+11 -16
View File
@@ -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());
}
smali/assets/version.properties
+4 -4
View File
@@ -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
smali/smali_classes2/com/my/target/ClickHandler$f.smali
+2
View File
@@ -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;
smali/smali_classes2/com/vk/attachpicker/PhotoVideoAttachActivity.smali
+2
View File
@@ -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;
smali/smali_classes2/com/vk/auth/base/BaseAuthFragment.smali
+4
View File
@@ -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;
smali/smali_classes2/com/vk/core/extensions/ActivityExt.smali
+6
View File
@@ -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
smali/smali_classes2/com/vk/core/tips/TipTextWindow.smali
+2
View File
@@ -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
smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali
+4
View File
@@ -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
smali/smali_classes2/com/vk/core/view/FitSystemWindowsFragmentWrapperFrameLayout.smali
+2
View File
@@ -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
smali/smali_classes2/com/vk/extensions/ActivityExt.smali
+2
View File
@@ -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
smali/smali_classes3/com/vk/libvideo/dialogs/BaseAnimationDialog.smali
+2
View File
@@ -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
smali/smali_classes3/com/vk/music/AudioPlayerActivity.smali
+2
View File
@@ -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
smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali
+2
View File
@@ -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;
smali/smali_classes3/com/vk/newsfeed/posting/attachments/PostingAttachActivity.smali
+2
View File
@@ -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;
smali/smali_classes4/com/vk/socialgraph/init/BaseSocialGraphInitFragment.smali
+2
View File
@@ -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
smali/smali_classes4/com/vk/socialgraph/list/SocialGraphFriendsFragment.smali
+2
View File
@@ -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
smali/smali_classes4/com/vk/stickers/StickerLongtapWindow.smali
+4
View File
@@ -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
smali/smali_classes4/com/vk/wall/thread/CommentThreadFragment.smali
+2
View File
@@ -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;
smali/smali_classes4/com/vk/webapp/p/a/StatusNavBarUtils.smali
+4
View File
@@ -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
smali/smali_classes4/com/vtosters/lite/TabletDialogActivity.smali
+4
View File
@@ -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
smali/smali_classes4/com/vtosters/lite/VKActivity.smali
+4
View File
@@ -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
smali/smali_classes4/com/vtosters/lite/ViewUtils.smali
+2
View File
@@ -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
smali/smali_classes4/com/vtosters/lite/fragments/messages/chat_invite/accept/ChatInviteActivity.smali
+2
View File
@@ -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
smali/smali_classes5/ru/mail/libverify/notifications/h.smali
+2
View File
@@ -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