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 45ff2afaf..ef3a0cdc9 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 @@ -13,7 +13,6 @@ import android.os.Build import android.os.Bundle import android.view.KeyEvent import android.view.Menu -import android.view.MenuItem import android.view.MotionEvent import android.view.View import android.view.WindowManager @@ -305,16 +304,16 @@ class ReaderActivity : BaseRxActivity() * Called when an item of the options menu was clicked. Used to handle clicks on our menu * entries. */ - override fun onOptionsItemSelected(item: MenuItem): Boolean { + /*override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - /*R.id.action_bookmark -> { + R.id.action_bookmark -> { presenter.bookmarkCurrentChapter(true) invalidateOptionsMenu() } R.id.action_remove_bookmark -> { presenter.bookmarkCurrentChapter(false) invalidateOptionsMenu() - }*/ + } R.id.action_settings -> ReaderSettingsSheet(this).show() R.id.action_custom_filter -> { val sheet = ReaderColorFilterSheet(this) @@ -329,7 +328,7 @@ class ReaderActivity : BaseRxActivity() } } return super.onOptionsItemSelected(item) - } + }*/ /** * Called when the user clicks the back key or the button on the toolbar. The call is @@ -403,7 +402,27 @@ class ReaderActivity : BaseRxActivity() } ) - /* SY --> binding.leftChapter.setOnClickListener { + // Extra menu buttons + binding.filterButton.clicks() + .onEach { + ReaderColorFilterSheet(this).show() + } + .launchIn(scope) + + binding.actionSettings.clicks() + .onEach { + ReaderSettingsSheet(this).show() + } + .launchIn(scope) + + binding.webviewButton.clicks() + .onEach { + openMangaInBrowser() + } + .launchIn(scope) + // Extra menu buttons + + binding.leftChapter.setOnClickListener { if (viewer != null) { if (viewer is R2LPagerViewer) { loadNextChapter() @@ -420,7 +439,7 @@ class ReaderActivity : BaseRxActivity() loadNextChapter() } } - } SY <-- */ + } // --> EH binding.expandEhButton.clicks() @@ -830,8 +849,16 @@ class ReaderActivity : BaseRxActivity() // Set bottom page number binding.pageNumber.text = "${page.number}/${pages.size}" - binding.pageText.text = "${page.number}/${pages.size}" - // Set seekbar progress + // binding.pageText.text = "${page.number}/${pages.size}" + + // Set seekbar page number + if (viewer !is R2LPagerViewer) { + binding.leftPageText.text = "${page.number}" + binding.rightPageText.text = "${pages.size}" + } else { + binding.rightPageText.text = "${page.number}" + binding.leftPageText.text = "${pages.size}" + } binding.pageSeekbar.max = pages.lastIndex binding.pageSeekbar.progress = page.index diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt index b0b026e3b..1b420b310 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt @@ -111,7 +111,7 @@ class ReaderChapterSheet(private val activity: ReaderActivity) : BottomSheetDial refreshList() initialized = true } - binding.pageText.text = activity.binding.pageText.text + binding.pageText.text = activity.binding.pageNumber.text binding.pageSeekbar.max = activity.binding.pageSeekbar.max binding.pageSeekbar.progress = activity.binding.pageSeekbar.progress super.show() diff --git a/app/src/main/res/drawable/chapter_nav.xml b/app/src/main/res/drawable/chapter_nav.xml new file mode 100644 index 000000000..09a30efaa --- /dev/null +++ b/app/src/main/res/drawable/chapter_nav.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/reader_menu_bottom.xml b/app/src/main/res/drawable/reader_menu_bottom.xml new file mode 100644 index 000000000..e411f9461 --- /dev/null +++ b/app/src/main/res/drawable/reader_menu_bottom.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/readernav_rounded.xml b/app/src/main/res/drawable/readernav_rounded.xml new file mode 100644 index 000000000..06220d555 --- /dev/null +++ b/app/src/main/res/drawable/readernav_rounded.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml index 62de1d847..bda8302f9 100755 --- a/app/src/main/res/layout/reader_activity.xml +++ b/app/src/main/res/layout/reader_activity.xml @@ -155,38 +155,150 @@ + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_gravity="bottom"> - - - - - + android:orientation="horizontal" + android:clickable="true" + android:focusable="true"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/menu/reader.xml b/app/src/main/res/menu/reader.xml index 7ef044662..ea18e53e6 100755 --- a/app/src/main/res/menu/reader.xml +++ b/app/src/main/res/menu/reader.xml @@ -14,7 +14,7 @@ android:icon="@drawable/ic_bookmark_24dp" android:title="@string/action_remove_bookmark" app:iconTint="?attr/colorOnPrimary" - app:showAsAction="ifRoom" />--> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" />-->