diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardHolder.kt index 6b740cee4..1a1c76197 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardHolder.kt @@ -7,9 +7,9 @@ import eu.kanade.tachiyomi.data.glide.GlideApp import eu.kanade.tachiyomi.data.glide.toMangaThumbnail import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder import eu.kanade.tachiyomi.widget.StateImageViewTarget -import kotlinx.android.synthetic.main.global_search_controller_card_item.itemImage -import kotlinx.android.synthetic.main.global_search_controller_card_item.progress -import kotlinx.android.synthetic.main.global_search_controller_card_item.tvTitle +import kotlinx.android.synthetic.main.global_search_controller_comfortable_card_item.itemImage +import kotlinx.android.synthetic.main.global_search_controller_comfortable_card_item.progress +import kotlinx.android.synthetic.main.global_search_controller_comfortable_card_item.tvTitle class GlobalSearchCardHolder(view: View, adapter: GlobalSearchCardAdapter) : BaseFlexibleViewHolder(view, adapter) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt index 9c3637a6d..5b202e563 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt @@ -7,11 +7,18 @@ import eu.davidea.flexibleadapter.items.AbstractFlexibleItem import eu.davidea.flexibleadapter.items.IFlexible import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga +import eu.kanade.tachiyomi.data.preference.PreferenceValues +import eu.kanade.tachiyomi.data.preference.PreferencesHelper +import uy.kohesive.injekt.Injekt +import uy.kohesive.injekt.api.get class GlobalSearchCardItem(val manga: Manga) : AbstractFlexibleItem() { override fun getLayoutRes(): Int { - return R.layout.global_search_controller_card_item + return when (Injekt.get().catalogueDisplayMode().get()) { + PreferenceValues.DisplayMode.COMPACT_GRID -> R.layout.global_search_controller_compact_card_item + else -> R.layout.global_search_controller_comfortable_card_item + } } override fun createViewHolder(view: View, adapter: FlexibleAdapter>): GlobalSearchCardHolder { 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 d40d6e06b..8be8719b9 100644 --- a/app/src/main/res/layout/global_search_controller_card.xml +++ b/app/src/main/res/layout/global_search_controller_card.xml @@ -54,7 +54,7 @@ android:orientation="horizontal" android:paddingStart="4dp" android:paddingEnd="4dp" - tools:listitem="@layout/global_search_controller_card_item" /> + tools:listitem="@layout/global_search_controller_comfortable_card_item" /> diff --git a/app/src/main/res/layout/global_search_controller_card_item.xml b/app/src/main/res/layout/global_search_controller_comfortable_card_item.xml similarity index 98% rename from app/src/main/res/layout/global_search_controller_card_item.xml rename to app/src/main/res/layout/global_search_controller_comfortable_card_item.xml index 396327662..1f84684fc 100644 --- a/app/src/main/res/layout/global_search_controller_card_item.xml +++ b/app/src/main/res/layout/global_search_controller_comfortable_card_item.xml @@ -28,7 +28,7 @@ + + + + + + + + + + + + + + + \ No newline at end of file