Remove legacy settings sheet

The per-series settings aren't quite functional yet, but they're also
accessible outside of the sheet.

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

@@ -69,7 +69,6 @@ import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderPreferences
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
-import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsSheet
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
 import eu.kanade.tachiyomi.ui.reader.viewer.ReaderProgressIndicator
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer
@@ -391,7 +390,13 @@ class ReaderActivity : BaseActivity() {
 
         binding.dialogRoot.setComposeContent {
             val state by viewModel.state.collectAsState()
-            val settingsScreenModel = remember { ReaderSettingsScreenModel() }
+            val settingsScreenModel = remember {
+                ReaderSettingsScreenModel(
+                    readerState = viewModel.state,
+                    onChangeReadingMode = viewModel::setMangaReadingMode,
+                    onChangeOrientation = viewModel::setMangaOrientationType,
+                )
+            }
 
             val onDismissRequest = viewModel::closeDialog
             when (state.dialog) {
@@ -485,7 +490,7 @@ class ReaderActivity : BaseActivity() {
                 ) {
                     val newReadingMode = ReadingModeType.fromPreference(itemId)
 
-                    viewModel.setMangaReadingMode(newReadingMode.flagValue)
+                    viewModel.setMangaReadingMode(newReadingMode)
 
                     menuToggleToast?.cancel()
                     if (!readerPreferences.showReadingMode().get()) {
@@ -539,7 +544,7 @@ class ReaderActivity : BaseActivity() {
                 ) {
                     val newOrientation = OrientationType.fromPreference(itemId)
 
-                    viewModel.setMangaOrientationType(newOrientation.flagValue)
+                    viewModel.setMangaOrientationType(newOrientation)
 
                     menuToggleToast?.cancel()
                     menuToggleToast = toast(newOrientation.stringRes)
@@ -548,16 +553,6 @@ class ReaderActivity : BaseActivity() {
         }
 
         // Settings sheet
-        with(binding.actionSettingsLegacy) {
-            setTooltip(R.string.action_settings)
-
-            var readerSettingSheet: ReaderSettingsSheet? = null
-
-            setOnClickListener {
-                if (readerSettingSheet?.isShowing == true) return@setOnClickListener
-                readerSettingSheet = ReaderSettingsSheet(this@ReaderActivity).apply { show() }
-            }
-        }
         with(binding.actionSettings) {
             setTooltip(R.string.action_settings)
 

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt

@@ -602,10 +602,10 @@ class ReaderViewModel(
     /**
      * Updates the viewer position for the open manga.
      */
-    fun setMangaReadingMode(readingModeType: Int) {
+    fun setMangaReadingMode(readingModeType: ReadingModeType) {
         val manga = manga ?: return
         runBlocking(Dispatchers.IO) {
-            setMangaViewerFlags.awaitSetMangaReadingMode(manga.id, readingModeType.toLong())
+            setMangaViewerFlags.awaitSetMangaReadingMode(manga.id, readingModeType.flagValue.toLong())
             val currChapters = state.value.viewerChapters
             if (currChapters != null) {
                 // Save current page
@@ -638,10 +638,10 @@ class ReaderViewModel(
     /**
      * Updates the orientation type for the open manga.
      */
-    fun setMangaOrientationType(rotationType: Int) {
+    fun setMangaOrientationType(rotationType: OrientationType) {
         val manga = manga ?: return
         viewModelScope.launchIO {
-            setMangaViewerFlags.awaitSetOrientationType(manga.id, rotationType.toLong())
+            setMangaViewerFlags.awaitSetOrientationType(manga.id, rotationType.flagValue.toLong())
             val currChapters = state.value.viewerChapters
             if (currChapters != null) {
                 // Save current page

app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsScreenModel.kt

@@ -1,15 +1,30 @@
 package eu.kanade.tachiyomi.ui.reader.setting
 
 import cafe.adriel.voyager.core.model.ScreenModel
+import eu.kanade.presentation.util.ioCoroutineScope
+import eu.kanade.tachiyomi.ui.reader.ReaderViewModel
 import eu.kanade.tachiyomi.util.preference.toggle
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
 import tachiyomi.core.preference.Preference
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
 class ReaderSettingsScreenModel(
+    readerState: StateFlow<ReaderViewModel.State>,
+    val onChangeReadingMode: (ReadingModeType) -> Unit,
+    val onChangeOrientation: (OrientationType) -> Unit,
     val preferences: ReaderPreferences = Injekt.get(),
 ) : ScreenModel {
 
+    val viewerFlow = readerState
+        .map { it.viewer }
+        .distinctUntilChanged()
+        .stateIn(ioCoroutineScope, SharingStarted.Lazily, null)
+
     fun togglePreference(preference: (ReaderPreferences) -> Preference<Boolean>) {
         preference(preferences).toggle()
     }

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

@@ -1,38 +0,0 @@
-package eu.kanade.tachiyomi.ui.reader.setting
-
-import android.os.Bundle
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import eu.kanade.domain.manga.model.orientationType
-import eu.kanade.domain.manga.model.readingModeType
-import eu.kanade.tachiyomi.databinding.ReaderReadingModeSettingsBinding
-import eu.kanade.tachiyomi.ui.reader.ReaderActivity
-
-class ReaderSettingsSheet(
-    private val activity: ReaderActivity,
-) : BottomSheetDialog(activity) {
-
-    private lateinit var binding: ReaderReadingModeSettingsBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = ReaderReadingModeSettingsBinding.inflate(activity.layoutInflater)
-        setContentView(binding.root)
-
-        initGeneralPreferences()
-    }
-
-    private fun initGeneralPreferences() {
-        binding.viewer.onItemSelectedListener = { position ->
-            val readingModeType = ReadingModeType.fromSpinner(position)
-            activity.viewModel.setMangaReadingMode(readingModeType.flagValue)
-        }
-        binding.viewer.setSelection(activity.viewModel.manga?.readingModeType?.let { ReadingModeType.fromPreference(it.toInt()).prefValue } ?: ReadingModeType.DEFAULT.prefValue)
-
-        binding.rotationMode.onItemSelectedListener = { position ->
-            val rotationType = OrientationType.fromSpinner(position)
-            activity.viewModel.setMangaOrientationType(rotationType.flagValue)
-        }
-        binding.rotationMode.setSelection(activity.viewModel.manga?.orientationType?.let { OrientationType.fromPreference(it.toInt()).prefValue } ?: OrientationType.DEFAULT.prefValue)
-    }
-}