diff --git a/app/src/main/java/com/vk/im/ui/views/Corners.java b/app/src/main/java/com/vk/im/ui/views/Corners.java new file mode 100644 index 000000000..6d09b5010 --- /dev/null +++ b/app/src/main/java/com/vk/im/ui/views/Corners.java @@ -0,0 +1,131 @@ +package com.vk.im.ui.views; + +import androidx.annotation.NonNull; + +public class Corners{ + private int topLeft; + private int topRight; + private int bottomLeft; + private int bottomRight; + + public Corners(int i, int i2, int i3, int i4){ + this.topLeft = i; + this.topRight = i2; + this.bottomLeft = i3; + this.bottomRight = i4; + } + + public Corners(int i, int i2, int i3, int i4, int i5) { + this((i5 & 1) != 0 ? 0 : i, (i5 & 2) != 0 ? 0 : i2, (i5 & 4) != 0 ? 0 : i3, (i5 & 8) != 0 ? 0 : i4); + } + + public Corners() { + this(0, 0, 0, 0, 15); + } + + public static Corners a(Corners corners, int i, int i2, int i3, int i4, int i5, Object obj){ + if ((i5 & 1) != 0) { + i = corners.topLeft; + } + if ((i5 & 2) != 0) { + i2 = corners.topRight; + } + if ((i5 & 4) != 0) { + i3 = corners.bottomLeft; + } + if ((i5 & 8) != 0) { + i4 = corners.bottomRight; + } + corners.a(i, i2, i3, i4); + return corners; + } + + public int a(){ + return this.bottomLeft; + } + + public int b(){ + return this.bottomRight; + } + + public int c(){ + return this.topLeft; + } + + public int d(){ + return this.topRight; + } + + public boolean e(){ + int i; + int i2 = this.topLeft; + int i3 = this.topRight; + return i2 == i3 && i3 == (i = this.bottomRight) && this.bottomLeft == i; + } + + public boolean equals(Object obj){ + if (this != obj) { + if (!(obj instanceof Corners)) { + return false; + } + Corners corners = (Corners) obj; + return this.topLeft == corners.topLeft && this.topRight == corners.topRight && this.bottomLeft == corners.bottomLeft && this.bottomRight == corners.bottomRight; + } + return true; + } + + public boolean f(){ + return this.topLeft == 0 && e(); + } + + public void g(){ + a(0, 0); + } + + public int hashCode(){ + return (((((this.topLeft * 31) + this.topRight) * 31) + this.bottomLeft) * 31) + this.bottomRight; + } + + @NonNull + public String toString(){ + return "Corners(topLeft=" + this.topLeft + ", topRight=" + this.topRight + ", bottomLeft=" + this.bottomLeft + ", bottomRight=" + this.bottomRight + ")"; + } + + public Corners a(int i, int i2){ + if ((i2 & 1) > 0) { + this.topLeft = i; + } + if ((i2 & 2) > 0) { + this.topRight = i; + } + if ((i2 & 4) > 0) { + this.bottomLeft = i; + } + if ((i2 & 8) > 0) { + this.bottomRight = i; + } + if (i2 == 0) { + this.topLeft = 0; + this.topRight = 0; + this.bottomLeft = 0; + this.bottomRight = 0; + } + return this; + } + + public Corners a(int i, int i2, int i3, int i4){ + this.topLeft = i; + this.topRight = i2; + this.bottomLeft = i3; + this.bottomRight = i4; + return this; + } + + public Corners a(Corners corners){ + this.topLeft = corners.topLeft; + this.topRight = corners.topRight; + this.bottomLeft = corners.bottomLeft; + this.bottomRight = corners.bottomRight; + return this; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/vk/im/ui/views/dialogs/DialogItemView.java b/app/src/main/java/com/vk/im/ui/views/dialogs/DialogItemView.java index 0a0bfcbc1..6b4c70675 100644 --- a/app/src/main/java/com/vk/im/ui/views/dialogs/DialogItemView.java +++ b/app/src/main/java/com/vk/im/ui/views/dialogs/DialogItemView.java @@ -2,6 +2,8 @@ package com.vk.im.ui.views.dialogs; import static com.vk.im.ui.d.vkim_administration_title; +import static ru.vtosters.lite.utils.ThemesUtils.getAccentColor; + import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -110,8 +112,8 @@ public class DialogItemView extends ViewGroup{ this.G = new TypingDrawable(ContextExtKt.h(context6, c.link_alternate)); Context context7 = getContext(); this.H = new RecordingDrawable(ContextExtKt.h(context7, c.link_alternate)); - Typeface create = Typeface.create(getResources().getString(m.fontRobotoRegular), 0); - Typeface create2 = Typeface.create(getResources().getString(m.fontRobotoMedium), 0); + Typeface create = Typeface.create(getResources().getString(m.fontRobotoRegular), Typeface.NORMAL); + Typeface create2 = Typeface.create(getResources().getString(m.fontRobotoMedium), Typeface.NORMAL); int i2 = this.E ? GONE : VISIBLE; TypedArray obtainStyledAttributes = context.obtainStyledAttributes(attributeSet, o.DialogItemView); String string2 = obtainStyledAttributes.getString(o.DialogItemView_vkim_title_font); @@ -119,7 +121,7 @@ public class DialogItemView extends ViewGroup{ int dimensionPixelSize2 = obtainStyledAttributes.getDimensionPixelSize(o.DialogItemView_vkim_body_text_size, Screen.c(15)); int dimensionPixelSize3 = obtainStyledAttributes.getDimensionPixelSize(o.DialogItemView_vkim_time_text_size, Screen.c(13)); int color = obtainStyledAttributes.getColor(o.DialogItemView_vkim_time_text_color, -16777216); - int color2 = obtainStyledAttributes.getColor(o.DialogItemView_vkim_avatar_story_border_color, VKThemeHelper.d(c.accent)); + int color2 = obtainStyledAttributes.getColor(o.DialogItemView_vkim_avatar_story_border_color, getAccentColor()); int dimensionPixelSize4 = obtainStyledAttributes.getDimensionPixelSize(o.DialogItemView_vkim_avatar_story_border_width, Screen.a(2)); int dimensionPixelSize5 = obtainStyledAttributes.getDimensionPixelSize(o.DialogItemView_vkim_avatar_story_size, Screen.a(68)); boolean z = obtainStyledAttributes.getBoolean(o.DialogItemView_vkim_avatar_combine, false); diff --git a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/o0/CornersHelper.smali b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/o0/CornersHelper.smali index e016dd547..f6da85203 100644 --- a/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/o0/CornersHelper.smali +++ b/smali/smali_classes3/com/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/o0/CornersHelper.smali @@ -37,7 +37,7 @@ move-object v0, v7 - invoke-direct/range {v0 .. v6}, Lcom/vk/im/ui/views/Corners;->(IIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v0 .. v5}, Lcom/vk/im/ui/views/Corners;->(IIIII)V iput-object v7, p0, Lcom/vk/im/ui/components/viewcontrollers/msg_list/adapter/msgparts/o0/CornersHelper;->d:Lcom/vk/im/ui/views/Corners; diff --git a/smali/smali_classes3/com/vk/im/ui/views/Corners$a.smali b/smali/smali_classes3/com/vk/im/ui/views/Corners$a.smali deleted file mode 100644 index 9b2334106..000000000 --- a/smali/smali_classes3/com/vk/im/ui/views/Corners$a.smali +++ /dev/null @@ -1,34 +0,0 @@ -.class public final Lcom/vk/im/ui/views/Corners$a; -.super Ljava/lang/Object; -.source "Corners.kt" - - -# annotations -.annotation system Ldalvik/annotation/EnclosingClass; - value = Lcom/vk/im/ui/views/Corners; -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 - name = "a" -.end annotation - - -# direct methods -.method private constructor ()V - .locals 0 - - .line 1 - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - -.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 0 - - .line 2 - invoke-direct {p0}, Lcom/vk/im/ui/views/Corners$a;->()V - - return-void -.end method diff --git a/smali/smali_classes3/com/vk/im/ui/views/Corners.smali b/smali/smali_classes3/com/vk/im/ui/views/Corners.smali deleted file mode 100644 index f860aa63d..000000000 --- a/smali/smali_classes3/com/vk/im/ui/views/Corners.smali +++ /dev/null @@ -1,480 +0,0 @@ -.class public final Lcom/vk/im/ui/views/Corners; -.super Ljava/lang/Object; -.source "Corners.kt" - - -# annotations -.annotation system Ldalvik/annotation/MemberClasses; - value = { - Lcom/vk/im/ui/views/Corners$a; - } -.end annotation - - -# instance fields -.field private a:I - -.field private b:I - -.field private c:I - -.field private d:I - - -# direct methods -.method static constructor ()V - .locals 2 - - new-instance v0, Lcom/vk/im/ui/views/Corners$a; - - const/4 v1, 0x0 - - invoke-direct {v0, v1}, Lcom/vk/im/ui/views/Corners$a;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V - - return-void -.end method - -.method public constructor ()V - .locals 7 - - const/4 v1, 0x0 - - const/4 v2, 0x0 - - const/4 v3, 0x0 - - const/4 v4, 0x0 - - const/16 v5, 0xf - - const/4 v6, 0x0 - - move-object v0, p0 - - invoke-direct/range {v0 .. v6}, Lcom/vk/im/ui/views/Corners;->(IIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V - - return-void -.end method - -.method public constructor (IIII)V - .locals 0 - - .line 1 - invoke-direct {p0}, Ljava/lang/Object;->()V - - iput p1, p0, Lcom/vk/im/ui/views/Corners;->a:I - - iput p2, p0, Lcom/vk/im/ui/views/Corners;->b:I - - iput p3, p0, Lcom/vk/im/ui/views/Corners;->c:I - - iput p4, p0, Lcom/vk/im/ui/views/Corners;->d:I - - return-void -.end method - -.method public synthetic constructor (IIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 1 - - and-int/lit8 p6, p5, 0x1 - - const/4 v0, 0x0 - - if-eqz p6, :cond_0 - - const/4 p1, 0x0 - - :cond_0 - and-int/lit8 p6, p5, 0x2 - - if-eqz p6, :cond_1 - - const/4 p2, 0x0 - - :cond_1 - and-int/lit8 p6, p5, 0x4 - - if-eqz p6, :cond_2 - - const/4 p3, 0x0 - - :cond_2 - and-int/lit8 p5, p5, 0x8 - - if-eqz p5, :cond_3 - - const/4 p4, 0x0 - - .line 2 - :cond_3 - invoke-direct {p0, p1, p2, p3, p4}, Lcom/vk/im/ui/views/Corners;->(IIII)V - - return-void -.end method - -.method public static synthetic a(Lcom/vk/im/ui/views/Corners;IIIIILjava/lang/Object;)Lcom/vk/im/ui/views/Corners; - .locals 0 - - and-int/lit8 p6, p5, 0x1 - - if-eqz p6, :cond_0 - - .line 10 - iget p1, p0, Lcom/vk/im/ui/views/Corners;->a:I - - :cond_0 - and-int/lit8 p6, p5, 0x2 - - if-eqz p6, :cond_1 - - .line 11 - iget p2, p0, Lcom/vk/im/ui/views/Corners;->b:I - - :cond_1 - and-int/lit8 p6, p5, 0x4 - - if-eqz p6, :cond_2 - - .line 12 - iget p3, p0, Lcom/vk/im/ui/views/Corners;->c:I - - :cond_2 - and-int/lit8 p5, p5, 0x8 - - if-eqz p5, :cond_3 - - .line 13 - iget p4, p0, Lcom/vk/im/ui/views/Corners;->d:I - - :cond_3 - invoke-virtual {p0, p1, p2, p3, p4}, Lcom/vk/im/ui/views/Corners;->a(IIII)Lcom/vk/im/ui/views/Corners; - - return-object p0 -.end method - - -# virtual methods -.method public final a()I - .locals 1 - - .line 1 - iget v0, p0, Lcom/vk/im/ui/views/Corners;->c:I - - return v0 -.end method - -.method public final a(II)Lcom/vk/im/ui/views/Corners; - .locals 1 - - and-int/lit8 v0, p2, 0x1 - - if-lez v0, :cond_0 - - .line 2 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->a:I - - :cond_0 - and-int/lit8 v0, p2, 0x2 - - if-lez v0, :cond_1 - - .line 3 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->b:I - - :cond_1 - and-int/lit8 v0, p2, 0x4 - - if-lez v0, :cond_2 - - .line 4 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->c:I - - :cond_2 - and-int/lit8 v0, p2, 0x8 - - if-lez v0, :cond_3 - - .line 5 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->d:I - - :cond_3 - if-nez p2, :cond_4 - - const/4 p1, 0x0 - - .line 6 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->a:I - - .line 7 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->b:I - - .line 8 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->c:I - - .line 9 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->d:I - - :cond_4 - return-object p0 -.end method - -.method public final a(IIII)Lcom/vk/im/ui/views/Corners; - .locals 0 - - .line 14 - iput p1, p0, Lcom/vk/im/ui/views/Corners;->a:I - - .line 15 - iput p2, p0, Lcom/vk/im/ui/views/Corners;->b:I - - .line 16 - iput p3, p0, Lcom/vk/im/ui/views/Corners;->c:I - - .line 17 - iput p4, p0, Lcom/vk/im/ui/views/Corners;->d:I - - return-object p0 -.end method - -.method public final a(Lcom/vk/im/ui/views/Corners;)Lcom/vk/im/ui/views/Corners; - .locals 1 - - .line 18 - iget v0, p1, Lcom/vk/im/ui/views/Corners;->a:I - - iput v0, p0, Lcom/vk/im/ui/views/Corners;->a:I - - .line 19 - iget v0, p1, Lcom/vk/im/ui/views/Corners;->b:I - - iput v0, p0, Lcom/vk/im/ui/views/Corners;->b:I - - .line 20 - iget v0, p1, Lcom/vk/im/ui/views/Corners;->c:I - - iput v0, p0, Lcom/vk/im/ui/views/Corners;->c:I - - .line 21 - iget p1, p1, Lcom/vk/im/ui/views/Corners;->d:I - - iput p1, p0, Lcom/vk/im/ui/views/Corners;->d:I - - return-object p0 -.end method - -.method public final b()I - .locals 1 - - .line 1 - iget v0, p0, Lcom/vk/im/ui/views/Corners;->d:I - - return v0 -.end method - -.method public final c()I - .locals 1 - - .line 1 - iget v0, p0, Lcom/vk/im/ui/views/Corners;->a:I - - return v0 -.end method - -.method public final d()I - .locals 1 - - .line 1 - iget v0, p0, Lcom/vk/im/ui/views/Corners;->b:I - - return v0 -.end method - -.method public final e()Z - .locals 2 - - .line 1 - iget v0, p0, Lcom/vk/im/ui/views/Corners;->a:I - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->b:I - - if-ne v0, v1, :cond_0 - - iget v0, p0, Lcom/vk/im/ui/views/Corners;->d:I - - if-ne v1, v0, :cond_0 - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->c:I - - if-ne v1, v0, :cond_0 - - const/4 v0, 0x1 - - goto :goto_0 - - :cond_0 - const/4 v0, 0x0 - - :goto_0 - return v0 -.end method - -.method public equals(Ljava/lang/Object;)Z - .locals 2 - - if-eq p0, p1, :cond_1 - - instance-of v0, p1, Lcom/vk/im/ui/views/Corners; - - if-eqz v0, :cond_0 - - check-cast p1, Lcom/vk/im/ui/views/Corners; - - iget v0, p0, Lcom/vk/im/ui/views/Corners;->a:I - - iget v1, p1, Lcom/vk/im/ui/views/Corners;->a:I - - if-ne v0, v1, :cond_0 - - iget v0, p0, Lcom/vk/im/ui/views/Corners;->b:I - - iget v1, p1, Lcom/vk/im/ui/views/Corners;->b:I - - if-ne v0, v1, :cond_0 - - iget v0, p0, Lcom/vk/im/ui/views/Corners;->c:I - - iget v1, p1, Lcom/vk/im/ui/views/Corners;->c:I - - if-ne v0, v1, :cond_0 - - iget v0, p0, Lcom/vk/im/ui/views/Corners;->d:I - - iget p1, p1, Lcom/vk/im/ui/views/Corners;->d:I - - if-ne v0, p1, :cond_0 - - goto :goto_0 - - :cond_0 - const/4 p1, 0x0 - - return p1 - - :cond_1 - :goto_0 - const/4 p1, 0x1 - - return p1 -.end method - -.method public final f()Z - .locals 1 - - .line 1 - iget v0, p0, Lcom/vk/im/ui/views/Corners;->a:I - - if-nez v0, :cond_0 - - invoke-virtual {p0}, Lcom/vk/im/ui/views/Corners;->e()Z - - move-result v0 - - if-eqz v0, :cond_0 - - const/4 v0, 0x1 - - goto :goto_0 - - :cond_0 - const/4 v0, 0x0 - - :goto_0 - return v0 -.end method - -.method public final g()V - .locals 1 - - const/4 v0, 0x0 - - .line 1 - invoke-virtual {p0, v0, v0}, Lcom/vk/im/ui/views/Corners;->a(II)Lcom/vk/im/ui/views/Corners; - - return-void -.end method - -.method public hashCode()I - .locals 2 - - iget v0, p0, Lcom/vk/im/ui/views/Corners;->a:I - - mul-int/lit8 v0, v0, 0x1f - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->b:I - - add-int/2addr v0, v1 - - mul-int/lit8 v0, v0, 0x1f - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->c:I - - add-int/2addr v0, v1 - - mul-int/lit8 v0, v0, 0x1f - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->d:I - - add-int/2addr v0, v1 - - return v0 -.end method - -.method public toString()Ljava/lang/String; - .locals 2 - - new-instance v0, Ljava/lang/StringBuilder; - - invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - - const-string v1, "Corners(topLeft=" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->a:I - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - - const-string v1, ", topRight=" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->b:I - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - - const-string v1, ", bottomLeft=" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->c:I - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - - const-string v1, ", bottomRight=" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget v1, p0, Lcom/vk/im/ui/views/Corners;->d:I - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - - const-string v1, ")" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object v0 - - return-object v0 -.end method diff --git a/smali/smali_classes3/com/vk/im/ui/views/FrescoImageView.smali b/smali/smali_classes3/com/vk/im/ui/views/FrescoImageView.smali index eaa7ee1e5..5cf629ce6 100644 --- a/smali/smali_classes3/com/vk/im/ui/views/FrescoImageView.smali +++ b/smali/smali_classes3/com/vk/im/ui/views/FrescoImageView.smali @@ -289,7 +289,7 @@ move-object v4, v0 - invoke-direct/range {v4 .. v10}, Lcom/vk/im/ui/views/Corners;->(IIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v4 .. v9}, Lcom/vk/im/ui/views/Corners;->(IIIII)V iput-object v0, p0, Lcom/vk/im/ui/views/FrescoImageView;->K:Lcom/vk/im/ui/views/Corners; diff --git a/smali/smali_classes3/com/vk/newsfeed/FrescoImageView.smali b/smali/smali_classes3/com/vk/newsfeed/FrescoImageView.smali index a4f0232b8..63334cfda 100644 --- a/smali/smali_classes3/com/vk/newsfeed/FrescoImageView.smali +++ b/smali/smali_classes3/com/vk/newsfeed/FrescoImageView.smali @@ -312,7 +312,7 @@ move-object v4, v0 - invoke-direct/range {v4 .. v10}, Lcom/vk/im/ui/views/Corners;->(IIIIILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v4 .. v9}, Lcom/vk/im/ui/views/Corners;->(IIIII)V iput-object v0, p0, Lcom/vk/newsfeed/FrescoImageView;->P:Lcom/vk/im/ui/views/Corners;