From 9295b6927547ee03da8a618116b592331938467e Mon Sep 17 00:00:00 2001
From: Quoc Nguyen <quoc.banguyen@what3words.com>
Date: Fri, 17 Jan 2025 15:27:59 +0700
Subject: [PATCH] Fix small border of zoom out marker, add shadow

---
 .../compose/maps/utils/BitmapUtils.kt         | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib-compose/src/main/java/com/what3words/components/compose/maps/utils/BitmapUtils.kt b/lib-compose/src/main/java/com/what3words/components/compose/maps/utils/BitmapUtils.kt
index 94be2dfd..6e84fc53 100644
--- a/lib-compose/src/main/java/com/what3words/components/compose/maps/utils/BitmapUtils.kt
+++ b/lib-compose/src/main/java/com/what3words/components/compose/maps/utils/BitmapUtils.kt
@@ -75,23 +75,27 @@ fun getPinBitmap(
 
     return getBitMapFromPathData(
         listOf(
-            DrawPath(context.getString(R.string.path_pin_circle),
-                Paint().apply {
-                    style = Paint.Style.STROKE
-                    strokeWidth = 2f * density
-                    isAntiAlias = true
-                    color = android.graphics.Color.WHITE
-                }
-            ),
             DrawPath(context.getString(R.string.path_pin_circle),
                 Paint().apply {
                     color = colorMarker.background.toArgb()
+                    // Draw shadow with radius 3dp (+2dp) of the stroke
+                    // The design has 2 shadow layers
+                    setShadowLayer(5 * density, 0f, 0f, Color(0x26000000).toArgb())
+                    setShadowLayer(4 * density, 0f, 0f, Color(0x4D000000).toArgb())
                 }
             ),
             DrawPath(context.getString(R.string.path_pin_slashes),
                 Paint().apply {
                     color = colorMarker.slash.toArgb()
                 }
+            ),
+            DrawPath(context.getString(R.string.path_pin_circle),
+                Paint().apply {
+                    style = Paint.Style.STROKE
+                    strokeWidth = 2f * density
+                    isAntiAlias = true
+                    color = android.graphics.Color.WHITE
+                }
             )
         ),
         pinSize,
@@ -109,15 +113,17 @@ fun getBitMapFromPathData(
     listDrawPath: List<DrawPath>,
     width: Int,
     height: Int,
-    scaleFactor: Float
+    scaleFactor: Float,
+    padding: Int = 4, // Default padding for shadow in dp
 ): Bitmap {
     // Calculate scaled dimensions
     val widthScaled = (width * scaleFactor).toInt()
     val heightScaled = (height * scaleFactor).toInt()
+    val paddingPx = (padding * scaleFactor).toInt()
 
     // Create a Bitmap of the target size
     val bitmap = try {
-        Bitmap.createBitmap(widthScaled, heightScaled, Bitmap.Config.ARGB_8888)
+        Bitmap.createBitmap(widthScaled + paddingPx * 2, heightScaled + paddingPx * 2, Bitmap.Config.ARGB_8888)
     } catch (e: OutOfMemoryError) {
         throw IllegalArgumentException("Bitmap too large to allocate", e)
     }
@@ -128,6 +134,9 @@ fun getBitMapFromPathData(
     // Create and apply scaling transformation
     val matrix = Matrix().apply { setScale(scaleFactor, scaleFactor) }
 
+    // Translate canvas to account for padding
+    canvas.translate(paddingPx.toFloat(), paddingPx.toFloat())
+
     // Draw each path onto the canvas
     listDrawPath.forEach { drawPath ->
         try {