From b9e5c3b9badc8f5fda5b72b3aed237b276b52acf Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Sat, 8 Jan 2022 18:24:59 +0100
Subject: [PATCH] Fix person placeholder drawable

---
 .../java/dev/jdtech/jellyfin/BindingAdapters.kt     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt b/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
index c40bfa85..42b74dec 100644
--- a/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
+++ b/app/src/main/java/dev/jdtech/jellyfin/BindingAdapters.kt
@@ -2,6 +2,7 @@ package dev.jdtech.jellyfin
 
 import android.view.View
 import android.widget.ImageView
+import androidx.annotation.DrawableRes
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
@@ -55,7 +56,7 @@ fun bindItemBackdropById(imageView: ImageView, itemId: UUID) {
 @BindingAdapter("personImage")
 fun bindPersonImage(imageView: ImageView, person: BaseItemPerson) {
     imageView
-        .loadImage("/items/${person.id}/Images/${ImageType.PRIMARY}")
+        .loadImage("/items/${person.id}/Images/${ImageType.PRIMARY}", R.drawable.person_placeholder)
         .posterDescription(person.name)
 }
 
@@ -102,7 +103,7 @@ fun bindSeasonPoster(imageView: ImageView, seasonId: UUID) {
     imageView.loadImage("/items/${seasonId}/Images/${ImageType.PRIMARY}")
 }
 
-private fun ImageView.loadImage(url: String, errorPlaceHolderId: Int? = null): View {
+private fun ImageView.loadImage(url: String, @DrawableRes errorPlaceHolderId: Int? = null): View {
     val api = JellyfinApi.getInstance(context.applicationContext)
 
     return Glide
@@ -110,15 +111,17 @@ private fun ImageView.loadImage(url: String, errorPlaceHolderId: Int? = null): V
         .load("${api.api.baseUrl}$url")
         .transition(DrawableTransitionOptions.withCrossFade())
         .placeholder(R.color.neutral_800)
-        .also { if (errorPlaceHolderId != null) error(errorPlaceHolderId) }
+        .error(errorPlaceHolderId)
         .into(this)
         .view
 }
 
 private fun View.posterDescription(name: String?) {
-    contentDescription = String.format(context.resources.getString(R.string.image_description_poster), name)
+    contentDescription =
+        String.format(context.resources.getString(R.string.image_description_poster), name)
 }
 
 private fun View.backdropDescription(name: String?) {
-    contentDescription = String.format(context.resources.getString(R.string.image_description_backdrop), name)
+    contentDescription =
+        String.format(context.resources.getString(R.string.image_description_backdrop), name)
 }
\ No newline at end of file