优化

2025-03-13 14:39:09 +08:00
parent 2852c1f182
commit a21db85838
5 changed files with 57 additions and 166 deletions
@@ -430,7 +430,6 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode

    override fun colorFilter(config: MangaColorFilterConfig) {
        mAdapter.setMangaImageColorFilter(config)
-        mAdapter.notifyItemChanged(ReadManga.durChapterPos)
        updateWindowBrightness(config.l)
    }

@@ -545,6 +544,7 @@ class ReadMangaActivity : VMBaseActivity<ActivityMangaBinding, ReadMangaViewMode
            }

            R.id.menu_manga_color_filter -> {
+                binding.mangaMenu.runMenuOut()
                MangaColorFilterDialog().show(supportFragmentManager, "MangaColorFilterDialog")
            }
        }
@@ -10,5 +10,4 @@ data class MangaColorFilterConfig(
    var b: Int = 0,
    var a: Int = 0,
    var l: Int = 0
-) :
-    Parcelable
+) : Parcelable
@@ -4,7 +4,7 @@ import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
-import android.widget.SeekBar
+import android.view.WindowManager
 import io.legado.app.R
 import io.legado.app.base.BaseDialogFragment
 import io.legado.app.databinding.DialogMangaColorFilterBinding
@@ -23,100 +23,48 @@ class MangaColorFilterDialog : BaseDialogFragment(R.layout.dialog_manga_color_fi

    override fun onStart() {
        super.onStart()
+        dialog?.window?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
        setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
    }

    override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
-        binding.seekA.progress = mConfig.a
-        binding.seekBrightness.progress = mConfig.l
-        binding.seekB.progress = mConfig.b
-        binding.seekG.progress = mConfig.g
-        binding.seekR.progress = mConfig.r
-        binding.seekBrightness.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(
-                seekBar: SeekBar?,
-                progress: Int,
-                fromUser: Boolean
-            ) {
-                mConfig.l = progress
+        initData()
+        initView()
+    }
+
+    private fun initData() {
+        binding.run {
+            dsbBrightness.progress = mConfig.l
+            dsbR.progress = mConfig.r
+            dsbG.progress = mConfig.g
+            dsbB.progress = mConfig.b
+            dsbA.progress = mConfig.a
+        }
+    }
+
+    private fun initView() {
+        binding.run {
+            dsbBrightness.onChanged = {
+                mConfig.l = it
                ReadManga.mCallback?.colorFilter(mConfig)
            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {
-            }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {
-            }
-
-        })
-        binding.seekR.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(
-                seekBar: SeekBar?,
-                progress: Int,
-                fromUser: Boolean
-            ) {
-                mConfig.r = progress
+            dsbR.onChanged = {
+                mConfig.r = it
                ReadManga.mCallback?.colorFilter(mConfig)
            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {
-            }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {
-            }
-
-        })
-        binding.seekG.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(
-                seekBar: SeekBar?,
-                progress: Int,
-                fromUser: Boolean
-            ) {
-                mConfig.g = progress
+            dsbG.onChanged = {
+                mConfig.g = it
                ReadManga.mCallback?.colorFilter(mConfig)
            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {
-            }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {
-            }
-
-        })
-        binding.seekB.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(
-                seekBar: SeekBar?,
-                progress: Int,
-                fromUser: Boolean
-            ) {
-                mConfig.b = progress
+            dsbB.onChanged = {
+                mConfig.b = it
                ReadManga.mCallback?.colorFilter(mConfig)
            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {
-            }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {
-            }
-
-        })
-        binding.seekA.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(
-                seekBar: SeekBar?,
-                progress: Int,
-                fromUser: Boolean
-            ) {
-                mConfig.a = progress
+            dsbA.onChanged = {
+                mConfig.a = it
                ReadManga.mCallback?.colorFilter(mConfig)
            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {
-            }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {
-            }
-
-        })
+        }
    }

    override fun onDismiss(dialog: DialogInterface) {
@@ -1,5 +1,6 @@
 package io.legado.app.ui.book.manga.recyclerview

+import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.ColorMatrix
 import android.graphics.ColorMatrixColorFilter
@@ -230,7 +231,9 @@ class MangaAdapter(private val context: Context) :
        return null
    }

+    @SuppressLint("NotifyDataSetChanged")
    fun setMangaImageColorFilter(config: MangaColorFilterConfig) {
        mConfig = config
+        notifyDataSetChanged()
    }
 }