Merge code

This commit is contained in:
2022-03-18 14:47:43 +08:00
parent 1def8ef6f2
commit fda47d7b53
2 changed files with 14 additions and 13 deletions

View File

@@ -145,17 +145,18 @@ val Context.versionName get() = packageInfo.versionName ?: ""
val Context.versionCode get() = packageInfo.versionCode val Context.versionCode get() = packageInfo.versionCode
/** /**
* dp 转换为 px * dp 转换为 pxInt
* @return [Int]
*/
val Number.dp get() = (toFloat() * appContext.resources.displayMetrics.density).toInt()
/**
* dp 转换为 px
* @param context 使用的实例 * @param context 使用的实例
* @return [Int] * @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 加密 * Base64 加密

View File

@@ -48,16 +48,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(