diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 4c3aa7550..d47f0d0e5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -558,15 +558,17 @@ class ReaderActivity : BaseActivity() { // Settings sheet with(binding.actionSettings) { setTooltip(R.string.action_settings) - val readerSettingSheetDialog = ReaderSettingsSheet(this@ReaderActivity) + + var readerSettingSheet: ReaderSettingsSheet? = null + setOnClickListener { - if (!readerSettingSheetDialog.isShowing()) { - readerSettingSheetDialog.show() - } + if (readerSettingSheet?.isShowing == true) return@setOnClickListener + readerSettingSheet = ReaderSettingsSheet(this@ReaderActivity).apply { show() } } setOnLongClickListener { - ReaderSettingsSheet(this@ReaderActivity, showColorFilterSettings = true).show() + if (readerSettingSheet?.isShowing == true) return@setOnLongClickListener false + readerSettingSheet = ReaderSettingsSheet(this@ReaderActivity, showColorFilterSettings = true).apply { show() } true } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt index 5d6dd6167..14386d3c5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt @@ -13,19 +13,9 @@ class ReaderSettingsSheet( private val showColorFilterSettings: Boolean = false, ) : TabbedBottomSheetDialog(activity) { - private lateinit var readingModeSettings: ReaderReadingModeSettings - private lateinit var generalSettings: ReaderGeneralSettings - private lateinit var colorFilterSettings: ReaderColorFilterSettings - - init { - initSettings() - } - - private fun initSettings() { - readingModeSettings = ReaderReadingModeSettings(activity) - generalSettings = ReaderGeneralSettings(activity) - colorFilterSettings = ReaderColorFilterSettings(activity) - } + private val readingModeSettings = ReaderReadingModeSettings(activity) + private val generalSettings = ReaderGeneralSettings(activity) + private val colorFilterSettings = ReaderColorFilterSettings(activity) private val backgroundDimAnimator by lazy { val sheetBackgroundDim = window?.attributes?.dimAmount ?: 0.25f @@ -84,9 +74,4 @@ class ReaderSettingsSheet( R.string.pref_category_general, R.string.custom_filter, ) - - override fun show() { - initSettings() - super.show() - } }