@rnmapbox/maps 10.1.0-beta.18 → 10.1.0-beta.19

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Image.kt

@@ -1,7 +1,9 @@
 package com.rnmapbox.rnmbx.v11compat.image;
 
 import android.content.Context
+import android.content.res.Resources
 import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.VectorDrawable
 import androidx.annotation.DrawableRes
@@ -9,7 +11,6 @@ import androidx.appcompat.content.res.AppCompatResources
 import com.mapbox.maps.Image
 import com.mapbox.maps.Style
 import com.rnmapbox.rnmbx.components.images.ImageInfo
-import com.rnmapbox.rnmbx.components.images.addBitmapImage
 import java.nio.ByteBuffer
 
 typealias ImageHolder = Drawable;
@@ -26,6 +27,10 @@ fun VectorDrawable.toBitmapImageHolder(): Drawable {
     return this
 }
 
+fun BitmapDrawable.toBitmapImageHolder(): ImageHolder {
+    return this
+}
+
 fun emptyImage(width: Int, height: Int): Image {
     return Image(width, height, ByteArray(width * height * 4) /* ByteBuffer.allocateDirect(width * height * 4).array()*/)
 }
@@ -51,3 +56,14 @@ class AppCompatResourcesV11 {
         }
     }
 }
+
+fun Image.toDrawable(): Drawable {
+    val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+    bitmap.copyPixelsFromBuffer(ByteBuffer.wrap(data))
+
+    return BitmapDrawable(Resources.getSystem(), bitmap)
+}
+
+fun Image.toImageHolder(): ImageHolder {
+    return toDrawable()
+}

package/android/src/main/mapbox-v11-compat/v10/com/rnmapbox/rnmbx/v11compat/Location.kt

@@ -3,35 +3,32 @@ package com.rnmapbox.rnmbx.v11compat.location;
 import android.Manifest.permission.ACCESS_COARSE_LOCATION
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.content.Context
-import android.location.LocationManager
 import android.os.Looper
 import androidx.annotation.RequiresPermission
 import com.mapbox.maps.MapView
 import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.maps.plugin.locationcomponent.LocationComponentPlugin2
 import com.mapbox.maps.plugin.locationcomponent.location2 as _location2
-
-
 import com.mapbox.android.core.location.LocationEngineResult as _LocationEngineResult
-
 import com.mapbox.android.core.location.LocationEngine as _LocationEngine
 import com.mapbox.android.core.location.LocationEngineCallback as _LocationEngineCallback
 import com.mapbox.android.core.location.LocationEngineRequest
 import com.mapbox.android.core.location.LocationEngineProvider
-import com.mapbox.common.location.LocationService
-import com.mapbox.common.location.LocationUpdatesReceiver
-import com.mapbox.common.location.LocationServiceFactory
 
 
 import android.location.Location as _Location
-//import com.mapbox.common.location.Location as _Location
 
 typealias Location = _Location;
-typealias PuckBearingSource = com.mapbox.maps.plugin.PuckBearingSource
+typealias PuckBearing = PuckBearingSource
 
 val MapView.location2 : LocationComponentPlugin2
     get() = _location2
 
+
+var LocationComponentPlugin2.puckBearing: PuckBearingSource
+    get() = this.puckBearingSource
+    set(value) { puckBearingSource = value }
+
 typealias LocationEngine = _LocationEngine
 typealias LocationEngineResult = _LocationEngineResult
 typealias LocationEngineCallback = _LocationEngineCallback<LocationEngineResult>

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Annotation.kt

@@ -1,4 +1,32 @@
 package com.rnmapbox.rnmbx.v11compat.annotation;
 
+import android.view.View
+import com.mapbox.geojson.Geometry
+import com.mapbox.geojson.Point
+import com.mapbox.maps.ScreenCoordinate
+import com.mapbox.maps.ViewAnnotationAnchorConfig
+import com.mapbox.maps.ViewAnnotationOptions
+import com.mapbox.maps.viewannotation.geometry as _geometry
+
+import com.mapbox.maps.viewannotation.OnViewAnnotationUpdatedListener as _OnViewAnnotationUpdatedListener
+
+
+
 public const val INVALID_ANNOTATION_ID = ""
-typealias AnnotationID = String
+typealias AnnotationID = String
+
+
+fun ViewAnnotationOptions.Builder.geometry(point: Geometry): ViewAnnotationOptions.Builder {
+  return _geometry(point)
+}
+
+fun ViewAnnotationOptions.Builder.offsets(x: Double, y: Double) {
+  this.variableAnchors(listOf(
+    ViewAnnotationAnchorConfig.Builder().offsetY(x).offsetY(y).build()
+  ))
+}
+
+
+abstract class OnViewAnnotationUpdatedListener : _OnViewAnnotationUpdatedListener {
+
+}

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Cancelable.kt

