From 95a0451c6b2a1dca0cd5d354b3352de5be20a6f1 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Tue, 22 Nov 2022 20:06:56 +0300 Subject: [PATCH] fixed dw coloring --- .../java/ru/vtosters/lite/themes/utils/RecolorUtils.java | 6 ++++++ .../smali_classes2/com/vk/core/extensions/DrawableExt.smali | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java b/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java index 1d35952eb..023e2ec8e 100644 --- a/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java +++ b/app/src/main/java/ru/vtosters/lite/themes/utils/RecolorUtils.java @@ -7,6 +7,7 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Build; +import android.util.Log; import com.vk.core.drawable.RecoloredDrawable; import ru.vtosters.lite.themes.ColorReferences; @@ -27,6 +28,11 @@ public class RecolorUtils { return new RecoloredDrawable(res, ThemesUtils.getAccentColor()); } // Get res drawable via id and coloring to accent + public static int recolorHexColor(int i){ + Log.d("RecolorUtils", ThemesUtils.hex(i)); + return ColorReferences.isAccentedColor(i) ? ThemesUtils.getAccentColor() : i; + } + public static ColorStateList recolorCSL(ColorStateList colorStateList) { if (colorStateList == null) return null; diff --git a/smali/smali_classes2/com/vk/core/extensions/DrawableExt.smali b/smali/smali_classes2/com/vk/core/extensions/DrawableExt.smali index 3cb24e12e..54ba928be 100644 --- a/smali/smali_classes2/com/vk/core/extensions/DrawableExt.smali +++ b/smali/smali_classes2/com/vk/core/extensions/DrawableExt.smali @@ -7,6 +7,10 @@ .method public static final a(Landroid/graphics/drawable/Drawable;ILandroid/graphics/PorterDuff$Mode;)Landroid/graphics/drawable/Drawable; .locals 1 + invoke-static {p2}, Lru/vtosters/lite/themes/utils/RecolorUtils;->recolorHexColor(I)I + + move-result p2 + .line 2 invoke-virtual {p0}, Landroid/graphics/drawable/Drawable;->mutate()Landroid/graphics/drawable/Drawable;