From b03cf30e0a4b7083e25f55bf1c64e861306d130b Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Sun, 20 Feb 2022 13:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=9C=86=E8=A7=92=E5=BD=A9?=
 =?UTF-8?q?=E8=89=B2=E5=9B=BE=E6=A0=87=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fankes/miui/notify/hook/HookEntry.kt  |  2 +-
 .../com/fankes/miui/notify/utils/Utils.kt     | 24 +++----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt b/app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt
index 476e11c..2729b00 100644
--- a/app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt
+++ b/app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt
@@ -253,7 +253,7 @@ class HookEntry : YukiHookXposedInitProxy {
                 /** 处理自定义通知图标优化 */
                 customIcon != null -> it(customIcon!!)
                 /** 若不是灰度图标自动处理为圆角 */
-                isNotGrayscaleIcon -> it(notifyInstance.compatNotifyIcon(context, iconDrawable).toBitmap().round(15.dp(context)))
+                isNotGrayscaleIcon -> it(notifyInstance.compatNotifyIcon(context, iconDrawable).toBitmap())
             }
         }
     }
diff --git a/app/src/main/java/com/fankes/miui/notify/utils/Utils.kt b/app/src/main/java/com/fankes/miui/notify/utils/Utils.kt
index 956dff9..d102ba0 100644
--- a/app/src/main/java/com/fankes/miui/notify/utils/Utils.kt
+++ b/app/src/main/java/com/fankes/miui/notify/utils/Utils.kt
@@ -29,8 +29,9 @@ import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
-import android.graphics.*
-import android.graphics.Bitmap.createBitmap
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Color
 import android.os.Build
 import android.provider.Settings
 import android.util.Base64
@@ -214,25 +215,6 @@ val ByteArray.bitmap: Bitmap get() = BitmapFactory.decodeByteArray(this, 0, size
  */
 val String.bitmap: Bitmap get() = unbase64.bitmap
 
-/**
- * 圆角图片
- * @param radius 圆角度
- * @return [Bitmap] 圆角后的位图 - 失败会返回处理之前的位图
- */
-fun Bitmap.round(radius: Float): Bitmap =
-    createBitmap(width, height, Bitmap.Config.ARGB_8888).also { out ->
-        Canvas(out).also { canvas ->
-            Paint().also { paint ->
-                paint.isAntiAlias = true
-                canvas.drawARGB(0, 0, 0, 0)
-                paint.color = Color.WHITE
-                canvas.drawRoundRect(RectF(Rect(0, 0, width, height)), radius, radius, paint)
-                paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_IN)
-                canvas.drawBitmap(this, Rect(0, 0, width, height), Rect(0, 0, width, height), paint)
-            }
-        }
-    }
-
 /**
  * 获取系统 Prop 值
  * @param key Key