Rerevert new reader bs

app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -36,6 +36,7 @@ import org.koitharu.kotatsu.databinding.ActivityReaderBinding
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaPage
+import org.koitharu.kotatsu.reader.ui.config.ReaderConfigBottomSheet
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
 import org.koitharu.kotatsu.reader.ui.thumbnails.OnPageSelectListener
 import org.koitharu.kotatsu.reader.ui.thumbnails.PagesThumbnailsSheet
@@ -50,8 +51,7 @@ class ReaderActivity :
 	ChaptersBottomSheet.OnChapterChangeListener,
 	GridTouchHelper.OnGridTouchListener,
 	OnPageSelectListener,
-	ReaderConfigDialog.Callback,
+	ReaderConfigBottomSheet.Callback,
-	ActivityResultCallback<Uri?>,
 	ReaderControlDelegate.OnInteractionListener,
 	OnApplyWindowInsetsListener {
 
@@ -65,7 +65,6 @@ class ReaderActivity :
 
 	private lateinit var touchHelper: GridTouchHelper
 	private lateinit var controlDelegate: ReaderControlDelegate
-	private val savePageRequest = registerForActivityResult(PageSaveContract(), this)
 	private var gestureInsets: Insets = Insets.NONE
 	private lateinit var readerManager: ReaderManager
 	private val hideUiRunnable = Runnable { setUiIsVisible(false) }
@@ -115,10 +114,6 @@ class ReaderActivity :
 
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		when (item.itemId) {
-			R.id.action_menu -> {
-				val currentMode = readerManager.currentMode ?: return false
-				ReaderConfigDialog.show(supportFragmentManager, currentMode)
-			}
 			R.id.action_settings -> {
 				startActivity(SettingsActivity.newReaderSettingsIntent(this))
 			}
@@ -149,15 +144,16 @@ class ReaderActivity :
 					viewModel.addBookmark()
 				}
 			}
+			R.id.action_options -> {
+				viewModel.saveCurrentState(readerManager.currentReader?.getCurrentState())
+				val currentMode = readerManager.currentMode ?: return false
+				ReaderConfigBottomSheet.show(supportFragmentManager, currentMode)
+			}
 			else -> return super.onOptionsItemSelected(item)
 		}
 		return true
 	}
 
-	override fun onActivityResult(uri: Uri?) {
-		viewModel.onActivityResult(uri)
-	}
-
 	private fun onLoadingStateChanged(isLoading: Boolean) {
 		val hasPages = !viewModel.content.value?.pages.isNullOrEmpty()
 		binding.layoutLoading.isVisible = isLoading && !hasPages

app/src/main/res/drawable/ic_read_reversed.xml

@@ -1,11 +0,0 @@
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M4 21h15a2 2 0 0 0 2-2v-6h-4v2l-4-3 4-3v2h4V5a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2m0-6h4v2H4v-2m0-4h7v2H4v-2m0-4h7v2H4V7m17 4h3v2h-3v-2z" />
-</vector>

app/src/main/res/menu/opt_reader_bottom.xml

@@ -20,7 +20,7 @@
 		app:showAsAction="always" />
 
 	<item
-		android:id="@+id/action_menu"
+		android:id="@+id/action_options"
 		android:icon="@drawable/abc_ic_menu_overflow_material"
 		android:title="@string/options"
 		app:showAsAction="always" />