diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchAdapter.kt index 31450d3b1..eadd43478 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchAdapter.kt @@ -18,7 +18,7 @@ class GlobalSearchAdapter(val controller: GlobalSearchController) : /** * Listen for more button clicks. */ - val moreClickListener: OnMoreClickListener = controller + val titleClickListener: OnTitleClickListener = controller /** * Bundle where the view state of the holders is saved. @@ -74,8 +74,8 @@ class GlobalSearchAdapter(val controller: GlobalSearchController) : } } - interface OnMoreClickListener { - fun onMoreClick(source: CatalogueSource) + interface OnTitleClickListener { + fun onTitleClick(source: CatalogueSource) } private companion object { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt index a116604f1..cd320fde6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt @@ -36,7 +36,7 @@ open class GlobalSearchController( protected val extensionFilter: String? = null ) : NucleusController(), GlobalSearchCardAdapter.OnMangaClickListener, - GlobalSearchAdapter.OnMoreClickListener { + GlobalSearchAdapter.OnTitleClickListener { /** * Application preferences. @@ -205,7 +205,7 @@ open class GlobalSearchController( getHolder(source)?.setImage(manga) } - override fun onMoreClick(source: CatalogueSource) { + override fun onTitleClick(source: CatalogueSource) { openCatalogue(source, BrowseSourceController(source, presenter.query)) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchHolder.kt index 5f35af850..201da47d3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchHolder.kt @@ -6,7 +6,6 @@ import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.util.view.gone import eu.kanade.tachiyomi.util.view.visible -import kotlinx.android.synthetic.main.global_search_controller_card.more import kotlinx.android.synthetic.main.global_search_controller_card.progress import kotlinx.android.synthetic.main.global_search_controller_card.recycler import kotlinx.android.synthetic.main.global_search_controller_card.source_card @@ -32,10 +31,10 @@ class GlobalSearchHolder(view: View, val adapter: GlobalSearchAdapter) : // Set layout horizontal. recycler.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false) recycler.adapter = mangaAdapter - more.setOnClickListener { + title.setOnClickListener { val item = adapter.getItem(bindingAdapterPosition) if (item != null) { - adapter.moreClickListener.onMoreClick(item.source) + adapter.titleClickListener.onTitleClick(item.source) } } } @@ -104,12 +103,10 @@ class GlobalSearchHolder(view: View, val adapter: GlobalSearchAdapter) : private fun showHolder() { title.visible() source_card.visible() - more.visible() // EXH } private fun hideHolder() { title.gone() source_card.gone() - more.gone() // EXH } } diff --git a/app/src/main/res/layout/global_search_controller_card.xml b/app/src/main/res/layout/global_search_controller_card.xml index 3255012dc..a8176f7db 100644 --- a/app/src/main/res/layout/global_search_controller_card.xml +++ b/app/src/main/res/layout/global_search_controller_card.xml @@ -1,43 +1,24 @@ - + android:layout_height="wrap_content" + android:orientation="vertical"> -