优化

app/src/main/java/io/legado/app/lib/theme/ATH.kt

@@ -19,14 +19,6 @@ import splitties.init.appCtx
 @Suppress("unused", "MemberVisibilityCanBePrivate")
 object ATH {
 
-    fun setTint(
-        view: View,
-        @ColorInt color: Int,
-        isDark: Boolean = AppConfig.isNightTheme(view.context)
-    ) {
-        TintHelper.setTintAuto(view, color, false, isDark)
-    }
-
     fun setBackgroundTint(
         view: View, @ColorInt color: Int,
         isDark: Boolean = AppConfig.isNightTheme
@@ -86,12 +78,6 @@ object ATH {
         }
     }
 
-    fun applyAccentTint(view: View?) {
-        view?.apply {
-            setTint(this, context.accentColor)
-        }
-    }
-
     fun applyBackgroundTint(view: View?) {
         view?.apply {
             if (background == null) {

app/src/main/java/io/legado/app/lib/theme/view/ATECheckBox.kt

@@ -3,8 +3,8 @@ package io.legado.app.lib.theme.view
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatCheckBox
-import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -13,7 +13,7 @@ class ATECheckBox(context: Context, attrs: AttributeSet) : AppCompatCheckBox(con
 
     init {
         if (!isInEditMode) {
-            ATH.setTint(this, context.accentColor)
+            applyTint(context.accentColor)
         }
     }
 }

app/src/main/java/io/legado/app/lib/theme/view/ATEProgressBar.kt

@@ -3,8 +3,8 @@ package io.legado.app.lib.theme.view
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.ProgressBar
-import io.legado.app.lib.theme.ATH
-import io.legado.app.lib.theme.ThemeStore
+import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -13,7 +13,7 @@ class ATEProgressBar(context: Context, attrs: AttributeSet) : ProgressBar(contex
 
     init {
         if (!isInEditMode) {
-            ATH.setTint(this, ThemeStore.accentColor(context))
+            applyTint(context.accentColor)
         }
     }
 }

app/src/main/java/io/legado/app/lib/theme/view/ATERadioButton.kt

@@ -3,8 +3,8 @@ package io.legado.app.lib.theme.view
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatRadioButton
-import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -13,7 +13,7 @@ class ATERadioButton(context: Context, attrs: AttributeSet) : AppCompatRadioButt
 
     init {
         if (!isInEditMode) {
-            ATH.setTint(this@ATERadioButton, context.accentColor)
+            applyTint(context.accentColor)
         }
     }
 }

app/src/main/java/io/legado/app/lib/theme/view/ATESeekBar.kt

@@ -3,8 +3,8 @@ package io.legado.app.lib.theme.view
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatSeekBar
-import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -13,7 +13,7 @@ class ATESeekBar(context: Context, attrs: AttributeSet) : AppCompatSeekBar(conte
 
     init {
         if (!isInEditMode) {
-            ATH.setTint(this, context.accentColor)
+            applyTint(context.accentColor)
         }
     }
 }

app/src/main/java/io/legado/app/lib/theme/view/ATESwitch.kt

@@ -3,8 +3,8 @@ package io.legado.app.lib.theme.view
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.SwitchCompat
-import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -13,7 +13,7 @@ class ATESwitch(context: Context, attrs: AttributeSet) : SwitchCompat(context, a
 
     init {
         if (!isInEditMode) {
-            ATH.setTint(this, context.accentColor)
+            applyTint(context.accentColor)
         }
 
     }

app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt

@@ -107,7 +107,7 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
     }
 
     private fun initSearchView() {
-        ATH.setTint(searchView, primaryTextColor)
+        searchView.applyTint(primaryTextColor)
         searchView.onActionViewExpanded()
         searchView.isSubmitButtonEnabled = true
         searchView.queryHint = getString(R.string.search_book_key)

app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt

@@ -15,13 +15,13 @@ import io.legado.app.data.entities.BookChapter
 import io.legado.app.databinding.ActivitySearchContentBinding
 import io.legado.app.help.AppConfig
 import io.legado.app.help.BookHelp
-import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.bottomBackground
 import io.legado.app.lib.theme.getPrimaryTextColor
 import io.legado.app.lib.theme.primaryTextColor
 import io.legado.app.ui.widget.recycler.UpLinearLayoutManager
 import io.legado.app.ui.widget.recycler.VerticalDivider
 import io.legado.app.utils.ColorUtils
+import io.legado.app.utils.applyTint
 import io.legado.app.utils.observeEvent
 import io.legado.app.utils.viewbindingdelegate.viewBinding
 import kotlinx.coroutines.Dispatchers
@@ -62,7 +62,7 @@ class SearchContentActivity :
     }
 
     private fun initSearchView() {
-        ATH.setTint(searchView, primaryTextColor)
+        searchView.applyTint(primaryTextColor)
         searchView.onActionViewExpanded()
         searchView.isSubmitButtonEnabled = true
         searchView.queryHint = getString(R.string.search)

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@@ -198,7 +198,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
     }
 
     private fun initSearchView() {
-        ATH.setTint(searchView, primaryTextColor)
+        searchView.applyTint(primaryTextColor)
         searchView.onActionViewExpanded()
         searchView.queryHint = getString(R.string.search_book_source)
         searchView.clearFocus()

app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt

@@ -15,9 +15,9 @@ import com.google.android.material.tabs.TabLayout
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.databinding.ActivityChapterListBinding
-import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
 import io.legado.app.lib.theme.primaryTextColor
+import io.legado.app.utils.applyTint
 import io.legado.app.utils.gone
 import io.legado.app.utils.viewbindingdelegate.viewBinding
 import io.legado.app.utils.visible
@@ -45,29 +45,30 @@ class TocActivity : VMBaseActivity<ActivityChapterListBinding, TocViewModel>() {
     override fun onCompatCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.book_toc, menu)
         val search = menu.findItem(R.id.menu_search)
-        searchView = search.actionView as SearchView
-        ATH.setTint(searchView!!, primaryTextColor)
-        searchView?.maxWidth = resources.displayMetrics.widthPixels
-        searchView?.onActionViewCollapsed()
-        searchView?.setOnCloseListener {
-            tabLayout.visible()
-            false
-        }
-        searchView?.setOnSearchClickListener { tabLayout.gone() }
-        searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String): Boolean {
-                return false
+        searchView = (search.actionView as SearchView).apply {
+            applyTint(primaryTextColor)
+            maxWidth = resources.displayMetrics.widthPixels
+            onActionViewCollapsed()
+            setOnCloseListener {
+                tabLayout.visible()
+                false
             }
+            setOnSearchClickListener { tabLayout.gone() }
+            setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String): Boolean {
+                    return false
+                }
 
-            override fun onQueryTextChange(newText: String): Boolean {
-                if (tabLayout.selectedTabPosition == 1) {
-                    viewModel.startBookmarkSearch(newText)
-                } else {
-                    viewModel.startChapterListSearch(newText)
+                override fun onQueryTextChange(newText: String): Boolean {
+                    if (tabLayout.selectedTabPosition == 1) {
+                        viewModel.startBookmarkSearch(newText)
+                    } else {
+                        viewModel.startChapterListSearch(newText)
+                    }
+                    return false
                 }
-                return false
-            }
-        })
+            })
+        }
         return super.onCompatCreateOptionsMenu(menu)
     }
 

