@lugg/maps 0.2.0-alpha.3 → 0.2.0-alpha.30

package/android/src/main/java/com/luggmaps/LuggMarkerView.kt

@@ -1,11 +1,16 @@
 package com.luggmaps
 
 import android.content.Context
-import android.util.Log
+import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.view.View
+import android.view.ViewGroup
+import androidx.core.graphics.createBitmap
 import androidx.core.view.isNotEmpty
 import com.facebook.react.views.view.ReactViewGroup
 import com.google.android.gms.maps.model.AdvancedMarker
+import com.google.android.gms.maps.model.BitmapDescriptor
+import com.google.android.gms.maps.model.BitmapDescriptorFactory
 
 interface LuggMarkerViewDelegate {
   fun markerViewDidUpdate(markerView: LuggMarkerView)
@@ -13,6 +18,8 @@ interface LuggMarkerViewDelegate {
 }
 
 class LuggMarkerView(context: Context) : ReactViewGroup(context) {
+  private var scaleUpdateRunnable: Runnable? = null
+
   var name: String? = null
     private set
 
@@ -34,23 +41,118 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
   var anchorY: Float = 1.0f
     private set
 
+  var zIndex: Float = 0f
+    private set
+
+  var rotate: Float = 0f
+    private set
+
+  var scale: Float = 1f
+    private set
+
+  var scaleChanged: Boolean = false
+    private set
+
+  var rasterize: Boolean = true
+    private set
+
   var didLayout: Boolean = false
     private set
 
   val hasCustomView: Boolean
     get() = iconView.isNotEmpty()
 
-  val iconView: ReactViewGroup = object : ReactViewGroup(context) {
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-      var maxWidth = 0
-      var maxHeight = 0
-      for (i in 0 until childCount) {
-        val child = getChildAt(i)
-        if (child.width > maxWidth) maxWidth = child.width
-        if (child.height > maxHeight) maxHeight = child.height
+  val iconView: ReactViewGroup = ReactViewGroup(context)
+
+  private fun measureIconViewBounds(): Pair<Int, Int> {
+    var maxWidth = 0
+    var maxHeight = 0
+    for (i in 0 until iconView.childCount) {
+      val child = iconView.getChildAt(i)
+      val childRight = child.left + child.width
+      val childBottom = child.top + child.height
+      if (childRight > maxWidth) maxWidth = childRight
+      if (childBottom > maxHeight) maxHeight = childBottom
+    }
+    return Pair(maxWidth, maxHeight)
+  }
+
+  private fun createIconBitmap(): BitmapDescriptor? {
+    val (width, height) = measureIconViewBounds()
+    if (width <= 0 || height <= 0) return null
+
+    val scaledWidth = (width * scale).toInt()
+    val scaledHeight = (height * scale).toInt()
+
+    val bitmap = createBitmap(scaledWidth, scaledHeight)
+    val canvas = Canvas(bitmap)
+    canvas.scale(scale, scale)
+    iconView.draw(canvas)
+    return BitmapDescriptorFactory.fromBitmap(bitmap)
+  }
+
+  private fun createIconViewWrapper(): View {
+    val (width, height) = measureIconViewBounds()
+    val scaledWidth = (width * scale).toInt()
+    val scaledHeight = (height * scale).toInt()
+
+    (iconView.parent as? ViewGroup)?.removeView(iconView)
+    iconView.scaleX = scale
+    iconView.scaleY = scale
+    iconView.pivotX = 0f
+    iconView.pivotY = 0f
+
+    return object : ReactViewGroup(context) {
+      init {
+        addView(iconView)
+      }
+
+      override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        setMeasuredDimension(scaledWidth, scaledHeight)
+      }
+    }
+  }
+
+  fun applyIconToMarker() {
+    val m = marker ?: return
+    if (!hasCustomView) return
+
+    if (rasterize) {
+      createIconBitmap()?.let { m.setIcon(it) }
+    } else {
+      m.iconView = createIconViewWrapper()
+    }
+  }
+
+  fun applyScaleToMarker() {
+    val m = marker ?: return
+    if (!hasCustomView) return
+
+    scaleUpdateRunnable?.let { removeCallbacks(it) }
+    scaleUpdateRunnable = Runnable {
+      if (rasterize) {
+        createIconBitmap()?.let { m.setIcon(it) }
+      } else {
+        m.iconView = createIconViewWrapper()
       }
+    }
+    post(scaleUpdateRunnable)
+  }
 
-      setMeasuredDimension(maxWidth, maxHeight)
+  fun updateIcon(onAddMarker: () -> Unit) {
+    if (!hasCustomView) return
+    if (rasterize) {
+      post {
+        if (marker == null) {
+          onAddMarker()
+        } else {
+          applyIconToMarker()
+        }
+      }
+    } else {
+      marker?.remove()
+      marker = null
+      post { onAddMarker() }
     }
   }
 
@@ -90,6 +192,7 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     bottom: Int
   ) {
     super.onLayout(changed, left, top, right, bottom)
+
     if (changed && !didLayout) {
       didLayout = true
       delegate?.markerViewDidLayout(this)
@@ -114,6 +217,27 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     anchorY = y.toFloat()
   }
 
+  fun setZIndex(zIndex: Float) {
+    this.zIndex = zIndex
+  }
+
+  fun setRotate(rotate: Float) {
+    this.rotate = rotate
+  }
+
+  fun setScale(scale: Float) {
+    scaleChanged = this.scale != scale
+    this.scale = scale
+  }
+
+  fun clearScaleChanged() {
+    scaleChanged = false
+  }
+
+  fun setRasterize(rasterize: Boolean) {
+    this.rasterize = rasterize
+  }
+
   fun setName(name: String?) {
     this.name = name
   }
@@ -123,12 +247,10 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
   }
 
   fun onDropViewInstance() {
+    scaleUpdateRunnable?.let { removeCallbacks(it) }
+    scaleUpdateRunnable = null
     didLayout = false
     delegate = null
     iconView.removeAllViews()
   }
-
-  companion object {
-    private const val TAG = "Lugg"
-  }
 }

package/android/src/main/java/com/luggmaps/LuggMarkerViewManager.kt

@@ -63,6 +63,27 @@ class LuggMarkerViewManager :
     }
   }
 
