From 5d6b3a8a75e7bcd0060201c8907380aa16a6c4f0 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 10 Nov 2021 13:18:03 -0400
Subject: [PATCH] Add support for 60dp badges in the spritesheet.

---
 .../badges/glide/BadgeSpriteTransformation.kt      | 14 +++++++++++++-
 .../thoughtcrime/securesms/badges/models/Badge.kt  |  2 +-
 app/src/main/res/values/attrs.xml                  |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt
index 9422d541a..492230a0f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt
@@ -75,6 +75,17 @@ class BadgeSpriteTransformation(
         Density.XXXHDPI to FrameSet(Frame(741, 1, 144, 144), Frame(643, 213, 144, 144))
       )
     ),
+    BADGE_60(
+      "badge_60",
+      mapOf(
+        Density.LDPI to FrameSet(Frame(124, 76, 45, 45), Frame(124, 76, 45, 45)),
+        Density.MDPI to FrameSet(Frame(163, 101, 60, 60), Frame(163, 101, 60, 60)),
+        Density.HDPI to FrameSet(Frame(244, 151, 90, 90), Frame(244, 151, 90, 90)),
+        Density.XHDPI to FrameSet(Frame(323, 201, 120, 120), Frame(323, 201, 120, 120)),
+        Density.XXHDPI to FrameSet(Frame(483, 301, 180, 180), Frame(483, 301, 180, 180)),
+        Density.XXXHDPI to FrameSet(Frame(643, 401, 240, 240), Frame(643, 401, 240, 240))
+      )
+    ),
     XLARGE(
       "xlarge",
       mapOf(
@@ -94,6 +105,7 @@ class BadgeSpriteTransformation(
           1 -> MEDIUM
           2 -> LARGE
           3 -> XLARGE
+          4 -> BADGE_60
           else -> LARGE
         }
       }
@@ -123,7 +135,7 @@ class BadgeSpriteTransformation(
   }
 
   companion object {
-    private const val VERSION = 1
+    private const val VERSION = 2
 
     private fun getDensity(density: String): Density {
       return Density.values().first { it.density == density }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
index bfd6b6e2c..79e959357 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt
@@ -133,7 +133,7 @@ data class Badge(
         .downsample(DownsampleStrategy.NONE)
         .diskCacheStrategy(DiskCacheStrategy.NONE)
         .transform(
-          BadgeSpriteTransformation(BadgeSpriteTransformation.Size.XLARGE, model.badge.imageDensity, ThemeUtil.isDarkTheme(context)),
+          BadgeSpriteTransformation(BadgeSpriteTransformation.Size.BADGE_60, model.badge.imageDensity, ThemeUtil.isDarkTheme(context)),
         )
         .into(badge)
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 5c237453f..3fc7badf2 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -333,6 +333,7 @@
             <enum name="medium" value="1" />
             <enum name="large" value="2" />
             <enum name="xlarge" value="3" />
+            <enum name="badge_60" value="4" />
         </attr>
     </declare-styleable>
 </resources>