Merge code

This commit is contained in:
2022-03-18 14:51:00 +08:00
parent 6d58f0330b
commit 17b3d8ac9a
3 changed files with 11 additions and 10 deletions

View File

@@ -102,7 +102,7 @@ class DialogBuilder(private val context: Context, private val isUseBlackTheme: B
).apply { ).apply {
shape = GradientDrawable.RECTANGLE shape = GradientDrawable.RECTANGLE
gradientType = GradientDrawable.LINEAR_GRADIENT gradientType = GradientDrawable.LINEAR_GRADIENT
cornerRadius = 15.dp(this@DialogBuilder.context) cornerRadius = 15.dpFloat(this@DialogBuilder.context)
}) })
}?.show() }?.show()
} }

View File

@@ -80,17 +80,18 @@ val Context.versionName get() = packageInfo.versionName ?: ""
val Context.versionCode get() = packageInfo.versionCode val Context.versionCode get() = packageInfo.versionCode
/** /**
* dp 转换为 px * dp 转换为 pxInt
* @param context 使用的实例
* @return [Int] * @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 使用的实例 * @param context 使用的实例
* @return [Float] * @return [Float]
*/ */
fun Number.dp(context: Context) = toFloat() * context.resources.displayMetrics.density fun Number.dpFloat(context: Context) = toFloat() * context.resources.displayMetrics.density
/** /**
* 跳转 APP 自身设置界面 * 跳转 APP 自身设置界面

View File

@@ -47,16 +47,16 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont
.rectangle() .rectangle()
.rounded() .rounded()
.solidColor(0xFF656565.toInt()) .solidColor(0xFF656565.toInt())
.height(20.dp) .height(20.dp(context))
.cornerRadius(15.dp) .cornerRadius(15.dp(context))
.build() .build()
thumbDrawable = DrawableBuilder() thumbDrawable = DrawableBuilder()
.rectangle() .rectangle()
.rounded() .rounded()
.solidColor(Color.WHITE) .solidColor(Color.WHITE)
.size(20.dp, 20.dp) .size(20.dp(context), 20.dp(context))
.cornerRadius(20.dp) .cornerRadius(20.dp(context))
.strokeWidth(8.dp) .strokeWidth(8.dp(context))
.strokeColor(Color.TRANSPARENT) .strokeColor(Color.TRANSPARENT)
.build() .build()
trackTintList = toColors( trackTintList = toColors(