react-native-google-maps-plus 1.12.0-dev.4 → 1.12.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (82) hide show
  1. package/README.md +1 -1
  2. package/RNGoogleMapsPlus.podspec +1 -1
  3. package/android/src/main/cpp/cpp-adapter.cpp +4 -1
  4. package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +11 -11
  5. package/android/src/main/java/com/rngooglemapsplus/LocationHandler.kt +2 -2
  6. package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt +1 -1
  7. package/android/src/main/java/com/rngooglemapsplus/PlayServicesHandler.kt +1 -1
  8. package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +2 -3
  9. package/ios/GoogleMapViewImpl.swift +0 -1
  10. package/ios/RNGoogleMapsPlusView.swift +1 -1
  11. package/nitro.json +16 -4
  12. package/nitrogen/generated/android/RNGoogleMapsPlusOnLoad.cpp +52 -36
  13. package/nitrogen/generated/android/RNGoogleMapsPlusOnLoad.hpp +13 -4
  14. package/nitrogen/generated/android/c++/JFunc_void_RNIndoorBuilding.hpp +2 -2
  15. package/nitrogen/generated/android/c++/JFunc_void_RNIndoorLevel.hpp +2 -2
  16. package/nitrogen/generated/android/c++/JFunc_void_RNLatLng.hpp +2 -2
  17. package/nitrogen/generated/android/c++/JFunc_void_RNLocation.hpp +2 -2
  18. package/nitrogen/generated/android/c++/JFunc_void_RNLocationErrorCode.hpp +2 -2
  19. package/nitrogen/generated/android/c++/JFunc_void_RNMapErrorCode_std__string.hpp +2 -2
  20. package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera.hpp +2 -2
  21. package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera_bool.hpp +2 -2
  22. package/nitrogen/generated/android/c++/JFunc_void_bool.hpp +2 -2
  23. package/nitrogen/generated/android/c++/JFunc_void_std__string.hpp +2 -2
  24. package/nitrogen/generated/android/c++/JFunc_void_std__string_RNLatLng.hpp +2 -2
  25. package/nitrogen/generated/android/c++/JFunc_void_std__string_std__string_RNLatLng.hpp +2 -2
  26. package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusModuleSpec.cpp +22 -28
  27. package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusModuleSpec.hpp +19 -22
  28. package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp +119 -125
  29. package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.hpp +19 -22
  30. package/nitrogen/generated/android/c++/JRNAndroidLocationConfig.hpp +1 -1
  31. package/nitrogen/generated/android/c++/JRNAndroidLocationPermissionResult.hpp +1 -1
  32. package/nitrogen/generated/android/c++/JRNAndroidLocationPriority.hpp +1 -1
  33. package/nitrogen/generated/android/c++/JRNCamera.hpp +1 -1
  34. package/nitrogen/generated/android/c++/JRNCameraUpdate.hpp +1 -1
  35. package/nitrogen/generated/android/c++/JRNCircle.hpp +1 -1
  36. package/nitrogen/generated/android/c++/JRNHeatmap.hpp +1 -1
  37. package/nitrogen/generated/android/c++/JRNHeatmapGradient.hpp +1 -1
  38. package/nitrogen/generated/android/c++/JRNHeatmapPoint.hpp +1 -1
  39. package/nitrogen/generated/android/c++/JRNIOSLocationAccuracy.hpp +1 -1
  40. package/nitrogen/generated/android/c++/JRNIOSLocationActivityType.hpp +1 -1
  41. package/nitrogen/generated/android/c++/JRNIOSLocationConfig.hpp +1 -1
  42. package/nitrogen/generated/android/c++/JRNIOSPermissionResult.hpp +1 -1
  43. package/nitrogen/generated/android/c++/JRNIndoorBuilding.hpp +1 -1
  44. package/nitrogen/generated/android/c++/JRNIndoorLevel.hpp +1 -1
  45. package/nitrogen/generated/android/c++/JRNInitialProps.hpp +1 -1
  46. package/nitrogen/generated/android/c++/JRNKMLayer.hpp +1 -1
  47. package/nitrogen/generated/android/c++/JRNLatLng.hpp +1 -1
  48. package/nitrogen/generated/android/c++/JRNLatLngBounds.hpp +1 -1
  49. package/nitrogen/generated/android/c++/JRNLineCapType.hpp +1 -1
  50. package/nitrogen/generated/android/c++/JRNLineJoinType.hpp +1 -1
  51. package/nitrogen/generated/android/c++/JRNLocation.hpp +1 -1
  52. package/nitrogen/generated/android/c++/JRNLocationAndroid.hpp +1 -1
  53. package/nitrogen/generated/android/c++/JRNLocationConfig.hpp +1 -1
  54. package/nitrogen/generated/android/c++/JRNLocationErrorCode.hpp +1 -1
  55. package/nitrogen/generated/android/c++/JRNLocationIOS.hpp +1 -1
  56. package/nitrogen/generated/android/c++/JRNLocationPermissionResult.hpp +1 -1
  57. package/nitrogen/generated/android/c++/JRNMapErrorCode.hpp +1 -1
  58. package/nitrogen/generated/android/c++/JRNMapPadding.hpp +1 -1
  59. package/nitrogen/generated/android/c++/JRNMapType.hpp +1 -1
  60. package/nitrogen/generated/android/c++/JRNMapUiSettings.hpp +1 -1
  61. package/nitrogen/generated/android/c++/JRNMapZoomConfig.hpp +1 -1
  62. package/nitrogen/generated/android/c++/JRNMarker.hpp +1 -1
  63. package/nitrogen/generated/android/c++/JRNMarkerSvg.hpp +1 -1
  64. package/nitrogen/generated/android/c++/JRNPolygon.hpp +1 -1
  65. package/nitrogen/generated/android/c++/JRNPolygonHole.hpp +1 -1
  66. package/nitrogen/generated/android/c++/JRNPolyline.hpp +1 -1
  67. package/nitrogen/generated/android/c++/JRNPosition.hpp +1 -1
  68. package/nitrogen/generated/android/c++/JRNRegion.hpp +1 -1
  69. package/nitrogen/generated/android/c++/JRNSize.hpp +1 -1
  70. package/nitrogen/generated/android/c++/JRNSnapshotFormat.hpp +1 -1
  71. package/nitrogen/generated/android/c++/JRNSnapshotOptions.hpp +1 -1
  72. package/nitrogen/generated/android/c++/JRNSnapshotResultType.hpp +1 -1
  73. package/nitrogen/generated/android/c++/JRNUrlTileOverlay.hpp +1 -1
  74. package/nitrogen/generated/android/c++/JRNUserInterfaceStyle.hpp +1 -1
  75. package/nitrogen/generated/android/c++/views/JHybridRNGoogleMapsPlusViewStateUpdater.cpp +48 -49
  76. package/nitrogen/generated/android/c++/views/JHybridRNGoogleMapsPlusViewStateUpdater.hpp +1 -1
  77. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec.kt +15 -18
  78. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt +16 -18
  79. package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/views/HybridRNGoogleMapsPlusViewManager.kt +12 -10
  80. package/nitrogen/generated/ios/c++/views/HybridRNGoogleMapsPlusViewComponent.mm +15 -9
  81. package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec_cxx.swift +4 -0
  82. package/package.json +23 -23
