Skip to content

Commit cfb0c06

Browse files
committed
Merge code
1 parent efabb72 commit cfb0c06

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

app/src/main/java/com/fankes/coloros/notify/ui/view/MaterialSwitch.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import android.util.AttributeSet
3232
import androidx.appcompat.widget.SwitchCompat
3333
import com.fankes.coloros.notify.utils.drawable.drawabletoolbox.DrawableBuilder
3434
import com.fankes.coloros.notify.utils.factory.dp
35+
import com.fankes.coloros.notify.utils.factory.isSystemInDarkMode
3536

3637
class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(context, attrs) {
3738

@@ -44,6 +45,8 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont
4445
return ColorStateList(states, colors)
4546
}
4647

48+
private val thumbColor get() = if (isSystemInDarkMode) 0xFF7C7C7C else 0xFFCCCCCC
49+
4750
init {
4851
trackDrawable = DrawableBuilder()
4952
.rectangle()
@@ -63,8 +66,8 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont
6366
.build()
6467
trackTintList = toColors(
6568
0xFF656565.toInt(),
66-
0xFFCCCCCC.toInt(),
67-
0xFFCCCCCC.toInt()
69+
thumbColor.toInt(),
70+
thumbColor.toInt()
6871
)
6972
isSingleLine = true
7073
ellipsize = TextUtils.TruncateAt.END

app/src/main/java/com/fankes/coloros/notify/utils/factory/FunctionFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ inline fun <reified T : Activity> Service.navigate() =
360360
fun Context.snake(msg: String, actionText: String = "", it: () -> Unit = {}) =
361361
Snackbar.make((this as Activity).findViewById(android.R.id.content), msg, Snackbar.LENGTH_LONG).apply {
362362
if (actionText.isBlank()) return@apply
363-
setActionTextColor(Color.WHITE)
363+
setActionTextColor(if (isSystemInDarkMode) Color.BLACK else Color.WHITE)
364364
setAction(actionText) { it() }
365365
}.show()
366366

0 commit comments

Comments
 (0)