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

---
 .../notify/utils/factory/FunctionFactory.kt     | 17 +++++++++--------
 .../coloros/notify/view/MaterialSwitch.kt       | 10 +++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt
index 85f8f7d..273f8c0 100644
--- a/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt
@@ -145,17 +145,18 @@ val Context.versionName get() = packageInfo.versionName ?: ""
 val Context.versionCode get() = packageInfo.versionCode
 
 /**
- * dp 转换为 px
- * @return [Int]
- */
-val Number.dp get() = (toFloat() * appContext.resources.displayMetrics.density).toInt()
-
-/**
- * dp 转换为 px
+ * dp 转换为 pxInt
  * @param context 使用的实例
  * @return [Int]
  */
-fun Number.dp(context: Context) = (toFloat() * context.resources.displayMetrics.density).toInt()
+fun Number.dp(context: Context) = dpFloat(context).toInt()
+
+/**
+ * dp 转换为 pxFloat
+ * @param context 使用的实例
+ * @return [Float]
+ */
+fun Number.dpFloat(context: Context) = toFloat() * context.resources.displayMetrics.density
 
 /**
  * Base64 加密
diff --git a/app/src/main/java/com/fankes/coloros/notify/view/MaterialSwitch.kt b/app/src/main/java/com/fankes/coloros/notify/view/MaterialSwitch.kt
index 4a23231..8f6c142 100644
--- a/app/src/main/java/com/fankes/coloros/notify/view/MaterialSwitch.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/view/MaterialSwitch.kt
@@ -48,16 +48,16 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont
             .rectangle()
             .rounded()
             .solidColor(0xFF656565.toInt())
-            .height(20.dp)
-            .cornerRadius(15.dp)
+            .height(20.dp(context))
+            .cornerRadius(15.dp(context))
             .build()
         thumbDrawable = DrawableBuilder()
             .rectangle()
             .rounded()
             .solidColor(Color.WHITE)
-            .size(20.dp, 20.dp)
-            .cornerRadius(20.dp)
-            .strokeWidth(8.dp)
+            .size(20.dp(context), 20.dp(context))
+            .cornerRadius(20.dp(context))
+            .strokeWidth(8.dp(context))
             .strokeColor(Color.TRANSPARENT)
             .build()
         trackTintList = toColors(