@@ -0,0 +1,3 @@
+package com.rnmapbox.rnmbx.v11compat
+
+typealias Cancelable = com.mapbox.common.Cancelable;

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Image.kt

@@ -1,11 +1,12 @@
 package com.rnmapbox.rnmbx.v11compat.image;
 
 import android.content.Context
+import android.content.res.Resources
 import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.VectorDrawable
 import androidx.annotation.DrawableRes
-import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.graphics.drawable.toBitmap
 import com.mapbox.bindgen.DataRef
 import com.mapbox.maps.Image
@@ -37,6 +38,10 @@ fun VectorDrawable.toBitmapImageHolder(): ImageHolder {
     return ImageHolder.from(this.toBitmap())
 }
 
+fun BitmapDrawable.toBitmapImageHolder(): ImageHolder {
+    return ImageHolder.from(this.toBitmap())
+}
+
 class AppCompatResourcesV11 {
     companion object {
         fun getDrawableImageHolder(context: Context, @DrawableRes resId: Int) : ImageHolder? {
@@ -66,3 +71,18 @@ fun emptyImage(width: Int, height: Int): Image {
         width, height, DataRef.allocateNative(width * height * 4)
     )
 }
+
+fun Image.toDrawable(): Drawable {
+    val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+    bitmap.copyPixelsFromBuffer(data.buffer)
+
+    return BitmapDrawable(Resources.getSystem(), bitmap)
+}
+
+fun Image.toImageHolder(): ImageHolder {
+    val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+    bitmap.copyPixelsFromBuffer(data.buffer)
+
+    return ImageHolder.from(bitmap)
+}
+

package/android/src/main/mapbox-v11-compat/v11/com/rnmapbox/rnmbx/v11compat/Location.kt

@@ -8,7 +8,7 @@ import com.mapbox.common.location.IntervalSettings
 import com.mapbox.common.location.LocationObserver
 import com.mapbox.common.location.Location as _Location
 import com.mapbox.maps.MapView
-import com.mapbox.maps.plugin.PuckBearing
+import com.mapbox.maps.plugin.PuckBearing as _PuckBearing
 import com.mapbox.maps.plugin.locationcomponent.LocationComponentPlugin
 import com.mapbox.maps.plugin.locationcomponent.location
 
@@ -19,7 +19,7 @@ import com.mapbox.common.location.LocationServiceFactory
 import com.rnmapbox.rnmbx.utils.Logger
 import kotlin.math.absoluteValue
 
-typealias PuckBearingSource = PuckBearing
+typealias PuckBearing = _PuckBearing
 
 const val DEFAULT_FASTEST_INTERVAL_MILLIS: Long = 1000
 const val DEFAULT_INTERVAL_MILLIS: Long = 1000

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerDelegate.java

@@ -0,0 +1,32 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNMBXCustomLocationProviderManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXCustomLocationProviderManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXCustomLocationProviderManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "coordinate":
+        mViewManager.setCoordinate(view, new DynamicFromObject(value));
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerInterface.java

@@ -0,0 +1,17 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+
+public interface RNMBXCustomLocationProviderManagerInterface<T extends View> {
+  void setCoordinate(T view, Dynamic value);
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerDelegate.java

@@ -25,8 +25,26 @@ public class RNMBXNativeUserLocationManagerDelegate<T extends View, U extends Ba
       case "androidRenderMode":
         mViewManager.setAndroidRenderMode(view, new DynamicFromObject(value));
         break;
-      case "iosShowsUserHeadingIndicator":
-        mViewManager.setIosShowsUserHeadingIndicator(view, new DynamicFromObject(value));
+      case "puckBearing":
+        mViewManager.setPuckBearing(view, new DynamicFromObject(value));
+        break;
+      case "puckBearingEnabled":
+        mViewManager.setPuckBearingEnabled(view, new DynamicFromObject(value));
+        break;
+      case "bearingImage":
+        mViewManager.setBearingImage(view, new DynamicFromObject(value));
+        break;
+      case "shadowImage":
+        mViewManager.setShadowImage(view, new DynamicFromObject(value));
+        break;
+      case "topImage":
+        mViewManager.setTopImage(view, new DynamicFromObject(value));
+        break;
+      case "scale":
+        mViewManager.setScale(view, new DynamicFromObject(value));
+        break;
+      case "visible":
+        mViewManager.setVisible(view, value == null ? false : (boolean) value);
         break;
       default:
         super.setProperty(view, propName, value);

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerInterface.java

@@ -14,5 +14,11 @@ import com.facebook.react.bridge.Dynamic;
 
 public interface RNMBXNativeUserLocationManagerInterface<T extends View> {
   void setAndroidRenderMode(T view, Dynamic value);
-  void setIosShowsUserHeadingIndicator(T view, Dynamic value);
+  void setPuckBearing(T view, Dynamic value);
+  void setPuckBearingEnabled(T view, Dynamic value);
+  void setBearingImage(T view, Dynamic value);
+  void setShadowImage(T view, Dynamic value);
+  void setTopImage(T view, Dynamic value);
+  void setScale(T view, Dynamic value);
+  void setVisible(T view, boolean value);
 }

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.java

@@ -0,0 +1,35 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaDelegate.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManagerDelegate;
+import com.facebook.react.uimanager.BaseViewManagerInterface;
+
+public class RNMBXViewportManagerDelegate<T extends View, U extends BaseViewManagerInterface<T> & RNMBXViewportManagerInterface<T>> extends BaseViewManagerDelegate<T, U> {
+  public RNMBXViewportManagerDelegate(U viewManager) {
+    super(viewManager);
+  }
+  @Override
+  public void setProperty(T view, String propName, @Nullable Object value) {
+    switch (propName) {
+      case "transitionsToIdleUponUserInteraction":
+        mViewManager.setTransitionsToIdleUponUserInteraction(view, new DynamicFromObject(value));
+        break;
+      case "hasStatusChanged":
+        mViewManager.setHasStatusChanged(view, value == null ? false : (boolean) value);
+        break;
+      default:
+        super.setProperty(view, propName, value);
+    }
+  }
+}

package/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerInterface.java

@@ -0,0 +1,18 @@
+/**
+* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+*
+* Do not edit this file as changes may cause incorrect behavior and will be lost
+* once the code is regenerated.
+*
+* @generated by codegen project: GeneratePropsJavaInterface.js
+*/
+
+package com.facebook.react.viewmanagers;
+
+import android.view.View;
+import com.facebook.react.bridge.Dynamic;
+
+public interface RNMBXViewportManagerInterface<T extends View> {
+  void setTransitionsToIdleUponUserInteraction(T view, Dynamic value);
+  void setHasStatusChanged(T view, boolean value);
+}

package/android/src/main/old-arch/com/rnmapbox/rnmbx/NativeRNMBXViewportModuleSpec.java

@@ -0,0 +1,49 @@
+
+/**
+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
+ *
+ * Do not edit this file as changes may cause incorrect behavior and will be lost
+ * once the code is regenerated.
+ *
+ * @generated by codegen project: GenerateModuleJavaSpec.js
+ *
+ * @nolint
+ */
+
+package com.rnmapbox.rnmbx;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public abstract class NativeRNMBXViewportModuleSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public static final String NAME = "RNMBXViewportModule";
+
+  public NativeRNMBXViewportModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @Override
+  public @Nonnull String getName() {
+    return NAME;
+  }
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getState(@Nullable Double viewRef, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void transitionTo(@Nullable Double viewRef, ReadableMap state, ReadableMap transition, Promise promise);
+
+  @ReactMethod
+  @DoNotStrip
+  public abstract void idle(@Nullable Double viewRef, Promise promise);
+}

package/ios/RNMBX/ImageManager.swift

@@ -0,0 +1,41 @@
+import MapboxMaps
+/**
+  ImageManager helps to resolve images defined by any of RNMBXImages component.
+ */
+class ImageManager {
+  typealias Resolver = (String, UIImage) -> Void
+  var subscriptions: [String: [Subscription]] = [:]
+  
+  class Subscription : Cancelable {
+    var name: String
+    var resolved: Resolver
+    weak var manager: ImageManager?
+    
+    init(name: String, resolved: @escaping Resolver) {
+      self.name = name
+      self.resolved = resolved
+    }
+    
+    func cancel() {
+      manager?.unsubscript(subscription: self)
+    }
+  }
+  
+  func subscribe(name: String, resolved: @escaping Resolver) -> Subscription {
+    var subscription = Subscription(name: name, resolved: resolved)
+    var list = subscriptions[name] ?? []
+    list.append(subscription)
+    subscriptions[name] = list
+    return subscription
+  }
+  
+  func unsubscript(subscription: Subscription) {
+    var list = subscriptions[subscription.name] ?? []
+    list.removeAll { $0 === subscription }
+    subscriptions[subscription.name] = list
+  }
+
+  func resolve(name: String, image: UIImage) {
+    subscriptions[name]?.forEach { $0.resolved(name, image) }
+  }
+}