diff --git a/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt b/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt index 5e9dfa6..9006dc4 100644 --- a/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt +++ b/app/src/main/java/com/fankes/tsbattery/utils/factory/DialogBuilderFactory.kt @@ -102,7 +102,7 @@ class DialogBuilder(private val context: Context, private val isUseBlackTheme: B ).apply { shape = GradientDrawable.RECTANGLE gradientType = GradientDrawable.LINEAR_GRADIENT - cornerRadius = 15.dp(this@DialogBuilder.context) + cornerRadius = 15.dpFloat(this@DialogBuilder.context) }) }?.show() } \ No newline at end of file diff --git a/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt index 226426f..d6c73a7 100644 --- a/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt @@ -80,17 +80,18 @@ val Context.versionName get() = packageInfo.versionName ?: "" val Context.versionCode get() = packageInfo.versionCode /** - * dp 转换为 px + * dp 转换为 pxInt + * @param context 使用的实例 * @return [Int] */ -val Number.dp get() = (toFloat() * appContext.resources.displayMetrics.density).toInt() +fun Number.dp(context: Context) = dpFloat(context).toInt() /** - * dp 转换为 px + * 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 /** * 跳转 APP 自身设置界面 diff --git a/app/src/main/java/com/fankes/tsbattery/view/MaterialSwitch.kt b/app/src/main/java/com/fankes/tsbattery/view/MaterialSwitch.kt index 2db71d2..824cbe8 100644 --- a/app/src/main/java/com/fankes/tsbattery/view/MaterialSwitch.kt +++ b/app/src/main/java/com/fankes/tsbattery/view/MaterialSwitch.kt @@ -47,16 +47,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(