diff --git a/__tests__/__mocks__/react-native.mock.js b/__tests__/__mocks__/react-native.mock.js
index f5ef9ebba9..3abb794f39 100644
--- a/__tests__/__mocks__/react-native.mock.js
+++ b/__tests__/__mocks__/react-native.mock.js
@@ -16,17 +16,21 @@ jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter', () => {
};
});
+
jest.mock('react-native/Libraries/Utilities/Platform', () => ({
- OS: 'ios', // or 'android'
- select: (x) => {
- if (x.android) {
- return x.android;
- } else if (x.native) {
- return x.native;
- } else if (x.default) {
- return x.default;
- }
- },
+ __esModule: true,
+ default: {
+ OS: 'ios', // or 'android'
+ select: (x) => {
+ if (x.android) {
+ return x.android;
+ } else if (x.native) {
+ return x.native;
+ } else if (x.default) {
+ return x.default;
+ }
+ },
+ }
}));
jest.mock('react-native/src/private/animated/NativeAnimatedHelper', () => ({
diff --git a/__tests__/components/BackgroundLayer.test.js b/__tests__/components/BackgroundLayer.test.js
index 8583c79a4d..203c841882 100644
--- a/__tests__/components/BackgroundLayer.test.js
+++ b/__tests__/components/BackgroundLayer.test.js
@@ -5,13 +5,11 @@ import BackgroundLayer from '../../src/components/BackgroundLayer';
describe('BackgroundLayer', () => {
test('renders correctly with default props', () => {
- const { UNSAFE_root: backgroundLayer } = render(
+ const { root: backgroundLayer } = render(
,
);
- const { props } = backgroundLayer;
-
- expect(props.sourceID).toStrictEqual('DefaultSourceID');
+ expect(backgroundLayer).toHaveProp('sourceID', 'DefaultSourceID');
});
test('renders correctly with custom props', () => {
diff --git a/__tests__/components/Callout.test.js b/__tests__/components/Callout.test.js
index be276c62ac..92211f9825 100644
--- a/__tests__/components/Callout.test.js
+++ b/__tests__/components/Callout.test.js
@@ -30,16 +30,16 @@ describe('Callout', () => {
tipStyle: { height: 4 },
textStyle: { height: 5 },
};
- const { UNSAFE_getByType, UNSAFE_getAllByType } = render(
+ const result = render(
,
);
-
+ const { UNSAFE_getByType, UNSAFE_getAllByType } = result
const callout = UNSAFE_getByType('RNMBXCallout');
const views = UNSAFE_getAllByType(View);
const text = UNSAFE_getByType(Text);
const calloutWrapperTestStyle = callout.props.style[1].height;
- const animatedViewTestStyle = views[0].props.style.height;
+ const animatedViewTestStyle = views[0].props.style[1].height;
const wrapperViewTestStyle = views[1].props.style[1].height;
const tipViewTestStyle = views[2].props.style[1].height;
const textTestStyle = text.props.style[1].height;
diff --git a/__tests__/components/CircleLayer.test.js b/__tests__/components/CircleLayer.test.js
index 59c83c8228..2e8a38c20c 100644
--- a/__tests__/components/CircleLayer.test.js
+++ b/__tests__/components/CircleLayer.test.js
@@ -5,12 +5,10 @@ import CircleLayer from '../../src/components/CircleLayer';
describe('CircleLayer', () => {
test('renders correctly with default props', () => {
- const { UNSAFE_root: circleLayer } = render(
+ const { root: circleLayer } = render(
,
);
- const { props } = circleLayer;
-
- expect(props.sourceID).toStrictEqual('DefaultSourceID');
+ expect(circleLayer).toHaveProp('sourceID', 'DefaultSourceID');
});
test('renders correctly with custom props', () => {
diff --git a/__tests__/components/HeatmapLayer.test.js b/__tests__/components/HeatmapLayer.test.js
index c0362ccd43..5448ada7ae 100644
--- a/__tests__/components/HeatmapLayer.test.js
+++ b/__tests__/components/HeatmapLayer.test.js
@@ -5,11 +5,10 @@ import HeatmapLayer from '../../src/components/HeatmapLayer';
describe('HeatmapLayer', () => {
test('renders correctly with default props', () => {
- const { UNSAFE_root: heatmapLayer } = render(
+ const { root: heatmapLayer } = render(
,
);
- const { props } = heatmapLayer;
- expect(props.sourceID).toStrictEqual('DefaultSourceID');
+ expect(heatmapLayer).toHaveProp('sourceID', 'DefaultSourceID');
});
test('renders correctly with custom props', () => {
diff --git a/__tests__/components/UserLocation.test.js b/__tests__/components/UserLocation.test.js
index 91330f104f..4163b27de2 100644
--- a/__tests__/components/UserLocation.test.js
+++ b/__tests__/components/UserLocation.test.js
@@ -93,18 +93,20 @@ describe('UserLocation', () => {
render();
- locationManager._onUpdate({
- coords: {
- accuracy: 9.977999687194824,
- altitude: 44.64373779296875,
- heading: 251.5358428955078,
- latitude: 51.5462244,
- longitude: 4.1036916,
- speed: 0.08543474227190018,
- course: 251.5358428955078,
- },
- timestamp: 1573730357879,
- });
+ act(() => {
+ locationManager._onUpdate({
+ coords: {
+ accuracy: 9.977999687194824,
+ altitude: 44.64373779296875,
+ heading: 251.5358428955078,
+ latitude: 51.5462244,
+ longitude: 4.1036916,
+ speed: 0.08543474227190018,
+ course: 251.5358428955078,
+ },
+ timestamp: 1573730357879,
+ });
+ })
expect(onUpdateCallback).toHaveBeenCalled();
});
@@ -176,7 +178,9 @@ describe('UserLocation', () => {
expect(ul.locationManagerRunning).toStrictEqual(false);
- await ul.setLocationManager({ running: true });
+ await act(async () => {
+ await ul.setLocationManager({ running: true });
+ })
expect(ul.locationManagerRunning).toStrictEqual(true);
expect(locationManager.start).toHaveBeenCalledTimes(1);
@@ -192,11 +196,16 @@ describe('UserLocation', () => {
test('called with "running" false', async () => {
// start
expect(ul.locationManagerRunning).toStrictEqual(false);
- await ul.setLocationManager({ running: true });
+ await act(async () => {
+ await ul.setLocationManager({ running: true });
+ })
+
expect(ul.locationManagerRunning).toStrictEqual(true);
// stop
- await ul.setLocationManager({ running: false });
+ await act(async () => {
+ await ul.setLocationManager({ running: false });
+ })
expect(ul.locationManagerRunning).toStrictEqual(false);
// only once from start
diff --git a/__tests__/utils/animated/AnimatedCoordinatesArray.test.js b/__tests__/utils/animated/AnimatedCoordinatesArray.test.js
index 19c74ff994..375706276f 100644
--- a/__tests__/utils/animated/AnimatedCoordinatesArray.test.js
+++ b/__tests__/utils/animated/AnimatedCoordinatesArray.test.js
@@ -1,6 +1,7 @@
import FakeTimers from '@sinonjs/fake-timers';
import { Animated, Easing } from 'react-native';
import TestRenderer from 'react-test-renderer';
+import { act } from '@testing-library/react-native';
import React from 'react';
import { AnimatedShape, AnimatedCoordinatesArray } from '../../../src/classes';
@@ -47,13 +48,15 @@ describe('AnimatedShapeSource', () => {
]);
let shapeSourceRef;
- // eslint-disable-next-line no-unused-vars
- const testRenderer = TestRenderer.create(
- (shapeSourceRef = ref)}
- />,
- );
+ act(() => {
+ // eslint-disable-next-line no-unused-vars
+ const testRenderer = TestRenderer.create(
+ (shapeSourceRef = ref)}
+ />,
+ );
+ });
const setNativeProps = jest.fn();
_nativeRef(shapeSourceRef).setNativeProps = setNativeProps;
@@ -96,13 +99,15 @@ describe('AnimatedShapeSource', () => {
]);
let shapeSourceRef;
- // eslint-disable-next-line no-unused-vars
- const testRenderer = TestRenderer.create(
- (shapeSourceRef = ref)}
- />,
- );
+ act(() => {
+ // eslint-disable-next-line no-unused-vars
+ const testRenderer = TestRenderer.create(
+ (shapeSourceRef = ref)}
+ />,
+ );
+ })
const setNativeProps = jest.fn();
_nativeRef(shapeSourceRef).setNativeProps = setNativeProps;
@@ -148,13 +153,15 @@ describe('AnimatedShapeSource', () => {
]);
let shapeSourceRef;
- // eslint-disable-next-line no-unused-vars
- const testRenderer = TestRenderer.create(
- (shapeSourceRef = ref)}
- />,
- );
+ act(() => {
+ // eslint-disable-next-line no-unused-vars
+ const testRenderer = TestRenderer.create(
+ (shapeSourceRef = ref)}
+ />,
+ );
+ })
const setNativeProps = jest.fn();
_nativeRef(shapeSourceRef).setNativeProps = setNativeProps;
diff --git a/android/build.gradle b/android/build.gradle
index dd8e6c69d4..09cee53ec2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -77,6 +77,16 @@ android {
java.srcDirs += 'src/main/mapbox-v11-compat/v10'
}
java.srcDirs += 'src/main/rn-compat/rn75'
+
+ // Add lifecycle compatibility source sets
+ // Apps targeting SDK 35+ typically use Lifecycle 2.6+ which changed from getLifecycle() to lifecycle property
+ def targetSdk = safeExtGet("targetSdkVersion", 28)
+ if (targetSdk >= 35) {
+ java.srcDirs += 'src/main/lifecycle-compat/v26'
+ } else {
+ java.srcDirs += 'src/main/lifecycle-compat/v25'
+ }
+
if (safeExtGet("RNMapboxMapsUseV11", false)) {
logger.warn("RNMapboxMapsUseV11 is deprecated, just set RNMapboxMapsVersion to 11.*")
}
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt
index fb2147f944..4c5a3a802c 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt
@@ -6,7 +6,6 @@ import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.Drawable
import android.view.View
import com.facebook.react.bridge.*
-import com.facebook.react.common.MapBuilder
import com.facebook.react.uimanager.ThemedReactContext
import com.facebook.react.uimanager.annotations.ReactProp
import com.facebook.react.viewmanagers.RNMBXImagesManagerInterface
@@ -15,7 +14,6 @@ import com.mapbox.maps.ImageStretches
import com.rnmapbox.rnmbx.components.AbstractEventEmitter
import com.rnmapbox.rnmbx.events.constants.EventKeys
import com.rnmapbox.rnmbx.events.constants.eventMapOf
-import com.rnmapbox.rnmbx.rncompat.dynamic.*
import com.rnmapbox.rnmbx.utils.ImageEntry
import com.rnmapbox.rnmbx.utils.Logger
import com.rnmapbox.rnmbx.utils.ResourceUtils
@@ -249,10 +247,14 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
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("RNMBXImages", "each element of stretch should be pair of 2 integers but was ${pair}")
+ if (pair != null) {
+ if (pair.size() != 2 || pair.getType(0) != ReadableType.Number || pair.getType(1) != ReadableType.Number) {
+ 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()))
+ } else {
+ Logger.e("RNMBXImages", "each element of stretch should be an array but was null")
}
- result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat()))
}
}
return result;
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt
index d390514c16..3bc941b750 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapView.kt
@@ -13,9 +13,6 @@ import android.view.View.OnLayoutChangeListener
import android.view.ViewGroup
import android.widget.FrameLayout
import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.ViewTreeLifecycleOwner
import com.facebook.react.bridge.*
import com.mapbox.android.gestures.*
import com.mapbox.bindgen.Value
@@ -76,6 +73,7 @@ import com.rnmapbox.rnmbx.v11compat.ornamentsettings.*
import org.json.JSONException
import org.json.JSONObject
+
fun MutableList.removeIf21(predicate: (T) -> Boolean): Boolean {
var removed = false
val iterator = this.iterator()
@@ -99,86 +97,11 @@ enum class MapGestureType {
Move,Scale,Rotate,Fling,Shove
}
-/***
- * Mapbox's MapView observers lifecycle events see MapboxLifecyclePluginImpl - (ON_START, ON_STOP, ON_DESTROY)
- * We need to emulate those.
- */
-interface RNMBXLifeCycleOwner : LifecycleOwner {
- fun handleLifecycleEvent(event: Lifecycle.Event)
-}
-
fun interface Cancelable {
fun cancel()
}
-class RNMBXLifeCycle {
- private var lifecycleOwner : RNMBXLifeCycleOwner? = null
-
- fun onAttachedToWindow(view: View) {
- if (lifecycleOwner == null) {
- lifecycleOwner = object : RNMBXLifeCycleOwner {
- private lateinit var lifecycleRegistry: LifecycleRegistry
- init {
- lifecycleRegistry = LifecycleRegistry(this)
- lifecycleRegistry.currentState = Lifecycle.State.CREATED
- }
-
- override fun handleLifecycleEvent(event: Lifecycle.Event) {
- try {
- lifecycleRegistry.handleLifecycleEvent(event)
- } catch (e: RuntimeException) {
- Log.e("RNMBXMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
- }
- }
-
- override fun getLifecycle(): Lifecycle {
- return lifecycleRegistry
- }
- }
- ViewTreeLifecycleOwner.set(view, lifecycleOwner);
- }
- lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_START)
- }
-
- fun onDetachedFromWindow() {
- if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.DESTROYED) {
- return
- }
- lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_STOP)
- }
-
- fun onDestroy() {
- if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.STARTED || lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
- lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_STOP)
- }
- if (lifecycleOwner?.lifecycle?.currentState != Lifecycle.State.DESTROYED) {
- lifecycleOwner?.handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_DESTROY)
- }
- }
-
- fun getState() : Lifecycle.State {
- return lifecycleOwner?.lifecycle?.currentState ?: Lifecycle.State.INITIALIZED;
- }
-
- var attachedToWindowWaiters : MutableList<()-> Unit> = mutableListOf()
-
- fun callIfAttachedToWindow(callback: () -> Unit) : com.rnmapbox.rnmbx.components.mapview.Cancelable {
- if (getState() == Lifecycle.State.STARTED) {
- callback()
- return com.rnmapbox.rnmbx.components.mapview.Cancelable {}
- } else {
- attachedToWindowWaiters.add(callback)
- return com.rnmapbox.rnmbx.components.mapview.Cancelable {
- attachedToWindowWaiters.removeIf21 { it === callback }
- }
- }
- }
-
- fun afterAttachFromLooper() {
- attachedToWindowWaiters.forEach { it() }
- attachedToWindowWaiters.clear()
- }
-}
+// RNMBXLifeCycle is now provided by lifecycle-compat layer
data class FeatureEntry(val feature: AbstractMapFeature?, val view: View?, var addedToMap: Boolean = false) {
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt
index 4df25e118e..15f4917b7c 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt
@@ -34,13 +34,13 @@ import java.util.HashMap
fun ReadableArray.forEachString(action: (String) -> Unit) {
for (i in 0 until size()) {
- action(getString(i))
+ getString(i)?.let { action(it) } ?: Logger.d("RNMBXMapViewManager", "Skipping null string at index $i")
}
}
fun ReadableArray.asArrayString(): Array {
val result = Array(size()) {
- getString(it)
+ getString(it).toString()
}
return result
}
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleValue.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleValue.kt
index db13128f38..8710d284c1 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleValue.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/RNMBXStyleValue.kt
@@ -82,7 +82,11 @@ class RNMBXStyleValue(config: ReadableMap) {
val result = ArrayList(arr!!.size())
for (i in 0 until arr.size()) {
val item = arr.getMap(i)
- result.add(item.getDouble("value"))
+ if (item != null) {
+ result.add(item.getDouble("value"))
+ } else {
+ Logger.e("RNMBXStyleValue", "getFloatArray: null value for item: $i")
+ }
}
return result
}
@@ -104,7 +108,7 @@ class RNMBXStyleValue(config: ReadableMap) {
val result = ArrayList(arr!!.size())
for (i in 0 until arr.size()) {
val item = arr.getMap(i)
- val value = item.getString("value")
+ val value = item?.getString("value")
if (value != null) {
result.add(value)
} else {
@@ -121,9 +125,11 @@ class RNMBXStyleValue(config: ReadableMap) {
val result = WritableNativeMap()
for (i in 0 until keyValues!!.size()) {
val keyValue = keyValues.getArray(i)
- val stringKey = keyValue.getMap(0).getString("value")
+ val stringKey = keyValue?.getMap(0)?.getString("value")
val value = WritableNativeMap()
- value.merge(keyValue.getMap(1))
+ if (keyValue != null) {
+ keyValue.getMap(1)?.let { value.merge(it) }
+ }
result.putMap(stringKey!!, value)
}
return result
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceManager.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceManager.kt
index 637372d081..3332858564 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceManager.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceManager.kt
@@ -119,7 +119,10 @@ class RNMBXShapeSourceManager(private val mContext: ReactApplicationContext, val
)
ReadableType.Boolean -> Expression.literal(expressions.getBoolean(iExp))
ReadableType.Number -> Expression.literal(expressions.getDouble(iExp))
- else -> Expression.literal(expressions.getString(iExp))
+ else -> {
+ Logger.d("setClusterProperties", "Unknown type for $iExp")
+ return
+ }
}
builder.add(argument)
}
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt
index 3b0a072f3c..96e068889c 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt
@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReactApplicationContext
import com.facebook.react.bridge.ReadableType
import com.facebook.react.uimanager.annotations.ReactProp
import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+import com.rnmapbox.rnmbx.utils.Logger
abstract class RNMBXTileSourceManager> internal constructor(
reactApplicationContext: ReactApplicationContext
@@ -41,7 +42,7 @@ abstract class RNMBXTileSourceManager> internal construct
val urls: MutableList = ArrayList()
for (i in 0 until tileUrlTemplates.asArray().size()) {
if (tileUrlTemplates.asArray().getType(0) == ReadableType.String) {
- urls.add(tileUrlTemplates.asArray().getString(i))
+ tileUrlTemplates.asArray().getString(i)?.let { urls.add(it) } ?: Logger.d("RNMBXTileSource", "Skipping null URL template at index $i")
}
}
source!!.tileUrlTemplates = urls
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt b/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt
index 28d1020925..17fa1b261d 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt
@@ -12,6 +12,7 @@ import com.mapbox.turf.TurfMeasurement
import com.mapbox.turf.TurfMisc
import com.rnmapbox.rnmbx.NativeRNMBXChangeLineOffsetsShapeAnimatorModuleSpec
import com.rnmapbox.rnmbx.utils.ViewRefTag
+import com.rnmapbox.rnmbx.utils.Logger
class ChangeLineOffsetsShapeAnimator(tag: Tag, _lineString: LineString, startOffset: Double, endOffset: Double): ShapeAnimatorCommon(tag) {
private var lineString = _lineString
@@ -210,8 +211,13 @@ private fun buildLineString(_coordinates: ReadableArray): LineString {
for (i in 0 until _coordinates.size()) {
val arr = _coordinates.getArray(i)
- val coord = Point.fromLngLat(arr.getDouble(0), arr.getDouble(1))
- coordinates = coordinates.plus(coord)
+
+ val coord = arr?.let { Point.fromLngLat(arr.getDouble(0), it.getDouble(1)) }
+ if(coord != null) {
+ coordinates = coordinates.plus(coord)
+ } else {
+ Logger.e("RNMBXChangeLineOffsetsShapeAnimatorModule", "buildLineString: null coordinate for item: $i")
+ }
}
return LineString.fromLngLats(coordinates)
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/Dynamic.kt b/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/Dynamic.kt
index d52fa211d6..36a4a0bcdd 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/Dynamic.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/Dynamic.kt
@@ -6,6 +6,7 @@ import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.ReadableType
import com.mapbox.bindgen.Value
import com.rnmapbox.rnmbx.rncompat.dynamic.*
+import com.rnmapbox.rnmbx.utils.Logger
fun ReadableMap.toValueHashMap(): HashMap {
var result = hashMapOf()
@@ -33,15 +34,18 @@ fun ReadableArray.toValue(): Value {
var result = ArrayList(size())
for (i in 0 until size()) {
- result.add(
when (getType(i)) {
ReadableType.Null -> Value.nullValue()
ReadableType.Boolean -> Value.valueOf(getBoolean(i))
ReadableType.Number -> Value.valueOf(getDouble(i))
- ReadableType.String -> Value.valueOf(getString(i))
- ReadableType.Array -> getArray(i).toValue()
- ReadableType.Map -> getMap(i).toValue()
- })
+ ReadableType.String -> getString(i)?.let { Value.valueOf(it) } ?: Logger.d("ReadableArray", "Skipping null string at index $i")
+ ReadableType.Array -> getArray(i)?.toValue()
+ ReadableType.Map -> getMap(i)?.toValue()
+ }?.let {
+ result.add(
+ it as Value
+ )
+ }
}
return Value.valueOf(result)
}
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableArray.kt b/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableArray.kt
index 83a78bcf5d..9a48ba9af6 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableArray.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableArray.kt
@@ -46,8 +46,8 @@ fun ReadableArray.toJsonArray() : JsonArray {
val result = JsonArray(size())
for (i in 0 until size()) {
when (getType(i)) {
- ReadableType.Map -> result.add(getMap(i).toJsonObject())
- ReadableType.Array -> result.add(getArray(i).toJsonArray())
+ ReadableType.Map -> getMap(i)?.let { result.add(it.toJsonObject()) } ?: Logger.d("ReadableTypeMap", "Map at index $i is null")
+ ReadableType.Array -> getArray(i)?.let {result.add(it.toJsonArray())} ?: Logger.d("ReadableTypeArray", "Array at index $i is null")
ReadableType.Null -> result.add(null as JsonElement?)
ReadableType.Number -> result.add(getDouble(i))
ReadableType.String -> result.add(getString(i))
diff --git a/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableMap.kt b/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableMap.kt
index c69ef8c222..8a79c0a5a4 100644
--- a/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableMap.kt
+++ b/android/src/main/java/com/rnmapbox/rnmbx/utils/extensions/ReadableMap.kt
@@ -25,7 +25,7 @@ fun ReadableMap.forEach(action: (String, Any) -> Unit) {
val iterator = this.entryIterator
while (iterator.hasNext()) {
val next = iterator.next()
- action(next.key, next.value)
+ next.value?.let { action(next.key, it) } ?: Logger.d("ReadableMap", "Skipping null value for key: ${next.key}")
}
}
fun ReadableMap.getIfDouble(key: String): Double? {
diff --git a/android/src/main/lifecycle-compat/v25/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt b/android/src/main/lifecycle-compat/v25/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt
new file mode 100644
index 0000000000..80e49edbd0
--- /dev/null
+++ b/android/src/main/lifecycle-compat/v25/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt
@@ -0,0 +1,86 @@
+package com.rnmapbox.rnmbx.components.mapview
+
+import android.util.Log
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.ViewTreeLifecycleOwner
+
+/**
+ * Lifecycle compatibility for Lifecycle 2.5 and older which uses getLifecycle() method
+ */
+interface RNMBXLifeCycleOwner : LifecycleOwner {
+ fun handleLifecycleEvent(event: Lifecycle.Event)
+}
+
+class RNMBXLifeCycle {
+ private var lifecycleOwner : RNMBXLifeCycleOwner? = null
+
+ fun onAttachedToWindow(view: View) {
+ if (lifecycleOwner == null) {
+ lifecycleOwner = object : RNMBXLifeCycleOwner {
+ private lateinit var lifecycleRegistry: LifecycleRegistry
+ init {
+ lifecycleRegistry = LifecycleRegistry(this)
+ lifecycleRegistry.currentState = Lifecycle.State.CREATED
+ }
+
+ override fun handleLifecycleEvent(event: Lifecycle.Event) {
+ try {
+ lifecycleRegistry.handleLifecycleEvent(event)
+ } catch (e: RuntimeException) {
+ Log.e("RNMBXMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
+ }
+ }
+
+ // Lifecycle 2.5 and older uses method syntax
+ override fun getLifecycle(): Lifecycle {
+ return lifecycleRegistry
+ }
+
+ }
+ ViewTreeLifecycleOwner.set(view, lifecycleOwner)
+ }
+ lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_START)
+ }
+
+ fun onDetachedFromWindow() {
+ if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.DESTROYED) {
+ return
+ }
+ lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+ }
+
+ fun onDestroy() {
+ if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.STARTED || lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
+ lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+ }
+ if (lifecycleOwner?.lifecycle?.currentState != Lifecycle.State.DESTROYED) {
+ lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+ }
+ }
+
+ fun getState() : Lifecycle.State {
+ return lifecycleOwner?.lifecycle?.currentState ?: Lifecycle.State.INITIALIZED
+ }
+
+ var attachedToWindowWaiters : MutableList<()-> Unit> = mutableListOf()
+
+ fun callIfAttachedToWindow(callback: () -> Unit) : com.rnmapbox.rnmbx.components.mapview.Cancelable {
+ if (getState() == Lifecycle.State.STARTED) {
+ callback()
+ return com.rnmapbox.rnmbx.components.mapview.Cancelable {}
+ } else {
+ attachedToWindowWaiters.add(callback)
+ return com.rnmapbox.rnmbx.components.mapview.Cancelable {
+ attachedToWindowWaiters.remove(callback)
+ }
+ }
+ }
+
+ fun afterAttachFromLooper() {
+ attachedToWindowWaiters.forEach { it() }
+ attachedToWindowWaiters.clear()
+ }
+}
\ No newline at end of file
diff --git a/android/src/main/lifecycle-compat/v26/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt b/android/src/main/lifecycle-compat/v26/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt
new file mode 100644
index 0000000000..b05cf47007
--- /dev/null
+++ b/android/src/main/lifecycle-compat/v26/com/rnmapbox/rnmbx/components/mapview/LifecycleCompat.kt
@@ -0,0 +1,85 @@
+package com.rnmapbox.rnmbx.components.mapview
+
+import android.util.Log
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.setViewTreeLifecycleOwner
+
+/**
+ * Lifecycle compatibility for Lifecycle 2.6+ which uses 'lifecycle' property
+ */
+interface RNMBXLifeCycleOwner : LifecycleOwner {
+ fun handleLifecycleEvent(event: Lifecycle.Event)
+}
+
+class RNMBXLifeCycle {
+ private var lifecycleOwner : RNMBXLifeCycleOwner? = null
+
+ fun onAttachedToWindow(view: View) {
+ if (lifecycleOwner == null) {
+ lifecycleOwner = object : RNMBXLifeCycleOwner {
+ private lateinit var lifecycleRegistry: LifecycleRegistry
+ init {
+ lifecycleRegistry = LifecycleRegistry(this)
+ lifecycleRegistry.currentState = Lifecycle.State.CREATED
+ }
+
+ override fun handleLifecycleEvent(event: Lifecycle.Event) {
+ try {
+ lifecycleRegistry.handleLifecycleEvent(event)
+ } catch (e: RuntimeException) {
+ Log.e("RNMBXMapView", "handleLifecycleEvent, handleLifecycleEvent error: $e")
+ }
+ }
+
+ // Lifecycle 2.6+ uses property syntax
+ override val lifecycle: Lifecycle
+ get() = lifecycleRegistry
+
+ }
+ view.setViewTreeLifecycleOwner(lifecycleOwner)
+ }
+ lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_START)
+ }
+
+ fun onDetachedFromWindow() {
+ if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.DESTROYED) {
+ return
+ }
+ lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+ }
+
+ fun onDestroy() {
+ if (lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.STARTED || lifecycleOwner?.lifecycle?.currentState == Lifecycle.State.RESUMED) {
+ lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+ }
+ if (lifecycleOwner?.lifecycle?.currentState != Lifecycle.State.DESTROYED) {
+ lifecycleOwner?.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+ }
+ }
+
+ fun getState() : Lifecycle.State {
+ return lifecycleOwner?.lifecycle?.currentState ?: Lifecycle.State.INITIALIZED
+ }
+
+ var attachedToWindowWaiters : MutableList<()-> Unit> = mutableListOf()
+
+ fun callIfAttachedToWindow(callback: () -> Unit) : com.rnmapbox.rnmbx.components.mapview.Cancelable {
+ if (getState() == Lifecycle.State.STARTED) {
+ callback()
+ return com.rnmapbox.rnmbx.components.mapview.Cancelable {}
+ } else {
+ attachedToWindowWaiters.add(callback)
+ return com.rnmapbox.rnmbx.components.mapview.Cancelable {
+ attachedToWindowWaiters.remove(callback)
+ }
+ }
+ }
+
+ fun afterAttachFromLooper() {
+ attachedToWindowWaiters.forEach { it() }
+ attachedToWindowWaiters.clear()
+ }
+}
\ No newline at end of file
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXAtmosphereManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXAtmosphereManagerDelegate.java
index 5a06406f7d..342de06262 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXAtmosphereManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXAtmosphereManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXAtmosphereManagerDelegate & RNMBXAtmosphereManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXAtmosphereManagerDelegate & RNMBXAtmosphereManagerInterface> extends BaseViewManagerDelegate {
public RNMBXAtmosphereManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXAtmosphereManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXAtmosphereManagerInterface.java
index 633366a578..4ca4850a51 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXAtmosphereManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXAtmosphereManagerInterface.java
@@ -11,7 +11,8 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXAtmosphereManagerInterface {
+public interface RNMBXAtmosphereManagerInterface extends ViewManagerWithGeneratedInterface {
void setReactStyle(T view, Dynamic value);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXBackgroundLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXBackgroundLayerManagerDelegate.java
index 76568d1615..a7af3e04e8 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXBackgroundLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXBackgroundLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXBackgroundLayerManagerDelegate & RNMBXBackgroundLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXBackgroundLayerManagerDelegate & RNMBXBackgroundLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXBackgroundLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXBackgroundLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXBackgroundLayerManagerInterface.java
index c5b1afeb31..6ac2e9eb25 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXBackgroundLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXBackgroundLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXBackgroundLayerManagerInterface {
+public interface RNMBXBackgroundLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setId(T view, Dynamic value);
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerDelegate.java
index 2b3e0862dc..5f13e79508 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerDelegate.java
@@ -11,10 +11,11 @@
import android.view.View;
import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXCalloutManagerDelegate & RNMBXCalloutManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXCalloutManagerDelegate & RNMBXCalloutManagerInterface> extends BaseViewManagerDelegate {
public RNMBXCalloutManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerInterface.java
index 74af771ee7..4c8e042beb 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerInterface.java
@@ -10,7 +10,8 @@
package com.facebook.react.viewmanagers;
import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXCalloutManagerInterface {
+public interface RNMBXCalloutManagerInterface extends ViewManagerWithGeneratedInterface {
// No props
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraManagerDelegate.java
index eef1384571..db3e9cebca 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXCameraManagerDelegate & RNMBXCameraManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXCameraManagerDelegate & RNMBXCameraManagerInterface> extends BaseViewManagerDelegate {
public RNMBXCameraManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraManagerInterface.java
index d37caac542..0460c4e8a2 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCameraManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXCameraManagerInterface {
+public interface RNMBXCameraManagerInterface extends ViewManagerWithGeneratedInterface {
void setMaxBounds(T view, Dynamic value);
void setAnimationDuration(T view, Dynamic value);
void setAnimationMode(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerDelegate.java
index 3b2b41b5bf..4615522466 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXCircleLayerManagerDelegate & RNMBXCircleLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXCircleLayerManagerDelegate & RNMBXCircleLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXCircleLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerInterface.java
index 1a505f68f9..7c8eae4e0a 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCircleLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXCircleLayerManagerInterface {
+public interface RNMBXCircleLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setFilter(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerDelegate.java
index f3bd0f8226..5d4d3ffea2 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXCustomLocationProviderManagerDelegate & RNMBXCustomLocationProviderManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXCustomLocationProviderManagerDelegate & RNMBXCustomLocationProviderManagerInterface> extends BaseViewManagerDelegate {
public RNMBXCustomLocationProviderManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerInterface.java
index 330d76c1aa..da679d790c 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCustomLocationProviderManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXCustomLocationProviderManagerInterface {
+public interface RNMBXCustomLocationProviderManagerInterface extends ViewManagerWithGeneratedInterface {
void setCoordinate(T view, Dynamic value);
void setHeading(T view, Dynamic value);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillExtrusionLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillExtrusionLayerManagerDelegate.java
index 0293627fc4..74d71efc9f 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillExtrusionLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillExtrusionLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXFillExtrusionLayerManagerDelegate & RNMBXFillExtrusionLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXFillExtrusionLayerManagerDelegate & RNMBXFillExtrusionLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXFillExtrusionLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillExtrusionLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillExtrusionLayerManagerInterface.java
index 33fbc819b6..0f410f3e1f 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillExtrusionLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillExtrusionLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXFillExtrusionLayerManagerInterface {
+public interface RNMBXFillExtrusionLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setId(T view, Dynamic value);
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerDelegate.java
index 6e5f1ad513..51e36e4ebf 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXFillLayerManagerDelegate & RNMBXFillLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXFillLayerManagerDelegate & RNMBXFillLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXFillLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerInterface.java
index df78d327e4..4bfd29de09 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXFillLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXFillLayerManagerInterface {
+public interface RNMBXFillLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setFilter(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerDelegate.java
index f7358c2213..26227c1476 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXHeatmapLayerManagerDelegate & RNMBXHeatmapLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXHeatmapLayerManagerDelegate & RNMBXHeatmapLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXHeatmapLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerInterface.java
index 2ad6feb35f..d4f58e2a2a 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXHeatmapLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXHeatmapLayerManagerInterface {
+public interface RNMBXHeatmapLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setFilter(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageManagerDelegate.java
index 0857a077e2..9feed84708 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXImageManagerDelegate & RNMBXImageManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXImageManagerDelegate & RNMBXImageManagerInterface> extends BaseViewManagerDelegate {
public RNMBXImageManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageManagerInterface.java
index c32b387924..6dc6b3ee14 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXImageManagerInterface {
+public interface RNMBXImageManagerInterface extends ViewManagerWithGeneratedInterface {
void setStretchX(T view, Dynamic value);
void setStretchY(T view, Dynamic value);
void setContent(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageSourceManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageSourceManagerDelegate.java
index d0f69992fa..a61516d39e 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageSourceManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageSourceManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXImageSourceManagerDelegate & RNMBXImageSourceManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXImageSourceManagerDelegate & RNMBXImageSourceManagerInterface> extends BaseViewManagerDelegate {
public RNMBXImageSourceManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageSourceManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageSourceManagerInterface.java
index 18e5bf4dd5..ed521acf1f 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageSourceManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImageSourceManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXImageSourceManagerInterface {
+public interface RNMBXImageSourceManagerInterface extends ViewManagerWithGeneratedInterface {
void setId(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setUrl(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImagesManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImagesManagerDelegate.java
index 59a80b2b73..0e45f933f9 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImagesManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImagesManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXImagesManagerDelegate & RNMBXImagesManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXImagesManagerDelegate & RNMBXImagesManagerInterface> extends BaseViewManagerDelegate {
public RNMBXImagesManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImagesManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImagesManagerInterface.java
index 3feb308b60..35495540dd 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImagesManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXImagesManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXImagesManagerInterface {
+public interface RNMBXImagesManagerInterface extends ViewManagerWithGeneratedInterface {
void setImages(T view, Dynamic value);
void setNativeImages(T view, Dynamic value);
void setHasOnImageMissing(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLightManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLightManagerDelegate.java
index 90cd3628f7..2abdb45002 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLightManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLightManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXLightManagerDelegate & RNMBXLightManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXLightManagerDelegate & RNMBXLightManagerInterface> extends BaseViewManagerDelegate {
public RNMBXLightManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLightManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLightManagerInterface.java
index 4bbb1c442a..7412e34d27 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLightManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLightManagerInterface.java
@@ -11,7 +11,8 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXLightManagerInterface {
+public interface RNMBXLightManagerInterface extends ViewManagerWithGeneratedInterface {
void setReactStyle(T view, Dynamic value);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerDelegate.java
index 47b42a528a..8d57d8bd61 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXLineLayerManagerDelegate & RNMBXLineLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXLineLayerManagerDelegate & RNMBXLineLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXLineLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerInterface.java
index 439bf17692..5d61ef813d 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXLineLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXLineLayerManagerInterface {
+public interface RNMBXLineLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setFilter(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java
index 9cff5aa4f9..2c054843b4 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXMapViewManagerDelegate & RNMBXMapViewManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXMapViewManagerDelegate & RNMBXMapViewManagerInterface> extends BaseViewManagerDelegate {
public RNMBXMapViewManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerInterface.java
index 63a738a171..f82af3c983 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXMapViewManagerInterface {
+public interface RNMBXMapViewManagerInterface extends ViewManagerWithGeneratedInterface {
void setAttributionEnabled(T view, Dynamic value);
void setAttributionPosition(T view, Dynamic value);
void setLogoEnabled(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerDelegate.java
index 9f88fceb16..0b53e6e5fe 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerDelegate.java
@@ -11,10 +11,11 @@
import android.view.View;
import androidx.annotation.Nullable;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXMarkerViewContentManagerDelegate & RNMBXMarkerViewContentManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXMarkerViewContentManagerDelegate & RNMBXMarkerViewContentManagerInterface> extends BaseViewManagerDelegate {
public RNMBXMarkerViewContentManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerInterface.java
index 1cf255d30a..15a4c51ce6 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewContentManagerInterface.java
@@ -10,7 +10,8 @@
package com.facebook.react.viewmanagers;
import android.view.View;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXMarkerViewContentManagerInterface {
+public interface RNMBXMarkerViewContentManagerInterface extends ViewManagerWithGeneratedInterface {
// No props
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerDelegate.java
index 78fd466db0..19010603ad 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXMarkerViewManagerDelegate & RNMBXMarkerViewManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXMarkerViewManagerDelegate & RNMBXMarkerViewManagerInterface> extends BaseViewManagerDelegate {
public RNMBXMarkerViewManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerInterface.java
index fd4c082148..d116d69145 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMarkerViewManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXMarkerViewManagerInterface {
+public interface RNMBXMarkerViewManagerInterface extends ViewManagerWithGeneratedInterface {
void setCoordinate(T view, Dynamic value);
void setAnchor(T view, Dynamic value);
void setAllowOverlap(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelLayerManagerDelegate.java
index 28dfb46305..ffb987dcac 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXModelLayerManagerDelegate & RNMBXModelLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXModelLayerManagerDelegate & RNMBXModelLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXModelLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelLayerManagerInterface.java
index 690603a990..da992aac51 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXModelLayerManagerInterface {
+public interface RNMBXModelLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setFilter(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelsManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelsManagerDelegate.java
index 7513c49850..9d0c1494fa 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelsManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelsManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXModelsManagerDelegate & RNMBXModelsManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXModelsManagerDelegate & RNMBXModelsManagerInterface> extends BaseViewManagerDelegate {
public RNMBXModelsManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelsManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelsManagerInterface.java
index 7f0edf0a02..2888f2d92f 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelsManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXModelsManagerInterface.java
@@ -11,7 +11,8 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXModelsManagerInterface {
+public interface RNMBXModelsManagerInterface extends ViewManagerWithGeneratedInterface {
void setModels(T view, Dynamic value);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerDelegate.java
index b0ef22ae68..35caed40af 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXNativeUserLocationManagerDelegate & RNMBXNativeUserLocationManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXNativeUserLocationManagerDelegate & RNMBXNativeUserLocationManagerInterface> extends BaseViewManagerDelegate {
public RNMBXNativeUserLocationManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerInterface.java
index 6367f894a8..0ef212d3a8 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXNativeUserLocationManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXNativeUserLocationManagerInterface {
+public interface RNMBXNativeUserLocationManagerInterface extends ViewManagerWithGeneratedInterface {
void setAndroidRenderMode(T view, Dynamic value);
void setPuckBearing(T view, Dynamic value);
void setPuckBearingEnabled(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXPointAnnotationManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXPointAnnotationManagerDelegate.java
index 70aa36d39f..950dc3b151 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXPointAnnotationManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXPointAnnotationManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXPointAnnotationManagerDelegate & RNMBXPointAnnotationManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXPointAnnotationManagerDelegate & RNMBXPointAnnotationManagerInterface> extends BaseViewManagerDelegate {
public RNMBXPointAnnotationManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXPointAnnotationManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXPointAnnotationManagerInterface.java
index 18a0ec65c5..2cceb2f343 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXPointAnnotationManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXPointAnnotationManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXPointAnnotationManagerInterface {
+public interface RNMBXPointAnnotationManagerInterface extends ViewManagerWithGeneratedInterface {
void setCoordinate(T view, Dynamic value);
void setDraggable(T view, Dynamic value);
void setId(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterDemSourceManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterDemSourceManagerDelegate.java
index 6a0ef3baf5..5fac0a3525 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterDemSourceManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterDemSourceManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXRasterDemSourceManagerDelegate & RNMBXRasterDemSourceManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXRasterDemSourceManagerDelegate & RNMBXRasterDemSourceManagerInterface> extends BaseViewManagerDelegate {
public RNMBXRasterDemSourceManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterDemSourceManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterDemSourceManagerInterface.java
index e1da4ca30d..3e19ea1b81 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterDemSourceManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterDemSourceManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXRasterDemSourceManagerInterface {
+public interface RNMBXRasterDemSourceManagerInterface extends ViewManagerWithGeneratedInterface {
void setId(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setUrl(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerDelegate.java
index 0630ce33f6..80776b61e2 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXRasterLayerManagerDelegate & RNMBXRasterLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXRasterLayerManagerDelegate & RNMBXRasterLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXRasterLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerInterface.java
index eb06c596e6..b992efa69f 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXRasterLayerManagerInterface {
+public interface RNMBXRasterLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setFilter(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterSourceManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterSourceManagerDelegate.java
index 68c26343c8..3681a0b597 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterSourceManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterSourceManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXRasterSourceManagerDelegate & RNMBXRasterSourceManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXRasterSourceManagerDelegate & RNMBXRasterSourceManagerInterface> extends BaseViewManagerDelegate {
public RNMBXRasterSourceManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterSourceManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterSourceManagerInterface.java
index 57af3c6281..c566f0716a 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterSourceManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXRasterSourceManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXRasterSourceManagerInterface {
+public interface RNMBXRasterSourceManagerInterface extends ViewManagerWithGeneratedInterface {
void setId(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setUrl(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXShapeSourceManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXShapeSourceManagerDelegate.java
index 75ebce18df..c780e6949f 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXShapeSourceManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXShapeSourceManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXShapeSourceManagerDelegate & RNMBXShapeSourceManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXShapeSourceManagerDelegate & RNMBXShapeSourceManagerInterface> extends BaseViewManagerDelegate {
public RNMBXShapeSourceManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXShapeSourceManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXShapeSourceManagerInterface.java
index a3bb0a717a..6a15c2b38d 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXShapeSourceManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXShapeSourceManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXShapeSourceManagerInterface {
+public interface RNMBXShapeSourceManagerInterface extends ViewManagerWithGeneratedInterface {
void setId(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setUrl(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSkyLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSkyLayerManagerDelegate.java
index 446a1aac6e..2cda3e9bd5 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSkyLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSkyLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXSkyLayerManagerDelegate & RNMBXSkyLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXSkyLayerManagerDelegate & RNMBXSkyLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXSkyLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSkyLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSkyLayerManagerInterface.java
index f7cad02cea..3f42220a51 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSkyLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSkyLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXSkyLayerManagerInterface {
+public interface RNMBXSkyLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setId(T view, Dynamic value);
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXStyleImportManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXStyleImportManagerDelegate.java
index 5a867b7edc..d6eaf989ba 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXStyleImportManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXStyleImportManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXStyleImportManagerDelegate & RNMBXStyleImportManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXStyleImportManagerDelegate & RNMBXStyleImportManagerInterface> extends BaseViewManagerDelegate {
public RNMBXStyleImportManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXStyleImportManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXStyleImportManagerInterface.java
index af29915934..323c65a5c4 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXStyleImportManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXStyleImportManagerInterface.java
@@ -12,8 +12,9 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXStyleImportManagerInterface {
+public interface RNMBXStyleImportManagerInterface extends ViewManagerWithGeneratedInterface {
void setId(T view, @Nullable String value);
void setExisting(T view, boolean value);
void setConfig(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerDelegate.java
index ebf11121c9..ca81653a11 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXSymbolLayerManagerDelegate & RNMBXSymbolLayerManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXSymbolLayerManagerDelegate & RNMBXSymbolLayerManagerInterface> extends BaseViewManagerDelegate {
public RNMBXSymbolLayerManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerInterface.java
index 943b75d740..fa2b7547e0 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXSymbolLayerManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXSymbolLayerManagerInterface {
+public interface RNMBXSymbolLayerManagerInterface extends ViewManagerWithGeneratedInterface {
void setSourceID(T view, Dynamic value);
void setExisting(T view, Dynamic value);
void setFilter(T view, Dynamic value);
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXTerrainManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXTerrainManagerDelegate.java
index 54a428c0ce..89a55a814b 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXTerrainManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXTerrainManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXTerrainManagerDelegate & RNMBXTerrainManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXTerrainManagerDelegate & RNMBXTerrainManagerInterface> extends BaseViewManagerDelegate {
public RNMBXTerrainManagerDelegate(U viewManager) {
super(viewManager);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXTerrainManagerInterface.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXTerrainManagerInterface.java
index 9964c5ff62..f23b71920a 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXTerrainManagerInterface.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXTerrainManagerInterface.java
@@ -11,8 +11,9 @@
import android.view.View;
import com.facebook.react.bridge.Dynamic;
+import com.facebook.react.uimanager.ViewManagerWithGeneratedInterface;
-public interface RNMBXTerrainManagerInterface {
+public interface RNMBXTerrainManagerInterface extends ViewManagerWithGeneratedInterface {
void setSourceID(T view, Dynamic value);
void setReactStyle(T view, Dynamic value);
}
diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXVectorSourceManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXVectorSourceManagerDelegate.java
index c47abe3d66..7252671464 100644
--- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXVectorSourceManagerDelegate.java
+++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXVectorSourceManagerDelegate.java
@@ -12,10 +12,11 @@
import android.view.View;
import androidx.annotation.Nullable;
import com.facebook.react.bridge.DynamicFromObject;
+import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.BaseViewManagerDelegate;
-import com.facebook.react.uimanager.BaseViewManagerInterface;
+import com.facebook.react.uimanager.LayoutShadowNode;
-public class RNMBXVectorSourceManagerDelegate & RNMBXVectorSourceManagerInterface> extends BaseViewManagerDelegate {
+public class RNMBXVectorSourceManagerDelegate & RNMBXVectorSourceManagerInterface