Update Global search layout to match Library and Browse (#3892)

* Update Global Search card item to be comfortable with rounded corners

* Remove card background

(cherry picked from commit a2b1acd70f5d41ad34fa8320ececb7cb9869bf6b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardHolder.kt
#	app/src/main/res/layout/global_search_controller_card.xml
#	app/src/main/res/layout/global_search_controller_comfortable_card_item.xml

app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestCardHolder.kt

@@ -7,9 +7,10 @@ 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_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
+import kotlinx.android.synthetic.main.global_search_controller_card_item.card
+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
 
 class LatestCardHolder(view: View, adapter: LatestCardAdapter) :
     BaseFlexibleViewHolder(view, adapter) {
@@ -32,6 +33,8 @@ class LatestCardHolder(view: View, adapter: LatestCardAdapter) :
     }
 
     fun bind(manga: Manga) {
+        card.clipToOutline = true
+
         tvTitle.text = manga.title
         // Set alpha of thumbnail.
         itemImage.alpha = if (manga.favorite) 0.3f else 1.0f

app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestCardItem.kt

@@ -7,18 +7,12 @@ 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 LatestCardItem(val manga: Manga) : AbstractFlexibleItem<LatestCardHolder>() {
 
     override fun getLayoutRes(): Int {
-        return when (Injekt.get<PreferencesHelper>().sourceDisplayMode().get()) {
-            PreferenceValues.DisplayMode.COMPACT_GRID -> R.layout.global_search_controller_compact_card_item
-            else -> R.layout.global_search_controller_comfortable_card_item
-        }
+        return R.layout.global_search_controller_card_item
     }
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): LatestCardHolder {

app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestHolder.kt

@@ -9,7 +9,6 @@ import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import kotlinx.android.synthetic.main.latest_controller_card.no_results_found
 import kotlinx.android.synthetic.main.latest_controller_card.progress
 import kotlinx.android.synthetic.main.latest_controller_card.recycler
-import kotlinx.android.synthetic.main.latest_controller_card.source_card
 import kotlinx.android.synthetic.main.latest_controller_card.title
 import kotlinx.android.synthetic.main.latest_controller_card.title_wrapper
 import uy.kohesive.injekt.Injekt
@@ -106,11 +105,9 @@ class LatestHolder(view: View, val adapter: LatestAdapter) :
 
     private fun showResultsHolder() {
         no_results_found.isVisible = false
-        source_card.isVisible = true
     }
 
     private fun showNoResults() {
         no_results_found.isVisible = true
-        source_card.isVisible = false
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardHolder.kt

@@ -7,9 +7,10 @@ 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_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
+import kotlinx.android.synthetic.main.global_search_controller_card_item.card
+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
 
 class GlobalSearchCardHolder(view: View, adapter: GlobalSearchCardAdapter) :
     BaseFlexibleViewHolder(view, adapter) {
@@ -32,6 +33,8 @@ class GlobalSearchCardHolder(view: View, adapter: GlobalSearchCardAdapter) :
     }
 
     fun bind(manga: Manga) {
+        card.clipToOutline = true
+
         tvTitle.text = manga.title
         // Set alpha of thumbnail.
         itemImage.alpha = if (manga.favorite) 0.3f else 1.0f

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchCardItem.kt

@@ -7,20 +7,12 @@ 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<GlobalSearchCardHolder>() {
 
     override fun getLayoutRes(): Int {
-        // SY -->
-        return when (Injekt.get<PreferencesHelper>().sourceDisplayMode().get()) {
-            PreferenceValues.DisplayMode.COMPACT_GRID -> R.layout.global_search_controller_compact_card_item
-            else -> R.layout.global_search_controller_comfortable_card_item
-        }
-        // SY <--
+        return R.layout.global_search_controller_card_item
     }
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): GlobalSearchCardHolder {

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchHolder.kt

@@ -8,7 +8,6 @@ import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import kotlinx.android.synthetic.main.global_search_controller_card.no_results_found
 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
 import kotlinx.android.synthetic.main.global_search_controller_card.title
 import kotlinx.android.synthetic.main.global_search_controller_card.title_wrapper
 
@@ -103,11 +102,9 @@ class GlobalSearchHolder(view: View, val adapter: GlobalSearchAdapter) :
 
     private fun showResultsHolder() {
         no_results_found.isVisible = false
-        source_card.isVisible = true
     }
 
     private fun showNoResults() {
         no_results_found.isVisible = true
-        source_card.isVisible = false
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexCardHolder.kt

@@ -7,9 +7,10 @@ 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_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
+import kotlinx.android.synthetic.main.global_search_controller_card_item.card
+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
 
 class IndexCardHolder(view: View, adapter: IndexCardAdapter) :
     BaseFlexibleViewHolder(view, adapter) {
@@ -32,6 +33,8 @@ class IndexCardHolder(view: View, adapter: IndexCardAdapter) :
     }
 
     fun bind(manga: Manga) {
+        card.clipToOutline = true
+
         tvTitle.text = manga.title
         // Set alpha of thumbnail.
         itemImage.alpha = if (manga.favorite) 0.3f else 1.0f

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/index/IndexCardItem.kt

@@ -7,19 +7,12 @@ 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 eu.kanade.tachiyomi.ui.browse.latest.LatestCardItem
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
 
 class IndexCardItem(val manga: Manga) : AbstractFlexibleItem<IndexCardHolder>() {
 
     override fun getLayoutRes(): Int {
-        return when (Injekt.get<PreferencesHelper>().sourceDisplayMode().get()) {
-            PreferenceValues.DisplayMode.COMPACT_GRID -> R.layout.global_search_controller_compact_card_item
-            else -> R.layout.global_search_controller_comfortable_card_item
-        }
+        return R.layout.global_search_controller_card_item
     }
 
     override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<RecyclerView.ViewHolder>>): IndexCardHolder {

app/src/main/res/layout/global_search_controller_card.xml

@@ -48,30 +48,21 @@
         android:text="@string/no_results_found"
         android:visibility="gone" />
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/source_card"
-        style="@style/Theme.Widget.CardView.Item"
+    <ProgressBar
+        android:id="@+id/progress"
+        style="?android:attr/progressBarStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="144dp">
+        android:clipToPadding="false"
+        android:orientation="horizontal"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        tools:listitem="@layout/global_search_controller_card_item" />
 
-        <ProgressBar
-            android:id="@+id/progress"
-            style="?android:attr/progressBarStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:orientation="horizontal"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp"
-            tools:listitem="@layout/global_search_controller_comfortable_card_item" />
-
-    </androidx.cardview.widget.CardView>
-
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/global_search_controller_card_item.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_item_selector_background"
+    android:layout_marginStart="4dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginBottom="8dp">
+
+    <FrameLayout
+        android:id="@+id/card"
+        android:layout_width="112dp"
+        android:layout_height="0dp"
+        android:background="@drawable/rounded_rectangle"
+        app:layout_constraintDimensionRatio="h,5:7"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ProgressBar
+            android:id="@+id/progress"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/itemImage"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/colorSurface"
+            android:scaleType="centerCrop"
+            tools:ignore="ContentDescription"
+            tools:src="@mipmap/ic_launcher" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/tvTitle"
+        style="@style/TextAppearance.Regular.Body1"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:fontFamily="@font/ptsans_narrow_bold"
+        android:lineSpacingExtra="-4dp"
+        android:maxLines="2"
+        android:padding="4dp"
+        android:shadowColor="@color/textColorPrimaryLight"
+        app:layout_constraintEnd_toEndOf="@+id/card"
+        app:layout_constraintStart_toStartOf="@+id/card"
+        app:layout_constraintTop_toBottomOf="@+id/card"
+        tools:text="Sample name" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+

app/src/main/res/layout/global_search_controller_comfortable_card_item.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    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"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/list_item_selector"
-    android:orientation="vertical"
-    android:paddingBottom="8dp"
-    android:paddingEnd="4dp"
-    android:paddingStart="4dp"
-    android:paddingTop="8dp">
-
-    <ProgressBar
-        android:id="@+id/progress"
-        style="?android:attr/progressBarStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constrainedHeight="true"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/itemImage"
-        android:layout_width="112dp"
-        android:layout_height="168dp"
-        android:paddingBottom="8dp"
-        android:scaleType="fitCenter"
-        android:background="@drawable/rounded_rectangle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription"
-        tools:src="@mipmap/ic_launcher" />
-
-    <TextView
-        android:id="@+id/tvTitle"
-        style="@style/TextAppearance.Regular.Caption"
-        android:layout_width="104dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="0dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        app:layout_constrainedHeight="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/itemImage"
-        tools:text="Sample title" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/global_search_controller_compact_card_item.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    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"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/list_item_selector"
-    android:orientation="vertical"
-    android:paddingBottom="8dp"
-    android:paddingEnd="4dp"
-    android:paddingStart="4dp"
-    android:paddingTop="8dp">
-
-    <ProgressBar
-        android:id="@+id/progress"
-        style="?android:attr/progressBarStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constrainedHeight="true"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <FrameLayout
-        android:layout_width="112dp"
-        android:layout_height="168dp"
-        android:background="@drawable/rounded_rectangle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-
-        <ImageView
-            android:id="@+id/itemImage"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="bottom"
-            android:scaleType="fitCenter"
-            android:background="@drawable/rounded_rectangle"
-            tools:ignore="ContentDescription"
-            tools:src="@mipmap/ic_launcher" />
-
-        <View
-            android:id="@+id/gradient"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="bottom"
-            android:background="@drawable/gradient_shape" />
-
-        <TextView
-            android:id="@+id/tvTitle"
-            style="@style/TextAppearance.Regular.Caption"
-            android:layout_width="104dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_marginTop="0dp"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:padding="8dp"
-            android:shadowColor="@color/textColorPrimaryLight"
-            android:shadowDx="0"
-            android:shadowDy="0"
-            android:shadowRadius="4"
-            android:textColor="@color/md_white_1000"
-            tools:text="Sample title" />
-
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/index_adapter.xml

@@ -75,7 +75,7 @@
                 android:orientation="horizontal"
                 android:paddingStart="4dp"
                 android:paddingEnd="4dp"
-                tools:listitem="@layout/global_search_controller_comfortable_card_item" />
+                tools:listitem="@layout/global_search_controller_card_item" />
 
         </androidx.cardview.widget.CardView>
 
@@ -145,7 +145,7 @@
             android:orientation="horizontal"
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
-            tools:listitem="@layout/global_search_controller_comfortable_card_item" />
+            tools:listitem="@layout/global_search_controller_card_item" />
 
     </androidx.cardview.widget.CardView>
 

app/src/main/res/layout/latest_controller_card.xml

@@ -49,30 +49,21 @@
         android:text="@string/no_results_found"
         android:visibility="gone" />
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/source_card"
-        style="@style/Theme.Widget.CardView.Item"
+    <ProgressBar
+        android:id="@+id/progress"
+        style="?android:attr/progressBarStyleSmall"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="144dp">
-
-        <ProgressBar
-            android:id="@+id/progress"
-            style="?android:attr/progressBarStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:orientation="horizontal"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp"
-            tools:listitem="@layout/global_search_controller_comfortable_card_item" />
-
-    </androidx.cardview.widget.CardView>
+        android:clipToPadding="false"
+        android:orientation="horizontal"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        tools:listitem="@layout/global_search_controller_card_item" />
 
 </LinearLayout>