diff --git a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java index d585c363a..6f0a71cf4 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java @@ -247,6 +247,11 @@ public class ThemesUtils { return new RecoloredDrawable(drawable, getAccentColor()); } // Recolor drawable to accent color + public static Drawable recolorToolbarDrawable(Drawable drawable) { + if (drawable == null) return null; + return new RecoloredDrawable(drawable, (ThemesUtils.isMilkshake() && !ThemesUtils.isDarkTheme()) ? ThemesUtils.getAccentColor() : ThemesUtils.getHeaderText()); + } + public static void recolorTextView(TextView tw) { tw.getBackground().setColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.SRC_OVER); } diff --git a/smali/smali/androidx/appcompat/widget/Toolbar.smali b/smali/smali/androidx/appcompat/widget/Toolbar.smali index bfeb8eab6..3d371290b 100644 --- a/smali/smali/androidx/appcompat/widget/Toolbar.smali +++ b/smali/smali/androidx/appcompat/widget/Toolbar.smali @@ -2084,6 +2084,10 @@ iget-object v1, p0, Landroidx/appcompat/widget/Toolbar;->mCollapseIcon:Landroid/graphics/drawable/Drawable; + invoke-static {v1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + + move-result-object v1 + invoke-virtual {v0, v1}, Landroid/widget/ImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V .line 4 @@ -5303,6 +5307,10 @@ if-eqz v0, :cond_2 + invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + + move-result-object p1 + .line 9 invoke-virtual {v0, p1}, Landroid/widget/ImageView;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V @@ -5646,6 +5654,10 @@ if-eqz v0, :cond_2 + invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + + move-result-object p1 + .line 9 invoke-virtual {v0, p1}, Landroid/widget/ImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V diff --git a/smali/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali b/smali/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali index 3ab873c4c..30256634c 100644 --- a/smali/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali +++ b/smali/smali/androidx/appcompat/widget/ToolbarWidgetWrapper.smali @@ -1585,6 +1585,10 @@ .method public setNavigationIcon(Landroid/graphics/drawable/Drawable;)V .locals 0 + invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + + move-result-object p1 + .line 1 iput-object p1, p0, Landroidx/appcompat/widget/ToolbarWidgetWrapper;->mNavIcon:Landroid/graphics/drawable/Drawable; diff --git a/smali/smali_classes2/com/vk/auth/ui/VkAuthToolbar.smali b/smali/smali_classes2/com/vk/auth/ui/VkAuthToolbar.smali index 3360c591b..aec508b05 100644 --- a/smali/smali_classes2/com/vk/auth/ui/VkAuthToolbar.smali +++ b/smali/smali_classes2/com/vk/auth/ui/VkAuthToolbar.smali @@ -882,6 +882,10 @@ .line 1 iget-object v0, p0, Lcom/vk/auth/ui/VkAuthToolbar;->c:Landroidx/appcompat/widget/AppCompatImageButton; + invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->recolorToolbarDrawable(Landroid/graphics/drawable/Drawable;)Landroid/graphics/drawable/Drawable; + + move-result-object p1 + invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatImageButton;->setImageDrawable(Landroid/graphics/drawable/Drawable;)V if-eqz p1, :cond_0