removed some hardcode

This commit is contained in:
gdlbo
2022-11-22 19:06:06 +03:00
parent 4dcea46be7
commit d3eeaf5f23
38 changed files with 42 additions and 130 deletions
@@ -11,7 +11,8 @@ public class ColorReferences {
Color.parseColor("#3f8ae0"), // azure_300 (light accent)
Color.parseColor("#4986cc"), // azure_a400
Color.parseColor("#528bcc"), // another light accent
Color.parseColor("#71AAEB") // vk_sky_300 (dark accent)
Color.parseColor("#71aaeb"), // vk_sky_300 (dark accent)
Color.parseColor("#5181b8") // header_blue
);
public static boolean isAccentedColor(ColorStateList target) {
@@ -29,6 +30,7 @@ public class ColorReferences {
target == com.vtosters.lite.R.color.light_blue_old || // light_blue
target == com.vtosters.lite.R.color.blue_200 || // blue_200
target == com.vtosters.lite.R.color.vk_blue_400 || // blue_200
target == com.vtosters.lite.R.color.header_blue ||
target == com.vtosters.lite.R.color.blue_200_muted; // blue_200_muted
}
@@ -3492,10 +3492,7 @@
.line 18
invoke-direct {p0, v2, v1, v3}, Lcom/vk/articles/ArticleFragment;->a(Ljava/lang/String;II)V
const v1, 0x7f060018
.line 19
invoke-static {p1, v1}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v2
@@ -75,9 +75,7 @@
move-result-object v0
const v1, 0x7f060018
invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -497,9 +497,7 @@
invoke-static {v2, v3}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
const v3, 0x7f060023
invoke-static {p1, v3}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v3
@@ -4160,9 +4160,7 @@
move-result-object v0
const v2, 0x7f060023
invoke-static {v0, v2}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -226,9 +226,7 @@
move-result-object p1
const v0, 0x7f060018
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p1
@@ -68,9 +68,7 @@
move-result-object v1
const v2, 0x7f0600f7
invoke-static {v1, v2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -58,12 +58,7 @@
.method public final invoke()I
.locals 2
.line 2
sget-object v0, Lcom/vk/core/util/AppContextHolder;->a:Landroid/content/Context;
sget v1, Lb/h/z/c;->accent_blue:I
invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -59,11 +59,7 @@
.locals 2
.line 2
sget-object v0, Lcom/vk/core/util/AppContextHolder;->a:Landroid/content/Context;
sget v1, Lb/h/z/c;->blue_200:I
invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -131,9 +131,7 @@
invoke-direct {v0, v1}, Landroid/graphics/drawable/ShapeDrawable;-><init>(Landroid/graphics/drawable/shapes/Shape;)V
.line 10
sget v1, Lb/h/z/c;->blue_300:I
invoke-static {p1, v1}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -125,9 +125,7 @@
move-result-object v1
const v2, 0x7f0600f7
invoke-static {v1, v2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -21,9 +21,7 @@
invoke-direct {p0}, Landroid/graphics/drawable/Drawable;-><init>()V
.line 2
sget v0, Lcom/vk/libvideo/c;->accent_blue:I
invoke-static {p1, v0}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -991,9 +991,7 @@
move-result-object v0
sget v1, Lcom/vk/libvideo/c;->header_blue:I
invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -67,10 +67,7 @@
invoke-static {p1, p2}, Lcom/vk/extensions/ViewExtKt;->b(Landroid/view/View;Z)V
const p1, 0x7f060018
.line 4
invoke-static {p1}, Lcom/vk/core/util/ResUtils;->b(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p1
@@ -289,9 +289,7 @@
move-result-object v0
const v1, 0x7f0600f7
invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -500,9 +500,7 @@
sget-object v1, Lcom/vk/core/util/AppContextHolder;->a:Landroid/content/Context;
const v3, 0x7f060018
invoke-static {v1, v3}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -47,9 +47,7 @@
.line 2
sget-object v0, Lcom/vk/core/util/AppContextHolder;->a:Landroid/content/Context;
const v1, 0x7f060018
invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -257,9 +257,7 @@
invoke-static {v7, v3}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
const v8, 0x7f060018
invoke-static {v7, v8}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v7
@@ -1124,9 +1124,7 @@
move-result-object v1
const v2, 0x7f060018
invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -377,9 +377,7 @@
if-eqz v3, :cond_3
const v4, 0x7f0600f7
invoke-static {v2, v4}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v4
@@ -113,9 +113,7 @@
.line 6
iget-object v1, p0, Lcom/vk/pushes/notifications/im/BusinessNotifyGroupNotification;->d:Landroid/content/Context;
const v2, 0x7f0600f7
invoke-static {v1, v2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -164,9 +164,7 @@
.line 6
iget-object v1, p0, Lcom/vk/pushes/notifications/im/MessageGroupNotification;->d:Landroid/content/Context;
const v2, 0x7f0600f7
invoke-static {v1, v2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -324,9 +324,7 @@
invoke-static {v1, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
const v3, 0x7f060023
invoke-static {v1, v3}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -659,9 +657,7 @@
invoke-static {v0, v1}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
const v2, 0x7f060023
invoke-static {v0, v2}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -994,9 +990,7 @@
invoke-static {p3, v0}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
const v1, 0x7f060023
invoke-static {p3, v1}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p3
@@ -126,10 +126,7 @@
aput-object v1, v0, v6
const v1, 0x7f060023
.line 7
invoke-static {v1}, Lcom/vk/core/util/ResUtils;->b(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -56,10 +56,7 @@
sput-object v0, Lcom/vk/stories/clickable/models/StoryQuestionInfo;->g:Lcom/vk/stories/clickable/models/StoryQuestionInfo$b;
const v0, 0x7f060023
.line 2
invoke-static {v0}, Lcom/vk/core/util/ResUtils;->b(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -1453,10 +1453,7 @@
if-eqz v16, :cond_12
const v1, 0x7f060023
.line 72
invoke-static {v1}, Lcom/vk/core/util/ResUtils;->b(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -1139,9 +1139,7 @@
invoke-static {p2, v2}, Lkotlin/jvm/internal/Intrinsics;->a(Ljava/lang/Object;Ljava/lang/String;)V
const v2, 0x7f060023
invoke-static {p2, v2}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p2
@@ -196,9 +196,7 @@
move-result-object v0
const v1, 0x7f0600f7
invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -51,10 +51,7 @@
move-result-object v0
const v1, 0x7f0600f7
.line 4
invoke-static {p0, v1}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p0
@@ -2088,10 +2088,7 @@
return p1
:cond_1
const v0, 0x7f0600f7
.line 24
invoke-static {p1, v0}, Lcom/vk/core/util/ContextExtKt;->a(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p1
@@ -833,9 +833,7 @@
move-result-object v0
const v1, 0x7f0600f7
invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -2159,9 +2159,7 @@
move-result-object p2
const v0, 0x7f0600f7
invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p2
@@ -1135,9 +1135,7 @@
move-result-object v1
const v2, 0x7f0600f7
invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v1
@@ -194,9 +194,7 @@
move-result-object v0
const v2, 0x7f060018
invoke-static {v0, v2}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -5824,9 +5824,7 @@
move-result-object v0
const v1, 0x7f060018
invoke-static {v0, v1}, Landroidx/core/content/ContextCompat;->getColor(Landroid/content/Context;I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result v0
@@ -135,9 +135,7 @@
move-result-object p2
const p3, 0x7f0600f7
invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p2
@@ -80,9 +80,7 @@
move-result-object p3
const v0, 0x7f0600f7
invoke-virtual {p3, v0}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p3
@@ -100,9 +100,7 @@
move-result-object p2
const p3, 0x7f0600f7
invoke-virtual {p2, p3}, Landroid/content/res/Resources;->getColor(I)I
invoke-static {}, Lru/vtosters/lite/utils/ThemesUtils;->getAccentColor()I
move-result p2