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 d1a2cb727..3f06a2ab5 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 @@ -310,18 +310,6 @@ class ReaderActivity : BaseRxActivity() presenter.bookmarkCurrentChapter(false) invalidateOptionsMenu() } - R.id.action_settings -> ReaderSettingsSheet(this).show() - R.id.action_custom_filter -> { - val sheet = ReaderColorFilterSheet(this) - // Remove dimmed backdrop so changes can be previewed - .apply { window?.setDimAmount(0f) } - - // Hide toolbars while sheet is open for better preview - sheet.setOnDismissListener { setMenuVisibility(true) } - setMenuVisibility(false) - - sheet.show() - } } return super.onOptionsItemSelected(item) }*/ @@ -410,24 +398,6 @@ class ReaderActivity : BaseRxActivity() ) // Extra menu buttons - binding.filterButton.clicks() - .onEach { - ReaderColorFilterSheet(this).show() - } - .launchIn(lifecycleScope) - - binding.actionSettings.clicks() - .onEach { - ReaderSettingsSheet(this).show() - } - .launchIn(lifecycleScope) - - binding.webviewButton.clicks() - .onEach { - openMangaInBrowser() - } - .launchIn(lifecycleScope) - // Extra menu buttons binding.leftChapter.setOnClickListener { if (viewer != null) { @@ -448,7 +418,29 @@ class ReaderActivity : BaseRxActivity() } } + binding.actionCustomFilter.setOnClickListener { + val sheet = ReaderColorFilterSheet(this) + // Remove dimmed backdrop so changes can be previewed + .apply { window?.setDimAmount(0f) } + + // Hide toolbars while sheet is open for better preview + sheet.setOnDismissListener { setMenuVisibility(true) } + setMenuVisibility(false) + + sheet.show() + } + binding.actionSettings.setOnClickListener { + ReaderSettingsSheet(this).show() + } + // --> EH + binding.actionWebView.setOnClickListener { + openMangaInBrowser() + } + binding.actionChapterList.setOnClickListener { + chapterBottomSheet.show() + } + binding.expandEhButton.clicks() .onEach { ehUtilsVisible = !ehUtilsVisible @@ -597,13 +589,6 @@ class ReaderActivity : BaseRxActivity() } .launchIn(lifecycleScope) - chapterBottomSheet = ReaderChapterSheet(this) - binding.chaptersButton.clicks() - .onEach { - chapterBottomSheet.show() - } - .launchIn(lifecycleScope) - autoScrollFlow .onEach { viewer.let { v -> @@ -612,6 +597,8 @@ class ReaderActivity : BaseRxActivity() } } .launchIn(lifecycleScope) + + chapterBottomSheet = ReaderChapterSheet(this) // <-- EH // Set initial visibility diff --git a/app/src/main/res/drawable/ic_skip_next_24dp.xml b/app/src/main/res/drawable/ic_skip_next_24dp.xml deleted file mode 100644 index 78ae4da4f..000000000 --- a/app/src/main/res/drawable/ic_skip_next_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_skip_previous_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_24dp.xml deleted file mode 100644 index 2dad0ad04..000000000 --- a/app/src/main/res/drawable/ic_skip_previous_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/reader_seekbar_background.xml b/app/src/main/res/drawable/reader_seekbar_background.xml new file mode 100644 index 000000000..0e6908eca --- /dev/null +++ b/app/src/main/res/drawable/reader_seekbar_background.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml index bda8302f9..7a6a446e5 100755 --- a/app/src/main/res/layout/reader_activity.xml +++ b/app/src/main/res/layout/reader_activity.xml @@ -156,52 +156,54 @@ android:id="@+id/reader_menu_bottom" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:layout_gravity="bottom"> + android:layout_gravity="bottom" + android:orientation="vertical"> + android:orientation="horizontal"> + app:tint="?attr/colorOnPrimary" /> + android:paddingEnd="10dp"> + + + app:tint="?attr/colorOnPrimary" /> + android:background="?attr/colorPrimary"> - - + app:srcCompat="@drawable/ic_format_list_numbered_24dp" + app:tint="?attr/colorOnPrimary" /> + app:srcCompat="@drawable/ic_brightness_4_24dp" + app:tint="?attr/colorOnPrimary" /> + + + app:srcCompat="@drawable/ic_settings_24dp" + app:tint="?attr/colorOnPrimary" /> diff --git a/app/src/main/res/menu/reader.xml b/app/src/main/res/menu/reader.xml index ea18e53e6..54d342fda 100755 --- a/app/src/main/res/menu/reader.xml +++ b/app/src/main/res/menu/reader.xml @@ -14,20 +14,6 @@ android:icon="@drawable/ic_bookmark_24dp" android:title="@string/action_remove_bookmark" app:iconTint="?attr/colorOnPrimary" - app:showAsAction="ifRoom" /> - - - - -->