diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt index ab6ec12c5..0d20ad322 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt +++ b/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, - ActivityResultCallback, + ReaderConfigBottomSheet.Callback, 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 diff --git a/app/src/main/res/drawable/ic_read_reversed.xml b/app/src/main/res/drawable/ic_read_reversed.xml deleted file mode 100644 index 1e564ec9e..000000000 --- a/app/src/main/res/drawable/ic_read_reversed.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/menu/opt_reader_bottom.xml b/app/src/main/res/menu/opt_reader_bottom.xml index c9dbdcba5..d900b0c37 100644 --- a/app/src/main/res/menu/opt_reader_bottom.xml +++ b/app/src/main/res/menu/opt_reader_bottom.xml @@ -20,7 +20,7 @@ app:showAsAction="always" />