@lugg/maps 1.0.0-beta.0 → 1.0.0-beta.10

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

@@ -1,10 +1,8 @@
 package com.luggmaps
 
 import android.content.Context
-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
@@ -18,6 +16,8 @@ import com.luggmaps.extensions.dispatchEvent
 interface LuggMarkerViewDelegate {
   fun markerViewDidUpdate(markerView: LuggMarkerView)
   fun markerViewDidLayout(markerView: LuggMarkerView)
+  fun showCalloutForMarkerView(markerView: LuggMarkerView)
+  fun hideCalloutForMarkerView(markerView: LuggMarkerView)
 }
 
 class LuggMarkerView(context: Context) : ReactViewGroup(context) {
@@ -59,6 +59,9 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
   var rasterize: Boolean = true
     private set
 
+  var centerOnPress: Boolean = true
+    private set
+
   var draggable: Boolean = false
     private set
 
@@ -68,15 +71,26 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     private set
 
   val hasCustomView: Boolean
-    get() = iconView.isNotEmpty()
+    get() = contentView.isNotEmpty()
+
+  val contentView: ReactViewGroup = ReactViewGroup(context)
 
-  val iconView: ReactViewGroup = ReactViewGroup(context)
+  var onUpdate: (() -> Unit)? = null
+
+  var calloutView: LuggCalloutView? = null
+    private set
 
-  private fun measureIconViewBounds(): Pair<Int, Int> {
+  val scaledContentHeight: Float
+    get() {
+      val (_, height) = measureContentBounds()
+      return height * scale
+    }
+
+  private fun measureContentBounds(): Pair<Int, Int> {
     var maxWidth = 0
     var maxHeight = 0
-    for (i in 0 until iconView.childCount) {
-      val child = iconView.getChildAt(i)
+    for (i in 0 until contentView.childCount) {
+      val child = contentView.getChildAt(i)
       val childRight = child.left + child.width
       val childBottom = child.top + child.height
       if (childRight > maxWidth) maxWidth = childRight
@@ -85,8 +99,8 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     return Pair(maxWidth, maxHeight)
   }
 
-  private fun createIconBitmap(): BitmapDescriptor? {
-    val (width, height) = measureIconViewBounds()
+  private fun createContentBitmap(): BitmapDescriptor? {
+    val (width, height) = measureContentBounds()
     if (width <= 0 || height <= 0) return null
 
     val scaledWidth = (width * scale).toInt()
@@ -95,41 +109,31 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     val bitmap = createBitmap(scaledWidth, scaledHeight)
     val canvas = Canvas(bitmap)
     canvas.scale(scale, scale)
-    iconView.draw(canvas)
+    contentView.draw(canvas)
     return BitmapDescriptorFactory.fromBitmap(bitmap)
   }
 
-  private fun createIconViewWrapper(): View {
-    val (width, height) = measureIconViewBounds()
+  fun layoutContentView() {
+    val (width, height) = measureContentBounds()
     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)
-      }
+    contentView.scaleX = scale
+    contentView.scaleY = scale
+    contentView.pivotX = 0f
+    contentView.pivotY = 0f
 
-      override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        setMeasuredDimension(scaledWidth, scaledHeight)
-      }
-    }
+    contentView.measure(
+      View.MeasureSpec.makeMeasureSpec(scaledWidth, View.MeasureSpec.EXACTLY),
+      View.MeasureSpec.makeMeasureSpec(scaledHeight, View.MeasureSpec.EXACTLY)
+    )
+    contentView.layout(0, 0, scaledWidth, scaledHeight)
   }
 
   fun applyIconToMarker() {
     val m = marker ?: return
     if (!hasCustomView) return
-
-    if (rasterize) {
-      createIconBitmap()?.let { m.setIcon(it) }
-    } else {
-      m.iconView = createIconViewWrapper()
-    }
+    createContentBitmap()?.let { m.setIcon(it) }
   }
 
   fun applyScaleToMarker() {
@@ -139,9 +143,10 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     scaleUpdateRunnable?.let { removeCallbacks(it) }
     scaleUpdateRunnable = Runnable {
       if (rasterize) {
-        createIconBitmap()?.let { m.setIcon(it) }
+        createContentBitmap()?.let { m.setIcon(it) }
       } else {
-        m.iconView = createIconViewWrapper()
+        layoutContentView()
+        onUpdate?.invoke()
       }
     }
     post(scaleUpdateRunnable)
@@ -149,18 +154,15 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
 
   fun updateIcon(onAddMarker: () -> Unit) {
     if (!hasCustomView) return
-    if (rasterize) {
-      post {
-        if (marker == null) {
-          onAddMarker()
-        } else {
-          applyIconToMarker()
-        }
+    post {
+      if (marker == null) {
+        onAddMarker()
+      } else if (rasterize) {
+        applyIconToMarker()
+      } else {
+        layoutContentView()
+        onUpdate?.invoke()
       }
-    } else {
-      marker?.remove()
-      marker = null
-      post { onAddMarker() }
     }
   }
 
@@ -169,23 +171,55 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
   }
 
   override fun addView(child: View, index: Int) {
-    iconView.addView(child, index)
+    if (child is LuggCalloutView) {
+      calloutView = child
+    } else {
+      contentView.addView(child, index)
+    }
     didLayout = false
   }
 
   override fun removeView(child: View) {
-    iconView.removeView(child)
+    if (child is LuggCalloutView) {
+      calloutView = null
+    } else {
+      contentView.removeView(child)
+    }
     didLayout = false
   }
 
   override fun removeViewAt(index: Int) {
-    iconView.removeViewAt(index)
+    val child = getChildAt(index)
+    if (child is LuggCalloutView) {
+      calloutView = null
+    } else {
+      contentView.removeViewAt(index)
+    }
     didLayout = false
   }
 
-  override fun getChildCount(): Int = iconView.childCount
+  override fun removeViews(start: Int, count: Int) {
+    for (i in (start until start + count).reversed()) {
+      val child = getChildAt(i)
+      if (child is LuggCalloutView) {
+        calloutView = null
+      } else if (i < contentView.childCount) {
+        contentView.removeViewAt(i)
+      }
+    }
+    didLayout = false
+  }
 
-  override fun getChildAt(index: Int): View? = iconView.getChildAt(index)
+  override fun getChildCount(): Int = contentView.childCount + if (calloutView != null) 1 else 0
+
+  override fun getChildAt(index: Int): View? {
+    if (index < contentView.childCount) return contentView.getChildAt(index)
+    if (index == contentView.childCount && calloutView != null) return calloutView
+    return null
+  }
+
+  // no-op: avoid accessibility traversal of detached marker children
+  override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {}
 
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
@@ -246,6 +280,10 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     this.rasterize = rasterize
   }
 
+  fun setCenterOnPress(centerOnPress: Boolean) {
+    this.centerOnPress = centerOnPress
+  }
+
   fun setDraggable(draggable: Boolean) {
     this.draggable = draggable
   }
@@ -266,6 +304,14 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     dispatchEvent(MarkerDragEvent(this, MarkerDragEvent.DRAG_END, latitude, longitude, x, y))
   }
 
+  fun showCallout() {
+    delegate?.showCalloutForMarkerView(this)
+  }
+
+  fun hideCallout() {
+    delegate?.hideCalloutForMarkerView(this)
+  }
+
   fun setName(name: String?) {
     this.name = name
   }
@@ -277,8 +323,10 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
   fun onDropViewInstance() {
     scaleUpdateRunnable?.let { removeCallbacks(it) }
     scaleUpdateRunnable = null
+    onUpdate = null
     didLayout = false
+    calloutView = null
     delegate = null
-    iconView.removeAllViews()
+    contentView.removeAllViews()
   }
 }

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

@@ -92,11 +92,24 @@ class LuggMarkerViewManager :
     view.setRasterize(value)
   }
 
