@rnmapbox/maps 10.1.0-beta.4 → 10.1.0-beta.6

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/images/RCTMGLImagesManager.kt → java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt}

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.images
+package com.rnmapbox.rnmbx.components.images
 
 import android.graphics.drawable.BitmapDrawable
 import android.view.View
@@ -8,24 +8,24 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.mapbox.maps.ImageContent
 import com.mapbox.maps.ImageStretches
-import com.mapbox.rctmgl.components.AbstractEventEmitter
-import com.mapbox.rctmgl.events.constants.EventKeys
-import com.mapbox.rctmgl.utils.ImageEntry
-import com.mapbox.rctmgl.utils.Logger
-import com.mapbox.rctmgl.utils.ResourceUtils
-import com.mapbox.rctmgl.utils.extensions.forEach
+import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.events.constants.EventKeys
+import com.rnmapbox.rnmbx.utils.ImageEntry
+import com.rnmapbox.rnmbx.utils.Logger
+import com.rnmapbox.rnmbx.utils.ResourceUtils
+import com.rnmapbox.rnmbx.utils.extensions.forEach
 import java.util.*
 
-class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
-    AbstractEventEmitter<RCTMGLImages?>(
+class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
+    AbstractEventEmitter<RNMBXImages?>(
         mContext
     ) {
     override fun getName(): String {
-        return "RCTMGLImages"
+        return "RNMBXImages"
     }
 
-    public override fun createViewInstance(context: ThemedReactContext): RCTMGLImages {
-        return RCTMGLImages(context, this)
+    public override fun createViewInstance(context: ThemedReactContext): RNMBXImages {
+        return RNMBXImages(context, this)
     }
 
     fun imageInfo(name: String, map: ReadableMap): ImageInfo {
@@ -48,7 +48,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
         }
         if (map.hasKey("scale")) {
             if (map.getType("scale") != ReadableType.Number) {
-                Logger.e("RCTMGLImages", "scale should be a number found: $scale in $map")
+                Logger.e("RNMBXImages", "scale should be a number found: $scale in $map")
             }
             scale = map.getDouble("scale")
         }
@@ -56,7 +56,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "images")
-    fun setImages(images: RCTMGLImages, map: ReadableMap) {
+    fun setImages(images: RNMBXImages, map: ReadableMap) {
         val imagesList = mutableListOf<Map.Entry<String, ImageEntry>>()
         map.forEach { imageName, imageInfo ->
             when (imageInfo) {
@@ -65,7 +65,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                     if (uri != null) {
                         imagesList.add(AbstractMap.SimpleEntry(imageName, ImageEntry(uri,  imageInfo(imageName, imageInfo))))
                     } else {
-                        Logger.e("RCTMGLImagesManager", "Unexpected value for key: $imageName in images property, no uri/url found!")
+                        Logger.e("RNMBXImagesManager", "Unexpected value for key: $imageName in images property, no uri/url found!")
                     }
                 }
                 is String -> {
@@ -73,7 +73,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                     imagesList.add(AbstractMap.SimpleEntry(imageName, ImageEntry(name, ImageInfo(name=imageName))))
                 }
                 else -> {
-                    Logger.e("RCTMGLImagesManager", "Unexpected value for key: $imageName in images property, only string/object is supported")
+                    Logger.e("RNMBXImagesManager", "Unexpected value for key: $imageName in images property, only string/object is supported")
                 }
             }
         }
@@ -81,7 +81,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
     }
 
     @ReactProp(name = "hasOnImageMissing")
-    fun setHasOnImageMissing(images: RCTMGLImages, value: Boolean?) {
+    fun setHasOnImageMissing(images: RNMBXImages, value: Boolean?) {
         images.setHasOnImageMissing(value!!)
     }
 
@@ -94,7 +94,7 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                 if (drawable != null) {
                     return NativeImage(ImageInfo(name=resourceName), drawable)
                 } else {
-                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $resourceName")
+                    Logger.e("RNMBXImages", "cound not get native drawable with name: $resourceName")
                     return null
                 }
             }
@@ -106,19 +106,19 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
                 if (drawable != null && resourceName != null) {
                     return NativeImage(imageInfo(resourceName, map), drawable)
                 } else {
-                    Logger.e("RCTMGLImages", "cound not get native drawable with name: $resourceName")
+                    Logger.e("RNMBXImages", "cound not get native drawable with name: $resourceName")
                     return null
                 }
             }
             else -> {
-                Logger.e("RCTMGLImages", "nativeImages element should be a string or a object, but was: $dynamic")
+                Logger.e("RNMBXImages", "nativeImages element should be a string or a object, but was: $dynamic")
                 return null
             }
         }
     }
 
     @ReactProp(name = "nativeImages")
