react-native-google-maps-plus 1.12.0-dev.3 → 1.12.0-dev.5

package/nitrogen/generated/android/c++/views/JHybridRNGoogleMapsPlusViewStateUpdater.cpp

@@ -16,9 +16,9 @@ using namespace facebook;
 using ConcreteStateData = react::ConcreteState<HybridRNGoogleMapsPlusViewState>;
 
 void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                                           jni::alias_ref<JHybridRNGoogleMapsPlusViewSpec::javaobject> javaView,
+                                           jni::alias_ref<JHybridRNGoogleMapsPlusViewSpec::JavaPart> javaView,
                                            jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
-  JHybridRNGoogleMapsPlusViewSpec* view = javaView->cthis();
+  std::shared_ptr<JHybridRNGoogleMapsPlusViewSpec> hybridView = javaView->getJHybridRNGoogleMapsPlusViewSpec();
 
   // Get concrete StateWrapperImpl from passed StateWrapper interface object
   jobject rawStateWrapper = stateWrapperInterface.get();
@@ -38,183 +38,183 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
 
   // Update all props if they are dirty
   if (props->initialProps.isDirty) {
-    view->setInitialProps(props->initialProps.value);
+    hybridView->setInitialProps(props->initialProps.value);
     props->initialProps.isDirty = false;
   }
   if (props->uiSettings.isDirty) {
-    view->setUiSettings(props->uiSettings.value);
+    hybridView->setUiSettings(props->uiSettings.value);
     props->uiSettings.isDirty = false;
   }
   if (props->myLocationEnabled.isDirty) {
-    view->setMyLocationEnabled(props->myLocationEnabled.value);
+    hybridView->setMyLocationEnabled(props->myLocationEnabled.value);
     props->myLocationEnabled.isDirty = false;
   }
   if (props->buildingEnabled.isDirty) {
-    view->setBuildingEnabled(props->buildingEnabled.value);
+    hybridView->setBuildingEnabled(props->buildingEnabled.value);
     props->buildingEnabled.isDirty = false;
   }
   if (props->trafficEnabled.isDirty) {
-    view->setTrafficEnabled(props->trafficEnabled.value);
+    hybridView->setTrafficEnabled(props->trafficEnabled.value);
     props->trafficEnabled.isDirty = false;
   }
   if (props->indoorEnabled.isDirty) {
-    view->setIndoorEnabled(props->indoorEnabled.value);
+    hybridView->setIndoorEnabled(props->indoorEnabled.value);
     props->indoorEnabled.isDirty = false;
   }
   if (props->transitEnabled.isDirty) {
-    view->setTransitEnabled(props->transitEnabled.value);
+    hybridView->setTransitEnabled(props->transitEnabled.value);
     props->transitEnabled.isDirty = false;
   }
   if (props->customMapStyle.isDirty) {
-    view->setCustomMapStyle(props->customMapStyle.value);
+    hybridView->setCustomMapStyle(props->customMapStyle.value);
     props->customMapStyle.isDirty = false;
   }
   if (props->userInterfaceStyle.isDirty) {
-    view->setUserInterfaceStyle(props->userInterfaceStyle.value);
+    hybridView->setUserInterfaceStyle(props->userInterfaceStyle.value);
     props->userInterfaceStyle.isDirty = false;
   }
   if (props->mapZoomConfig.isDirty) {
-    view->setMapZoomConfig(props->mapZoomConfig.value);
+    hybridView->setMapZoomConfig(props->mapZoomConfig.value);
     props->mapZoomConfig.isDirty = false;
   }
   if (props->mapPadding.isDirty) {
-    view->setMapPadding(props->mapPadding.value);
+    hybridView->setMapPadding(props->mapPadding.value);
     props->mapPadding.isDirty = false;
   }
   if (props->mapType.isDirty) {
-    view->setMapType(props->mapType.value);
+    hybridView->setMapType(props->mapType.value);
     props->mapType.isDirty = false;
   }
   if (props->markers.isDirty) {
-    view->setMarkers(props->markers.value);
+    hybridView->setMarkers(props->markers.value);
     props->markers.isDirty = false;
   }
   if (props->polygons.isDirty) {
-    view->setPolygons(props->polygons.value);
+    hybridView->setPolygons(props->polygons.value);
     props->polygons.isDirty = false;
   }
   if (props->polylines.isDirty) {
-    view->setPolylines(props->polylines.value);
+    hybridView->setPolylines(props->polylines.value);
     props->polylines.isDirty = false;
   }
   if (props->circles.isDirty) {
-    view->setCircles(props->circles.value);
+    hybridView->setCircles(props->circles.value);
     props->circles.isDirty = false;
   }
   if (props->heatmaps.isDirty) {
-    view->setHeatmaps(props->heatmaps.value);
+    hybridView->setHeatmaps(props->heatmaps.value);
     props->heatmaps.isDirty = false;
   }
   if (props->kmlLayers.isDirty) {
-    view->setKmlLayers(props->kmlLayers.value);
+    hybridView->setKmlLayers(props->kmlLayers.value);
     props->kmlLayers.isDirty = false;
   }
   if (props->urlTileOverlays.isDirty) {
-    view->setUrlTileOverlays(props->urlTileOverlays.value);
+    hybridView->setUrlTileOverlays(props->urlTileOverlays.value);
     props->urlTileOverlays.isDirty = false;
   }
   if (props->locationConfig.isDirty) {
-    view->setLocationConfig(props->locationConfig.value);
+    hybridView->setLocationConfig(props->locationConfig.value);
     props->locationConfig.isDirty = false;
   }
   if (props->onMapError.isDirty) {
-    view->setOnMapError(props->onMapError.value);
+    hybridView->setOnMapError(props->onMapError.value);
     props->onMapError.isDirty = false;
   }
   if (props->onMapReady.isDirty) {
-    view->setOnMapReady(props->onMapReady.value);
+    hybridView->setOnMapReady(props->onMapReady.value);
     props->onMapReady.isDirty = false;
   }
   if (props->onMapLoaded.isDirty) {
-    view->setOnMapLoaded(props->onMapLoaded.value);
+    hybridView->setOnMapLoaded(props->onMapLoaded.value);
     props->onMapLoaded.isDirty = false;
   }
   if (props->onLocationUpdate.isDirty) {
-    view->setOnLocationUpdate(props->onLocationUpdate.value);
+    hybridView->setOnLocationUpdate(props->onLocationUpdate.value);
     props->onLocationUpdate.isDirty = false;
   }
   if (props->onLocationError.isDirty) {
-    view->setOnLocationError(props->onLocationError.value);
+    hybridView->setOnLocationError(props->onLocationError.value);
     props->onLocationError.isDirty = false;
   }
   if (props->onMapPress.isDirty) {
-    view->setOnMapPress(props->onMapPress.value);
+    hybridView->setOnMapPress(props->onMapPress.value);
     props->onMapPress.isDirty = false;
   }
   if (props->onMapLongPress.isDirty) {
-    view->setOnMapLongPress(props->onMapLongPress.value);
+    hybridView->setOnMapLongPress(props->onMapLongPress.value);
     props->onMapLongPress.isDirty = false;
   }
   if (props->onPoiPress.isDirty) {
-    view->setOnPoiPress(props->onPoiPress.value);
+    hybridView->setOnPoiPress(props->onPoiPress.value);
     props->onPoiPress.isDirty = false;
   }
   if (props->onMarkerPress.isDirty) {
-    view->setOnMarkerPress(props->onMarkerPress.value);
+    hybridView->setOnMarkerPress(props->onMarkerPress.value);
     props->onMarkerPress.isDirty = false;
   }
   if (props->onPolylinePress.isDirty) {
-    view->setOnPolylinePress(props->onPolylinePress.value);
+    hybridView->setOnPolylinePress(props->onPolylinePress.value);
     props->onPolylinePress.isDirty = false;
   }
   if (props->onPolygonPress.isDirty) {
-    view->setOnPolygonPress(props->onPolygonPress.value);
+    hybridView->setOnPolygonPress(props->onPolygonPress.value);
     props->onPolygonPress.isDirty = false;
   }
   if (props->onCirclePress.isDirty) {
-    view->setOnCirclePress(props->onCirclePress.value);
+    hybridView->setOnCirclePress(props->onCirclePress.value);
     props->onCirclePress.isDirty = false;
   }
   if (props->onMarkerDragStart.isDirty) {
-    view->setOnMarkerDragStart(props->onMarkerDragStart.value);
+    hybridView->setOnMarkerDragStart(props->onMarkerDragStart.value);
     props->onMarkerDragStart.isDirty = false;
   }
   if (props->onMarkerDrag.isDirty) {
-    view->setOnMarkerDrag(props->onMarkerDrag.value);
+    hybridView->setOnMarkerDrag(props->onMarkerDrag.value);
     props->onMarkerDrag.isDirty = false;
   }
   if (props->onMarkerDragEnd.isDirty) {
-    view->setOnMarkerDragEnd(props->onMarkerDragEnd.value);
+    hybridView->setOnMarkerDragEnd(props->onMarkerDragEnd.value);
     props->onMarkerDragEnd.isDirty = false;
   }
   if (props->onIndoorBuildingFocused.isDirty) {
-    view->setOnIndoorBuildingFocused(props->onIndoorBuildingFocused.value);
+    hybridView->setOnIndoorBuildingFocused(props->onIndoorBuildingFocused.value);
     props->onIndoorBuildingFocused.isDirty = false;
   }
   if (props->onIndoorLevelActivated.isDirty) {
-    view->setOnIndoorLevelActivated(props->onIndoorLevelActivated.value);
+    hybridView->setOnIndoorLevelActivated(props->onIndoorLevelActivated.value);
     props->onIndoorLevelActivated.isDirty = false;
   }
   if (props->onInfoWindowPress.isDirty) {
-    view->setOnInfoWindowPress(props->onInfoWindowPress.value);
+    hybridView->setOnInfoWindowPress(props->onInfoWindowPress.value);
     props->onInfoWindowPress.isDirty = false;
   }
   if (props->onInfoWindowClose.isDirty) {
-    view->setOnInfoWindowClose(props->onInfoWindowClose.value);
+    hybridView->setOnInfoWindowClose(props->onInfoWindowClose.value);
     props->onInfoWindowClose.isDirty = false;
   }
   if (props->onInfoWindowLongPress.isDirty) {
-    view->setOnInfoWindowLongPress(props->onInfoWindowLongPress.value);
+    hybridView->setOnInfoWindowLongPress(props->onInfoWindowLongPress.value);
     props->onInfoWindowLongPress.isDirty = false;
   }
   if (props->onMyLocationPress.isDirty) {
-    view->setOnMyLocationPress(props->onMyLocationPress.value);
+    hybridView->setOnMyLocationPress(props->onMyLocationPress.value);
     props->onMyLocationPress.isDirty = false;
   }
   if (props->onMyLocationButtonPress.isDirty) {
-    view->setOnMyLocationButtonPress(props->onMyLocationButtonPress.value);
+    hybridView->setOnMyLocationButtonPress(props->onMyLocationButtonPress.value);
     props->onMyLocationButtonPress.isDirty = false;
   }
   if (props->onCameraChangeStart.isDirty) {
-    view->setOnCameraChangeStart(props->onCameraChangeStart.value);
+    hybridView->setOnCameraChangeStart(props->onCameraChangeStart.value);
     props->onCameraChangeStart.isDirty = false;
   }
   if (props->onCameraChange.isDirty) {
-    view->setOnCameraChange(props->onCameraChange.value);
+    hybridView->setOnCameraChange(props->onCameraChange.value);
     props->onCameraChange.isDirty = false;
   }
   if (props->onCameraChangeComplete.isDirty) {
-    view->setOnCameraChangeComplete(props->onCameraChangeComplete.value);
+    hybridView->setOnCameraChangeComplete(props->onCameraChangeComplete.value);
     props->onCameraChangeComplete.isDirty = false;
   }
 
