舍弃原来的主题系统

app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeBookSourceDialog.kt

@@ -9,6 +9,7 @@ import android.widget.ImageButton
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.os.bundleOf
+import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle.State.STARTED
 import androidx.lifecycle.lifecycleScope
@@ -215,7 +216,7 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b
 
     private fun initLiveData() {
         viewModel.searchStateData.observe(viewLifecycleOwner) {
-            //binding.refreshProgressBar.isAutoLoading = it
+            binding.refreshProgressBar.isVisible = it
             if (it) {
                 startStopMenuItem?.let { item ->
                     item.setIcon(R.drawable.ic_stop_black_24dp)
@@ -227,7 +228,7 @@ class ChangeBookSourceDialog() : BaseBottomSheetDialogFragment(R.layout.dialog_b
                     item.setTitle(R.string.refresh)
                 }
             }
-            binding.toolBar.menu.applyTint(requireContext())
+            //binding.toolBar.menu.applyTint(requireContext())
         }
         lifecycleScope.launch {
             repeatOnLifecycle(STARTED) {

app/src/main/java/io/legato/kazusa/ui/book/changesource/ChangeChapterTocAdapter.kt

@@ -11,6 +11,7 @@ import io.legato.kazusa.lib.theme.ThemeUtils
 //import io.legado.app.lib.theme.accentColor
 import io.legato.kazusa.utils.getCompatColor
 import io.legato.kazusa.utils.gone
+import io.legato.kazusa.utils.themeColor
 import io.legato.kazusa.utils.visible
 
 class ChangeChapterTocAdapter(context: Context, val callback: Callback) :
@@ -30,11 +31,13 @@ class ChangeChapterTocAdapter(context: Context, val callback: Callback) :
     ) {
         binding.run {
             val isDur = durChapterIndex == item.index
+
             if (isDur) {
-                //tvChapterName.setTextColor(context.accentColor)
+                tvChapterName.setTextColor(context.themeColor(com.google.android.material.R.attr.colorPrimary))
             } else {
-                tvChapterName.setTextColor(context.getCompatColor(R.color.primaryText))
+                tvChapterName.setTextColor(context.themeColor(com.google.android.material.R.attr.colorOnSurface))
             }
+
             tvChapterName.text = item.title
             if (item.isVolume) {
                 //卷名，如第一卷 突出显示

app/src/main/java/io/legato/kazusa/ui/book/read/page/AutoPager.kt

@@ -1,5 +1,6 @@
 package io.legato.kazusa.ui.book.read.page
 
+import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.os.SystemClock
@@ -10,11 +11,13 @@ import io.legato.kazusa.lib.theme.ThemeStore
 import io.legato.kazusa.ui.book.read.page.entities.PageDirection
 import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory
 import io.legato.kazusa.utils.canvasrecorder.recordIfNeeded
+import io.legato.kazusa.utils.themeColor
 
 /**
  * 自动翻页
  */
-class AutoPager(private val readView: ReadView) {
+class AutoPager(
+    private val readView: ReadView) {
     private var progress = 0
     var isRunning = false
         private set
@@ -28,7 +31,7 @@ class AutoPager(private val readView: ReadView) {
 
     fun start() {
         isRunning = true
-        paint.color = ThemeStore.accentColor
+        paint.color = readView.context.themeColor(com.google.android.material.R.attr.colorPrimary)
         lastTimeMillis = SystemClock.uptimeMillis()
         readView.curPage.upSelectAble(false)
         readView.invalidate()

app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/TextLine.kt

@@ -19,6 +19,7 @@ import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider
 import io.legato.kazusa.utils.canvasrecorder.CanvasRecorderFactory
 import io.legato.kazusa.utils.canvasrecorder.recordIfNeededThenDraw
 import io.legato.kazusa.utils.dpToPx
+import io.legato.kazusa.utils.themeColor
 
 /**
  * 行信息
@@ -173,7 +174,7 @@ data class TextLine(
             ChapterProvider.contentPaint
         }
         val textColor = if (isReadAloud) {
-            ThemeStore.accentColor
+            view.context.themeColor(com.google.android.material.R.attr.colorPrimary)
         } else {
             ReadBookConfig.textColor
         }

app/src/main/java/io/legato/kazusa/ui/book/read/page/entities/column/TextColumn.kt

@@ -9,6 +9,7 @@ import io.legato.kazusa.ui.book.read.page.ContentTextView
 import io.legato.kazusa.ui.book.read.page.entities.TextLine
 import io.legato.kazusa.ui.book.read.page.entities.TextLine.Companion.emptyTextLine
 import io.legato.kazusa.ui.book.read.page.provider.ChapterProvider
+import io.legato.kazusa.utils.themeColor
 
 /**
  * 文字列
@@ -49,7 +50,7 @@ data class TextColumn(
             ChapterProvider.contentPaint
         }
         val textColor = if (textLine.isReadAloud || isSearchResult) {
-            ThemeStore.accentColor
+            view.context.themeColor(com.google.android.material.R.attr.colorPrimary)
         } else {
             ReadBookConfig.textColor
         }

app/src/main/java/io/legato/kazusa/ui/book/searchContent/SearchContentAdapter.kt

@@ -9,13 +9,14 @@ import io.legato.kazusa.databinding.ItemSearchListBinding
 //import io.legado.app.lib.theme.accentColor
 import io.legato.kazusa.utils.getCompatColor
 import io.legato.kazusa.utils.hexString
+import io.legato.kazusa.utils.themeColor
 
 
 class SearchContentAdapter(context: Context, val callback: Callback) :
     RecyclerAdapter<SearchResult, ItemSearchListBinding>(context) {
 
-    val textColor = context.getCompatColor(R.color.primaryText).hexString.substring(2)
-    //val accentColor = context.accentColor.hexString.substring(2)
+    val textColor = context.themeColor(com.google.android.material.R.attr.colorOnSurface).hexString.substring(2)
+    val accentColor = context.themeColor(com.google.android.material.R.attr.colorPrimary).hexString.substring(2)
 
     override fun getViewBinding(parent: ViewGroup): ItemSearchListBinding {
         return ItemSearchListBinding.inflate(inflater, parent, false)
@@ -30,7 +31,7 @@ class SearchContentAdapter(context: Context, val callback: Callback) :
         binding.run {
             val isDur = callback.durChapterIndex() == item.chapterIndex
             if (payloads.isEmpty()) {
-                //tvSearchResult.text = item.getHtmlCompat(textColor, accentColor)
+                tvSearchResult.text = item.getHtmlCompat(textColor, accentColor)
                 tvSearchResult.paint.isFakeBoldText = isDur
             }
         }