+  @ReactProp(name = "zIndex", defaultFloat = 0f)
+  override fun setZIndex(view: LuggMarkerView, zIndex: Float) {
+    super.setZIndex(view, zIndex)
+    view.setZIndex(zIndex)
+  }
+
+  @ReactProp(name = "rotate", defaultDouble = 0.0)
+  override fun setRotate(view: LuggMarkerView, value: Double) {
+    view.setRotate(value.toFloat())
+  }
+
+  @ReactProp(name = "scale", defaultDouble = 1.0)
+  override fun setScale(view: LuggMarkerView, value: Double) {
+    view.setScale(value.toFloat())
+  }
+
+  @ReactProp(name = "rasterize", defaultBoolean = true)
+  override fun setRasterize(view: LuggMarkerView, value: Boolean) {
+    view.setRasterize(value)
+  }
+
   companion object {
     const val NAME = "LuggMarkerView"
   }

package/android/src/main/java/com/luggmaps/LuggPackage.kt

@@ -1,13 +1,10 @@
 package com.luggmaps
 
 import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
 
 class LuggPackage : ReactPackage {
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
-    listOf(LuggGoogleMapViewManager(), LuggMarkerViewManager(), LuggMapWrapperViewManager(), LuggPolylineViewManager())
-
-  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> = emptyList()
+    listOf(LuggMapViewManager(), LuggMarkerViewManager(), LuggMapWrapperViewManager(), LuggPolylineViewManager())
 }

package/android/src/main/java/com/luggmaps/LuggPolylineView.kt

@@ -12,6 +12,8 @@ interface LuggPolylineViewDelegate {
   fun polylineViewDidUpdate(polylineView: LuggPolylineView)
 }
 
+data class AnimatedOptions(val duration: Long = 2150L, val easing: String = "linear", val trailLength: Float = 1f, val delay: Long = 0L)
+
 class LuggPolylineView(context: Context) : ReactViewGroup(context) {
   var coordinates: List<LatLng> = emptyList()
     private set
@@ -25,6 +27,12 @@ class LuggPolylineView(context: Context) : ReactViewGroup(context) {
   var animated: Boolean = false
     private set
 
+  var animatedOptions: AnimatedOptions = AnimatedOptions()
+    private set
+
+  var zIndex: Float = 0f
+    private set
+
   var cachedSpans: List<StyleSpan>? = null
     private set
 
@@ -55,6 +63,14 @@ class LuggPolylineView(context: Context) : ReactViewGroup(context) {
     animated = value
   }
 
+  fun setAnimatedOptions(options: AnimatedOptions) {
+    animatedOptions = options
+  }
+
+  fun setZIndex(value: Float) {
+    zIndex = value
+  }
+
   fun getOrCreateSpans(): List<StyleSpan> {
     cachedSpans?.let { return it }
 

package/android/src/main/java/com/luggmaps/LuggPolylineViewManager.kt

@@ -1,6 +1,7 @@
 package com.luggmaps
 
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
@@ -65,6 +66,27 @@ class LuggPolylineViewManager :
     view.setAnimated(value)
   }
 
+  @ReactProp(name = "animatedOptions")
+  override fun setAnimatedOptions(view: LuggPolylineView, value: ReadableMap?) {
+    val options = if (value != null) {
+      AnimatedOptions(
+        duration = if (value.hasKey("duration")) value.getDouble("duration").toLong() else 2150L,
+        easing = if (value.hasKey("easing")) value.getString("easing") ?: "linear" else "linear",
+        trailLength = if (value.hasKey("trailLength")) value.getDouble("trailLength").toFloat() else 1f,
+        delay = if (value.hasKey("delay")) value.getDouble("delay").toLong() else 0L
+      )
+    } else {
+      AnimatedOptions()
+    }
+    view.setAnimatedOptions(options)
+  }
+
+  @ReactProp(name = "zIndex", defaultFloat = 0f)
+  override fun setZIndex(view: LuggPolylineView, value: Float) {
+    super.setZIndex(view, value)
+    view.setZIndex(value)
+  }
+
   companion object {
     const val NAME = "LuggPolylineView"
   }