From e36b0d8405f118b7c25711ffcbecb8cc7de954c0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 13 Sep 2023 15:45:56 +0200
Subject: [PATCH] share full mount image when raising pet

---
 Habitica/res/layout/mount_imageview.xml          | 10 ++++++++++
 .../habitica/interactors/FeedPetUseCase.kt       | 16 +++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 Habitica/res/layout/mount_imageview.xml

diff --git a/Habitica/res/layout/mount_imageview.xml b/Habitica/res/layout/mount_imageview.xml
new file mode 100644
index 000000000..c30b027f0
--- /dev/null
+++ b/Habitica/res/layout/mount_imageview.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/pet_image_width" android:layout_height="@dimen/pet_image_height"
+    android:layout_gravity="center">
+    <com.habitrpg.android.habitica.ui.views.stable.MountView
+        android:id="@+id/mount_imageview"
+        android:layout_width="68dp"
+        android:layout_height="68dp"
+        android:layout_gravity="center" />
+</FrameLayout>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
index 7632b35c7..e51610671 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/FeedPetUseCase.kt
@@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.models.inventory.Pet
 import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import com.habitrpg.android.habitica.ui.views.SnackbarActivity
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.stable.MountView
 import com.habitrpg.common.habitica.extensions.loadImage
 import com.habitrpg.common.habitica.views.PixelArtView
 import com.habitrpg.shared.habitica.models.responses.FeedResponse
@@ -29,13 +30,13 @@ constructor(
             val mountWrapper =
                 View.inflate(
                     requestValues.context,
-                    R.layout.pet_imageview,
+                    R.layout.mount_imageview,
                     null
                 ) as? FrameLayout
             val mountImageView =
-                mountWrapper?.findViewById(R.id.pet_imageview) as? PixelArtView
+                mountWrapper?.findViewById(R.id.mount_imageview) as? MountView
 
-            mountImageView?.loadImage("Mount_Icon_" + requestValues.pet.key)
+            mountImageView?.setMount("Mount_Icon_" + requestValues.pet.key)
             val dialog = HabiticaAlertDialog(requestValues.context)
             dialog.setTitle(
                 requestValues.context.getString(
@@ -58,14 +59,7 @@ constructor(
                     Bitmap.Config.ARGB_8888
                 )
                 val canvas = Canvas(sharedImage)
-                mountImageView?.drawable?.setBounds(
-                    0,
-                    0,
-                    mountImageSideLength,
-                    mountImageSideLength
-                )
-                val bitmap = (mountImageView?.drawable as? BitmapDrawable)?.bitmap ?: mountImageView?.bitmap ?: return@addButton
-                canvas.drawBitmap(bitmap, 0f, 0f, null)
+                mountImageView?.draw(canvas)
                 (requestValues.context as? BaseActivity)?.shareContent(
                     "raisedPet",
                     message,