+  @ReactProp(name = "centerOnPress", defaultBoolean = true)
+  override fun setCenterOnPress(view: LuggMarkerView, value: Boolean) {
+    view.setCenterOnPress(value)
+  }
+
   @ReactProp(name = "draggable", defaultBoolean = false)
   override fun setDraggable(view: LuggMarkerView, value: Boolean) {
     view.setDraggable(value)
   }
 
+  override fun showCallout(view: LuggMarkerView) {
+    view.showCallout()
+  }
+
+  override fun hideCallout(view: LuggMarkerView) {
+    view.hideCallout()
+  }
+
   companion object {
     const val NAME = "LuggMarkerView"
   }

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

@@ -6,5 +6,15 @@ import com.facebook.react.uimanager.ViewManager
 
 class LuggPackage : ReactPackage {
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> =
-    listOf(LuggMapViewManager(), LuggMarkerViewManager(), LuggMapWrapperViewManager(), LuggPolylineViewManager(), LuggPolygonViewManager())
+    listOf(
+      LuggMapViewManager(),
+      LuggMarkerViewManager(),
+      LuggCalloutViewManager(),
+      LuggMapWrapperViewManager(),
+      LuggPolylineViewManager(),
+      LuggPolygonViewManager(),
+      LuggCircleViewManager(),
+      LuggGroundOverlayViewManager(),
+      LuggTileOverlayViewManager()
+    )
 }

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

