重写主题系统

app/src/main/java/io/legato/kazusa/ui/book/bookmark/AllBookmarkActivity.kt

@@ -52,6 +52,7 @@ class AllBookmarkActivity : VMBaseActivity<ActivityAllBookmarkBinding, AllBookma
     }
 
     private fun initView() {
+        setSupportActionBar(binding.topBar)
         binding.recyclerView.addItemDecoration(BookmarkDecoration(this,adapter))
         binding.recyclerView.adapter = adapter
         binding.recyclerView.applyNavigationBarPadding()

app/src/main/java/io/legato/kazusa/ui/config/ConfigActivity.kt

@@ -28,7 +28,7 @@ class ConfigActivity : VMBaseActivity<ActivityConfigBinding, ConfigViewModel>()
 
     override fun setTitle(resId: Int) {
         super.setTitle(resId)
-        binding.titleBar.setTitle(resId)
+        binding.topBar.setTitle(resId)
     }
 
     inline fun <reified T : Fragment> replaceFragment(configTag: String) {

app/src/main/java/io/legato/kazusa/ui/config/CoverRuleConfigDialog.kt

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import io.legato.kazusa.R
+import io.legato.kazusa.base.BaseBottomSheetDialogFragment
 import io.legato.kazusa.base.BaseDialogFragment
 import io.legato.kazusa.databinding.DialogCoverRuleConfigBinding
 //import io.legado.app.lib.theme.primaryColor
@@ -19,13 +20,13 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import splitties.views.onClick
 
-class CoverRuleConfigDialog : BaseDialogFragment(R.layout.dialog_cover_rule_config) {
+class CoverRuleConfigDialog : BaseBottomSheetDialogFragment(R.layout.dialog_cover_rule_config) {
 
     val binding by viewBinding(DialogCoverRuleConfigBinding::bind)
 
     override fun onStart() {
         super.onStart()
-        setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+
     }
 
     override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {

app/src/main/java/io/legato/kazusa/ui/config/ThemeConfigFragment.kt

@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.widget.SeekBar
+import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import io.legato.kazusa.R
@@ -22,6 +23,7 @@ import io.legato.kazusa.lib.dialogs.alert
 import io.legato.kazusa.lib.dialogs.selector
 import io.legato.kazusa.lib.prefs.ColorPreference
 import io.legato.kazusa.lib.prefs.NameListPreference
+import io.legato.kazusa.lib.prefs.ThemeModePreference
 //import io.legado.app.lib.theme.primaryColor
 import io.legato.kazusa.ui.widget.number.NumberPickerDialog
 import io.legato.kazusa.ui.widget.seekbar.SeekBarChangeListener
@@ -71,6 +73,7 @@ class ThemeConfigFragment : PreferenceFragmentCompat(),
         if (Build.VERSION.SDK_INT < 26) {
             preferenceScreen.removePreferenceRecursively(PreferKey.launcherIcon)
         }
+        upPreferenceSummary(PreferKey.themePref)
         upPreferenceSummary(PreferKey.bgImage, getPrefString(PreferKey.bgImage))
         upPreferenceSummary(PreferKey.bgImageN, getPrefString(PreferKey.bgImageN))
         //upPreferenceSummary(PreferKey.barElevation, AppConfig.elevation.toString())
@@ -95,12 +98,20 @@ class ThemeConfigFragment : PreferenceFragmentCompat(),
                 }
             }
         }
-        findPreference<NameListPreference>(PreferKey.themeMode)?.let {
+        findPreference<ThemeModePreference>(PreferKey.themeMode)?.let {
             it.setOnPreferenceChangeListener { _, _ ->
                 ThemeConfig.applyDayNight(requireContext())
                 true
             }
         }
+        findPreference<ListPreference>(PreferKey.themePref)?.let {
+            it.setOnPreferenceChangeListener { _, _ ->
+                val intent = requireActivity().intent
+                requireActivity().finish()
+                startActivity(intent)
+                true
+            }
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -126,6 +137,11 @@ class ThemeConfigFragment : PreferenceFragmentCompat(),
             PreferKey.launcherIcon -> LauncherIconHelp.changeIcon(getPrefString(key))
             //PreferKey.transparentStatusBar -> recreateActivities()
             //PreferKey.immNavigationBar -> recreateActivities()
+            PreferKey.themePref -> {
+                val intent = requireActivity().intent
+                requireActivity().finish()
+                startActivity(intent)
+            }
             PreferKey.cPrimary,
             PreferKey.cAccent,
             PreferKey.cBackground,
@@ -139,9 +155,11 @@ class ThemeConfigFragment : PreferenceFragmentCompat(),
             PreferKey.cNBBackground -> {
                 upTheme(true)
             }
+
             PreferKey.themeMode -> {
                 ThemeConfig.applyDayNight(requireContext())
             }
+
             PreferKey.bgImage,
             PreferKey.bgImageN -> {
                 upPreferenceSummary(key, getPrefString(key))

app/src/main/java/io/legato/kazusa/ui/welcome/WelcomeActivity.kt

@@ -27,7 +27,7 @@ open class WelcomeActivity : BaseActivity<ActivityWelcomeBinding>() {
         if (intent.flags and Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT != 0) {
             finish()
         } else {
-            binding.root.postDelayed(600) { startMainActivity() }
+            binding.root.postDelayed(100) { startMainActivity() }
         }
     }