mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-12 21:35:18 +01:00
Reverted manga details intent back to tapping on reader toolbar + ripple
Since all other forks are doing it, it should be clear to everyone BUT I'm adding a ripple to show it's clickable
This commit is contained in:
parent
110807bd49
commit
c26c38ca39
@ -279,19 +279,6 @@ class ReaderActivity :
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
|
|
||||||
val detailsItem = menu?.findItem(R.id.action_manga_details)
|
|
||||||
if (presenter.manga?.mangaType(this) != null) {
|
|
||||||
detailsItem?.title = getString(
|
|
||||||
R.string._details,
|
|
||||||
presenter.manga?.mangaType(this)?.capitalize(Locale.ROOT) ?: ""
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
detailsItem?.title = getString(R.string.details)
|
|
||||||
}
|
|
||||||
return super.onPrepareOptionsMenu(menu)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when an item of the options menu was clicked. Used to handle clicks on our menu
|
* Called when an item of the options menu was clicked. Used to handle clicks on our menu
|
||||||
* entries.
|
* entries.
|
||||||
@ -300,12 +287,6 @@ class ReaderActivity :
|
|||||||
coroutine?.cancel()
|
coroutine?.cancel()
|
||||||
when (item.itemId) {
|
when (item.itemId) {
|
||||||
R.id.action_display_settings -> TabbedReaderSettingsSheet(this).show()
|
R.id.action_display_settings -> TabbedReaderSettingsSheet(this).show()
|
||||||
R.id.action_manga_details -> {
|
|
||||||
presenter.manga?.id?.let { id ->
|
|
||||||
val intent = SearchActivity.openMangaIntent(this, id)
|
|
||||||
startActivity(intent)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
R.id.action_share_page, R.id.action_set_page_as_cover, R.id.action_save_page -> {
|
R.id.action_share_page, R.id.action_set_page_as_cover, R.id.action_save_page -> {
|
||||||
val currentChapter = presenter.getCurrentChapter() ?: return true
|
val currentChapter = presenter.getCurrentChapter() ?: return true
|
||||||
val page = currentChapter.pages?.getOrNull(page_seekbar.progress) ?: return true
|
val page = currentChapter.pages?.getOrNull(page_seekbar.progress) ?: return true
|
||||||
@ -395,6 +376,13 @@ class ReaderActivity :
|
|||||||
popToMain()
|
popToMain()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toolbar.setOnClickListener {
|
||||||
|
presenter.manga?.id?.let { id ->
|
||||||
|
val intent = SearchActivity.openMangaIntent(this, id)
|
||||||
|
startActivity(intent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Init listeners on bottom menu
|
// Init listeners on bottom menu
|
||||||
page_seekbar.setOnSeekBarChangeListener(
|
page_seekbar.setOnSeekBarChangeListener(
|
||||||
object : SimpleSeekBarListener() {
|
object : SimpleSeekBarListener() {
|
||||||
|
@ -8,13 +8,6 @@
|
|||||||
android:title="@string/display_options"
|
android:title="@string/display_options"
|
||||||
app:showAsAction="ifRoom" />
|
app:showAsAction="ifRoom" />
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_manga_details"
|
|
||||||
android:icon="@drawable/ic_book_24dp"
|
|
||||||
android:title="@string/details"
|
|
||||||
app:showAsAction="ifRoom" />
|
|
||||||
|
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_share_page"
|
android:id="@+id/action_share_page"
|
||||||
android:icon="@drawable/ic_share_24dp"
|
android:icon="@drawable/ic_share_24dp"
|
||||||
|
Loading…
Reference in New Issue
Block a user