Merge code

This commit is contained in:
2022-03-18 14:45:46 +08:00
parent 3e50ca6db7
commit f0f3a37402
3 changed files with 16 additions and 9 deletions

View File

@@ -420,7 +420,7 @@ class HookEntry : YukiHookXposedInitProxy {
override fun getOutline(view: View, out: Outline) { override fun getOutline(view: View, out: Outline) {
out.setRoundRect( out.setRoundRect(
0, 0, 0, 0,
view.width, view.height, 5.dp(context) view.width, view.height, 5.dpFloat(context)
) )
} }
} }

View File

@@ -218,11 +218,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]
*/
fun Number.dp(context: Context) = dpFloat(context).toInt()
/**
* 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
/** /**
* 是否为白色 * 是否为白色
@@ -283,7 +290,7 @@ fun AlertDialog.setDefaultStyle(context: Context) =
).apply { ).apply {
shape = GradientDrawable.RECTANGLE shape = GradientDrawable.RECTANGLE
gradientType = GradientDrawable.LINEAR_GRADIENT gradientType = GradientDrawable.LINEAR_GRADIENT
cornerRadius = 15.dp(context) cornerRadius = 15.dpFloat(context)
}) })
/** /**

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(context).toInt()) .height(20.dp(context))
.cornerRadius(15.dp(context).toInt()) .cornerRadius(15.dp(context))
.build() .build()
thumbDrawable = DrawableBuilder() thumbDrawable = DrawableBuilder()
.rectangle() .rectangle()
.rounded() .rounded()
.solidColor(Color.WHITE) .solidColor(Color.WHITE)
.size(20.dp(context).toInt(), 20.dp(context).toInt()) .size(20.dp(context), 20.dp(context))
.cornerRadius(20.dp(context).toInt()) .cornerRadius(20.dp(context))
.strokeWidth(8.dp(context).toInt()) .strokeWidth(8.dp(context))
.strokeColor(Color.TRANSPARENT) .strokeColor(Color.TRANSPARENT)
.build() .build()
trackTintList = toColors( trackTintList = toColors(