@rnmapbox/maps 10.1.0-beta.2 → 10.1.0-beta.5

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,12 +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.PuckBearingSource
 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.rnmapbox.rnmbx.v11compat.location.PuckBearingSource;
+import com.rnmapbox.rnmbx.v11compat.image.*;
 
 /**
  * The LocationComponent on android implements display of user's current location.
@@ -20,7 +22,7 @@ import com.mapbox.rctmgl.location.LocationManager
  * 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)
@@ -35,7 +37,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
         val showUserLocation: Boolean,
         val followUserLocation: Boolean,
         val tintColor: Int?, // tint of location puck
-        var bearingImage: Drawable?, // bearing image (background)
+        var bearingImage: ImageHolder?, // bearing image (background)
         var puckBearingSource: PuckBearingSource? // bearing source
     ) {
         val enabled: Boolean
@@ -63,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
@@ -79,7 +81,7 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
             if (fullUpdate || (newState.hidden != oldState.hidden) || (newState.tintColor != oldState.tintColor) || (newState.bearingImage != oldState.bearingImage)) {
                 if (newState.hidden) {
                     var emptyLocationPuck = LocationPuck2D()
-                    val empty = AppCompatResources.getDrawable(mContext, R.drawable.empty)
+                    val empty = AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.empty)
                     emptyLocationPuck.bearingImage = empty
                     emptyLocationPuck.shadowImage = empty
                     emptyLocationPuck.topImage = empty
@@ -90,18 +92,18 @@ class LocationComponentManager(mapView: RCTMGLMapView, context: Context) {
                     val mapboxBlueColor = Color.parseColor("#4A90E2")
                     val tintColor = newState.tintColor
                     val defaultLocationPuck = LocationPuck2D()
-                    var topImage = AppCompatResources.getDrawable(mContext, R.drawable.mapbox_user_icon)
+                    var topImage = AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.mapbox_user_icon)
                     if (tintColor != null) {
-                        val drawable = topImage as VectorDrawable?
+                        val drawable = AppCompatResources.getDrawable(mContext, R.drawable.mapbox_user_icon) as VectorDrawable?
                         drawable!!.setTint(tintColor)
-                        topImage = drawable
+                        topImage = drawable.toBitmapImageHolder()
                     }
                     defaultLocationPuck.topImage = topImage
-                    val defaultBearingImage = AppCompatResources.getDrawable(
+                    val defaultBearingImage = AppCompatResourcesV11.getDrawableImageHolder(
                         mContext, R.drawable.mapbox_user_stroke_icon
-                    );
+                    )
                     defaultLocationPuck.bearingImage = newState.bearingImage ?: defaultBearingImage
-                    val shadowImage = AppCompatResources.getDrawable(
+                    val shadowImage = AppCompatResourcesV11.getDrawableImageHolder(
                         mContext, R.drawable.mapbox_user_icon_shadow
                     )
                     defaultLocationPuck.shadowImage = shadowImage
@@ -140,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,29 +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.maps.plugin.PuckBearingSource
-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.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()
@@ -32,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)
@@ -69,10 +71,10 @@ class RCTMGLNativeUserLocation(context: Context) : AbstractMapFeature(context),
                 RenderMode.NORMAL ->
                     it.update { it.copy(bearingImage =  null, puckBearingSource = null)}
                 RenderMode.GPS -> it.update {
-                    it.copy(bearingImage =  AppCompatResources.getDrawable(
+                    it.copy(bearingImage =  AppCompatResourcesV11.getDrawableImageHolder(
                         mContext, R.drawable.mapbox_user_bearing_icon
                     ), puckBearingSource = PuckBearingSource.COURSE) }
-                RenderMode.COMPASS -> it.update{ it.copy(bearingImage=  AppCompatResources.getDrawable(
+                RenderMode.COMPASS -> it.update{ it.copy(bearingImage=  AppCompatResourcesV11.getDrawableImageHolder(
                     mContext, R.drawable.mapbox_user_puck_icon
                 ), puckBearingSource = PuckBearingSource.HEADING) }
             }

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