From 7a8bc6c8f8c4665caef0e60cdc83e40d871d3403 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Mon, 28 Mar 2022 13:58:34 +0800
Subject: [PATCH] Merge code

---
 .../java/com/fankes/tsbattery/ui/view/MaterialSwitch.kt    | 7 +++++--
 .../com/fankes/tsbattery/utils/factory/FunctionFactory.kt  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/fankes/tsbattery/ui/view/MaterialSwitch.kt b/app/src/main/java/com/fankes/tsbattery/ui/view/MaterialSwitch.kt
index e9c0153..312f64a 100644
--- a/app/src/main/java/com/fankes/tsbattery/ui/view/MaterialSwitch.kt
+++ b/app/src/main/java/com/fankes/tsbattery/ui/view/MaterialSwitch.kt
@@ -31,6 +31,7 @@ import android.util.AttributeSet
 import androidx.appcompat.widget.SwitchCompat
 import com.fankes.tsbattery.utils.drawable.drawabletoolbox.DrawableBuilder
 import com.fankes.tsbattery.utils.factory.dp
+import com.fankes.tsbattery.utils.factory.isSystemInDarkMode
 
 class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(context, attrs) {
 
@@ -43,6 +44,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()
@@ -62,8 +65,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/tsbattery/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt
index 43d0622..cad9e5f 100644
--- a/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt
+++ b/app/src/main/java/com/fankes/tsbattery/utils/factory/FunctionFactory.kt
@@ -131,7 +131,7 @@ fun toast(msg: String) = Toast.makeText(appContext, msg, Toast.LENGTH_SHORT).sho
 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()