@@ -26,37 +26,31 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNIOSPermissionResult; }
26
26
 
27
27
  namespace margelo::nitro::rngooglemapsplus {
28
28
 
29
- jni::local_ref<JHybridRNGoogleMapsPlusModuleSpec::jhybriddata> JHybridRNGoogleMapsPlusModuleSpec::initHybrid(jni::alias_ref<jhybridobject> jThis) {
30
- return makeCxxInstance(jThis);
31
- }
32
-
33
- void JHybridRNGoogleMapsPlusModuleSpec::registerNatives() {
34
- registerHybrid({
35
- makeNativeMethod("initHybrid", JHybridRNGoogleMapsPlusModuleSpec::initHybrid),
36
- });
29
+ std::shared_ptr<JHybridRNGoogleMapsPlusModuleSpec> JHybridRNGoogleMapsPlusModuleSpec::JavaPart::getJHybridRNGoogleMapsPlusModuleSpec() {
30
+ auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
31
+ auto castHybridObject = std::dynamic_pointer_cast<JHybridRNGoogleMapsPlusModuleSpec>(hybridObject);
32
+ if (castHybridObject == nullptr) [[unlikely]] {
33
+ throw std::runtime_error("Failed to downcast JHybridObject to JHybridRNGoogleMapsPlusModuleSpec!");
34
+ }
35
+ return castHybridObject;
37
36
  }
38
37
 
39
- size_t JHybridRNGoogleMapsPlusModuleSpec::getExternalMemorySize() noexcept {
40
- static const auto method = javaClassStatic()->getMethod<jlong()>("getMemorySize");
41
- return method(_javaPart);
38
+ jni::local_ref<JHybridRNGoogleMapsPlusModuleSpec::CxxPart::jhybriddata> JHybridRNGoogleMapsPlusModuleSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
39
+ return makeCxxInstance(jThis);
42
40
  }
43
41
 
44
- bool JHybridRNGoogleMapsPlusModuleSpec::equals(const std::shared_ptr<HybridObject>& other) {
45
- if (auto otherCast = std::dynamic_pointer_cast<JHybridRNGoogleMapsPlusModuleSpec>(other)) {
46
- return _javaPart == otherCast->_javaPart;
42
+ std::shared_ptr<JHybridObject> JHybridRNGoogleMapsPlusModuleSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
43
+ auto castJavaPart = jni::dynamic_ref_cast<JHybridRNGoogleMapsPlusModuleSpec::JavaPart>(javaPart);
44
+ if (castJavaPart == nullptr) [[unlikely]] {
45
+ throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridRNGoogleMapsPlusModuleSpec::JavaPart!");
47
46
  }
48
- return false;
49
- }
50
-
51
- void JHybridRNGoogleMapsPlusModuleSpec::dispose() noexcept {
52
- static const auto method = javaClassStatic()->getMethod<void()>("dispose");
53
- method(_javaPart);
47
+ return std::make_shared<JHybridRNGoogleMapsPlusModuleSpec>(castJavaPart);
54
48
  }
55
49
 
56
- std::string JHybridRNGoogleMapsPlusModuleSpec::toString() {
57
- static const auto method = javaClassStatic()->getMethod<jni::JString()>("toString");
58
- auto javaString = method(_javaPart);
59
- return javaString->toStdString();
50
+ void JHybridRNGoogleMapsPlusModuleSpec::CxxPart::registerNatives() {
51
+ registerHybrid({
52
+ makeNativeMethod("initHybrid", JHybridRNGoogleMapsPlusModuleSpec::CxxPart::initHybrid),
53
+ });
60
54
  }
61
55
 
62
56
  // Properties
@@ -64,15 +58,15 @@ namespace margelo::nitro::rngooglemapsplus {
64
58
 
65
59
  // Methods
66
60
  void JHybridRNGoogleMapsPlusModuleSpec::showLocationDialog() {
67
- static const auto method = javaClassStatic()->getMethod<void()>("showLocationDialog");
61
+ static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("showLocationDialog");
68
62
  method(_javaPart);
69
63
  }
70
64
  void JHybridRNGoogleMapsPlusModuleSpec::openLocationSettings() {
71
- static const auto method = javaClassStatic()->getMethod<void()>("openLocationSettings");
65
+ static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("openLocationSettings");
72
66
  method(_javaPart);
73
67
  }
74
68
  std::shared_ptr<Promise<RNLocationPermissionResult>> JHybridRNGoogleMapsPlusModuleSpec::requestLocationPermission() {
75
- static const auto method = javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestLocationPermission");
69
+ static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JPromise::javaobject>()>("requestLocationPermission");
76
70
  auto __result = method(_javaPart);
77
71
  return [&]() {
78
72
  auto __promise = Promise<RNLocationPermissionResult>::create();
@@ -88,7 +82,7 @@ namespace margelo::nitro::rngooglemapsplus {
88
82
  }();
89
83
  }
90
84
  bool JHybridRNGoogleMapsPlusModuleSpec::isGooglePlayServicesAvailable() {
91
- static const auto method = javaClassStatic()->getMethod<jboolean()>("isGooglePlayServicesAvailable");
85
+ static const auto method = _javaPart->javaClassStatic()->getMethod<jboolean()>("isGooglePlayServicesAvailable");
92
86
  auto __result = method(_javaPart);
93
87
  return static_cast<bool>(__result);
94
88
  }
@@ -18,34 +18,33 @@ namespace margelo::nitro::rngooglemapsplus {
18
18
 
19
19
  using namespace facebook;
20
20
 
21
- class JHybridRNGoogleMapsPlusModuleSpec: public jni::HybridClass<JHybridRNGoogleMapsPlusModuleSpec, JHybridObject>,
22
- public virtual HybridRNGoogleMapsPlusModuleSpec {
21
+ class JHybridRNGoogleMapsPlusModuleSpec: public virtual HybridRNGoogleMapsPlusModuleSpec, public virtual JHybridObject {
23
22
  public:
24
- static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec;";
25
- static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
26
- static void registerNatives();
27
-
28
- protected:
29
- // C++ constructor (called from Java via `initHybrid()`)
30
- explicit JHybridRNGoogleMapsPlusModuleSpec(jni::alias_ref<jhybridobject> jThis) :
31
- HybridObject(HybridRNGoogleMapsPlusModuleSpec::TAG),
32
- HybridBase(jThis),
33
- _javaPart(jni::make_global(jThis)) {}
23
+ struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
24
+ static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec;";
25
+ std::shared_ptr<JHybridRNGoogleMapsPlusModuleSpec> getJHybridRNGoogleMapsPlusModuleSpec();
26
+ };
27
+ struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
28
+ static constexpr auto kJavaDescriptor = "Lcom/rngooglemapsplus/HybridRNGoogleMapsPlusModuleSpec$CxxPart;";
29
+ static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
30
+ static void registerNatives();
31
+ using HybridBase::HybridBase;
32
+ protected:
33
+ std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
34
+ };
34
35
 
35
36
  public:
37
+ explicit JHybridRNGoogleMapsPlusModuleSpec(const jni::local_ref<JHybridRNGoogleMapsPlusModuleSpec::JavaPart>& javaPart):
38
+ HybridObject(HybridRNGoogleMapsPlusModuleSpec::TAG),
39
+ JHybridObject(javaPart),
40
+ _javaPart(jni::make_global(javaPart)) {}
36
41
  ~JHybridRNGoogleMapsPlusModuleSpec() override {
37
42
  // Hermes GC can destroy JS objects on a non-JNI Thread.
38
43
  jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
39
44
  }
40
45
 
41
46
  public:
42
- size_t getExternalMemorySize() noexcept override;
43
- bool equals(const std::shared_ptr<HybridObject>& other) override;
44
- void dispose() noexcept override;
45
- std::string toString() override;
46
-
47
- public:
48
- inline const jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::javaobject>& getJavaPart() const noexcept {
47
+ inline const jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::JavaPart>& getJavaPart() const noexcept {
49
48
  return _javaPart;
50
49
  }
51
50
 
@@ -61,9 +60,7 @@ namespace margelo::nitro::rngooglemapsplus {
61
60
  bool isGooglePlayServicesAvailable() override;
62
61
 
63
62
  private:
64
- friend HybridBase;
65
- using HybridBase::HybridBase;
66
- jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::javaobject> _javaPart;
63
+ jni::global_ref<JHybridRNGoogleMapsPlusModuleSpec::JavaPart> _javaPart;
67
64
  };
68
65
 
69
66
  } // namespace margelo::nitro::rngooglemapsplus