From 18e2554d5e6f23bf9ec208799bd59d82f80b82b7 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 11 Dec 2022 14:17:03 +0300 Subject: [PATCH] fixed btns color --- .../ru/vtosters/lite/utils/ThemesUtils.java | 27 ------------------- .../com/vk/core/ui/themes/VKThemeHelper.smali | 24 ++++++----------- 2 files changed, 8 insertions(+), 43 deletions(-) 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 0fff66009..7e6c02228 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java @@ -264,33 +264,6 @@ public class ThemesUtils { return MilkshakeHelper.e(); } - private static int[] p() { - int[] iArr = new int[4]; - iArr[0] = getColor(isDarkTheme() ? R.color.gray_800 : R.color.white); - iArr[1] = getColor(isDarkTheme() ? R.color.switch_disabled_on_dark : R.color.switch_disabled_on_light); - iArr[2] = getColor(R.color.gray_20); - iArr[3] = getAccentColor(); - return iArr; - } - - private static int[][] f() { - return new int[][]{new int[]{-16842910, -16842912}, new int[]{-16842910, 16842912}, new int[]{-16842912}, new int[]{16842912}}; - } - - private static int[] q() { - return new int[]{VKThemeHelper.d(R.attr.loader_track_fill), getMutedAccentColor(), VKThemeHelper.d(R.attr.loader_track_fill), getMutedAccentColor()}; - } - - public static void setSwitch(SwitchCompat switchCompat) { - DrawableCompat.setTintList(DrawableCompat.wrap(switchCompat.getThumbDrawable()), new ColorStateList(f(), p())); - DrawableCompat.setTintList(DrawableCompat.wrap(switchCompat.getTrackDrawable()), new ColorStateList(f(), q())); - } - - public static void setSwitch(Switch aSwitch) { - DrawableCompat.setTintList(DrawableCompat.wrap(aSwitch.getThumbDrawable()), new ColorStateList(f(), p())); - DrawableCompat.setTintList(DrawableCompat.wrap(aSwitch.getTrackDrawable()), new ColorStateList(f(), q())); - } - public static void setImageViewColored(ImageView view){ view.setColorFilter(ThemesUtils.getAccentColor(), PorterDuff.Mode.MULTIPLY); } 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 bb5a641b7..d04c89aca 100644 --- a/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali +++ b/smali/smali_classes2/com/vk/core/ui/themes/VKThemeHelper.smali @@ -1188,9 +1188,9 @@ aput v1, v0, v3 .line 84 - sget v1, Lb/h/z/b;->accent:I + invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I - invoke-static {v1}, Lcom/vk/core/ui/themes/VKThemeHelper;->d(I)I + move-result v1 invoke-static {v1, v2}, Lcom/vk/core/util/ColorUtils;->b(IF)I @@ -1212,9 +1212,9 @@ aput v1, v0, v2 .line 86 - sget v1, Lb/h/z/b;->accent:I + invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I - invoke-static {v1}, Lcom/vk/core/ui/themes/VKThemeHelper;->d(I)I + move-result v1 const/4 v2, 0x3 @@ -2607,9 +2607,9 @@ aput v1, v0, v2 .line 2 - sget v1, Lb/h/z/b;->accent:I + invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I - invoke-static {v1}, Lcom/vk/core/ui/themes/VKThemeHelper;->d(I)I + move-result v1 const v2, 0x3df5c28f # 0.12f @@ -2633,9 +2633,9 @@ aput v1, v0, v2 .line 4 - sget v1, Lb/h/z/b;->accent:I + invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I - invoke-static {v1}, Lcom/vk/core/ui/themes/VKThemeHelper;->d(I)I + move-result v1 const v2, 0x3ef5c28f # 0.48f @@ -2783,10 +2783,6 @@ .method public final a(Landroid/widget/Switch;)V .locals 4 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->setSwitch(Landroid/widget/Switch;)V - - return-void - .line 90 invoke-virtual {p1}, Landroid/widget/Switch;->getThumbDrawable()Landroid/graphics/drawable/Drawable; @@ -2839,10 +2835,6 @@ .method public final a(Landroidx/appcompat/widget/SwitchCompat;)V .locals 4 - invoke-static {p1}, Lru/vtosters/lite/utils/ThemesUtils;->setSwitch(Landroidx/appcompat/widget/SwitchCompat;)V - - return-void - .line 88 invoke-virtual {p1}, Landroidx/appcompat/widget/SwitchCompat;->getThumbDrawable()Landroid/graphics/drawable/Drawable;