Replace Kotlin synthetic views in viewholders

app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionGroupHolder.kt

@@ -3,11 +3,13 @@ package eu.kanade.tachiyomi.ui.browse.extension
 import android.annotation.SuppressLint
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.source_main_controller_card_header.title
+import eu.davidea.viewholders.FlexibleViewHolder
+import eu.kanade.tachiyomi.databinding.SourceMainControllerCardHeaderBinding
 
 class ExtensionGroupHolder(view: View, adapter: FlexibleAdapter<*>) :
-    BaseFlexibleViewHolder(view, adapter) {
+    FlexibleViewHolder(view, adapter) {
+
+    private val binding = SourceMainControllerCardHeaderBinding.bind(view)
 
     @SuppressLint("SetTextI18n")
     fun bind(item: ExtensionGroupItem) {
@@ -16,6 +18,6 @@ class ExtensionGroupHolder(view: View, adapter: FlexibleAdapter<*>) :
             text += " (${item.size})"
         }
 
-        title.text = text
+        binding.title.text = text
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt

@@ -1,24 +1,21 @@
 package eu.kanade.tachiyomi.ui.browse.extension
 
 import android.view.View
+import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.glide.GlideApp
+import eu.kanade.tachiyomi.databinding.ExtensionCardItemBinding
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.model.InstallStep
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import eu.kanade.tachiyomi.util.system.LocaleHelper
-import kotlinx.android.synthetic.main.extension_card_item.ext_button
-import kotlinx.android.synthetic.main.extension_card_item.ext_title
-import kotlinx.android.synthetic.main.extension_card_item.image
-import kotlinx.android.synthetic.main.extension_card_item.lang
-import kotlinx.android.synthetic.main.extension_card_item.version
-import kotlinx.android.synthetic.main.extension_card_item.warning
 
 class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
-    BaseFlexibleViewHolder(view, adapter) {
+    FlexibleViewHolder(view, adapter) {
+
+    private val binding = ExtensionCardItemBinding.bind(view)
 
     init {
-        ext_button.setOnClickListener {
+        binding.extButton.setOnClickListener {
             adapter.buttonClickListener.onButtonClick(bindingAdapterPosition)
         }
     }
@@ -26,10 +23,10 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
     fun bind(item: ExtensionItem) {
         val extension = item.extension
 
-        ext_title.text = extension.name
-        version.text = extension.versionName
-        lang.text = LocaleHelper.getSourceDisplayName(extension.lang, itemView.context)
-        warning.text = when {
+        binding.extTitle.text = extension.name
+        binding.version.text = extension.versionName
+        binding.lang.text = LocaleHelper.getSourceDisplayName(extension.lang, itemView.context)
+        binding.warning.text = when {
             extension is Extension.Untrusted -> itemView.context.getString(R.string.ext_untrusted)
             extension is Extension.Installed && extension.isObsolete -> itemView.context.getString(R.string.ext_obsolete)
             extension is Extension.Installed && extension.isUnofficial -> itemView.context.getString(R.string.ext_unofficial)
@@ -37,19 +34,19 @@ class ExtensionHolder(view: View, val adapter: ExtensionAdapter) :
             else -> ""
         }.toUpperCase()
 
-        GlideApp.with(itemView.context).clear(image)
+        GlideApp.with(itemView.context).clear(binding.image)
         if (extension is Extension.Available) {
             GlideApp.with(itemView.context)
                 .load(extension.iconUrl)
-                .into(image)
+                .into(binding.image)
         } else {
-            extension.getApplicationIcon(itemView.context)?.let { image.setImageDrawable(it) }
+            extension.getApplicationIcon(itemView.context)?.let { binding.image.setImageDrawable(it) }
         }
         bindButton(item)
     }
 
     @Suppress("ResourceType")
-    fun bindButton(item: ExtensionItem) = with(ext_button) {
+    fun bindButton(item: ExtensionItem) = with(binding.extButton) {
         isEnabled = true
         isClickable = true
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MangaHolder.kt

@@ -6,30 +6,31 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.source_list_item.thumbnail
-import kotlinx.android.synthetic.main.source_list_item.title
+import eu.kanade.tachiyomi.databinding.SourceListItemBinding
 
 class MangaHolder(
     view: View,
     adapter: FlexibleAdapter<*>
-) : BaseFlexibleViewHolder(view, adapter) {
+) : FlexibleViewHolder(view, adapter) {
+
+    private val binding = SourceListItemBinding.bind(view)
 
     fun bind(item: MangaItem) {
         // Update the title of the manga.
-        title.text = item.manga.title
+        binding.title.text = item.manga.title
 
         // Create thumbnail onclick to simulate long click
-        thumbnail.setOnClickListener {
+        binding.thumbnail.setOnClickListener {
             // Simulate long click on this view to enter selection mode
             onLongClick(itemView)
         }
 
         // Update the cover.
-        GlideApp.with(itemView.context).clear(thumbnail)
+        GlideApp.with(itemView.context).clear(binding.thumbnail)
 
         val radius = itemView.context.resources.getDimensionPixelSize(R.dimen.card_radius)
         val requestOptions = RequestOptions().transform(CenterCrop(), RoundedCorners(radius))
@@ -38,6 +39,6 @@ class MangaHolder(
             .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
             .apply(requestOptions)
             .dontAnimate()
-            .into(thumbnail)
+            .into(binding.thumbnail)
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt

@@ -5,9 +5,9 @@ import androidx.recyclerview.widget.RecyclerView
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.AbstractHeaderItem
 import eu.davidea.flexibleadapter.items.IFlexible
+import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.source_main_controller_card_header.title
+import eu.kanade.tachiyomi.databinding.SourceMainControllerCardHeaderBinding
 
 /**
  * Item that contains the selection header.
@@ -43,9 +43,12 @@ class SelectionHeader : AbstractHeaderItem<SelectionHeader.Holder>() {
         // Intentionally empty
     }
 
-    class Holder(view: View, adapter: FlexibleAdapter<*>) : BaseFlexibleViewHolder(view, adapter) {
+    class Holder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter) {
+
+        private val binding = SourceMainControllerCardHeaderBinding.bind(view)
+
         init {
-            title.text = view.context.getString(R.string.migration_selection_prompt)
+            binding.title.text = view.context.getString(R.string.migration_selection_prompt)
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SourceHolder.kt

@@ -1,23 +1,24 @@
 package eu.kanade.tachiyomi.ui.browse.migration.sources
 
 import android.view.View
+import eu.davidea.viewholders.FlexibleViewHolder
+import eu.kanade.tachiyomi.databinding.SourceMainControllerCardItemBinding
 import eu.kanade.tachiyomi.source.icon
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
-import kotlinx.android.synthetic.main.source_main_controller_card_item.image
-import kotlinx.android.synthetic.main.source_main_controller_card_item.title
 
 class SourceHolder(view: View, val adapter: SourceAdapter) :
-    BaseFlexibleViewHolder(view, adapter) {
+    FlexibleViewHolder(view, adapter) {
+
+    private val binding = SourceMainControllerCardItemBinding.bind(view)
 
     fun bind(item: SourceItem) {
         val source = item.source
 
         // Set source name
-        title.text = source.name
+        binding.title.text = source.name
 
         // Set source icon
         itemView.post {
-            image.setImageDrawable(source.icon())
+            binding.image.setImageDrawable(source.icon())
         }
     }
 }

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

@@ -2,14 +2,16 @@ package eu.kanade.tachiyomi.ui.browse.source
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
+import eu.davidea.viewholders.FlexibleViewHolder
+import eu.kanade.tachiyomi.databinding.SourceMainControllerCardHeaderBinding
 import eu.kanade.tachiyomi.util.system.LocaleHelper
-import kotlinx.android.synthetic.main.source_main_controller_card_header.title
 
 class LangHolder(view: View, adapter: FlexibleAdapter<*>) :
-    BaseFlexibleViewHolder(view, adapter) {
+    FlexibleViewHolder(view, adapter) {
+
+    private val binding = SourceMainControllerCardHeaderBinding.bind(view)
 
     fun bind(item: LangItem) {
-        title.text = LocaleHelper.getSourceDisplayName(item.code, itemView.context)
+        binding.title.text = LocaleHelper.getSourceDisplayName(item.code, itemView.context)
     }
 }

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

@@ -2,28 +2,26 @@ package eu.kanade.tachiyomi.ui.browse.source
 
 import android.view.View
 import androidx.core.view.isVisible
+import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.databinding.SourceMainControllerCardItemBinding
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.source.icon
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import eu.kanade.tachiyomi.util.system.LocaleHelper
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import eu.kanade.tachiyomi.util.view.setVectorCompat
-import kotlinx.android.synthetic.main.source_main_controller_card_item.image
-import kotlinx.android.synthetic.main.source_main_controller_card_item.pin
-import kotlinx.android.synthetic.main.source_main_controller_card_item.source_latest
-import kotlinx.android.synthetic.main.source_main_controller_card_item.subtitle
-import kotlinx.android.synthetic.main.source_main_controller_card_item.title
 
 class SourceHolder(private val view: View, val adapter: SourceAdapter) :
-    BaseFlexibleViewHolder(view, adapter) {
+    FlexibleViewHolder(view, adapter) {
+
+    private val binding = SourceMainControllerCardItemBinding.bind(view)
 
     init {
-        source_latest.setOnClickListener {
+        binding.sourceLatest.setOnClickListener {
             adapter.clickListener.onLatestClick(bindingAdapterPosition)
         }
 
-        pin.setOnClickListener {
+        binding.pin.setOnClickListener {
             adapter.clickListener.onPinClick(bindingAdapterPosition)
         }
     }
@@ -31,26 +29,26 @@ class SourceHolder(private val view: View, val adapter: SourceAdapter) :
     fun bind(item: SourceItem) {
         val source = item.source
 
-        title.text = source.name
-        subtitle.isVisible = source !is LocalSource
-        subtitle.text = LocaleHelper.getDisplayName(source.lang)
+        binding.title.text = source.name
+        binding.subtitle.isVisible = source !is LocalSource
+        binding.subtitle.text = LocaleHelper.getDisplayName(source.lang)
 
         // Set source icon
         itemView.post {
             val icon = source.icon()
             when {
-                icon != null -> image.setImageDrawable(icon)
-                item.source.id == LocalSource.ID -> image.setImageResource(R.mipmap.ic_local_source)
+                icon != null -> binding.image.setImageDrawable(icon)
+                item.source.id == LocalSource.ID -> binding.image.setImageResource(R.mipmap.ic_local_source)
             }
         }
 
-        source_latest.isVisible = source.supportsLatest
+        binding.sourceLatest.isVisible = source.supportsLatest
 
-        pin.isVisible = true
+        binding.pin.isVisible = true
         if (item.isPinned) {
-            pin.setVectorCompat(R.drawable.ic_push_pin_filled_24dp, view.context.getResourceColor(R.attr.colorAccent))
+            binding.pin.setVectorCompat(R.drawable.ic_push_pin_filled_24dp, view.context.getResourceColor(R.attr.colorAccent))
         } else {
-            pin.setVectorCompat(R.drawable.ic_push_pin_24dp, view.context.getResourceColor(android.R.attr.textColorHint))
+            binding.pin.setVectorCompat(R.drawable.ic_push_pin_24dp, view.context.getResourceColor(android.R.attr.textColorHint))
         }
     }
 }

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

@@ -6,11 +6,8 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
+import eu.kanade.tachiyomi.databinding.SourceComfortableGridItemBinding
 import eu.kanade.tachiyomi.widget.StateImageViewTarget
-import kotlinx.android.synthetic.main.source_comfortable_grid_item.card
-import kotlinx.android.synthetic.main.source_comfortable_grid_item.progress
-import kotlinx.android.synthetic.main.source_comfortable_grid_item.thumbnail
-import kotlinx.android.synthetic.main.source_comfortable_grid_item.title
 
 /**
  * Class used to hold the displayed data of a manga in the catalogue, like the cover or the title.
@@ -23,6 +20,8 @@ import kotlinx.android.synthetic.main.source_comfortable_grid_item.title
 class SourceComfortableGridHolder(private val view: View, private val adapter: FlexibleAdapter<*>) :
     SourceGridHolder(view, adapter) {
 
+    private val binding = SourceComfortableGridItemBinding.bind(view)
+
     /**
      * Method called from [CatalogueAdapter.onBindViewHolder]. It updates the data for this
      * holder with the given manga.
@@ -31,26 +30,26 @@ class SourceComfortableGridHolder(private val view: View, private val adapter: F
      */
     override fun onSetValues(manga: Manga) {
         // Set manga title
-        title.text = manga.title
+        binding.title.text = manga.title
 
         // Set alpha of thumbnail.
-        thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
+        binding.thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
 
         setImage(manga)
     }
 
     override fun setImage(manga: Manga) {
         // For rounded corners
-        card.clipToOutline = true
+        binding.card.clipToOutline = true
 
-        GlideApp.with(view.context).clear(thumbnail)
+        GlideApp.with(view.context).clear(binding.thumbnail)
         if (!manga.thumbnail_url.isNullOrEmpty()) {
             GlideApp.with(view.context)
                 .load(manga.toMangaThumbnail())
                 .diskCacheStrategy(DiskCacheStrategy.DATA)
                 .centerCrop()
                 .placeholder(android.R.color.transparent)
-                .into(StateImageViewTarget(thumbnail, progress))
+                .into(StateImageViewTarget(binding.thumbnail, binding.progress))
         }
     }
 }

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

@@ -6,11 +6,8 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
+import eu.kanade.tachiyomi.databinding.SourceComfortableGridItemBinding
 import eu.kanade.tachiyomi.widget.StateImageViewTarget
-import kotlinx.android.synthetic.main.source_compact_grid_item.card
-import kotlinx.android.synthetic.main.source_compact_grid_item.progress
-import kotlinx.android.synthetic.main.source_compact_grid_item.thumbnail
-import kotlinx.android.synthetic.main.source_compact_grid_item.title
 
 /**
  * Class used to hold the displayed data of a manga in the catalogue, like the cover or the title.
@@ -23,6 +20,8 @@ import kotlinx.android.synthetic.main.source_compact_grid_item.title
 open class SourceGridHolder(private val view: View, private val adapter: FlexibleAdapter<*>) :
     SourceHolder(view, adapter) {
 
+    private val binding = SourceComfortableGridItemBinding.bind(view)
+
     /**
      * Method called from [CatalogueAdapter.onBindViewHolder]. It updates the data for this
      * holder with the given manga.
@@ -31,26 +30,26 @@ open class SourceGridHolder(private val view: View, private val adapter: Flexibl
      */
     override fun onSetValues(manga: Manga) {
         // Set manga title
-        title.text = manga.title
+        binding.title.text = manga.title
 
         // Set alpha of thumbnail.
-        thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
+        binding.thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
 
         setImage(manga)
     }
 
     override fun setImage(manga: Manga) {
         // For rounded corners
-        card.clipToOutline = true
+        binding.card.clipToOutline = true
 
-        GlideApp.with(view.context).clear(thumbnail)
+        GlideApp.with(view.context).clear(binding.thumbnail)
         if (!manga.thumbnail_url.isNullOrEmpty()) {
             GlideApp.with(view.context)
                 .load(manga.toMangaThumbnail())
                 .diskCacheStrategy(DiskCacheStrategy.DATA)
                 .centerCrop()
                 .placeholder(android.R.color.transparent)
-                .into(StateImageViewTarget(thumbnail, progress))
+                .into(StateImageViewTarget(binding.thumbnail, binding.progress))
         }
     }
 }

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

@@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.ui.browse.source.browse
 
 import android.view.View
 import eu.davidea.flexibleadapter.FlexibleAdapter
+import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 
 /**
  * Generic class used to hold the displayed data of a manga in the catalogue.
@@ -12,7 +12,7 @@ import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
  * @param adapter the adapter handling this holder.
  */
 abstract class SourceHolder(view: View, adapter: FlexibleAdapter<*>) :
-    BaseFlexibleViewHolder(view, adapter) {
+    FlexibleViewHolder(view, adapter) {
 
     /**
      * Method called from [CatalogueAdapter.onBindViewHolder]. It updates the data for this

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

@@ -10,9 +10,8 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.glide.GlideApp
 import eu.kanade.tachiyomi.data.glide.toMangaThumbnail
+import eu.kanade.tachiyomi.databinding.SourceListItemBinding
 import eu.kanade.tachiyomi.util.system.getResourceColor
-import kotlinx.android.synthetic.main.source_list_item.thumbnail
-import kotlinx.android.synthetic.main.source_list_item.title
 
 /**
  * Class used to hold the displayed data of a manga in the catalogue, like the cover or the title.
@@ -25,6 +24,8 @@ import kotlinx.android.synthetic.main.source_list_item.title
 class SourceListHolder(private val view: View, adapter: FlexibleAdapter<*>) :
     SourceHolder(view, adapter) {
 
+    private val binding = SourceListItemBinding.bind(view)
+
     private val favoriteColor = view.context.getResourceColor(R.attr.colorOnSurface, 0.38f)
     private val unfavoriteColor = view.context.getResourceColor(R.attr.colorOnSurface)
 
@@ -35,17 +36,17 @@ class SourceListHolder(private val view: View, adapter: FlexibleAdapter<*>) :
      * @param manga the manga to bind.
      */
     override fun onSetValues(manga: Manga) {
-        title.text = manga.title
-        title.setTextColor(if (manga.favorite) favoriteColor else unfavoriteColor)
+        binding.title.text = manga.title
+        binding.title.setTextColor(if (manga.favorite) favoriteColor else unfavoriteColor)
 
         // Set alpha of thumbnail.
-        thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
+        binding.thumbnail.alpha = if (manga.favorite) 0.3f else 1.0f
 
         setImage(manga)
     }
 
     override fun setImage(manga: Manga) {
-        GlideApp.with(view.context).clear(thumbnail)
+        GlideApp.with(view.context).clear(binding.thumbnail)
 
         if (!manga.thumbnail_url.isNullOrEmpty()) {
             val radius = view.context.resources.getDimensionPixelSize(R.dimen.card_radius)
@@ -56,7 +57,7 @@ class SourceListHolder(private val view: View, adapter: FlexibleAdapter<*>) :
                 .apply(requestOptions)
                 .dontAnimate()
                 .placeholder(android.R.color.transparent)
-                .into(thumbnail)
+                .into(binding.thumbnail)
         }
     }
 }

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

@@ -2,18 +2,17 @@ package eu.kanade.tachiyomi.ui.browse.source.globalsearch
 
 import android.view.View
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.data.database.models.Manga
 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.databinding.GlobalSearchControllerCardItemBinding
 import eu.kanade.tachiyomi.widget.StateImageViewTarget
-import kotlinx.android.synthetic.main.global_search_controller_card_item.card
-import kotlinx.android.synthetic.main.global_search_controller_card_item.cover
-import kotlinx.android.synthetic.main.global_search_controller_card_item.progress
-import kotlinx.android.synthetic.main.global_search_controller_card_item.title
 
 class GlobalSearchCardHolder(view: View, adapter: GlobalSearchCardAdapter) :
-    BaseFlexibleViewHolder(view, adapter) {
+    FlexibleViewHolder(view, adapter) {
+
+    private val binding = GlobalSearchControllerCardItemBinding.bind(view)
 
     init {
         // Call onMangaClickListener when item is pressed.
@@ -33,17 +32,17 @@ class GlobalSearchCardHolder(view: View, adapter: GlobalSearchCardAdapter) :
     }
 
     fun bind(manga: Manga) {
-        card.clipToOutline = true
+        binding.card.clipToOutline = true
 
-        title.text = manga.title
+        binding.title.text = manga.title
         // Set alpha of thumbnail.
-        cover.alpha = if (manga.favorite) 0.3f else 1.0f
+        binding.cover.alpha = if (manga.favorite) 0.3f else 1.0f
 
         setImage(manga)
     }
 
     fun setImage(manga: Manga) {
-        GlideApp.with(itemView.context).clear(cover)
+        GlideApp.with(itemView.context).clear(binding.cover)
         if (!manga.thumbnail_url.isNullOrEmpty()) {
             GlideApp.with(itemView.context)
                 .load(manga.toMangaThumbnail())
@@ -51,7 +50,7 @@ class GlobalSearchCardHolder(view: View, adapter: GlobalSearchCardAdapter) :
                 .centerCrop()
                 .skipMemoryCache(true)
                 .placeholder(android.R.color.transparent)
-                .into(StateImageViewTarget(cover, progress))
+                .into(StateImageViewTarget(binding.cover, binding.progress))
         }
     }
 }

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

@@ -3,16 +3,11 @@ package eu.kanade.tachiyomi.ui.browse.source.globalsearch
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
+import eu.davidea.viewholders.FlexibleViewHolder
 import eu.kanade.tachiyomi.data.database.models.Manga
+import eu.kanade.tachiyomi.databinding.GlobalSearchControllerCardBinding
 import eu.kanade.tachiyomi.source.LocalSource
-import eu.kanade.tachiyomi.ui.base.holder.BaseFlexibleViewHolder
 import eu.kanade.tachiyomi.util.system.LocaleHelper
-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.subtitle
-import kotlinx.android.synthetic.main.global_search_controller_card.title
-import kotlinx.android.synthetic.main.global_search_controller_card.title_wrapper
 
 /**
  * Holder that binds the [GlobalSearchItem] containing catalogue cards.
@@ -21,7 +16,9 @@ import kotlinx.android.synthetic.main.global_search_controller_card.title_wrappe
  * @param adapter instance of [GlobalSearchAdapter]
  */
 class GlobalSearchHolder(view: View, val adapter: GlobalSearchAdapter) :
-    BaseFlexibleViewHolder(view, adapter) {
+    FlexibleViewHolder(view, adapter) {
+
+    private val binding = GlobalSearchControllerCardBinding.bind(view)
 
     /**
      * Adapter containing manga from search results.
@@ -32,10 +29,10 @@ class GlobalSearchHolder(view: View, val adapter: GlobalSearchAdapter) :
 
     init {
         // Set layout horizontal.
-        recycler.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false)
-        recycler.adapter = mangaAdapter
+        binding.recycler.layoutManager = LinearLayoutManager(view.context, LinearLayoutManager.HORIZONTAL, false)
+        binding.recycler.adapter = mangaAdapter
 
-        title_wrapper.setOnClickListener {
+        binding.titleWrapper.setOnClickListener {
             adapter.getItem(bindingAdapterPosition)?.let {
                 adapter.titleClickListener.onTitleClick(it.source)
             }
@@ -53,21 +50,21 @@ class GlobalSearchHolder(view: View, val adapter: GlobalSearchAdapter) :
 
         val titlePrefix = if (item.highlighted) "▶ " else ""
 
-        title.text = titlePrefix + source.name
-        subtitle.isVisible = source !is LocalSource
-        subtitle.text = LocaleHelper.getDisplayName(source.lang)
+        binding.title.text = titlePrefix + source.name
+        binding.subtitle.isVisible = source !is LocalSource
+        binding.subtitle.text = LocaleHelper.getDisplayName(source.lang)
 
         when {
             results == null -> {
-                progress.isVisible = true
+                binding.progress.isVisible = true
                 showResultsHolder()
             }
             results.isEmpty() -> {
-                progress.isVisible = false
+                binding.progress.isVisible = false
                 showNoResults()
             }
             else -> {
-                progress.isVisible = false
+                binding.progress.isVisible = false
                 showResultsHolder()
             }
         }
@@ -104,10 +101,10 @@ class GlobalSearchHolder(view: View, val adapter: GlobalSearchAdapter) :
     }
 
     private fun showResultsHolder() {
-        no_results_found.isVisible = false
+        binding.noResultsFound.isVisible = false
     }
 
     private fun showNoResults() {
-        no_results_found.isVisible = true
+        binding.noResultsFound.isVisible = true
     }
 }