refactor: leverage new dependency features from recent updates (#5057)

app/src/google/kotlin/org/meshtastic/app/map/MapView.kt

@@ -21,8 +21,6 @@ package org.meshtastic.app.map
 import android.Manifest
 import android.app.Activity
 import android.content.Intent
-import android.graphics.Canvas
-import android.graphics.Paint
 import android.net.Uri
 import android.view.WindowManager
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -56,7 +54,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import androidx.core.graphics.createBitmap
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import co.touchlab.kermit.Logger
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
@@ -67,8 +64,6 @@ import com.google.android.gms.location.LocationResult
 import com.google.android.gms.location.LocationServices
 import com.google.android.gms.location.Priority
 import com.google.android.gms.maps.CameraUpdateFactory
-import com.google.android.gms.maps.model.BitmapDescriptor
-import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.CameraPosition
 import com.google.android.gms.maps.model.JointType
 import com.google.android.gms.maps.model.LatLng
@@ -798,7 +793,6 @@ private fun MainMapContent(
         mapFilterState = mapFilterState,
         myNodeNum = myNodeNum ?: 0,
         isConnected = isConnected,
-        unicodeEmojiToBitmapProvider = ::unicodeEmojiToBitmap,
         onEditWaypointRequest = onEditWaypointRequest,
         selectedWaypointId = selectedWaypointId,
     )
@@ -1068,23 +1062,6 @@ internal fun convertIntToEmoji(unicodeCodePoint: Int): String = try {
     "\uD83D\uDCCD"
 }
 
-internal fun unicodeEmojiToBitmap(icon: Int): BitmapDescriptor {
-    val unicodeEmoji = convertIntToEmoji(icon)
-    val paint =
-        Paint(Paint.ANTI_ALIAS_FLAG).apply {
-            textSize = 64f
-            color = android.graphics.Color.BLACK
-            textAlign = Paint.Align.CENTER
-        }
-    val baseline = -paint.ascent()
-    val width = (paint.measureText(unicodeEmoji) + 0.5f).toInt()
-    val height = (baseline + paint.descent() + 0.5f).toInt()
-    val image = createBitmap(width, height, android.graphics.Bitmap.Config.ARGB_8888)
-    val canvas = Canvas(image)
-    canvas.drawText(unicodeEmoji, width / 2f, baseline, paint)
-    return BitmapDescriptorFactory.fromBitmap(image)
-}
-
 @Suppress("NestedBlockDepth")
 fun Uri.getFileName(context: android.content.Context): String {
     var name = this.lastPathSegment ?: "layer_$nowMillis"

app/src/google/kotlin/org/meshtastic/app/map/component/WaypointMarkers.kt

@@ -16,15 +16,22 @@
  */
 package org.meshtastic.app.map.component
 
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import com.google.android.gms.maps.model.BitmapDescriptor
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.google.android.gms.maps.model.LatLng
+import com.google.maps.android.compose.MapsComposeExperimentalApi
 import com.google.maps.android.compose.Marker
+import com.google.maps.android.compose.rememberComposeBitmapDescriptor
 import com.google.maps.android.compose.rememberUpdatedMarkerState
 import kotlinx.coroutines.launch
+import org.meshtastic.app.map.convertIntToEmoji
 import org.meshtastic.core.model.util.GeoConstants.DEG_D
 import org.meshtastic.core.resources.Res
 import org.meshtastic.core.resources.locked
@@ -32,13 +39,13 @@ import org.meshtastic.core.ui.util.showToast
 import org.meshtastic.feature.map.BaseMapViewModel
 import org.meshtastic.proto.Waypoint
 
+@OptIn(MapsComposeExperimentalApi::class)
 @Composable
 fun WaypointMarkers(
     displayableWaypoints: List<Waypoint>,
     mapFilterState: BaseMapViewModel.MapFilterState,
     myNodeNum: Int,
     isConnected: Boolean,
-    unicodeEmojiToBitmapProvider: (Int) -> BitmapDescriptor,
     onEditWaypointRequest: (Waypoint) -> Unit,
     selectedWaypointId: Int? = null,
 ) {
@@ -57,14 +64,16 @@ fun WaypointMarkers(
                 }
             }
 
+            val iconCodePoint = if ((waypoint.icon ?: 0) == 0) PUSHPIN else waypoint.icon!!
+            val emojiText = convertIntToEmoji(iconCodePoint)
+            val icon =
+                rememberComposeBitmapDescriptor(iconCodePoint) {
+                    Text(text = emojiText, fontSize = 32.sp, modifier = Modifier.padding(2.dp))
+                }
+
             Marker(
                 state = markerState,
-                icon =
-                if ((waypoint.icon ?: 0) == 0) {
-                    unicodeEmojiToBitmapProvider(PUSHPIN) // Default icon (Round Pushpin)
-                } else {
-                    unicodeEmojiToBitmapProvider(waypoint.icon!!)
-                },
+                icon = icon,
                 title = (waypoint.name ?: "").replace('\n', ' ').replace('\b', ' '),
                 snippet = (waypoint.description ?: "").replace('\n', ' ').replace('\b', ' '),
                 visible = true,