@@ -5,8 +5,6 @@ import android.graphics.Color
 import com.facebook.react.views.view.ReactViewGroup
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.Polyline
-import com.google.android.gms.maps.model.StrokeStyle
-import com.google.android.gms.maps.model.StyleSpan
 
 interface LuggPolylineViewDelegate {
   fun polylineViewDidUpdate(polylineView: LuggPolylineView)
@@ -33,9 +31,6 @@ class LuggPolylineView(context: Context) : ReactViewGroup(context) {
   var zIndex: Float = 0f
     private set
 
-  var cachedSpans: List<StyleSpan>? = null
-    private set
-
   var delegate: LuggPolylineViewDelegate? = null
   var polyline: Polyline? = null
 
@@ -48,11 +43,7 @@ class LuggPolylineView(context: Context) : ReactViewGroup(context) {
   }
 
   fun setStrokeColors(colors: List<Int>) {
-    val newColors = colors.ifEmpty { listOf(Color.BLACK) }
-    if (newColors != strokeColors) {
-      strokeColors = newColors
-      cachedSpans = null
-    }
+    strokeColors = colors.ifEmpty { listOf(Color.BLACK) }
   }
 
   fun setStrokeWidth(width: Float) {
@@ -71,18 +62,6 @@ class LuggPolylineView(context: Context) : ReactViewGroup(context) {
     zIndex = value
   }
 
-  fun getOrCreateSpans(): List<StyleSpan> {
-    cachedSpans?.let { return it }
-
-    val segmentCount = coordinates.size - 1
-    val spans = (0 until segmentCount).map { i ->
-      val color = strokeColors[i % strokeColors.size]
-      StyleSpan(StrokeStyle.colorBuilder(color).build())
-    }
-    cachedSpans = spans
-    return spans
-  }
-
   fun onAfterUpdateTransaction() {
     delegate?.polylineViewDidUpdate(this)
   }

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

@@ -0,0 +1,92 @@
+package com.luggmaps
+
+import android.content.Context
+import com.facebook.react.views.view.ReactViewGroup
+import com.google.android.gms.maps.model.TileOverlay
+import com.luggmaps.events.TileOverlayPressEvent
+import com.luggmaps.extensions.dispatchEvent
+
+interface LuggTileOverlayViewDelegate {
+  fun tileOverlayViewDidUpdate(tileOverlayView: LuggTileOverlayView)
+}
+
+class LuggTileOverlayView(context: Context) : ReactViewGroup(context) {
+  var urlTemplate: String = ""
+    private set
+
+  var tileSize: Int = 256
+    private set
+
+  var overlayOpacity: Float = 1f
+    private set
+
+  var hasBounds: Boolean = false
+    private set
+  var boundsSwLat: Double = 0.0
+    private set
+  var boundsSwLng: Double = 0.0
+    private set
+  var boundsNeLat: Double = 0.0
+    private set
+  var boundsNeLng: Double = 0.0
+    private set
+
+  var zIndex: Float = 0f
+    private set
+
+  var tappable: Boolean = false
+    private set
+
+  var delegate: LuggTileOverlayViewDelegate? = null
+  var tileOverlay: TileOverlay? = null
+
+  init {
+    visibility = GONE
+  }
+
+  fun setUrlTemplate(value: String) {
+    urlTemplate = value
+  }
+
+  fun setTileSize(value: Int) {
+    tileSize = value
+  }
+
+  fun setOverlayOpacity(value: Float) {
+    overlayOpacity = value
+  }
+
+  fun setZIndex(value: Float) {
+    zIndex = value
+  }
+
+  fun setBounds(swLat: Double, swLng: Double, neLat: Double, neLng: Double) {
+    hasBounds = true
+    boundsSwLat = swLat
+    boundsSwLng = swLng
+    boundsNeLat = neLat
+    boundsNeLng = neLng
+  }
+
+  fun clearBounds() {
+    hasBounds = false
+  }
+
+  fun setTappable(value: Boolean) {
+    tappable = value
+  }
+
+  fun emitPressEvent() {
+    dispatchEvent(TileOverlayPressEvent(this))
+  }
+
+  fun onAfterUpdateTransaction() {
+    delegate?.tileOverlayViewDidUpdate(this)
+  }
+
+  fun onDropViewInstance() {
+    delegate = null
+    tileOverlay?.remove()
+    tileOverlay = null
+  }
+}

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

@@ -0,0 +1,80 @@
+package com.luggmaps
+
+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
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.facebook.react.viewmanagers.LuggTileOverlayViewManagerDelegate
+import com.facebook.react.viewmanagers.LuggTileOverlayViewManagerInterface
+
+@ReactModule(name = LuggTileOverlayViewManager.NAME)
+class LuggTileOverlayViewManager :
+  ViewGroupManager<LuggTileOverlayView>(),
+  LuggTileOverlayViewManagerInterface<LuggTileOverlayView> {
+  private val delegate: ViewManagerDelegate<LuggTileOverlayView> = LuggTileOverlayViewManagerDelegate(this)
+
+  override fun getDelegate(): ViewManagerDelegate<LuggTileOverlayView> = delegate
+  override fun getName(): String = NAME
+  override fun createViewInstance(context: ThemedReactContext): LuggTileOverlayView = LuggTileOverlayView(context)
+
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+    mapOf("topTileOverlayPress" to mapOf("registrationName" to "onTileOverlayPress"))
+
+  override fun onDropViewInstance(view: LuggTileOverlayView) {
+    super.onDropViewInstance(view)
+    view.onDropViewInstance()
+  }
+
+  override fun onAfterUpdateTransaction(view: LuggTileOverlayView) {
+    super.onAfterUpdateTransaction(view)
+    view.onAfterUpdateTransaction()
+  }
+
+  @ReactProp(name = "urlTemplate")
+  override fun setUrlTemplate(view: LuggTileOverlayView, value: String?) {
+    view.setUrlTemplate(value ?: "")
+  }
+
+  @ReactProp(name = "tileSize", defaultInt = 256)
+  override fun setTileSize(view: LuggTileOverlayView, value: Int) {
+    view.setTileSize(value)
+  }
+
+  @ReactProp(name = "opacity", defaultDouble = 1.0)
+  override fun setOpacity(view: LuggTileOverlayView, value: Double) {
+    view.setOverlayOpacity(value.toFloat())
+  }
+
+  @ReactProp(name = "bounds")
+  override fun setBounds(view: LuggTileOverlayView, value: ReadableMap?) {
+    if (value == null) {
+      view.clearBounds()
+      return
+    }
+    val ne = value.getMap("northeast")
+    val sw = value.getMap("southwest")
+    view.setBounds(
+      sw?.getDouble("latitude") ?: 0.0,
+      sw?.getDouble("longitude") ?: 0.0,
+      ne?.getDouble("latitude") ?: 0.0,
+      ne?.getDouble("longitude") ?: 0.0
+    )
+  }
+
+  @ReactProp(name = "tappable")
+  override fun setTappable(view: LuggTileOverlayView, value: Boolean) {
+    view.setTappable(value)
+  }
+
+  @ReactProp(name = "zIndex", defaultFloat = 0f)
+  override fun setZIndex(view: LuggTileOverlayView, value: Float) {
+    super.setZIndex(view, value)
+    view.setZIndex(value)
+  }
+
+  companion object {
+    const val NAME = "LuggTileOverlayView"
+  }
+}