Remove global search more button in favor of clicking the title

This commit is contained in:
Jobobby04 2020-06-01 18:19:12 -04:00
parent fb81431199
commit 852e340c21
4 changed files with 14 additions and 36 deletions

View File

@ -18,7 +18,7 @@ class GlobalSearchAdapter(val controller: GlobalSearchController) :
/** /**
* Listen for more button clicks. * Listen for more button clicks.
*/ */
val moreClickListener: OnMoreClickListener = controller val titleClickListener: OnTitleClickListener = controller
/** /**
* Bundle where the view state of the holders is saved. * Bundle where the view state of the holders is saved.
@ -74,8 +74,8 @@ class GlobalSearchAdapter(val controller: GlobalSearchController) :
} }
} }
interface OnMoreClickListener { interface OnTitleClickListener {
fun onMoreClick(source: CatalogueSource) fun onTitleClick(source: CatalogueSource)
} }
private companion object { private companion object {

View File

@ -36,7 +36,7 @@ open class GlobalSearchController(
protected val extensionFilter: String? = null protected val extensionFilter: String? = null
) : NucleusController<GlobalSearchControllerBinding, GlobalSearchPresenter>(), ) : NucleusController<GlobalSearchControllerBinding, GlobalSearchPresenter>(),
GlobalSearchCardAdapter.OnMangaClickListener, GlobalSearchCardAdapter.OnMangaClickListener,
GlobalSearchAdapter.OnMoreClickListener { GlobalSearchAdapter.OnTitleClickListener {
/** /**
* Application preferences. * Application preferences.
@ -205,7 +205,7 @@ open class GlobalSearchController(
getHolder(source)?.setImage(manga) getHolder(source)?.setImage(manga)
} }
override fun onMoreClick(source: CatalogueSource) { override fun onTitleClick(source: CatalogueSource) {
openCatalogue(source, BrowseSourceController(source, presenter.query)) openCatalogue(source, BrowseSourceController(source, presenter.query))
} }

View File

@ -6,7 +6,6 @@ import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
import eu.kanade.tachiyomi.util.view.gone import eu.kanade.tachiyomi.util.view.gone
import eu.kanade.tachiyomi.util.view.visible 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.progress
import kotlinx.android.synthetic.main.global_search_controller_card.recycler import kotlinx.android.synthetic.main.global_search_controller_card.recycler
import kotlinx.android.synthetic.main.global_search_controller_card.source_card 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. // Set layout horizontal.
recycler.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false) recycler.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false)
recycler.adapter = mangaAdapter recycler.adapter = mangaAdapter
more.setOnClickListener { title.setOnClickListener {
val item = adapter.getItem(bindingAdapterPosition) val item = adapter.getItem(bindingAdapterPosition)
if (item != null) { 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() { private fun showHolder() {
title.visible() title.visible()
source_card.visible() source_card.visible()
more.visible() // EXH
} }
private fun hideHolder() { private fun hideHolder() {
title.gone() title.gone()
source_card.gone() source_card.gone()
more.gone() // EXH
} }
} }

View File

@ -1,43 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
style="@style/TextAppearance.Regular.SubHeading" style="@style/TextAppearance.Regular.SubHeading"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/material_component_text_fields_padding_above_and_below_label" android:padding="@dimen/material_component_text_fields_padding_above_and_below_label"
app:layout_constraintBottom_toTopOf="@+id/source_card"
app:layout_constrainedHeight="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Title" /> tools:text="Title" />
<Button
android:id="@+id/more"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="More"
style="@style/Widget.AppCompat.Button.Borderless"
app:layout_constraintBottom_toTopOf="@+id/source_card"
app:layout_constraintHeight_default="wrap"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/source_card" android:id="@+id/source_card"
style="@style/Theme.Widget.CardView.Item" style="@style/Theme.Widget.CardView.Item"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="200dp" android:minHeight="144dp">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constrainedHeight="true"
app:layout_constraintStart_toStartOf="parent">
<ProgressBar <ProgressBar
android:id="@+id/progress" android:id="@+id/progress"
@ -58,4 +39,4 @@
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout> </LinearLayout>