From a07e6e002c6223a359ae06a86a4033ed48ba33c9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 25 Jan 2023 16:26:23 +0100
Subject: [PATCH] fix issue with loading blank images

---
 .../habitica/extensions/DataBindingUtils.kt    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
index f9c4f756b..a3c98720a 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
@@ -20,7 +20,8 @@ import java.util.Collections
 import java.util.Date
 
 fun PixelArtView.loadImage(imageName: String?, imageFormat: String? = null) {
-    if (imageName != null) {
+    val shouldLoadImage = DataBindingUtils.existsAsImage(imageName)
+    if (shouldLoadImage && imageName != null) {
         val fullname = DataBindingUtils.getFullFilename(imageName, imageFormat)
         if (tag == fullname) {
             return
@@ -39,11 +40,14 @@ fun PixelArtView.loadImage(imageName: String?, imageFormat: String? = null) {
                 }
             }
         }
+    } else {
+        tag = null
+        setImageDrawable(null)
+        bitmap = null
     }
 }
 
 object DataBindingUtils {
-
     fun loadImage(context: Context, imageName: String, imageResult: (Drawable) -> Unit) {
         loadImage(context, imageName, null, imageResult)
     }
@@ -84,6 +88,16 @@ object DataBindingUtils {
         view.background = drawable
     }
 
+    fun existsAsImage(imageName: String?): Boolean {
+        if (imageName == null) {
+            return false
+        }
+        if (imageName == "shop_") {
+            return false
+        }
+        return true
+    }
+
     class LayoutWeightAnimation(internal var view: View, internal var targetWeight: Float) : Animation() {
         private var initializeWeight: Float = 0.toFloat()