From 0bed92879da0143e7c97d0c830a54fa9ada22066 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Fri, 30 Aug 2019 21:31:39 +0800
Subject: [PATCH] up

---
 .../io/legado/app/lib/theme/TintHelper.kt     | 37 +++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/legado/app/lib/theme/TintHelper.kt b/app/src/main/java/io/legado/app/lib/theme/TintHelper.kt
index fc79f4584..0caf1b8a8 100644
--- a/app/src/main/java/io/legado/app/lib/theme/TintHelper.kt
+++ b/app/src/main/java/io/legado/app/lib/theme/TintHelper.kt
@@ -250,7 +250,10 @@ object TintHelper {
     }
 
     @JvmOverloads
-    fun setTint(progressBar: ProgressBar, @ColorInt color: Int, skipIndeterminate: Boolean = false) {
+    fun setTint(
+        progressBar: ProgressBar, @ColorInt color: Int,
+        skipIndeterminate: Boolean = false
+    ) {
         val sl = ColorStateList.valueOf(color)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             progressBar.progressTintList = sl
@@ -272,7 +275,11 @@ object TintHelper {
         val editTextColorStateList = ColorStateList(
             arrayOf(
                 intArrayOf(-android.R.attr.state_enabled),
-                intArrayOf(android.R.attr.state_enabled, -android.R.attr.state_pressed, -android.R.attr.state_focused),
+                intArrayOf(
+                    android.R.attr.state_enabled,
+                    -android.R.attr.state_pressed,
+                    -android.R.attr.state_focused
+                ),
                 intArrayOf()
             ),
             intArrayOf(
@@ -314,7 +321,12 @@ object TintHelper {
             box.buttonTintList = sl
         } else {
             val drawable =
-                createTintedDrawable(ContextCompat.getDrawable(box.context, R.drawable.abc_btn_check_material), sl)
+                createTintedDrawable(
+                    ContextCompat.getDrawable(
+                        box.context,
+                        R.drawable.abc_btn_check_material
+                    ), sl
+                )
             box.buttonDrawable = drawable
         }
     }
@@ -380,7 +392,6 @@ object TintHelper {
     }
 
     fun setTint(switchView: Switch, @ColorInt color: Int, useDarker: Boolean) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return
         if (switchView.trackDrawable != null) {
             switchView.trackDrawable = modifySwitchDrawable(
                 switchView.context,
@@ -390,7 +401,11 @@ object TintHelper {
         if (switchView.thumbDrawable != null) {
             switchView.thumbDrawable = modifySwitchDrawable(
                 switchView.context,
-                switchView.thumbDrawable, color, true, false, useDarker
+                switchView.thumbDrawable,
+                color,
+                thumb = true,
+                compatSwitch = false,
+                useDarker = useDarker
             )
         }
     }
@@ -399,13 +414,21 @@ object TintHelper {
         if (switchView.trackDrawable != null) {
             switchView.trackDrawable = modifySwitchDrawable(
                 switchView.context,
-                switchView.trackDrawable, color, false, true, useDarker
+                switchView.trackDrawable,
+                color,
+                thumb = false,
+                compatSwitch = true,
+                useDarker = useDarker
             )
         }
         if (switchView.thumbDrawable != null) {
             switchView.thumbDrawable = modifySwitchDrawable(
                 switchView.context,
-                switchView.thumbDrawable, color, true, true, useDarker
+                switchView.thumbDrawable,
+                color,
+                thumb = true,
+                compatSwitch = true,
+                useDarker = useDarker
             )
         }
     }