From 4dcea46be77ca0d60bf4e7fee187810123269e32 Mon Sep 17 00:00:00 2001 From: aliveoutside <53598473+aliveoutside@users.noreply.github.com> Date: Tue, 22 Nov 2022 18:06:32 +0300 Subject: [PATCH] recolor CSL where it is possible --- .../content/res/AppCompatResources.smali | 4 ++ .../androidx/core/content/ContextCompat.smali | 46 +++++++++++-------- .../graphics/drawable/DrawableCompat.smali | 4 ++ .../vk/core/drawable/RecoloredDrawable.smali | 4 ++ 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/smali/smali/androidx/appcompat/content/res/AppCompatResources.smali b/smali/smali/androidx/appcompat/content/res/AppCompatResources.smali index 2d17d0ff8..9a80cf07e 100644 --- a/smali/smali/androidx/appcompat/content/res/AppCompatResources.smali +++ b/smali/smali/androidx/appcompat/content/res/AppCompatResources.smali @@ -268,6 +268,10 @@ move-result-object p0 + invoke-static {p0}, Lru/vtosters/lite/themes/utils/RecolorUtils;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList; + + move-result-object p0 + return-object p0 .line 3 diff --git a/smali/smali/androidx/core/content/ContextCompat.smali b/smali/smali/androidx/core/content/ContextCompat.smali index 15f36416b..425d44f8a 100644 --- a/smali/smali/androidx/core/content/ContextCompat.smali +++ b/smali/smali/androidx/core/content/ContextCompat.smali @@ -292,31 +292,37 @@ .annotation build Landroidx/annotation/Nullable; .end annotation - .line 1 - sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - - const/16 v1, 0x17 - - if-lt v0, v1, :cond_0 - - .line 2 - invoke-virtual {p0, p1}, Landroid/content/Context;->getColorStateList(I)Landroid/content/res/ColorStateList; + invoke-static {p0, p1}, Lru/vtosters/lite/themes/utils/RecolorUtils;->themeCSL(Landroid/content/Context;I)Landroid/content/res/ColorStateList; move-result-object p0 return-object p0 - .line 3 - :cond_0 - invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; - - move-result-object p0 - - invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getColorStateList(I)Landroid/content/res/ColorStateList; - - move-result-object p0 - - return-object p0 +# .line 1 +# sget v0, Landroid/os/Build$VERSION;->SDK_INT:I +# +# const/16 v1, 0x17 +# +# if-lt v0, v1, :cond_0 +# +# .line 2 +# invoke-virtual {p0, p1}, Landroid/content/Context;->getColorStateList(I)Landroid/content/res/ColorStateList; +# +# move-result-object p0 +# +# return-object p0 +# +# .line 3 +# :cond_0 +# invoke-virtual {p0}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; +# +# move-result-object p0 +# +# invoke-virtual {p0, p1}, Landroid/content/res/Resources;->getColorStateList(I)Landroid/content/res/ColorStateList; +# +# move-result-object p0 +# +# return-object p0 .end method .method public static getDataDir(Landroid/content/Context;)Ljava/io/File; diff --git a/smali/smali/androidx/core/graphics/drawable/DrawableCompat.smali b/smali/smali/androidx/core/graphics/drawable/DrawableCompat.smali index 69b709c1d..8b710f823 100644 --- a/smali/smali/androidx/core/graphics/drawable/DrawableCompat.smali +++ b/smali/smali/androidx/core/graphics/drawable/DrawableCompat.smali @@ -645,6 +645,10 @@ .end annotation .end param + invoke-static {p1}, Lru/vtosters/lite/themes/utils/RecolorUtils;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList; + + move-result-object p1 + .line 1 sget v0, Landroid/os/Build$VERSION;->SDK_INT:I diff --git a/smali/smali_classes2/com/vk/core/drawable/RecoloredDrawable.smali b/smali/smali_classes2/com/vk/core/drawable/RecoloredDrawable.smali index cb6a6d397..5c0ad4e90 100644 --- a/smali/smali_classes2/com/vk/core/drawable/RecoloredDrawable.smali +++ b/smali/smali_classes2/com/vk/core/drawable/RecoloredDrawable.smali @@ -87,6 +87,10 @@ invoke-virtual {p1, p0}, Landroid/graphics/drawable/Drawable;->setCallback(Landroid/graphics/drawable/Drawable$Callback;)V + invoke-static {p2}, Lru/vtosters/lite/themes/utils/RecolorUtils;->themeCSL(Landroid/content/res/ColorStateList;)Landroid/content/res/ColorStateList; + + move-result-object p2 + .line 6 iput-object p2, p0, Lcom/vk/core/drawable/RecoloredDrawable;->b:Landroid/content/res/ColorStateList;