From 01f956477b5cc1b748943057e8733c56d4c6387a Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Fri, 12 Aug 2022 17:44:40 +0300
Subject: [PATCH] some rounding improvements

---
 .../main/java/ru/vtosters/lite/hooks/PicRoundingHook.java | 8 ++++++++
 .../com/vk/attachpicker/widget/TabImageView.smali         | 2 +-
 .../com/vk/imageloader/ImageLoaderUtils.smali             | 4 ++--
 .../viewpresenter/bottom/PosterPreviewAdapter$e$a.smali   | 2 +-
 .../com/vtosters/lite/ui/CircleColorDrawable.smali        | 4 ++--
 .../lite/ui/refreshlayout/CircleImageView$a.smali         | 4 ++--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PicRoundingHook.java b/app/src/main/java/ru/vtosters/lite/hooks/PicRoundingHook.java
index 2813a61d7..7da6258d7 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/PicRoundingHook.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/PicRoundingHook.java
@@ -55,6 +55,14 @@ public class PicRoundingHook{
         }
     }
 
+    public static void inject(Canvas canvas, float orig, float orig2, float orig3, Paint paint){
+        if (pref > 0) {
+            canvas.drawRoundRect(new RectF(0, 0, canvas.getWidth(), canvas.getHeight()), AndroidUtils.dp2px(pref), AndroidUtils.dp2px(pref), paint);
+        } else {
+            canvas.drawCircle(orig, orig2, orig3, paint);
+        }
+    }
+
     public static void inject(Bitmap bitmap, Bitmap bitmap2, Paint b2) {
         Shader.TileMode tileMode = Shader.TileMode.CLAMP;
         b2.setShader(new BitmapShader(bitmap2, tileMode, tileMode));
diff --git a/smali/smali_classes2/com/vk/attachpicker/widget/TabImageView.smali b/smali/smali_classes2/com/vk/attachpicker/widget/TabImageView.smali
index 98c0ebcb1..1736680ab 100644
--- a/smali/smali_classes2/com/vk/attachpicker/widget/TabImageView.smali
+++ b/smali/smali_classes2/com/vk/attachpicker/widget/TabImageView.smali
@@ -315,7 +315,7 @@
 
     iget-object v3, p0, Lcom/vk/attachpicker/widget/TabImageView;->b:Landroid/graphics/Paint;
 
-    invoke-virtual {p1, v1, v2, v0, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-static {p1, v1, v2, v0, v3}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V
 
     .line 7
     invoke-super {p0, p1}, Landroid/widget/ImageView;->onDraw(Landroid/graphics/Canvas;)V
diff --git a/smali/smali_classes3/com/vk/imageloader/ImageLoaderUtils.smali b/smali/smali_classes3/com/vk/imageloader/ImageLoaderUtils.smali
index 9ad41f22e..3ee4628b9 100644
--- a/smali/smali_classes3/com/vk/imageloader/ImageLoaderUtils.smali
+++ b/smali/smali_classes3/com/vk/imageloader/ImageLoaderUtils.smali
@@ -147,7 +147,7 @@
     div-float/2addr p0, v3
 
     .line 26
-    invoke-virtual {v2, p0, p0, p0, v5}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-static {v2, p0, p0, p0, v5}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V
 
     return-object v1
 
@@ -212,7 +212,7 @@
     div-float/2addr v0, v3
 
     .line 36
-    invoke-virtual {v2, v0, v0, v0, v5}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-static {v2, v0, v0, v0, v5}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V
 
     .line 37
     invoke-virtual {v1}, Landroid/graphics/Bitmap;->recycle()V
diff --git a/smali/smali_classes3/com/vk/newsfeed/posting/viewpresenter/bottom/PosterPreviewAdapter$e$a.smali b/smali/smali_classes3/com/vk/newsfeed/posting/viewpresenter/bottom/PosterPreviewAdapter$e$a.smali
index b656888f7..f47efb65c 100644
--- a/smali/smali_classes3/com/vk/newsfeed/posting/viewpresenter/bottom/PosterPreviewAdapter$e$a.smali
+++ b/smali/smali_classes3/com/vk/newsfeed/posting/viewpresenter/bottom/PosterPreviewAdapter$e$a.smali
@@ -118,7 +118,7 @@
 
     div-float/2addr v7, v5
 
-    invoke-virtual {v1, v4, v6, v7, v2}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-static {v1, v4, v6, v7, v2}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V
 
     .line 11
     new-instance v4, Landroid/graphics/PorterDuffXfermode;
diff --git a/smali/smali_classes5/com/vtosters/lite/ui/CircleColorDrawable.smali b/smali/smali_classes5/com/vtosters/lite/ui/CircleColorDrawable.smali
index 2638804b7..e7893c6e6 100644
--- a/smali/smali_classes5/com/vtosters/lite/ui/CircleColorDrawable.smali
+++ b/smali/smali_classes5/com/vtosters/lite/ui/CircleColorDrawable.smali
@@ -204,7 +204,7 @@
 
     iget-object v3, p0, Lcom/vtosters/lite/ui/CircleColorDrawable;->c:Landroid/graphics/Paint;
 
-    invoke-virtual {p1, v0, v0, v2, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-static {p1, v0, v0, v2, v3}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V
 
     .line 6
     iget-boolean v2, p0, Lcom/vtosters/lite/ui/CircleColorDrawable;->e:Z
@@ -226,7 +226,7 @@
 
     iget-object v1, p0, Lcom/vtosters/lite/ui/CircleColorDrawable;->b:Landroid/graphics/Paint;
 
-    invoke-virtual {p1, v0, v0, v2, v1}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-static {p1, v0, v0, v2, v1}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V
 
     .line 8
     :cond_0
diff --git a/smali/smali_classes5/com/vtosters/lite/ui/refreshlayout/CircleImageView$a.smali b/smali/smali_classes5/com/vtosters/lite/ui/refreshlayout/CircleImageView$a.smali
index b862ef18e..e017b3177 100644
--- a/smali/smali_classes5/com/vtosters/lite/ui/refreshlayout/CircleImageView$a.smali
+++ b/smali/smali_classes5/com/vtosters/lite/ui/refreshlayout/CircleImageView$a.smali
@@ -143,7 +143,7 @@
 
     iget-object v3, p0, Lcom/vtosters/lite/ui/refreshlayout/CircleImageView$a;->b:Landroid/graphics/Paint;
 
-    invoke-virtual {p1, v0, v1, v2, v3}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-static {p1, v0, v1, v2, v3}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V
 
     .line 4
     iget v2, p0, Lcom/vtosters/lite/ui/refreshlayout/CircleImageView$a;->c:I
@@ -152,7 +152,7 @@
 
     int-to-float v2, v2
 
-    invoke-virtual {p1, v0, v1, v2, p2}, Landroid/graphics/Canvas;->drawCircle(FFFLandroid/graphics/Paint;)V
+    invoke-static {p1, v0, v1, v2, p2}, Lru/vtosters/lite/hooks/PicRoundingHook;->inject(Landroid/graphics/Canvas;FFFLandroid/graphics/Paint;)V
 
     return-void
 .end method