app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt

@@ -96,18 +96,18 @@ class BackupConfigFragment : BasePreferenceFragment(),
         addPreferencesFromResource(R.xml.pref_config_backup)
         findPreference<EditTextPreference>(PreferKey.webDavUrl)?.let {
             it.setOnBindEditTextListener { editText ->
-                ATH.setTint(editText, requireContext().accentColor)
+                editText.applyTint(requireContext().accentColor)
             }
 
         }
         findPreference<EditTextPreference>(PreferKey.webDavAccount)?.let {
             it.setOnBindEditTextListener { editText ->
-                ATH.setTint(editText, requireContext().accentColor)
+                editText.applyTint(requireContext().accentColor)
             }
         }
         findPreference<EditTextPreference>(PreferKey.webDavPassword)?.let {
             it.setOnBindEditTextListener { editText ->
-                ATH.setTint(editText, requireContext().accentColor)
+                editText.applyTint(requireContext().accentColor)
                 editText.inputType =
                     InputType.TYPE_TEXT_VARIATION_PASSWORD or InputType.TYPE_CLASS_TEXT
             }

app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt

@@ -23,6 +23,7 @@ import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.primaryTextColor
 import io.legado.app.ui.book.explore.ExploreShowActivity
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
+import io.legado.app.utils.applyTint
 import io.legado.app.utils.cnCompare
 import io.legado.app.utils.splitNotBlank
 import io.legado.app.utils.startActivity
@@ -68,7 +69,7 @@ class ExploreFragment : VMBaseFragment<ExploreViewModel>(R.layout.fragment_explo
     }
 
     private fun initSearchView() {
-        ATH.setTint(searchView, primaryTextColor)
+        searchView.applyTint(primaryTextColor)
         searchView.onActionViewExpanded()
         searchView.isSubmitButtonEnabled = true
         searchView.queryHint = getString(R.string.screen_find)

app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt

@@ -23,10 +23,7 @@ import io.legado.app.ui.rss.source.edit.RssSourceEditActivity
 import io.legado.app.ui.rss.source.manage.RssSourceActivity
 import io.legado.app.ui.rss.source.manage.RssSourceViewModel
 import io.legado.app.ui.rss.subscription.RuleSubActivity
-import io.legado.app.utils.cnCompare
-import io.legado.app.utils.openUrl
-import io.legado.app.utils.splitNotBlank
-import io.legado.app.utils.startActivity
+import io.legado.app.utils.*
 import io.legado.app.utils.viewbindingdelegate.viewBinding
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.collect
@@ -88,7 +85,7 @@ class RssFragment : VMBaseFragment<RssSourceViewModel>(R.layout.fragment_rss),
     }
 
     private fun initSearchView() {
-        ATH.setTint(searchView, primaryTextColor)
+        searchView.applyTint(primaryTextColor)
         searchView.onActionViewExpanded()
         searchView.isSubmitButtonEnabled = true
         searchView.queryHint = getString(R.string.rss)

app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt

@@ -138,7 +138,7 @@ class ReplaceRuleActivity : VMBaseActivity<ActivityReplaceRuleBinding, ReplaceRu
     }
 
     private fun initSearchView() {
-        ATH.setTint(searchView, primaryTextColor)
+        searchView.applyTint(primaryTextColor)
         searchView.onActionViewExpanded()
         searchView.queryHint = getString(R.string.replace_purify_search)
         searchView.clearFocus()

app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt

@@ -165,7 +165,7 @@ class RssSourceActivity : VMBaseActivity<ActivityRssSourceBinding, RssSourceView
 
     private fun initSearchView() {
         binding.titleBar.findViewById<SearchView>(R.id.search_view).let {
-            ATH.setTint(it, primaryTextColor)
+            it.applyTint(primaryTextColor)
             it.onActionViewExpanded()
             it.queryHint = getString(R.string.search_rss_source)
             it.clearFocus()

app/src/main/java/io/legado/app/ui/widget/prefs/SwitchPreference.kt

@@ -6,8 +6,8 @@ import androidx.appcompat.widget.SwitchCompat
 import androidx.preference.PreferenceViewHolder
 import androidx.preference.SwitchPreferenceCompat
 import io.legado.app.R
-import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 
 class SwitchPreference(context: Context, attrs: AttributeSet) :
     SwitchPreferenceCompat(context, attrs) {
@@ -33,7 +33,7 @@ class SwitchPreference(context: Context, attrs: AttributeSet) :
             isBottomBackground = isBottomBackground
         )
         if (v is SwitchCompat && !v.isInEditMode) {
-            ATH.setTint(v, context.accentColor)
+            v.applyTint(context.accentColor)
         }
         super.onBindViewHolder(holder)
     }

app/src/main/java/io/legado/app/ui/widget/seekbar/VerticalSeekBar.kt

@@ -11,8 +11,8 @@ import android.widget.ProgressBar
 import androidx.appcompat.widget.AppCompatSeekBar
 import androidx.core.view.ViewCompat
 import io.legado.app.R
-import io.legado.app.lib.theme.ATH
-import io.legado.app.lib.theme.ThemeStore
+import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 
@@ -56,7 +56,7 @@ class VerticalSeekBar @JvmOverloads constructor(context: Context, attrs: Attribu
         }
 
     init {
-        ATH.setTint(this, ThemeStore.accentColor(context))
+        applyTint(context.accentColor)
         ViewCompat.setLayoutDirection(this, ViewCompat.LAYOUT_DIRECTION_LTR)
 
         if (attrs != null) {

app/src/main/java/io/legado/app/ui/widget/text/AutoCompleteTextView.kt

@@ -12,7 +12,8 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatAutoCompleteTextView
 import io.legado.app.R
-import io.legado.app.lib.theme.ATH
+import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 import io.legado.app.utils.gone
 import io.legado.app.utils.visible
 
@@ -26,7 +27,7 @@ class AutoCompleteTextView @JvmOverloads constructor(
     var delCallBack: ((value: String) -> Unit)? = null
 
     init {
-        ATH.applyAccentTint(this)
+        applyTint(context.accentColor)
     }
 
     override fun enoughToFilter(): Boolean {

app/src/main/java/io/legado/app/ui/widget/text/EditText.kt

@@ -3,8 +3,8 @@ package io.legado.app.ui.widget.text
 import android.content.Context
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatEditText
-import io.legado.app.lib.theme.ATH
-import io.legado.app.lib.theme.ThemeStore
+import io.legado.app.lib.theme.accentColor
+import io.legado.app.utils.applyTint
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -13,7 +13,7 @@ class EditText(context: Context, attrs: AttributeSet) : AppCompatEditText(contex
 
     init {
         if (!isInEditMode) {
-            ATH.setTint(this, ThemeStore.accentColor(context))
+            applyTint(context.accentColor)
         }
     }
 }

app/src/main/java/io/legado/app/utils/ViewExtensions.kt

@@ -12,10 +12,13 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.RadioGroup
 import android.widget.SeekBar
 import android.widget.TextView
+import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.menu.MenuPopupHelper
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.get
+import io.legado.app.help.AppConfig
+import io.legado.app.lib.theme.TintHelper
 import splitties.init.appCtx
 import java.lang.reflect.Field
 
@@ -43,6 +46,20 @@ fun View.disableAutoFill() = run {
     }
 }
 
+fun View.applyTint(
+    @ColorInt color: Int,
+    isDark: Boolean = AppConfig.isNightTheme(context)
+) {
+    TintHelper.setTintAuto(this, color, false, isDark)
+}
+
+fun View.applyBackground(
+    @ColorInt color: Int,
+    isDark: Boolean = AppConfig.isNightTheme
+) {
+    TintHelper.setTintAuto(this, color, true, isDark)
+}
+
 fun View.gone() {
     if (visibility != GONE) {
         visibility = GONE