From 204e7312efaa7277fb4fe2b1741d5c73033e878b Mon Sep 17 00:00:00 2001 From: Efstathios Ntonas Date: Thu, 23 Jan 2025 15:37:22 +0200 Subject: [PATCH 1/6] chore: updated delegates classes signatures and imports --- .../react/viewmanagers/RNMBXAtmosphereManagerDelegate.java | 5 +++-- .../viewmanagers/RNMBXBackgroundLayerManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXCalloutManagerDelegate.java | 6 ++++-- .../react/viewmanagers/RNMBXCameraManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXCircleLayerManagerDelegate.java | 5 +++-- .../RNMBXCustomLocationProviderManagerDelegate.java | 5 +++-- .../RNMBXFillExtrusionLayerManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXFillLayerManagerDelegate.java | 5 +++-- .../viewmanagers/RNMBXHeatmapLayerManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXImageManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXImageSourceManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXImagesManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXLightManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXLineLayerManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXMapViewManagerDelegate.java | 5 +++-- .../viewmanagers/RNMBXMarkerViewContentManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXMarkerViewManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXModelLayerManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXModelsManagerDelegate.java | 5 +++-- .../RNMBXNativeUserLocationManagerDelegate.java | 5 +++-- .../viewmanagers/RNMBXPointAnnotationManagerDelegate.java | 5 +++-- .../viewmanagers/RNMBXRasterDemSourceManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXRasterLayerManagerDelegate.java | 5 +++-- .../viewmanagers/RNMBXRasterSourceManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXShapeSourceManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXSkyLayerManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXStyleImportManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXSymbolLayerManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXTerrainManagerDelegate.java | 5 +++-- .../viewmanagers/RNMBXVectorSourceManagerDelegate.java | 5 +++-- .../react/viewmanagers/RNMBXViewportManagerDelegate.java | 5 +++-- 31 files changed, 94 insertions(+), 62 deletions(-) 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/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/RNMBXCalloutManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXCalloutManagerDelegate.java index 2b3e0862dc..857ae634af 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,12 @@ 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; -public class RNMBXCalloutManagerDelegate & RNMBXCalloutManagerInterface> extends BaseViewManagerDelegate { +import com.facebook.react.uimanager.LayoutShadowNode; + +public class RNMBXCalloutManagerDelegate & RNMBXCalloutManagerInterface> extends BaseViewManagerDelegate { public RNMBXCalloutManagerDelegate(U viewManager) { super(viewManager); } 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/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/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/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/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/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/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/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/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/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/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/RNMBXMapViewManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXMapViewManagerDelegate.java index 63e6d3d159..e4f15e45a1 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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> extends BaseViewManagerDelegate { public RNMBXVectorSourceManagerDelegate(U viewManager) { super(viewManager); } diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.java index dc37ae1fa1..c652f461b4 100644 --- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.java +++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.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 RNMBXViewportManagerDelegate & RNMBXViewportManagerInterface> extends BaseViewManagerDelegate { +public class RNMBXViewportManagerDelegate & RNMBXViewportManagerInterface> extends BaseViewManagerDelegate { public RNMBXViewportManagerDelegate(U viewManager) { super(viewManager); } From 3c6403fc00437224a6370f8517e85337840e70be Mon Sep 17 00:00:00 2001 From: Efstathios Ntonas Date: Mon, 27 Jan 2025 08:51:03 +0200 Subject: [PATCH 2/6] chore: bump peerDependencies, min react-native@0.72 --- package.json | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index d6702011e5..9b1d8307ba 100644 --- a/package.json +++ b/package.json @@ -56,11 +56,11 @@ "prepare": "yarn bob build" }, "peerDependencies": { - "expo": ">=47.0.0", + "expo": ">=49.0.0", "mapbox-gl": "^2.9.0", - "react": ">=16.6.1", - "react-native": ">=0.59.9", - "react-dom": ">= 17.0.0" + "react": ">=18.2.0", + "react-native": ">=0.72.0", + "react-dom": ">= 18.0.0" }, "peerDependenciesMeta": { "expo": { @@ -83,13 +83,13 @@ "debounce": "^1.2.0" }, "devDependencies": { - "@babel/core": "7.19.1", - "@babel/eslint-parser": "^7.19.1", + "@babel/core": "7.20.0", + "@babel/eslint-parser": "7.20.0", "@babel/plugin-proposal-class-properties": "7.18.6", "@babel/helper-split-export-declaration": "7.24.7", "@babel/helper-hoist-variables": "7.24.7", "@babel/helper-function-name": "7.24.7", - "@babel/runtime": "7.19.0", + "@babel/runtime": "7.20.0", "@react-native/eslint-config": "^0.72.2", "@sinonjs/fake-timers": "^8.0.1", "@testing-library/react-native": "^12.4.0", @@ -106,14 +106,14 @@ "eslint-plugin-ft-flow": "^2.0.3", "eslint-plugin-import": "2.25.3", "eslint-plugin-jest": "^27.0.1", - "expo": "^47.0.0", + "expo": "^49.0.0", "expo-module-scripts": "^3.0.4", "husky": "^8.0.1", "jest": "29.7.0", "jest-cli": "29.7.0", "lint-staged": "^12.1.2", "mapbox-gl": "^2.9.0", - "metro-react-native-babel-preset": "0.71.1", + "metro-react-native-babel-preset": "0.72.0", "node-dir": "0.1.17", "prettier": "2.7.1", "react": "18.2.0", @@ -148,5 +148,6 @@ "eslintIgnore": [ "node_modules/", "lib/" - ] + ], + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } From 9e33682fb852ca5746c9e4e0b503da28a341a14a Mon Sep 17 00:00:00 2001 From: Efstathios Ntonas Date: Mon, 27 Jan 2025 15:16:23 +0200 Subject: [PATCH 3/6] chore: align with optional ReadableArray --- .../components/images/RNMBXImagesManager.kt | 12 ++++++++---- .../components/mapview/RNMBXMapViewManager.kt | 4 ++-- .../rnmbx/components/styles/RNMBXStyleValue.kt | 16 ++++++++++------ .../styles/sources/RNMBXShapeSourceManager.kt | 2 +- .../styles/sources/RNMBXTileSourceManager.kt | 4 ++-- .../RNMBXChangeLineOffsetsShapeAnimatorModule.kt | 4 ++-- .../rnmapbox/rnmbx/utils/extensions/Dynamic.kt | 13 +++++++------ .../rnmbx/utils/extensions/ReadableArray.kt | 4 ++-- .../rnmbx/utils/extensions/ReadableMap.kt | 2 +- .../com/rnmapbox/rnmbx/rncompat/ReadableMap.kt | 4 ++-- 10 files changed, 37 insertions(+), 28 deletions(-) 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..984eaa4fbf 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 @@ -249,10 +249,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}") - } - result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat())) + 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}") + } + } + if (pair != 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/RNMBXMapViewManager.kt b/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt index 220cf54486..b5e9246879 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) } } } 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..bf003c1032 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,9 @@ 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")) + } } return result } @@ -104,7 +106,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 +123,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 @@ -131,7 +135,7 @@ class RNMBXStyleValue(config: ReadableMap) { return null } - fun getMap(_key: String?): ReadableMap? { + fun getMap(_key: String): ReadableMap? { return map } @@ -227,4 +231,4 @@ class RNMBXStyleValue(config: ReadableMap) { } } } -} \ No newline at end of file +} 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..2b45f07823 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,7 @@ 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 -> expressions.getString(iExp)?.let { Expression.literal(it) }!! } 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..bd6129983e 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 @@ -41,7 +41,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) } } } source!!.tileUrlTemplates = urls @@ -66,4 +66,4 @@ abstract class RNMBXTileSourceManager> internal construct fun setTms(source: T, tms: Dynamic) { source!!.tMS = tms.asBoolean() } -} \ No newline at end of file +} 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..9d77abae02 100644 --- a/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt +++ b/android/src/main/java/com/rnmapbox/rnmbx/shapeAnimators/RNMBXChangeLineOffsetsShapeAnimatorModule.kt @@ -210,9 +210,9 @@ 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)) + val coord = Point.fromLngLat(arr!!.getDouble(0), arr.getDouble(1)) coordinates = coordinates.plus(coord) } return LineString.fromLngLats(coordinates) -} \ No newline at end of file +} 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..b1d2c858a2 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 @@ -33,15 +33,16 @@ 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) } + ReadableType.Array -> getArray(i)?.toValue() + ReadableType.Map -> getMap(i)?.toValue() + }?.let { + result.add(it) + } } return Value.valueOf(result) } @@ -79,4 +80,4 @@ fun Dynamic.asStringOrNull(): String? { } else { asString() } -} \ No newline at end of file +} 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..5e02895bf2 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 -> result.add(getMap(i)!!.toJsonObject()) + ReadableType.Array -> result.add(getArray(i)!!.toJsonArray()) 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..d2e99cdcf3 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) } } } fun ReadableMap.getIfDouble(key: String): Double? { diff --git a/android/src/main/rn-compat/rn75/com/rnmapbox/rnmbx/rncompat/ReadableMap.kt b/android/src/main/rn-compat/rn75/com/rnmapbox/rnmbx/rncompat/ReadableMap.kt index fee7f2218c..6181dc9973 100644 --- a/android/src/main/rn-compat/rn75/com/rnmapbox/rnmbx/rncompat/ReadableMap.kt +++ b/android/src/main/rn-compat/rn75/com/rnmapbox/rnmbx/rncompat/ReadableMap.kt @@ -1,7 +1,7 @@ package com.rnmapbox.rnmbx.rncompat.readable_map import com.facebook.react.bridge.ReadableMap -fun ReadableMap.getEntryIterator(): Iterator> +fun ReadableMap.getEntryIterator(): Iterator> { return this.entryIterator -} \ No newline at end of file +} From d033edf5b7a4273bb4c90f2d52cb3cb61481e012 Mon Sep 17 00:00:00 2001 From: Efstathios Ntonas Date: Mon, 27 Jan 2025 15:20:34 +0200 Subject: [PATCH 4/6] chore: remove packageManager from package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 9b1d8307ba..be31c0632f 100644 --- a/package.json +++ b/package.json @@ -148,6 +148,5 @@ "eslintIgnore": [ "node_modules/", "lib/" - ], - "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" + ] } From c46148f69630761013c9130b57a8ddaa7f0225f7 Mon Sep 17 00:00:00 2001 From: Efstathios Ntonas Date: Tue, 28 Jan 2025 08:19:22 +0200 Subject: [PATCH 5/6] chore: removed duplicate if statement --- .../rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 984eaa4fbf..a80c05dc3b 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 @@ -249,12 +249,10 @@ 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 != null) { + 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}") } - } - if (pair != null) { result.add(ImageStretches(pair.getDouble(0).toFloat(), pair.getDouble(1).toFloat())) } } From 73fc7eaaa53a45edcdd796487d83386dbd9843b8 Mon Sep 17 00:00:00 2001 From: Efstathios Ntonas Date: Tue, 28 Jan 2025 08:24:41 +0200 Subject: [PATCH 6/6] chore: optimize imports --- .../react/viewmanagers/RNMBXAtmosphereManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXBackgroundLayerManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXCalloutManagerDelegate.java | 2 +- .../facebook/react/viewmanagers/RNMBXCameraManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXCircleLayerManagerDelegate.java | 1 + .../RNMBXCustomLocationProviderManagerDelegate.java | 1 + .../viewmanagers/RNMBXFillExtrusionLayerManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXFillLayerManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXHeatmapLayerManagerDelegate.java | 1 + .../facebook/react/viewmanagers/RNMBXImageManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXImageSourceManagerDelegate.java | 1 + .../facebook/react/viewmanagers/RNMBXImagesManagerDelegate.java | 1 + .../facebook/react/viewmanagers/RNMBXLightManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXLineLayerManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXMapViewManagerDelegate.java | 1 + .../viewmanagers/RNMBXMarkerViewContentManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXMarkerViewManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXModelLayerManagerDelegate.java | 1 + .../facebook/react/viewmanagers/RNMBXModelsManagerDelegate.java | 1 + .../viewmanagers/RNMBXNativeUserLocationManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXPointAnnotationManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXRasterDemSourceManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXRasterLayerManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXRasterSourceManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXShapeSourceManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXSkyLayerManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXStyleImportManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXSymbolLayerManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXTerrainManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXVectorSourceManagerDelegate.java | 1 + .../react/viewmanagers/RNMBXViewportManagerDelegate.java | 1 + 31 files changed, 31 insertions(+), 1 deletion(-) 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 342de06262..7032b6ccb2 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,6 +12,7 @@ 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.LayoutShadowNode; 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 a7af3e04e8..89c56628da 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,6 +12,7 @@ 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.LayoutShadowNode; 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 857ae634af..dbace3f926 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,9 +11,9 @@ 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.LayoutShadowNode; public class RNMBXCalloutManagerDelegate & RNMBXCalloutManagerInterface> extends BaseViewManagerDelegate { 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 db3e9cebca..9e4c5a23f3 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,6 +12,7 @@ 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.LayoutShadowNode; 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 4615522466..1ee30925ca 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,6 +12,7 @@ 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.LayoutShadowNode; 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 5d4d3ffea2..7f63c59399 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,6 +12,7 @@ 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.LayoutShadowNode; 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 74d71efc9f..c37a8b72a0 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,6 +12,7 @@ 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.LayoutShadowNode; 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 51e36e4ebf..da19e3f959 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,6 +12,7 @@ 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.LayoutShadowNode; 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 26227c1476..39fd79be5b 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,6 +12,7 @@ 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.LayoutShadowNode; 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 9feed84708..5abf7c1912 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,6 +12,7 @@ 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.LayoutShadowNode; 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 a61516d39e..bb46c55f14 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,6 +12,7 @@ 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.LayoutShadowNode; 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 0e45f933f9..7147c92030 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,6 +12,7 @@ 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.LayoutShadowNode; 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 2abdb45002..31c81947fd 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,6 +12,7 @@ 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.LayoutShadowNode; 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 8d57d8bd61..abd033f818 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,6 +12,7 @@ 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.LayoutShadowNode; 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 e4f15e45a1..dd91681917 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,6 +12,7 @@ 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.LayoutShadowNode; 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 0b53e6e5fe..084c9958f6 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,6 +11,7 @@ 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.LayoutShadowNode; 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 19010603ad..1adc4a9503 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,6 +12,7 @@ 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.LayoutShadowNode; 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 ffb987dcac..1054fbcc12 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,6 +12,7 @@ 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.LayoutShadowNode; 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 9d0c1494fa..fcef2896f9 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,6 +12,7 @@ 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.LayoutShadowNode; 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 35caed40af..c73d1a5762 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,6 +12,7 @@ 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.LayoutShadowNode; 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 950dc3b151..9fb8bcb054 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,6 +12,7 @@ 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.LayoutShadowNode; 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 5fac0a3525..cdf0f58fe9 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,6 +12,7 @@ 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.LayoutShadowNode; 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 80776b61e2..629fd18eca 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,6 +12,7 @@ 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.LayoutShadowNode; 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 3681a0b597..29198ae987 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,6 +12,7 @@ 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.LayoutShadowNode; 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 c780e6949f..e697ad38f5 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,6 +12,7 @@ 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.LayoutShadowNode; 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 2cda3e9bd5..58579fcd86 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,6 +12,7 @@ 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.LayoutShadowNode; 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 d6eaf989ba..0e8f234764 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,6 +12,7 @@ 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.LayoutShadowNode; 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 ca81653a11..ee9e8b087c 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,6 +12,7 @@ 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.LayoutShadowNode; 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 89a55a814b..332465e029 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,6 +12,7 @@ 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.LayoutShadowNode; 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 7252671464..55adc84aa1 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,6 +12,7 @@ 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.LayoutShadowNode; diff --git a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.java b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.java index c652f461b4..ec23013476 100644 --- a/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.java +++ b/android/src/main/old-arch/com/facebook/react/viewmanagers/RNMBXViewportManagerDelegate.java @@ -12,6 +12,7 @@ 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.LayoutShadowNode;