@@ -223,8 +223,7 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
     // hybridRef changed - call it with new this
     const auto& maybeFunc = props->hybridRef.value;
     if (maybeFunc.has_value()) {
-      std::shared_ptr<JHybridRNGoogleMapsPlusViewSpec> shared = javaView->cthis()->shared_cast<JHybridRNGoogleMapsPlusViewSpec>();
-      maybeFunc.value()(shared);
+      maybeFunc.value()(hybridView);
     }
     props->hybridRef.isDirty = false;
   }

package/nitrogen/generated/android/c++/views/JHybridRNGoogleMapsPlusViewStateUpdater.hpp

@@ -30,7 +30,7 @@ public:
 
 public:
   static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
-                              jni::alias_ref<JHybridRNGoogleMapsPlusViewSpec::javaobject> view,
+                              jni::alias_ref<JHybridRNGoogleMapsPlusViewSpec::JavaPart> view,
                               jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
 
 public:

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec.kt

@@ -25,23 +25,6 @@ import com.margelo.nitro.core.HybridObject
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridRNGoogleMapsPlusModuleSpec: HybridObject() {
-  @DoNotStrip
-  private var mHybridData: HybridData = initHybrid()
-
-  init {
-    super.updateNative(mHybridData)
-  }
-
-  override fun updateNative(hybridData: HybridData) {
-    mHybridData = hybridData
-    super.updateNative(hybridData)
-  }
-
-  // Default implementation of `HybridObject.toString()`
-  override fun toString(): String {
-    return "[HybridObject RNGoogleMapsPlusModule]"
-  }
-
   // Properties
   
 
@@ -62,7 +45,21 @@ abstract class HybridRNGoogleMapsPlusModuleSpec: HybridObject() {
   @Keep
   abstract fun isGooglePlayServicesAvailable(): Boolean
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject RNGoogleMapsPlusModule]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridRNGoogleMapsPlusModuleSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridRNGoogleMapsPlusModuleSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridRNGoogleMapsPlusModuleSpec"

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt

@@ -11,6 +11,7 @@ import androidx.annotation.Keep
 import com.facebook.jni.HybridData
 import com.facebook.proguard.annotations.DoNotStrip
 import com.margelo.nitro.core.Promise
+import com.margelo.nitro.core.HybridObject
 import com.margelo.nitro.views.HybridView
 
 /**
@@ -25,23 +26,6 @@ import com.margelo.nitro.views.HybridView
   "LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
 )
 abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
-  @DoNotStrip
-  private var mHybridData: HybridData = initHybrid()
-
-  init {
-    super.updateNative(mHybridData)
-  }
-
-  override fun updateNative(hybridData: HybridData) {
-    mHybridData = hybridData
-    super.updateNative(hybridData)
-  }
-
-  // Default implementation of `HybridObject.toString()`
-  override fun toString(): String {
-    return "[HybridObject RNGoogleMapsPlusView]"
-  }
-
   // Properties
   @get:DoNotStrip
   @get:Keep
@@ -558,7 +542,21 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
   @Keep
   abstract fun isGooglePlayServicesAvailable(): Boolean
 
-  private external fun initHybrid(): HybridData
+  // Default implementation of `HybridObject.toString()`
+  override fun toString(): String {
+    return "[HybridObject RNGoogleMapsPlusView]"
+  }
+
+  // C++ backing class
+  @DoNotStrip
+  @Keep
+  protected open class CxxPart(javaPart: HybridRNGoogleMapsPlusViewSpec): HybridObject.CxxPart(javaPart) {
+    // C++ JHybridRNGoogleMapsPlusViewSpec::CxxPart::initHybrid(...)
+    external override fun initHybrid(): HybridData
+  }
+  override fun createCxxPart(): CxxPart {
+    return CxxPart(this)
+  }
 
   companion object {
     protected const val TAG = "HybridRNGoogleMapsPlusViewSpec"

package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/views/HybridRNGoogleMapsPlusViewManager.kt

@@ -38,16 +38,8 @@ public class HybridRNGoogleMapsPlusViewManager: SimpleViewManager<View>() {
     return view
   }
 
-  // added by nitrogen-patch.js
-  override fun onDropViewInstance(view: View) {
-    val hybridView = view.getTag(associated_hybrid_view_tag) as? RNGoogleMapsPlusView
-    hybridView?.dispose()
-    view.setTag(associated_hybrid_view_tag, null)
-    super.onDropViewInstance(view)
-  }
-
   override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
-    val hybridView = view.getTag(associated_hybrid_view_tag) as? RNGoogleMapsPlusView
+    val hybridView = getHybridView(view)
       ?: throw Error("Couldn't find view $view in local views table!")
 
     // 1. Update each prop individually
@@ -59,9 +51,15 @@ public class HybridRNGoogleMapsPlusViewManager: SimpleViewManager<View>() {
     return super.updateState(view, props, stateWrapper)
   }
 
+  override fun onDropViewInstance(view: View) {
+    val hybridView = getHybridView(view)
+    hybridView?.onDropView()
+    return super.onDropViewInstance(view)
+  }
+
   protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
     super.prepareToRecycleView(reactContext, view)
-    val hybridView = view.getTag(associated_hybrid_view_tag) as? RNGoogleMapsPlusView
+    val hybridView = getHybridView(view)
       ?: return null
 
     @Suppress("USELESS_IS_CHECK")
@@ -75,4 +73,8 @@ public class HybridRNGoogleMapsPlusViewManager: SimpleViewManager<View>() {
       return null
     }
   }
+
+  private fun getHybridView(view: View): RNGoogleMapsPlusView? {
+    return view.getTag(associated_hybrid_view_tag) as? RNGoogleMapsPlusView
+  }
 }