@lugg/maps 0.2.0-alpha.9 → 1.0.0-beta.1

package/android/src/main/java/com/luggmaps/{LuggGoogleMapViewManager.kt → LuggMapViewManager.kt}

@@ -8,40 +8,44 @@ 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.LuggGoogleMapViewManagerDelegate
-import com.facebook.react.viewmanagers.LuggGoogleMapViewManagerInterface
+import com.facebook.react.viewmanagers.LuggMapViewManagerDelegate
+import com.facebook.react.viewmanagers.LuggMapViewManagerInterface
 import com.google.android.gms.maps.model.LatLng
 import com.luggmaps.events.CameraIdleEvent
 import com.luggmaps.events.CameraMoveEvent
+import com.luggmaps.events.LongPressEvent
+import com.luggmaps.events.PressEvent
 import com.luggmaps.events.ReadyEvent
 import com.luggmaps.extensions.dispatchEvent
 
-@ReactModule(name = LuggGoogleMapViewManager.NAME)
-class LuggGoogleMapViewManager :
-  ViewGroupManager<LuggGoogleMapView>(),
-  LuggGoogleMapViewManagerInterface<LuggGoogleMapView>,
-  LuggGoogleMapViewEventDelegate {
-  private val delegate: ViewManagerDelegate<LuggGoogleMapView> = LuggGoogleMapViewManagerDelegate(this)
+@ReactModule(name = LuggMapViewManager.NAME)
+class LuggMapViewManager :
+  ViewGroupManager<LuggMapView>(),
+  LuggMapViewManagerInterface<LuggMapView>,
+  LuggMapViewEventDelegate {
+  private val delegate: ViewManagerDelegate<LuggMapView> = LuggMapViewManagerDelegate(this)
 
-  override fun getDelegate(): ViewManagerDelegate<LuggGoogleMapView> = delegate
+  override fun getDelegate(): ViewManagerDelegate<LuggMapView> = delegate
 
   override fun getName(): String = NAME
 
-  override fun createViewInstance(context: ThemedReactContext): LuggGoogleMapView {
-    val view = LuggGoogleMapView(context)
+  override fun createViewInstance(context: ThemedReactContext): LuggMapView {
+    val view = LuggMapView(context)
     view.eventDelegate = this
     return view
   }
 
   override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
     mapOf(
+      "topMapPress" to mapOf("registrationName" to "onMapPress"),
+      "topMapLongPress" to mapOf("registrationName" to "onMapLongPress"),
       "topCameraMove" to mapOf("registrationName" to "onCameraMove"),
       "topCameraIdle" to mapOf("registrationName" to "onCameraIdle"),
       "topReady" to mapOf("registrationName" to "onReady")
     )
 
   override fun onCameraMove(
-    view: LuggGoogleMapView,
+    view: LuggMapView,
     latitude: Double,
     longitude: Double,
     zoom: Float,
@@ -51,7 +55,7 @@ class LuggGoogleMapViewManager :
   }
 
   override fun onCameraIdle(
-    view: LuggGoogleMapView,
+    view: LuggMapView,
     latitude: Double,
     longitude: Double,
     zoom: Float,
@@ -60,17 +64,42 @@ class LuggGoogleMapViewManager :
     view.dispatchEvent(CameraIdleEvent(view, latitude, longitude, zoom, gesture))
   }
 
-  override fun onReady(view: LuggGoogleMapView) {
+  override fun onReady(view: LuggMapView) {
     view.dispatchEvent(ReadyEvent(view))
   }
 
+  override fun onPress(
+    view: LuggMapView,
+    latitude: Double,
+    longitude: Double,
+    x: Float,
+    y: Float
+  ) {
+    view.dispatchEvent(PressEvent(view, latitude, longitude, x, y))
+  }
+
+  override fun onLongPress(
+    view: LuggMapView,
+    latitude: Double,
+    longitude: Double,
+    x: Float,
+    y: Float
+  ) {
+    view.dispatchEvent(LongPressEvent(view, latitude, longitude, x, y))
+  }
+
+  @ReactProp(name = "provider")
+  override fun setProvider(view: LuggMapView, value: String?) {
+    view.setProvider(value)
+  }
+
   @ReactProp(name = "mapId")
-  override fun setMapId(view: LuggGoogleMapView, value: String?) {
+  override fun setMapId(view: LuggMapView, value: String?) {
     view.setMapId(value)
   }
 
   @ReactProp(name = "initialCoordinate")
-  override fun setInitialCoordinate(view: LuggGoogleMapView, value: ReadableMap?) {
+  override fun setInitialCoordinate(view: LuggMapView, value: ReadableMap?) {
     value?.let {
       val latitude = if (it.hasKey("latitude")) it.getDouble("latitude") else 0.0
       val longitude = if (it.hasKey("longitude")) it.getDouble("longitude") else 0.0
@@ -79,63 +108,73 @@ class LuggGoogleMapViewManager :
   }
 
   @ReactProp(name = "initialZoom", defaultDouble = 10.0)
-  override fun setInitialZoom(view: LuggGoogleMapView, value: Double) {
+  override fun setInitialZoom(view: LuggMapView, value: Double) {
     view.setInitialZoom(value)
   }
 
   @ReactProp(name = "zoomEnabled", defaultBoolean = true)
-  override fun setZoomEnabled(view: LuggGoogleMapView, value: Boolean) {
+  override fun setZoomEnabled(view: LuggMapView, value: Boolean) {
     view.setZoomEnabled(value)
   }
 
   @ReactProp(name = "scrollEnabled", defaultBoolean = true)
-  override fun setScrollEnabled(view: LuggGoogleMapView, value: Boolean) {
+  override fun setScrollEnabled(view: LuggMapView, value: Boolean) {
     view.setScrollEnabled(value)
   }
 
   @ReactProp(name = "rotateEnabled", defaultBoolean = true)
-  override fun setRotateEnabled(view: LuggGoogleMapView, value: Boolean) {
+  override fun setRotateEnabled(view: LuggMapView, value: Boolean) {
     view.setRotateEnabled(value)
   }
 
   @ReactProp(name = "pitchEnabled", defaultBoolean = true)
-  override fun setPitchEnabled(view: LuggGoogleMapView, value: Boolean) {
+  override fun setPitchEnabled(view: LuggMapView, value: Boolean) {
     view.setPitchEnabled(value)
   }
 
   @ReactProp(name = "userLocationEnabled", defaultBoolean = false)
-  override fun setUserLocationEnabled(view: LuggGoogleMapView, value: Boolean) {
+  override fun setUserLocationEnabled(view: LuggMapView, value: Boolean) {
     view.setUserLocationEnabled(value)
   }
 
+  @ReactProp(name = "userLocationButtonEnabled", defaultBoolean = false)
+  override fun setUserLocationButtonEnabled(view: LuggMapView, value: Boolean) {
+    view.setUserLocationButtonEnabled(value)
+  }
+
   @ReactProp(name = "minZoom")
-  override fun setMinZoom(view: LuggGoogleMapView, value: Double) {
+  override fun setMinZoom(view: LuggMapView, value: Double) {
     view.setMinZoom(value)
   }
 
   @ReactProp(name = "maxZoom")
-  override fun setMaxZoom(view: LuggGoogleMapView, value: Double) {
+  override fun setMaxZoom(view: LuggMapView, value: Double) {
     view.setMaxZoom(value)
   }
 
-  @ReactProp(name = "padding")
-  override fun setPadding(view: LuggGoogleMapView, value: ReadableMap?) {
+  @ReactProp(name = "theme")
+  override fun setTheme(view: LuggMapView, value: String?) {
+    view.setTheme(value ?: "system")
+  }
+
+  @ReactProp(name = "edgeInsets")
+  override fun setEdgeInsets(view: LuggMapView, value: ReadableMap?) {
     value?.let {
       val top = if (it.hasKey("top")) it.getDouble("top").toFloat().dpToPx().toInt() else 0
       val left = if (it.hasKey("left")) it.getDouble("left").toFloat().dpToPx().toInt() else 0
       val bottom = if (it.hasKey("bottom")) it.getDouble("bottom").toFloat().dpToPx().toInt() else 0
       val right = if (it.hasKey("right")) it.getDouble("right").toFloat().dpToPx().toInt() else 0
-      view.setMapPadding(top, left, bottom, right)
+      view.setEdgeInsets(top, left, bottom, right)
     }
   }
 
-  override fun onDropViewInstance(view: LuggGoogleMapView) {
+  override fun onDropViewInstance(view: LuggMapView) {
     super.onDropViewInstance(view)
     view.onDropViewInstance()
   }
 
   override fun moveCamera(
-    view: LuggGoogleMapView,
+    view: LuggMapView,
     latitude: Double,
     longitude: Double,
     zoom: Double,
@@ -144,13 +183,30 @@ class LuggGoogleMapViewManager :
     view.moveCamera(latitude, longitude, zoom, duration.toInt())
   }
 
+  override fun setEdgeInsets(
+    view: LuggMapView,
+    top: Double,
+    left: Double,
+    bottom: Double,
+    right: Double,
+    duration: Double
+  ) {
+    view.setEdgeInsets(
+      top.toFloat().dpToPx().toInt(),
+      left.toFloat().dpToPx().toInt(),
+      bottom.toFloat().dpToPx().toInt(),
+      right.toFloat().dpToPx().toInt(),
+      duration.toInt()
+    )
+  }
+
   override fun fitCoordinates(
-    view: LuggGoogleMapView,
+    view: LuggMapView,
     coordinates: ReadableArray?,
-    paddingTop: Double,
-    paddingLeft: Double,
-    paddingBottom: Double,
-    paddingRight: Double,
+    edgeInsetsTop: Double,
+    edgeInsetsLeft: Double,
+    edgeInsetsBottom: Double,
+    edgeInsetsRight: Double,
     duration: Double
   ) {
     val coords = mutableListOf<LatLng>()
@@ -162,10 +218,17 @@ class LuggGoogleMapViewManager :
         coords.add(LatLng(lat, lng))
       }
     }
-    view.fitCoordinates(coords, paddingTop.toInt(), paddingLeft.toInt(), paddingBottom.toInt(), paddingRight.toInt(), duration.toInt())
+    view.fitCoordinates(
+      coords,
+      edgeInsetsTop.toInt(),
+      edgeInsetsLeft.toInt(),
+      edgeInsetsBottom.toInt(),
+      edgeInsetsRight.toInt(),
+      duration.toInt()
+    )
   }
 
   companion object {
-    const val NAME = "LuggGoogleMapView"
+    const val NAME = "LuggMapView"
   }
 }

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

@@ -1,21 +1,18 @@
 package com.luggmaps
 
 import android.annotation.SuppressLint
+import android.view.MotionEvent
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 
 @SuppressLint("ViewConstructor")
 class LuggMapWrapperView(context: ThemedReactContext) : ReactViewGroup(context) {
 
-  override fun requestLayout() {
-    super.requestLayout()
-    getChildAt(0)?.let {
-      it.measure(
-        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-      )
-      it.layout(0, 0, width, height)
-    }
+  var touchEventHandler: ((MotionEvent) -> Unit)? = null
+
+  override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+    touchEventHandler?.invoke(event)
+    return super.dispatchTouchEvent(event)
   }
 
   override fun onLayout(
@@ -26,14 +23,14 @@ class LuggMapWrapperView(context: ThemedReactContext) : ReactViewGroup(context)
     bottom: Int
   ) {
     super.onLayout(changed, left, top, right, bottom)
-    val width = right - left
-    val height = bottom - top
+    val w = right - left
+    val h = bottom - top
     getChildAt(0)?.let {
       it.measure(
-        MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY),
-        MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        MeasureSpec.makeMeasureSpec(w, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(h, MeasureSpec.EXACTLY)
       )
-      it.layout(0, 0, width, height)
+      it.layout(0, 0, w, h)
     }
   }
 }

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

@@ -1,10 +1,17 @@
 package com.luggmaps
 
 import android.content.Context
+import android.graphics.Canvas
 import android.view.View
+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.luggmaps.events.MarkerDragEvent
+import com.luggmaps.events.MarkerPressEvent
+import com.luggmaps.extensions.dispatchEvent
 
 interface LuggMarkerViewDelegate {
   fun markerViewDidUpdate(markerView: LuggMarkerView)
@@ -12,6 +19,8 @@ interface LuggMarkerViewDelegate {
 }
 
 class LuggMarkerView(context: Context) : ReactViewGroup(context) {
+  private var scaleUpdateRunnable: Runnable? = null
+
   var name: String? = null
     private set
 
@@ -36,23 +45,113 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
   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 draggable: Boolean = false
+    private set
+
+  var isDragging: Boolean = false
+
   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
+    get() = contentView.isNotEmpty()
+
+  val contentView: ReactViewGroup = ReactViewGroup(context)
+
+  var onUpdate: (() -> Unit)? = null
+
+  var calloutView: LuggCalloutView? = null
+    private set
+
+  private fun measureContentBounds(): Pair<Int, Int> {
+    var maxWidth = 0
+    var maxHeight = 0
+    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
+      if (childBottom > maxHeight) maxHeight = childBottom
+    }
+    return Pair(maxWidth, maxHeight)
+  }
+
+  private fun createContentBitmap(): BitmapDescriptor? {
+    val (width, height) = measureContentBounds()
+    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)
+    contentView.draw(canvas)
+    return BitmapDescriptorFactory.fromBitmap(bitmap)
+  }
+
+  fun layoutContentView() {
+    val (width, height) = measureContentBounds()
+    val scaledWidth = (width * scale).toInt()
+    val scaledHeight = (height * scale).toInt()
+
+    contentView.scaleX = scale
+    contentView.scaleY = scale
+    contentView.pivotX = 0f
+    contentView.pivotY = 0f
+
+    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
+    createContentBitmap()?.let { m.setIcon(it) }
+  }
+
+  fun applyScaleToMarker() {
+    val m = marker ?: return
+    if (!hasCustomView) return
+
+    scaleUpdateRunnable?.let { removeCallbacks(it) }
+    scaleUpdateRunnable = Runnable {
+      if (rasterize) {
+        createContentBitmap()?.let { m.setIcon(it) }
+      } else {
+        layoutContentView()
+        onUpdate?.invoke()
       }
+    }
+    post(scaleUpdateRunnable)
+  }
 
-      setMeasuredDimension(maxWidth, maxHeight)
+  fun updateIcon(onAddMarker: () -> Unit) {
+    if (!hasCustomView) return
+    post {
+      if (marker == null) {
+        onAddMarker()
+      } else if (rasterize) {
+        applyIconToMarker()
+      } else {
+        layoutContentView()
+        onUpdate?.invoke()
+      }
     }
   }
 
@@ -61,23 +160,52 @@ 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 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 getChildCount(): Int = iconView.childCount
+  override fun getChildCount(): Int = contentView.childCount + if (calloutView != null) 1 else 0
 
-  override fun getChildAt(index: Int): View? = iconView.getChildAt(index)
+  override fun getChildAt(index: Int): View? {
+    if (index < contentView.childCount) return contentView.getChildAt(index)
+    if (index == contentView.childCount && calloutView != null) return calloutView
+    return null
+  }
 
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
@@ -92,6 +220,7 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     bottom: Int
   ) {
     super.onLayout(changed, left, top, right, bottom)
+
     if (changed && !didLayout) {
       didLayout = true
       delegate?.markerViewDidLayout(this)
@@ -120,6 +249,43 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
     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 setDraggable(draggable: Boolean) {
+    this.draggable = draggable
+  }
+
+  fun emitPressEvent(x: Float, y: Float) {
+    dispatchEvent(MarkerPressEvent(this, latitude, longitude, x, y))
+  }
+
+  fun emitDragStartEvent(x: Float, y: Float) {
+    dispatchEvent(MarkerDragEvent(this, MarkerDragEvent.DRAG_START, latitude, longitude, x, y))
+  }
+
+  fun emitDragChangeEvent(x: Float, y: Float) {
+    dispatchEvent(MarkerDragEvent(this, MarkerDragEvent.DRAG_CHANGE, latitude, longitude, x, y))
+  }
+
+  fun emitDragEndEvent(x: Float, y: Float) {
+    dispatchEvent(MarkerDragEvent(this, MarkerDragEvent.DRAG_END, latitude, longitude, x, y))
+  }
+
   fun setName(name: String?) {
     this.name = name
   }
@@ -129,12 +295,12 @@ class LuggMarkerView(context: Context) : ReactViewGroup(context) {
   }
 
   fun onDropViewInstance() {
+    scaleUpdateRunnable?.let { removeCallbacks(it) }
+    scaleUpdateRunnable = null
+    onUpdate = null
     didLayout = false
+    calloutView = null
     delegate = null
-    iconView.removeAllViews()
-  }
-
-  companion object {
-    private const val TAG = "Lugg"
+    contentView.removeAllViews()
   }
 }

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

@@ -20,6 +20,14 @@ class LuggMarkerViewManager :
   override fun getName(): String = NAME
   override fun createViewInstance(context: ThemedReactContext): LuggMarkerView = LuggMarkerView(context)
 
+  override fun getExportedCustomDirectEventTypeConstants(): Map<String, Any> =
+    mapOf(
+      "topMarkerPress" to mapOf("registrationName" to "onMarkerPress"),
+      "topMarkerDragStart" to mapOf("registrationName" to "onMarkerDragStart"),
+      "topMarkerDragChange" to mapOf("registrationName" to "onMarkerDragChange"),
+      "topMarkerDragEnd" to mapOf("registrationName" to "onMarkerDragEnd")
+    )
+
   override fun onDropViewInstance(view: LuggMarkerView) {
     super.onDropViewInstance(view)
     view.onDropViewInstance()
@@ -69,6 +77,26 @@ class LuggMarkerViewManager :
     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)
+  }
+
+  @ReactProp(name = "draggable", defaultBoolean = false)
+  override fun setDraggable(view: LuggMarkerView, value: Boolean) {
+    view.setDraggable(value)
+  }
+
   companion object {
     const val NAME = "LuggMarkerView"
   }

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

@@ -1,13 +1,17 @@
 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(),
+      LuggCalloutViewManager(),
+      LuggMapWrapperViewManager(),
+      LuggPolylineViewManager(),
+      LuggPolygonViewManager()
+    )
 }