@lugg/maps 1.0.0-beta.2 → 1.0.0-beta.21

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

@@ -3,12 +3,13 @@ package com.luggmaps
 import android.content.Context
 import android.graphics.Canvas
 import android.view.View
+import android.view.accessibility.AccessibilityEvent
 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
+import com.google.android.gms.maps.model.Marker
 import com.luggmaps.events.MarkerDragEvent
 import com.luggmaps.events.MarkerPressEvent
 import com.luggmaps.extensions.dispatchEvent
@@ -16,6 +17,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) {
@@ -35,7 +38,7 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     private set
 
   var delegate: LuggMarkerViewDelegate? = null
-  var marker: AdvancedMarker? = null
+  var marker: Marker? = null
 
   var anchorX: Float = 0.5f
     private set
@@ -57,6 +60,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
 
@@ -75,6 +81,12 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
   var calloutView: LuggCalloutView? = null
     private set
 
+  val scaledContentHeight: Float
+    get() {
+      val (_, height) = measureContentBounds()
+      return height * scale
+    }
+
   private fun measureContentBounds(): Pair<Int, Int> {
     var maxWidth = 0
     var maxHeight = 0
@@ -207,6 +219,10 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     return null
   }
 
+  // no-op: avoid accessibility traversal of detached marker children
+  override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {}
+  override fun dispatchPopulateAccessibilityEvent(event: AccessibilityEvent): Boolean = false
+
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
     didLayout = false
@@ -266,6 +282,10 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     this.rasterize = rasterize
   }
 
+  fun setCenterOnPress(centerOnPress: Boolean) {
+    this.centerOnPress = centerOnPress
+  }
+
   fun setDraggable(draggable: Boolean) {
     this.draggable = draggable
   }
@@ -286,6 +306,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
   }

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

@@ -12,6 +12,9 @@ class LuggPackage : ReactPackage {
       LuggCalloutViewManager(),
       LuggMapWrapperViewManager(),
       LuggPolylineViewManager(),
-      LuggPolygonViewManager()
+      LuggPolygonViewManager(),
+      LuggCircleViewManager(),
+      LuggGroundOverlayViewManager(),
+      LuggTileOverlayViewManager()
     )
 }

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

@@ -5,11 +5,10 @@ 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)
+  fun polylineViewDidDrop(polylineView: LuggPolylineView)
 }
 
 data class AnimatedOptions(val duration: Long = 2150L, val easing: String = "linear", val trailLength: Float = 1f, val delay: Long = 0L)
@@ -33,9 +32,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 +44,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,25 +63,13 @@ 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)
   }
 
   fun onDropViewInstance() {
+    delegate?.polylineViewDidDrop(this)
     delegate = null
-    polyline?.remove()
     polyline = null
   }
 }

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"
+  }
+}