-    fun setNativeImages(images: RCTMGLImages, arr: ReadableArray) {
+    fun setNativeImages(images: RNMBXImages, arr: ReadableArray) {
         val nativeImages = mutableListOf<NativeImage>();
         for (i in 0 until arr.size()) {
             val nativeImage = toNativeImage(arr.getDynamic(i))
@@ -135,16 +135,16 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
             .build()
     }
 
-    // region RCTMGLImage children
+    // region RNMBXImage children
 
-    override fun addView(parent: RCTMGLImages?, childView: View?, childPosition: Int) {
+    override fun addView(parent: RNMBXImages?, childView: View?, childPosition: Int) {
         if (parent == null || childView == null) {
-            Logger.e("RCTMGLImages", "addView: parent or childView is null")
+            Logger.e("RNMBXImages", "addView: parent or childView is null")
             return
         }
 
-        if (childView !is RCTMGLImage) {
-            Logger.e("RCTMGLImages", "child view should be RCTMGLImage")
+        if (childView !is RNMBXImage) {
+            Logger.e("RNMBXImages", "child view should be RNMBXImage")
             return
         }
 
@@ -152,18 +152,18 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
         childView.nativeImageUpdater = parent
     }
 
-    override fun removeView(parent: RCTMGLImages?, view: View?) {
+    override fun removeView(parent: RNMBXImages?, view: View?) {
         if (parent == null || view == null) {
-            Logger.e("RCTMGLImages", "removeView: parent or view is null")
+            Logger.e("RNMBXImages", "removeView: parent or view is null")
             return
         }
 
         parent.mImageViews.remove(view)
     }
 
-    override fun removeAllViews(parent: RCTMGLImages?) {
+    override fun removeAllViews(parent: RNMBXImages?) {
         if (parent == null) {
-            Logger.e("RCTMGLImages", "removeAllViews parent is null")
+            Logger.e("RNMBXImages", "removeAllViews parent is null")
             return
         }
 
@@ -173,22 +173,22 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
     // endregion
 
     companion object {
-        const val REACT_CLASS = "RCTMGLImages"
+        const val REACT_CLASS = "RNMBXImages"
 
         fun convertStretch(stretch: Dynamic) : List<ImageStretches>? {
             if (stretch.type != ReadableType.Array) {
-                Logger.e("RCTMGLImages", "stretch should be an array, got $stretch")
+                Logger.e("RNMBXImages", "stretch should be an array, got $stretch")
                 return null
             }
             val array = stretch.asArray()
             var result = mutableListOf<ImageStretches>();
             for (i in 0 until array.size()) {
                 if (array.getType(i) != ReadableType.Array) {
-                    Logger.e("RTMGLImages", "each element of strech should be an array but was: ${array.getDynamic(i)}")
+                    Logger.e("RNMBXImages", "each element of strech should be an array but was: ${array.getDynamic(i)}")
                 } else {
                     val pair = array.getArray(i)
                     if (pair.size() != 2 || pair.getType(0) != ReadableType.Number || pair.getType(1) != ReadableType.Number) {
-                        Logger.e("RCTMGLImages", "each element of stretch should be pair of 2 integers but was ${pair}")
+                        Logger.e("RNMBXImages", "each element of stretch should be pair of 2 integers but was ${pair}")
                     }
                     result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat()))
                 }
@@ -198,18 +198,18 @@ class RCTMGLImagesManager(private val mContext: ReactApplicationContext) :
 
         fun convertContent(content: Dynamic) : ImageContent? {
             if (content.type != ReadableType.Array) {
-                Logger.e("RCTMGLImages", "content should be an array, got $content")
+                Logger.e("RNMBXImages", "content should be an array, got $content")
                 return null
             }
             val array = content.asArray()
             if (array.size() != 4) {
-                Logger.e("RCTMGLImages", "content should be an array of 4 numbers, got $content")
+                Logger.e("RNMBXImages", "content should be an array of 4 numbers, got $content")
                 return null
             }
             val result = arrayOf(0.0, 0.0, 0.0, 0.0, 0.0)
             for (i in 0 until array.size()) {
                 if (array.getType(i) != ReadableType.Number) {
-                    Logger.e("RTMGLImages", "each element of content should be an number but was : ${array}")
+                    Logger.e("RNMBXImages", "each element of content should be an number but was : ${array}")
                     return null
                 } else {
                     result[i] = array.getDouble(i)

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/location/CameraMode.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.location;
+package com.rnmapbox.rnmbx.components.location;
 
 import androidx.annotation.IntDef;
 

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/location/LocationComponentManager.kt

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.location
+package com.rnmapbox.rnmbx.components.location
 
 import android.content.Context
 import android.graphics.Color
@@ -7,14 +7,14 @@ import android.graphics.drawable.VectorDrawable
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.lifecycle.Lifecycle
 import com.mapbox.maps.plugin.locationcomponent.location
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 import com.mapbox.maps.plugin.LocationPuck2D
 import com.mapbox.maps.plugin.lifecycle.lifecycle
-import com.mapbox.rctmgl.R
-import com.mapbox.rctmgl.location.LocationManager
+import com.rnmapbox.rnmbx.R
+import com.rnmapbox.rnmbx.location.LocationManager
 
-import com.mapbox.rctmgl.v11compat.location.PuckBearingSource;
-import com.mapbox.rctmgl.v11compat.image.*;
+import com.rnmapbox.rnmbx.v11compat.location.PuckBearingSource;
+import com.rnmapbox.rnmbx.v11compat.image.*;
 
 /**
  * The LocationComponent on android implements display of user's current location.
@@ -22,7 +22,7 @@ import com.mapbox.rctmgl.v11compat.image.*;
  * LocationComponentManager attempts to separate that, so that Camera can ask for location tracking independent of display of user current location.
  * And NativeUserLocation can ask for display of user's current location - independent of Camera's user tracking.
  */
-class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
+class LocationComponentManager(mapView: RNMBXMapView, context: Context) {
     var mMapView = mapView
     var mContext = context
     private var mState = State(showUserLocation=false, followUserLocation=false, tintColor= null, bearingImage = null, puckBearingSource =null)
@@ -65,7 +65,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
         }
     }
 
-    private fun applyStateChanges(map: RCTMGLMapView, oldState: State, newState: State, fullUpdate: Boolean) {
+    private fun applyStateChanges(map: RNMBXMapView, oldState: State, newState: State, fullUpdate: Boolean) {
         val mapView = map.mapView
         if (map.getLifecycleState() != Lifecycle.State.STARTED) {
             // In case lifecycle was already stopped, so we're part of shutdown, do not call updateSettings as it'll just restart
@@ -142,7 +142,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
         }
     }
 
-    private fun useMapLocationProvider(mapView: RCTMGLMapView) {
+    private fun useMapLocationProvider(mapView: RNMBXMapView) {
         val provider = mapView.mapView.location.getLocationProvider()
         if (provider != null) {
             mLocationManager.provider = provider

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/location/RCTMGLNativeUserLocation.kt → java/com/rnmapbox/rnmbx/components/location/RNMBXNativeUserLocation.kt}

@@ -1,31 +1,31 @@
-package com.mapbox.rctmgl.components.location
+package com.rnmapbox.rnmbx.components.location
 
 import android.annotation.SuppressLint
 import android.content.Context
 import androidx.appcompat.content.res.AppCompatResources
-import com.mapbox.rctmgl.components.mapview.OnMapReadyCallback
+import com.rnmapbox.rnmbx.components.mapview.OnMapReadyCallback
 import com.mapbox.maps.MapboxMap
 import com.mapbox.android.core.permissions.PermissionsManager
 import com.mapbox.maps.Style
-import com.mapbox.rctmgl.R
-import com.mapbox.rctmgl.components.AbstractMapFeature
-import com.mapbox.rctmgl.components.RemovalReason
-import com.mapbox.rctmgl.components.mapview.RCTMGLMapView
+import com.rnmapbox.rnmbx.R
+import com.rnmapbox.rnmbx.components.AbstractMapFeature
+import com.rnmapbox.rnmbx.components.RemovalReason
+import com.rnmapbox.rnmbx.components.mapview.RNMBXMapView
 
-import com.mapbox.rctmgl.v11compat.location.PuckBearingSource
-import com.mapbox.rctmgl.v11compat.image.AppCompatResourcesV11
+import com.rnmapbox.rnmbx.v11compat.location.PuckBearingSource
+import com.rnmapbox.rnmbx.v11compat.image.AppCompatResourcesV11
 
 enum class RenderMode {
     GPS, COMPASS, NORMAL
 }
 
-class RCTMGLNativeUserLocation(context: Context) : AbstractMapFeature(context), OnMapReadyCallback, Style.OnStyleLoaded {
+class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), OnMapReadyCallback, Style.OnStyleLoaded {
     private var mEnabled = true
     private var mMap: MapboxMap? = null
     private var mRenderMode : RenderMode = RenderMode.NORMAL;
     private var mContext : Context = context
 
-    override fun addToMap(mapView: RCTMGLMapView) {
+    override fun addToMap(mapView: RNMBXMapView) {
         super.addToMap(mapView)
         mEnabled = true
         mapView.getMapboxMap()
@@ -34,7 +34,7 @@ class RCTMGLNativeUserLocation(context: Context) : AbstractMapFeature(context),
         applyChanges()
     }
 
-    override fun removeFromMap(mapView: RCTMGLMapView, reason: RemovalReason): Boolean {
+    override fun removeFromMap(mapView: RNMBXMapView, reason: RemovalReason): Boolean {
         mEnabled = false
         mMapView?.locationComponentManager?.showNativeUserLocation(false)
         mMap?.getStyle(this)

package/android/src/main/{java-v10/com/mapbox/rctmgl/components/location/RCTMGLNativeUserLocationManager.kt → java/com/rnmapbox/rnmbx/components/location/RNMBXNativeUserLocationManager.kt}

@@ -1,19 +1,19 @@
-package com.mapbox.rctmgl.components.location
+package com.rnmapbox.rnmbx.components.location
 
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.mapbox.rctmgl.utils.Logger
+import com.rnmapbox.rnmbx.utils.Logger
 import javax.annotation.Nonnull
 
-class RCTMGLNativeUserLocationManager : ViewGroupManager<RCTMGLNativeUserLocation>() {
+class RNMBXNativeUserLocationManager : ViewGroupManager<RNMBXNativeUserLocation>() {
     @Nonnull
     override fun getName(): String {
         return REACT_CLASS
     }
 
     @ReactProp(name = "androidRenderMode")
-    fun setAndroidRenderMode(userLocation: RCTMGLNativeUserLocation, mode: String) {
+    fun setAndroidRenderMode(userLocation: RNMBXNativeUserLocation, mode: String) {
         when (mode) {
             "compass" -> userLocation.setAndroidRenderMode(RenderMode.COMPASS);
             "gps" -> userLocation.setAndroidRenderMode(RenderMode.GPS);
@@ -22,11 +22,11 @@ class RCTMGLNativeUserLocationManager : ViewGroupManager<RCTMGLNativeUserLocatio
     }
 
     @Nonnull
-    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RCTMGLNativeUserLocation {
-        return RCTMGLNativeUserLocation(reactContext)
+    override fun createViewInstance(@Nonnull reactContext: ThemedReactContext): RNMBXNativeUserLocation {
+        return RNMBXNativeUserLocation(reactContext)
     }
 
     companion object {
-        const val REACT_CLASS = "RCTMGLNativeUserLocation"
+        const val REACT_CLASS = "RNMBXNativeUserLocation"
     }
 }

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/location/UserLocation.java

@@ -1,8 +1,8 @@
-package com.mapbox.rctmgl.components.location;
+package com.rnmapbox.rnmbx.components.location;
 
 import android.location.Location;
 
-import com.mapbox.rctmgl.utils.LatLng;
+import com.rnmapbox.rnmbx.utils.LatLng;
 
 public class UserLocation {
     private Location currentLocation;

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/location/UserTrackingMode.kt

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.location
+package com.rnmapbox.rnmbx.components.location
 
 object UserTrackingMode {
     const val NONE = 0

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/mapview/NativeMapViewModule.kt

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.mapview
+package com.rnmapbox.rnmbx.components.mapview
 
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -7,15 +7,15 @@ import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
-import com.mapbox.rctmgl.BuildConfig
-import com.mapbox.rctmgl.NativeMapViewModuleSpec
-import com.mapbox.rctmgl.utils.ConvertUtils
-import com.mapbox.rctmgl.utils.ExpressionParser
-import com.mapbox.rctmgl.utils.extensions.toCoordinate
-import com.mapbox.rctmgl.utils.extensions.toScreenCoordinate
+import com.rnmapbox.rnmbx.BuildConfig
+import com.rnmapbox.rnmbx.NativeMapViewModuleSpec
+import com.rnmapbox.rnmbx.utils.ConvertUtils
+import com.rnmapbox.rnmbx.utils.ExpressionParser
+import com.rnmapbox.rnmbx.utils.extensions.toCoordinate
+import com.rnmapbox.rnmbx.utils.extensions.toScreenCoordinate
 
 class NativeMapViewModule(context: ReactApplicationContext) : NativeMapViewModuleSpec(context) {
-    private fun withMapViewOnUIThread(viewRef: Double?, promise: Promise, fn: (RCTMGLMapView) -> Unit) {
+    private fun withMapViewOnUIThread(viewRef: Double?, promise: Promise, fn: (RNMBXMapView) -> Unit) {
         if (viewRef == null) {
             return
         }
@@ -26,7 +26,7 @@ class NativeMapViewModule(context: ReactApplicationContext) : NativeMapViewModul
             else
                 UIManagerHelper.getUIManager(reactApplicationContext, UIManagerType.DEFAULT)
 
-            val view = manager?.resolveView(viewRef.toInt()) as? RCTMGLMapView
+            val view = manager?.resolveView(viewRef.toInt()) as? RNMBXMapView
 
             if (view != null) {
                 fn(view)
@@ -188,6 +188,6 @@ class NativeMapViewModule(context: ReactApplicationContext) : NativeMapViewModul
     }
 
     companion object {
-        const val NAME = "MBXMapViewModule"
+        const val NAME = "RNMBXMapViewModule"
     }
 }

package/android/src/main/{java-v10/com/mapbox/rctmgl → java/com/rnmapbox/rnmbx}/components/mapview/OnMapReadyCallback.java

@@ -1,4 +1,4 @@
-package com.mapbox.rctmgl.components.mapview;
+package com.rnmapbox.rnmbx.components.mapview;
 
 import androidx.annotation.NonNull;
 

package/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXAndroidTextureMapViewManager.kt

@@ -0,0 +1,37 @@
+package com.rnmapbox.rnmbx.components.mapview
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXAndroidTextureMapViewManagerDelegate
+import com.facebook.react.viewmanagers.RNMBXAndroidTextureMapViewManagerInterface
+import com.facebook.react.viewmanagers.RNMBXMapViewManagerDelegate
+import com.mapbox.maps.MapInitOptions
+
+class RNMBXAndroidTextureMapViewManager(context: ReactApplicationContext) : RNMBXMapViewManager(
+    context
+), RNMBXAndroidTextureMapViewManagerInterface<RNMBXMapView> {
+    private val mDelegate: ViewManagerDelegate<RNMBXMapView>
+
+    init {
+        mDelegate = RNMBXAndroidTextureMapViewManagerDelegate<RNMBXMapView, RNMBXAndroidTextureMapViewManager>(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<RNMBXMapView>? {
+        return mDelegate
+    }
+
+    override fun getName(): String {
+        return REACT_CLASS
+    }
+
+    override fun createViewInstance(themedReactContext: ThemedReactContext): RNMBXMapView {
+        val context = getMapViewContext(themedReactContext)
+        val options = MapInitOptions(context = context, textureView= true)
+        return RNMBXMapView(context, this, options)
+    }
+
+    companion object {
+        const val REACT_CLASS = "RNMBXAndroidTextureMapView"
+    }
+}