Merge pull request #130 from what3words/fix/snapshot-release-job-does-not-run

Add manual trigger to snapshot workflow

Author: mani-apps

.github/workflows/BuildTestSnapshot.yml

@@ -9,8 +9,20 @@ on:
       - 'epic/**'
   pull_request:
     branches:
-      - 'epic/**'
+      - 'staging'
     types: [ closed ]
+  workflow_dispatch:
+    inputs:
+      force_snapshot_lib:
+        description: 'Force snapshot-lib to run'
+        required: false
+        type: boolean
+        default: false
+      force_snapshot_compose_lib:
+        description: 'Force snapshot-compose-lib to run'
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   detect-changes:
@@ -108,13 +120,14 @@ jobs:
     # This job must explicitly depend on build_test and detect-changes
     needs: [build_test, detect-changes]
     # Run for direct commits to epic branches OR when PRs are merged into epic branches
-    # AND only when build_test succeeds AND lib has changed
+    # AND only when build_test succeeds AND lib has changed OR manually triggered with force_snapshot_lib
     if: >
       success() && 
-      needs.detect-changes.outputs.lib-changed == 'true' &&
-      ((github.event_name == 'push' && startsWith(github.ref, 'refs/heads/epic/')) ||
-       (github.event_name == 'pull_request' && github.event.action == 'closed' && 
-        github.event.pull_request.merged == true && startsWith(github.base_ref, 'staging')))
+      ((github.event_name == 'workflow_dispatch' && github.event.inputs.force_snapshot_lib == 'true') ||
+       (needs.detect-changes.outputs.lib-changed == 'true' &&
+        ((github.event_name == 'push' && startsWith(github.ref, 'refs/heads/epic/')) ||
+         (github.event_name == 'pull_request' && github.event.action == 'closed' && 
+          github.event.pull_request.merged == true && startsWith(github.base_ref, 'staging')))))
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -155,13 +168,14 @@ jobs:
     # This job must explicitly depend on build_test and detect-changes
     needs: [build_test, detect-changes]
     # Run for direct commits to epic branches OR when PRs are merged into epic branches
-    # AND only when build_test succeeds AND lib-compose has changed
+    # AND only when build_test succeeds AND lib-compose has changed OR manually triggered with force_snapshot_compose_lib
     if: >
       success() && 
-      needs.detect-changes.outputs.lib-compose-changed == 'true' &&
-      ((github.event_name == 'push' && startsWith(github.ref, 'refs/heads/epic/')) ||
-       (github.event_name == 'pull_request' && github.event.action == 'closed' && 
-        github.event.pull_request.merged == true && startsWith(github.base_ref, 'staging')))
+      ((github.event_name == 'workflow_dispatch' && github.event.inputs.force_snapshot_compose_lib == 'true') ||
+       (needs.detect-changes.outputs.lib-compose-changed == 'true' &&
+        ((github.event_name == 'push' && startsWith(github.ref, 'refs/heads/epic/')) ||
+         (github.event_name == 'pull_request' && github.event.action == 'closed' && 
+          github.event.pull_request.merged == true && startsWith(github.base_ref, 'staging')))))
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code

lib-compose/src/main/java/com/what3words/components/compose/maps/utils/BitmapUtils.kt

@@ -11,6 +11,7 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.core.graphics.PathParser
 import com.what3words.components.compose.maps.models.W3WMarkerColor
 import com.what3words.map.components.compose.R
+import androidx.core.graphics.createBitmap
 
 /**
  * Creates a bitmap for the standard what3words marker.
@@ -187,7 +188,7 @@ fun getBitMapFromPathData(
 
     // Create a Bitmap of the target size
     val bitmap = try {
-        Bitmap.createBitmap(widthScaled + paddingPx * 2, heightScaled + paddingPx * 2, Bitmap.Config.ARGB_8888)
+        createBitmap(widthScaled + paddingPx * 2, heightScaled + paddingPx * 2)
     } catch (e: OutOfMemoryError) {
         throw IllegalArgumentException("Bitmap too large to allocate", e)
     }