github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix reader settings sheet not updated (#8854)

Browse source 
* Revert "Recreate reader settings when opening sheet (#8054)"

This reverts commit acb8ab15b2.

* Revert "Fix stacking of Settings menu in the reader on multiple taps (#8002)"

This reverts commit 30ac94181b.

* Fix reader settings sheet not updated
This commit is contained in:
stevenyomi 2023-01-08 03:25:30 +08:00 committed by GitHub
parent 817418f7c9
commit 0861c5618c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
View file

@ -558,15 +558,17 @@ class ReaderActivity : BaseActivity() {
// Settings sheet // Settings sheet
with(binding.actionSettings) { with(binding.actionSettings) {
setTooltip(R.string.action_settings) setTooltip(R.string.action_settings)
val readerSettingSheetDialog = ReaderSettingsSheet(this@ReaderActivity)
var readerSettingSheet: ReaderSettingsSheet? = null
setOnClickListener { setOnClickListener {
if (!readerSettingSheetDialog.isShowing()) { if (readerSettingSheet?.isShowing == true) return@setOnClickListener
readerSettingSheetDialog.show() readerSettingSheet = ReaderSettingsSheet(this@ReaderActivity).apply { show() }
}
} }
setOnLongClickListener { setOnLongClickListener {
ReaderSettingsSheet(this@ReaderActivity, showColorFilterSettings = true).show() if (readerSettingSheet?.isShowing == true) return@setOnLongClickListener false
readerSettingSheet = ReaderSettingsSheet(this@ReaderActivity, showColorFilterSettings = true).apply { show() }
true true
} }
} }

21
app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
View file

@ -13,19 +13,9 @@ class ReaderSettingsSheet(
private val showColorFilterSettings: Boolean = false, private val showColorFilterSettings: Boolean = false,
) : TabbedBottomSheetDialog(activity) { ) : TabbedBottomSheetDialog(activity) {
private lateinit var readingModeSettings: ReaderReadingModeSettings private val readingModeSettings = ReaderReadingModeSettings(activity)
private lateinit var generalSettings: ReaderGeneralSettings private val generalSettings = ReaderGeneralSettings(activity)
private lateinit var colorFilterSettings: ReaderColorFilterSettings private val colorFilterSettings = ReaderColorFilterSettings(activity)
init {
initSettings()
}
private fun initSettings() {
readingModeSettings = ReaderReadingModeSettings(activity)
generalSettings = ReaderGeneralSettings(activity)
colorFilterSettings = ReaderColorFilterSettings(activity)
}
private val backgroundDimAnimator by lazy { private val backgroundDimAnimator by lazy {
val sheetBackgroundDim = window?.attributes?.dimAmount ?: 0.25f val sheetBackgroundDim = window?.attributes?.dimAmount ?: 0.25f
@ -84,9 +74,4 @@ class ReaderSettingsSheet(
R.string.pref_category_general, R.string.pref_category_general,
R.string.custom_filter, R.string.custom_filter,
) )
override fun show() {
initSettings()
super.show()
}
} }