From f0f3a3740207a5dcf81b74e200f0ace5381ed613 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Fri, 18 Mar 2022 14:45:46 +0800
Subject: [PATCH] Merge code

---
 .../java/com/fankes/miui/notify/hook/HookEntry.kt   |  2 +-
 .../miui/notify/utils/factory/FunctionFactory.kt    | 13 ++++++++++---
 .../com/fankes/miui/notify/view/MaterialSwitch.kt   | 10 +++++-----
 3 files changed, 16 insertions(+), 9 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 862561f..9961839 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
@@ -420,7 +420,7 @@ class HookEntry : YukiHookXposedInitProxy {
                         override fun getOutline(view: View, out: Outline) {
                             out.setRoundRect(
                                 0, 0,
-                                view.width, view.height, 5.dp(context)
+                                view.width, view.height, 5.dpFloat(context)
                             )
                         }
                     }
diff --git a/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt
index e1c1184..84fe756 100644
--- a/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt
+++ b/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt
@@ -218,11 +218,18 @@ val Context.versionName get() = packageInfo.versionName ?: ""
 val Context.versionCode get() = packageInfo.versionCode
 
 /**
- * dp 转换为 px
+ * dp 转换为 pxInt
+ * @param context 使用的实例
+ * @return [Int]
+ */
+fun Number.dp(context: Context) = dpFloat(context).toInt()
+
+/**
+ * dp 转换为 pxFloat
  * @param context 使用的实例
  * @return [Float]
  */
-fun Number.dp(context: Context) = (toFloat() * context.resources.displayMetrics.density)
+fun Number.dpFloat(context: Context) = toFloat() * context.resources.displayMetrics.density
 
 /**
  * 是否为白色
@@ -283,7 +290,7 @@ fun AlertDialog.setDefaultStyle(context: Context) =
         ).apply {
             shape = GradientDrawable.RECTANGLE
             gradientType = GradientDrawable.LINEAR_GRADIENT
-            cornerRadius = 15.dp(context)
+            cornerRadius = 15.dpFloat(context)
         })
 
 /**
diff --git a/app/src/main/java/com/fankes/miui/notify/view/MaterialSwitch.kt b/app/src/main/java/com/fankes/miui/notify/view/MaterialSwitch.kt
index 51bea50..dfebd0a 100644
--- a/app/src/main/java/com/fankes/miui/notify/view/MaterialSwitch.kt
+++ b/app/src/main/java/com/fankes/miui/notify/view/MaterialSwitch.kt
@@ -48,16 +48,16 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont
             .rectangle()
             .rounded()
             .solidColor(0xFF656565.toInt())
-            .height(20.dp(context).toInt())
-            .cornerRadius(15.dp(context).toInt())
+            .height(20.dp(context))
+            .cornerRadius(15.dp(context))
             .build()
         thumbDrawable = DrawableBuilder()
             .rectangle()
             .rounded()
             .solidColor(Color.WHITE)
-            .size(20.dp(context).toInt(), 20.dp(context).toInt())
-            .cornerRadius(20.dp(context).toInt())
-            .strokeWidth(8.dp(context).toInt())
+            .size(20.dp(context), 20.dp(context))
+            .cornerRadius(20.dp(context))
+            .strokeWidth(8.dp(context))
             .strokeColor(Color.TRANSPARENT)
             .build()
         trackTintList = toColors(