null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

swap order of search source and library options while browsing

Browse source 
like when tapping on a tag while browsing manga, it will be copy/search source/search library, vs tapping on a tag when in library, that'll still be copy/search library/search source
This commit is contained in:
Jays2Kings 2022-12-17 14:52:53 -05:00
parent c3d2c19ab9
commit 900bc07a94
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
View file

@ -1831,7 +1831,7 @@ class MangaDetailsController :
menu, menu,
) )
menu?.findItem(R.id.action_copy)?.isVisible = showCopy menu?.findItem(R.id.action_copy)?.isVisible = showCopy
val sourceMenuItem = menu?.findItem(R.id.action_source_search) var sourceMenuItem = menu?.findItem(R.id.action_source_search)
sourceMenuItem?.isVisible = searchSource && presenter.source is CatalogueSource sourceMenuItem?.isVisible = searchSource && presenter.source is CatalogueSource
val context = view?.context ?: return false val context = view?.context ?: return false
val localItem = menu?.findItem(R.id.action_local_search) ?: return true val localItem = menu?.findItem(R.id.action_local_search) ?: return true
@ -1840,6 +1840,11 @@ class MangaDetailsController :
localItem.title = context.getString(R.string.search_, library) localItem.title = context.getString(R.string.search_, library)
sourceMenuItem?.title = context.getString(R.string.search_, presenter.source.name) sourceMenuItem?.title = context.getString(R.string.search_, presenter.source.name)
if (searchSource) { if (searchSource) {
if (previousController is BrowseSourceController) {
menu.removeItem(R.id.action_source_search)
sourceMenuItem = menu.add(0, R.id.action_source_search, 1, sourceMenuItem?.title)
sourceMenuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
}
sourceMenuItem?.icon = presenter.source.icon() sourceMenuItem?.icon = presenter.source.icon()
} }
return true return true

4
app/src/main/res/menu/manga_details_tag.xml
View file

@ -5,24 +5,28 @@
<item <item
android:id="@+id/action_copy" android:id="@+id/action_copy"
android:icon="@drawable/ic_done_all_24dp" android:icon="@drawable/ic_done_all_24dp"
android:orderInCategory="0"
android:title="@string/copy_value" android:title="@string/copy_value"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/action_local_search" android:id="@+id/action_local_search"
android:icon="@drawable/ic_search_24dp" android:icon="@drawable/ic_search_24dp"
android:orderInCategory="2"
android:title="@string/search" android:title="@string/search"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/action_source_search" android:id="@+id/action_source_search"
android:icon="@drawable/ic_extension_update_24dp" android:icon="@drawable/ic_extension_update_24dp"
android:orderInCategory="3"
android:title="@string/search" android:title="@string/search"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
<item <item
android:id="@+id/action_global_search" android:id="@+id/action_global_search"
android:icon="@drawable/ic_open_in_webview_24dp" android:icon="@drawable/ic_open_in_webview_24dp"
android:orderInCategory="4"
android:title="@string/label_global_search" android:title="@string/label_global_search"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
</menu> </menu>