diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt b/app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt index 8e5a22c..1c09047 100644 --- a/app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt +++ b/app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt @@ -32,6 +32,7 @@ import android.util.AttributeSet import androidx.appcompat.widget.SwitchCompat import com.fankes.coloros.notify.utils.drawable.drawabletoolbox.DrawableBuilder import com.fankes.coloros.notify.utils.factory.dp +import com.fankes.coloros.notify.utils.factory.isSystemInDarkMode class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(context, attrs) { @@ -44,6 +45,8 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont return ColorStateList(states, colors) } + private val thumbColor get() = if (isSystemInDarkMode) 0xFF7C7C7C else 0xFFCCCCCC + init { trackDrawable = DrawableBuilder() .rectangle() @@ -63,8 +66,8 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont .build() trackTintList = toColors( 0xFF656565.toInt(), - 0xFFCCCCCC.toInt(), - 0xFFCCCCCC.toInt() + thumbColor.toInt(), + thumbColor.toInt() ) isSingleLine = true ellipsize = TextUtils.TruncateAt.END 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 22171fc..d118d22 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 @@ -360,7 +360,7 @@ inline fun Service.navigate() = fun Context.snake(msg: String, actionText: String = "", it: () -> Unit = {}) = Snackbar.make((this as Activity).findViewById(android.R.id.content), msg, Snackbar.LENGTH_LONG).apply { if (actionText.isBlank()) return@apply - setActionTextColor(Color.WHITE) + setActionTextColor(if (isSystemInDarkMode) Color.BLACK else Color.WHITE) setAction(actionText) { it() } }.show()