react-native-google-maps-plus 1.7.0 → 1.8.0-dev.1
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.
- package/android/build.gradle +1 -1
- package/android/gradle.properties +2 -1
- package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +4 -4
- package/android/src/main/java/com/rngooglemapsplus/MapCircleBuilder.kt +2 -3
- package/android/src/main/java/com/rngooglemapsplus/MapMarkerBuilder.kt +51 -54
- package/android/src/main/java/com/rngooglemapsplus/MapPolygonBuilder.kt +6 -23
- package/android/src/main/java/com/rngooglemapsplus/MapPolylineBuilder.kt.kt +12 -39
- package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +7 -5
- package/android/src/main/java/com/rngooglemapsplus/extensions/CameraPositionExtension.kt +3 -2
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNLineCapTypeExtension.kt +14 -0
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNLineJoinTypeExtension.kt +12 -0
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNMapCircleExtension.kt +7 -1
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNMarkerExtension.kt +54 -17
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNPolygonExtension.kt +31 -1
- package/android/src/main/java/com/rngooglemapsplus/extensions/RNPolylineExtension.kt +6 -1
- package/ios/GoogleMapViewImpl.swift +8 -5
- package/ios/LocationHandler.swift +3 -1
- package/ios/MapCircleBuilder.swift +2 -3
- package/ios/MapHelper.swift +3 -5
- package/ios/MapMarkerBuilder.swift +108 -105
- package/ios/MapPolygonBuilder.swift +6 -41
- package/ios/MapPolylineBuilder.swift +2 -10
- package/ios/RNGoogleMapsPlusView.swift +31 -25
- package/ios/extensions/GMSCameraPosition+Extension.swift +2 -2
- package/ios/extensions/RNCircle+Extension.swift +14 -5
- package/ios/extensions/RNLatLng+Extension.swift +11 -0
- package/ios/extensions/RNLineCapType+Extension.swift +10 -0
- package/ios/extensions/RNLineJoinType+Extension.swift +11 -0
- package/ios/extensions/RNMarker+Extension.swift +43 -12
- package/ios/extensions/RNPolygon+Extension.swift.swift +50 -21
- package/ios/extensions/RNPolyline+Extension.swift.swift +15 -26
- package/ios/extensions/SVGKImage+Extension.swift +22 -0
- package/lib/module/types.js.map +1 -1
- package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts +5 -5
- package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts.map +1 -1
- package/lib/typescript/src/types.d.ts +7 -1
- package/lib/typescript/src/types.d.ts.map +1 -1
- package/nitrogen/generated/android/RNGoogleMapsPlusOnLoad.cpp +4 -4
- package/nitrogen/generated/android/c++/{JFunc_void_RNRegion_RNCamera.hpp → JFunc_void_RNRegion_RNCameraChange.hpp} +21 -22
- package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCameraChange_bool.hpp +82 -0
- package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp +42 -38
- package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.hpp +8 -8
- package/nitrogen/generated/android/c++/JRNCameraChange.hpp +70 -0
- package/nitrogen/generated/android/c++/JRNInitialProps.hpp +7 -3
- package/nitrogen/generated/android/c++/JRNMarker.hpp +1 -5
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_RNRegion_RNCamera.kt → Func_void_RNRegion_RNCameraChange.kt} +9 -9
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/{Func_void_RNRegion_RNCamera_bool.kt → Func_void_RNRegion_RNCameraChange_bool.kt} +9 -9
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt +12 -12
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNCameraChange.kt +46 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNInitialProps.kt +6 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNMarker.kt +2 -5
- package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Bridge.cpp +8 -8
- package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Bridge.hpp +39 -36
- package/nitrogen/generated/ios/RNGoogleMapsPlus-Swift-Cxx-Umbrella.hpp +3 -0
- package/nitrogen/generated/ios/c++/HybridRNGoogleMapsPlusViewSpecSwift.hpp +11 -8
- package/nitrogen/generated/ios/swift/{Func_void_RNRegion_RNCamera.swift → Func_void_RNRegion_RNCameraChange.swift} +10 -10
- package/nitrogen/generated/ios/swift/{Func_void_RNRegion_RNCamera_bool.swift → Func_void_RNRegion_RNCameraChange_bool.swift} +10 -10
- package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec.swift +4 -4
- package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec_cxx.swift +44 -44
- package/nitrogen/generated/ios/swift/RNCameraChange.swift +68 -0
- package/nitrogen/generated/ios/swift/RNInitialProps.swift +31 -1
- package/nitrogen/generated/ios/swift/RNMarker.swift +1 -31
- package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.hpp +14 -11
- package/nitrogen/generated/shared/c++/RNCameraChange.hpp +88 -0
- package/nitrogen/generated/shared/c++/RNInitialProps.hpp +6 -2
- package/nitrogen/generated/shared/c++/RNMarker.hpp +1 -5
- package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.cpp +8 -8
- package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.hpp +5 -5
- package/package.json +1 -1
- package/src/RNGoogleMapsPlusView.nitro.ts +5 -4
- package/src/types.ts +8 -1
- package/nitrogen/generated/android/c++/JFunc_void_RNRegion_RNCamera_bool.hpp +0 -83
|
@@ -65,6 +65,8 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNIOSLocationAccuracy; }
|
|
|
65
65
|
namespace margelo::nitro::rngooglemapsplus { enum class RNMapErrorCode; }
|
|
66
66
|
// Forward declaration of `RNRegion` to properly resolve imports.
|
|
67
67
|
namespace margelo::nitro::rngooglemapsplus { struct RNRegion; }
|
|
68
|
+
// Forward declaration of `RNCameraChange` to properly resolve imports.
|
|
69
|
+
namespace margelo::nitro::rngooglemapsplus { struct RNCameraChange; }
|
|
68
70
|
// Forward declaration of `RNLatLngBounds` to properly resolve imports.
|
|
69
71
|
namespace margelo::nitro::rngooglemapsplus { struct RNLatLngBounds; }
|
|
70
72
|
// Forward declaration of `RNLocation` to properly resolve imports.
|
|
@@ -157,10 +159,12 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
|
|
|
157
159
|
#include "JRNMapErrorCode.hpp"
|
|
158
160
|
#include "JFunc_void_bool.hpp"
|
|
159
161
|
#include "RNRegion.hpp"
|
|
160
|
-
#include "
|
|
162
|
+
#include "RNCameraChange.hpp"
|
|
163
|
+
#include "JFunc_void_RNRegion_RNCameraChange.hpp"
|
|
161
164
|
#include "JRNRegion.hpp"
|
|
162
165
|
#include "RNLatLngBounds.hpp"
|
|
163
166
|
#include "JRNLatLngBounds.hpp"
|
|
167
|
+
#include "JRNCameraChange.hpp"
|
|
164
168
|
#include "RNLocation.hpp"
|
|
165
169
|
#include "JFunc_void_RNLocation.hpp"
|
|
166
170
|
#include "JRNLocation.hpp"
|
|
@@ -181,7 +185,7 @@ namespace margelo::nitro::rngooglemapsplus { enum class RNSnapshotResultType; }
|
|
|
181
185
|
#include "RNIndoorLevel.hpp"
|
|
182
186
|
#include "JRNIndoorLevel.hpp"
|
|
183
187
|
#include "JFunc_void_RNIndoorLevel.hpp"
|
|
184
|
-
#include "
|
|
188
|
+
#include "JFunc_void_RNRegion_RNCameraChange_bool.hpp"
|
|
185
189
|
#include <NitroModules/Promise.hpp>
|
|
186
190
|
#include <NitroModules/JPromise.hpp>
|
|
187
191
|
#include "RNLocationPermissionResult.hpp"
|
|
@@ -550,24 +554,24 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
550
554
|
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* onMapReady */)>("setOnMapReady_cxx");
|
|
551
555
|
method(_javaPart, onMapReady.has_value() ? JFunc_void_bool_cxx::fromCpp(onMapReady.value()) : nullptr);
|
|
552
556
|
}
|
|
553
|
-
std::optional<std::function<void(const RNRegion& /* region */, const
|
|
554
|
-
static const auto method = javaClassStatic()->getMethod<jni::local_ref<
|
|
557
|
+
std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)>> JHybridRNGoogleMapsPlusViewSpec::getOnMapLoaded() {
|
|
558
|
+
static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNRegion_RNCameraChange::javaobject>()>("getOnMapLoaded_cxx");
|
|
555
559
|
auto __result = method(_javaPart);
|
|
556
|
-
return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const
|
|
557
|
-
if (__result->isInstanceOf(
|
|
558
|
-
auto downcast = jni::static_ref_cast<
|
|
560
|
+
return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)> {
|
|
561
|
+
if (__result->isInstanceOf(JFunc_void_RNRegion_RNCameraChange_cxx::javaClassStatic())) [[likely]] {
|
|
562
|
+
auto downcast = jni::static_ref_cast<JFunc_void_RNRegion_RNCameraChange_cxx::javaobject>(__result);
|
|
559
563
|
return downcast->cthis()->getFunction();
|
|
560
564
|
} else {
|
|
561
565
|
auto __resultRef = jni::make_global(__result);
|
|
562
|
-
return [__resultRef](RNRegion region,
|
|
566
|
+
return [__resultRef](RNRegion region, RNCameraChange camera) -> void {
|
|
563
567
|
return __resultRef->invoke(region,camera);
|
|
564
568
|
};
|
|
565
569
|
}
|
|
566
570
|
}()) : std::nullopt;
|
|
567
571
|
}
|
|
568
|
-
void JHybridRNGoogleMapsPlusViewSpec::setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
569
|
-
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<
|
|
570
|
-
method(_javaPart, onMapLoaded.has_value() ?
|
|
572
|
+
void JHybridRNGoogleMapsPlusViewSpec::setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)>>& onMapLoaded) {
|
|
573
|
+
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNRegion_RNCameraChange::javaobject> /* onMapLoaded */)>("setOnMapLoaded_cxx");
|
|
574
|
+
method(_javaPart, onMapLoaded.has_value() ? JFunc_void_RNRegion_RNCameraChange_cxx::fromCpp(onMapLoaded.value()) : nullptr);
|
|
571
575
|
}
|
|
572
576
|
std::optional<std::function<void(const RNLocation& /* location */)>> JHybridRNGoogleMapsPlusViewSpec::getOnLocationUpdate() {
|
|
573
577
|
static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNLocation::javaobject>()>("getOnLocationUpdate_cxx");
|
|
@@ -930,62 +934,62 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
930
934
|
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_bool::javaobject> /* onMyLocationButtonPress */)>("setOnMyLocationButtonPress_cxx");
|
|
931
935
|
method(_javaPart, onMyLocationButtonPress.has_value() ? JFunc_void_bool_cxx::fromCpp(onMyLocationButtonPress.value()) : nullptr);
|
|
932
936
|
}
|
|
933
|
-
std::optional<std::function<void(const RNRegion& /* region */, const
|
|
934
|
-
static const auto method = javaClassStatic()->getMethod<jni::local_ref<
|
|
937
|
+
std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCameraChangeStart() {
|
|
938
|
+
static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNRegion_RNCameraChange_bool::javaobject>()>("getOnCameraChangeStart_cxx");
|
|
935
939
|
auto __result = method(_javaPart);
|
|
936
|
-
return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const
|
|
937
|
-
if (__result->isInstanceOf(
|
|
938
|
-
auto downcast = jni::static_ref_cast<
|
|
940
|
+
return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)> {
|
|
941
|
+
if (__result->isInstanceOf(JFunc_void_RNRegion_RNCameraChange_bool_cxx::javaClassStatic())) [[likely]] {
|
|
942
|
+
auto downcast = jni::static_ref_cast<JFunc_void_RNRegion_RNCameraChange_bool_cxx::javaobject>(__result);
|
|
939
943
|
return downcast->cthis()->getFunction();
|
|
940
944
|
} else {
|
|
941
945
|
auto __resultRef = jni::make_global(__result);
|
|
942
|
-
return [__resultRef](RNRegion region,
|
|
946
|
+
return [__resultRef](RNRegion region, RNCameraChange camera, bool isGesture) -> void {
|
|
943
947
|
return __resultRef->invoke(region,camera,isGesture);
|
|
944
948
|
};
|
|
945
949
|
}
|
|
946
950
|
}()) : std::nullopt;
|
|
947
951
|
}
|
|
948
|
-
void JHybridRNGoogleMapsPlusViewSpec::setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
949
|
-
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<
|
|
950
|
-
method(_javaPart, onCameraChangeStart.has_value() ?
|
|
952
|
+
void JHybridRNGoogleMapsPlusViewSpec::setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) {
|
|
953
|
+
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNRegion_RNCameraChange_bool::javaobject> /* onCameraChangeStart */)>("setOnCameraChangeStart_cxx");
|
|
954
|
+
method(_javaPart, onCameraChangeStart.has_value() ? JFunc_void_RNRegion_RNCameraChange_bool_cxx::fromCpp(onCameraChangeStart.value()) : nullptr);
|
|
951
955
|
}
|
|
952
|
-
std::optional<std::function<void(const RNRegion& /* region */, const
|
|
953
|
-
static const auto method = javaClassStatic()->getMethod<jni::local_ref<
|
|
956
|
+
std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCameraChange() {
|
|
957
|
+
static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNRegion_RNCameraChange_bool::javaobject>()>("getOnCameraChange_cxx");
|
|
954
958
|
auto __result = method(_javaPart);
|
|
955
|
-
return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const
|
|
956
|
-
if (__result->isInstanceOf(
|
|
957
|
-
auto downcast = jni::static_ref_cast<
|
|
959
|
+
return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)> {
|
|
960
|
+
if (__result->isInstanceOf(JFunc_void_RNRegion_RNCameraChange_bool_cxx::javaClassStatic())) [[likely]] {
|
|
961
|
+
auto downcast = jni::static_ref_cast<JFunc_void_RNRegion_RNCameraChange_bool_cxx::javaobject>(__result);
|
|
958
962
|
return downcast->cthis()->getFunction();
|
|
959
963
|
} else {
|
|
960
964
|
auto __resultRef = jni::make_global(__result);
|
|
961
|
-
return [__resultRef](RNRegion region,
|
|
965
|
+
return [__resultRef](RNRegion region, RNCameraChange camera, bool isGesture) -> void {
|
|
962
966
|
return __resultRef->invoke(region,camera,isGesture);
|
|
963
967
|
};
|
|
964
968
|
}
|
|
965
969
|
}()) : std::nullopt;
|
|
966
970
|
}
|
|
967
|
-
void JHybridRNGoogleMapsPlusViewSpec::setOnCameraChange(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
968
|
-
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<
|
|
969
|
-
method(_javaPart, onCameraChange.has_value() ?
|
|
971
|
+
void JHybridRNGoogleMapsPlusViewSpec::setOnCameraChange(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChange) {
|
|
972
|
+
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNRegion_RNCameraChange_bool::javaobject> /* onCameraChange */)>("setOnCameraChange_cxx");
|
|
973
|
+
method(_javaPart, onCameraChange.has_value() ? JFunc_void_RNRegion_RNCameraChange_bool_cxx::fromCpp(onCameraChange.value()) : nullptr);
|
|
970
974
|
}
|
|
971
|
-
std::optional<std::function<void(const RNRegion& /* region */, const
|
|
972
|
-
static const auto method = javaClassStatic()->getMethod<jni::local_ref<
|
|
975
|
+
std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> JHybridRNGoogleMapsPlusViewSpec::getOnCameraChangeComplete() {
|
|
976
|
+
static const auto method = javaClassStatic()->getMethod<jni::local_ref<JFunc_void_RNRegion_RNCameraChange_bool::javaobject>()>("getOnCameraChangeComplete_cxx");
|
|
973
977
|
auto __result = method(_javaPart);
|
|
974
|
-
return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const
|
|
975
|
-
if (__result->isInstanceOf(
|
|
976
|
-
auto downcast = jni::static_ref_cast<
|
|
978
|
+
return __result != nullptr ? std::make_optional([&]() -> std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)> {
|
|
979
|
+
if (__result->isInstanceOf(JFunc_void_RNRegion_RNCameraChange_bool_cxx::javaClassStatic())) [[likely]] {
|
|
980
|
+
auto downcast = jni::static_ref_cast<JFunc_void_RNRegion_RNCameraChange_bool_cxx::javaobject>(__result);
|
|
977
981
|
return downcast->cthis()->getFunction();
|
|
978
982
|
} else {
|
|
979
983
|
auto __resultRef = jni::make_global(__result);
|
|
980
|
-
return [__resultRef](RNRegion region,
|
|
984
|
+
return [__resultRef](RNRegion region, RNCameraChange camera, bool isGesture) -> void {
|
|
981
985
|
return __resultRef->invoke(region,camera,isGesture);
|
|
982
986
|
};
|
|
983
987
|
}
|
|
984
988
|
}()) : std::nullopt;
|
|
985
989
|
}
|
|
986
|
-
void JHybridRNGoogleMapsPlusViewSpec::setOnCameraChangeComplete(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
987
|
-
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<
|
|
988
|
-
method(_javaPart, onCameraChangeComplete.has_value() ?
|
|
990
|
+
void JHybridRNGoogleMapsPlusViewSpec::setOnCameraChangeComplete(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChangeComplete) {
|
|
991
|
+
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<JFunc_void_RNRegion_RNCameraChange_bool::javaobject> /* onCameraChangeComplete */)>("setOnCameraChangeComplete_cxx");
|
|
992
|
+
method(_javaPart, onCameraChangeComplete.has_value() ? JFunc_void_RNRegion_RNCameraChange_bool_cxx::fromCpp(onCameraChangeComplete.value()) : nullptr);
|
|
989
993
|
}
|
|
990
994
|
|
|
991
995
|
// Methods
|
|
@@ -91,8 +91,8 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
91
91
|
void setOnMapError(const std::optional<std::function<void(RNMapErrorCode /* error */)>>& onMapError) override;
|
|
92
92
|
std::optional<std::function<void(bool /* ready */)>> getOnMapReady() override;
|
|
93
93
|
void setOnMapReady(const std::optional<std::function<void(bool /* ready */)>>& onMapReady) override;
|
|
94
|
-
std::optional<std::function<void(const RNRegion& /* region */, const
|
|
95
|
-
void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
94
|
+
std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)>> getOnMapLoaded() override;
|
|
95
|
+
void setOnMapLoaded(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */)>>& onMapLoaded) override;
|
|
96
96
|
std::optional<std::function<void(const RNLocation& /* location */)>> getOnLocationUpdate() override;
|
|
97
97
|
void setOnLocationUpdate(const std::optional<std::function<void(const RNLocation& /* location */)>>& onLocationUpdate) override;
|
|
98
98
|
std::optional<std::function<void(RNLocationErrorCode /* error */)>> getOnLocationError() override;
|
|
@@ -131,12 +131,12 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
131
131
|
void setOnMyLocationPress(const std::optional<std::function<void(const RNLocation& /* location */)>>& onMyLocationPress) override;
|
|
132
132
|
std::optional<std::function<void(bool /* pressed */)>> getOnMyLocationButtonPress() override;
|
|
133
133
|
void setOnMyLocationButtonPress(const std::optional<std::function<void(bool /* pressed */)>>& onMyLocationButtonPress) override;
|
|
134
|
-
std::optional<std::function<void(const RNRegion& /* region */, const
|
|
135
|
-
void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
136
|
-
std::optional<std::function<void(const RNRegion& /* region */, const
|
|
137
|
-
void setOnCameraChange(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
138
|
-
std::optional<std::function<void(const RNRegion& /* region */, const
|
|
139
|
-
void setOnCameraChangeComplete(const std::optional<std::function<void(const RNRegion& /* region */, const
|
|
134
|
+
std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChangeStart() override;
|
|
135
|
+
void setOnCameraChangeStart(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChangeStart) override;
|
|
136
|
+
std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChange() override;
|
|
137
|
+
void setOnCameraChange(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChange) override;
|
|
138
|
+
std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>> getOnCameraChangeComplete() override;
|
|
139
|
+
void setOnCameraChangeComplete(const std::optional<std::function<void(const RNRegion& /* region */, const RNCameraChange& /* camera */, bool /* isGesture */)>>& onCameraChangeComplete) override;
|
|
140
140
|
|
|
141
141
|
public:
|
|
142
142
|
// Methods
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// JRNCameraChange.hpp
|
|
3
|
+
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
|
+
/// https://github.com/mrousavy/nitro
|
|
5
|
+
/// Copyright © 2025 Marc Rousavy @ Margelo
|
|
6
|
+
///
|
|
7
|
+
|
|
8
|
+
#pragma once
|
|
9
|
+
|
|
10
|
+
#include <fbjni/fbjni.h>
|
|
11
|
+
#include "RNCameraChange.hpp"
|
|
12
|
+
|
|
13
|
+
#include "JRNLatLng.hpp"
|
|
14
|
+
#include "RNLatLng.hpp"
|
|
15
|
+
|
|
16
|
+
namespace margelo::nitro::rngooglemapsplus {
|
|
17
|
+
|
|
18
|
+
using namespace facebook;
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* The C++ JNI bridge between the C++ struct "RNCameraChange" and the the Kotlin data class "RNCameraChange".
|
|
22
|
+
*/
|
|
23
|
+
struct JRNCameraChange final: public jni::JavaClass<JRNCameraChange> {
|
|
24
|
+
public:
|
|
25
|
+
static auto constexpr kJavaDescriptor = "Lcom/rngooglemapsplus/RNCameraChange;";
|
|
26
|
+
|
|
27
|
+
public:
|
|
28
|
+
/**
|
|
29
|
+
* Convert this Java/Kotlin-based struct to the C++ struct RNCameraChange by copying all values to C++.
|
|
30
|
+
*/
|
|
31
|
+
[[maybe_unused]]
|
|
32
|
+
[[nodiscard]]
|
|
33
|
+
RNCameraChange toCpp() const {
|
|
34
|
+
static const auto clazz = javaClassStatic();
|
|
35
|
+
static const auto fieldCenter = clazz->getField<JRNLatLng>("center");
|
|
36
|
+
jni::local_ref<JRNLatLng> center = this->getFieldValue(fieldCenter);
|
|
37
|
+
static const auto fieldZoom = clazz->getField<double>("zoom");
|
|
38
|
+
double zoom = this->getFieldValue(fieldZoom);
|
|
39
|
+
static const auto fieldBearing = clazz->getField<double>("bearing");
|
|
40
|
+
double bearing = this->getFieldValue(fieldBearing);
|
|
41
|
+
static const auto fieldTilt = clazz->getField<double>("tilt");
|
|
42
|
+
double tilt = this->getFieldValue(fieldTilt);
|
|
43
|
+
return RNCameraChange(
|
|
44
|
+
center->toCpp(),
|
|
45
|
+
zoom,
|
|
46
|
+
bearing,
|
|
47
|
+
tilt
|
|
48
|
+
);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
public:
|
|
52
|
+
/**
|
|
53
|
+
* Create a Java/Kotlin-based struct by copying all values from the given C++ struct to Java.
|
|
54
|
+
*/
|
|
55
|
+
[[maybe_unused]]
|
|
56
|
+
static jni::local_ref<JRNCameraChange::javaobject> fromCpp(const RNCameraChange& value) {
|
|
57
|
+
using JSignature = JRNCameraChange(jni::alias_ref<JRNLatLng>, double, double, double);
|
|
58
|
+
static const auto clazz = javaClassStatic();
|
|
59
|
+
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
60
|
+
return create(
|
|
61
|
+
clazz,
|
|
62
|
+
JRNLatLng::fromCpp(value.center),
|
|
63
|
+
value.zoom,
|
|
64
|
+
value.bearing,
|
|
65
|
+
value.tilt
|
|
66
|
+
);
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
} // namespace margelo::nitro::rngooglemapsplus
|
|
@@ -42,10 +42,13 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
42
42
|
jni::local_ref<jni::JBoolean> liteMode = this->getFieldValue(fieldLiteMode);
|
|
43
43
|
static const auto fieldCamera = clazz->getField<JRNCamera>("camera");
|
|
44
44
|
jni::local_ref<JRNCamera> camera = this->getFieldValue(fieldCamera);
|
|
45
|
+
static const auto fieldBackgroundColor = clazz->getField<jni::JString>("backgroundColor");
|
|
46
|
+
jni::local_ref<jni::JString> backgroundColor = this->getFieldValue(fieldBackgroundColor);
|
|
45
47
|
return RNInitialProps(
|
|
46
48
|
mapId != nullptr ? std::make_optional(mapId->toStdString()) : std::nullopt,
|
|
47
49
|
liteMode != nullptr ? std::make_optional(static_cast<bool>(liteMode->value())) : std::nullopt,
|
|
48
|
-
camera != nullptr ? std::make_optional(camera->toCpp()) : std::nullopt
|
|
50
|
+
camera != nullptr ? std::make_optional(camera->toCpp()) : std::nullopt,
|
|
51
|
+
backgroundColor != nullptr ? std::make_optional(backgroundColor->toStdString()) : std::nullopt
|
|
49
52
|
);
|
|
50
53
|
}
|
|
51
54
|
|
|
@@ -55,14 +58,15 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
55
58
|
*/
|
|
56
59
|
[[maybe_unused]]
|
|
57
60
|
static jni::local_ref<JRNInitialProps::javaobject> fromCpp(const RNInitialProps& value) {
|
|
58
|
-
using JSignature = JRNInitialProps(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JRNCamera>);
|
|
61
|
+
using JSignature = JRNInitialProps(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<JRNCamera>, jni::alias_ref<jni::JString>);
|
|
59
62
|
static const auto clazz = javaClassStatic();
|
|
60
63
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
61
64
|
return create(
|
|
62
65
|
clazz,
|
|
63
66
|
value.mapId.has_value() ? jni::make_jstring(value.mapId.value()) : nullptr,
|
|
64
67
|
value.liteMode.has_value() ? jni::JBoolean::valueOf(value.liteMode.value()) : nullptr,
|
|
65
|
-
value.camera.has_value() ? JRNCamera::fromCpp(value.camera.value()) : nullptr
|
|
68
|
+
value.camera.has_value() ? JRNCamera::fromCpp(value.camera.value()) : nullptr,
|
|
69
|
+
value.backgroundColor.has_value() ? jni::make_jstring(value.backgroundColor.value()) : nullptr
|
|
66
70
|
);
|
|
67
71
|
}
|
|
68
72
|
};
|
|
@@ -46,8 +46,6 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
46
46
|
jni::local_ref<JRNLatLng> coordinate = this->getFieldValue(fieldCoordinate);
|
|
47
47
|
static const auto fieldAnchor = clazz->getField<JRNPosition>("anchor");
|
|
48
48
|
jni::local_ref<JRNPosition> anchor = this->getFieldValue(fieldAnchor);
|
|
49
|
-
static const auto fieldShowInfoWindow = clazz->getField<jni::JBoolean>("showInfoWindow");
|
|
50
|
-
jni::local_ref<jni::JBoolean> showInfoWindow = this->getFieldValue(fieldShowInfoWindow);
|
|
51
49
|
static const auto fieldTitle = clazz->getField<jni::JString>("title");
|
|
52
50
|
jni::local_ref<jni::JString> title = this->getFieldValue(fieldTitle);
|
|
53
51
|
static const auto fieldSnippet = clazz->getField<jni::JString>("snippet");
|
|
@@ -71,7 +69,6 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
71
69
|
zIndex != nullptr ? std::make_optional(zIndex->value()) : std::nullopt,
|
|
72
70
|
coordinate->toCpp(),
|
|
73
71
|
anchor != nullptr ? std::make_optional(anchor->toCpp()) : std::nullopt,
|
|
74
|
-
showInfoWindow != nullptr ? std::make_optional(static_cast<bool>(showInfoWindow->value())) : std::nullopt,
|
|
75
72
|
title != nullptr ? std::make_optional(title->toStdString()) : std::nullopt,
|
|
76
73
|
snippet != nullptr ? std::make_optional(snippet->toStdString()) : std::nullopt,
|
|
77
74
|
opacity != nullptr ? std::make_optional(opacity->value()) : std::nullopt,
|
|
@@ -90,7 +87,7 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
90
87
|
*/
|
|
91
88
|
[[maybe_unused]]
|
|
92
89
|
static jni::local_ref<JRNMarker::javaobject> fromCpp(const RNMarker& value) {
|
|
93
|
-
using JSignature = JRNMarker(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNPosition>, jni::alias_ref<jni::
|
|
90
|
+
using JSignature = JRNMarker(jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNLatLng>, jni::alias_ref<JRNPosition>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JString>, jni::alias_ref<jni::JDouble>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JBoolean>, jni::alias_ref<jni::JDouble>, jni::alias_ref<JRNPosition>, jni::alias_ref<JRNMarkerSvg>, jni::alias_ref<JRNMarkerSvg>);
|
|
94
91
|
static const auto clazz = javaClassStatic();
|
|
95
92
|
static const auto create = clazz->getStaticMethod<JSignature>("fromCpp");
|
|
96
93
|
return create(
|
|
@@ -99,7 +96,6 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
99
96
|
value.zIndex.has_value() ? jni::JDouble::valueOf(value.zIndex.value()) : nullptr,
|
|
100
97
|
JRNLatLng::fromCpp(value.coordinate),
|
|
101
98
|
value.anchor.has_value() ? JRNPosition::fromCpp(value.anchor.value()) : nullptr,
|
|
102
|
-
value.showInfoWindow.has_value() ? jni::JBoolean::valueOf(value.showInfoWindow.value()) : nullptr,
|
|
103
99
|
value.title.has_value() ? jni::make_jstring(value.title.value()) : nullptr,
|
|
104
100
|
value.snippet.has_value() ? jni::make_jstring(value.snippet.value()) : nullptr,
|
|
105
101
|
value.opacity.has_value() ? jni::JDouble::valueOf(value.opacity.value()) : nullptr,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
///
|
|
2
|
-
///
|
|
2
|
+
/// Func_void_RNRegion_RNCameraChange.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
5
|
/// Copyright © 2025 Marc Rousavy @ Margelo
|
|
@@ -22,14 +22,14 @@ import dalvik.annotation.optimization.FastNative
|
|
|
22
22
|
@DoNotStrip
|
|
23
23
|
@Keep
|
|
24
24
|
@Suppress("ClassName", "RedundantUnitReturnType")
|
|
25
|
-
fun interface
|
|
25
|
+
fun interface Func_void_RNRegion_RNCameraChange: (RNRegion, RNCameraChange) -> Unit {
|
|
26
26
|
/**
|
|
27
27
|
* Call the given JS callback.
|
|
28
28
|
* @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
|
|
29
29
|
*/
|
|
30
30
|
@DoNotStrip
|
|
31
31
|
@Keep
|
|
32
|
-
override fun invoke(region: RNRegion, camera:
|
|
32
|
+
override fun invoke(region: RNRegion, camera: RNCameraChange): Unit
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
/**
|
|
@@ -44,7 +44,7 @@ fun interface Func_void_RNRegion_RNCamera: (RNRegion, RNCamera) -> Unit {
|
|
|
44
44
|
"RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
|
|
45
45
|
"ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
|
|
46
46
|
)
|
|
47
|
-
class
|
|
47
|
+
class Func_void_RNRegion_RNCameraChange_cxx: Func_void_RNRegion_RNCameraChange {
|
|
48
48
|
@DoNotStrip
|
|
49
49
|
@Keep
|
|
50
50
|
private val mHybridData: HybridData
|
|
@@ -57,25 +57,25 @@ class Func_void_RNRegion_RNCamera_cxx: Func_void_RNRegion_RNCamera {
|
|
|
57
57
|
|
|
58
58
|
@DoNotStrip
|
|
59
59
|
@Keep
|
|
60
|
-
override fun invoke(region: RNRegion, camera:
|
|
60
|
+
override fun invoke(region: RNRegion, camera: RNCameraChange): Unit
|
|
61
61
|
= invoke_cxx(region,camera)
|
|
62
62
|
|
|
63
63
|
@FastNative
|
|
64
|
-
private external fun invoke_cxx(region: RNRegion, camera:
|
|
64
|
+
private external fun invoke_cxx(region: RNRegion, camera: RNCameraChange): Unit
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
/**
|
|
68
68
|
* Represents the JavaScript callback `(region: struct, camera: struct) => void`.
|
|
69
|
-
* This is implemented in Java/Kotlin, via a `(RNRegion,
|
|
69
|
+
* This is implemented in Java/Kotlin, via a `(RNRegion, RNCameraChange) -> Unit`.
|
|
70
70
|
* The callback is always coming from native.
|
|
71
71
|
*/
|
|
72
72
|
@DoNotStrip
|
|
73
73
|
@Keep
|
|
74
74
|
@Suppress("ClassName", "RedundantUnitReturnType", "unused")
|
|
75
|
-
class
|
|
75
|
+
class Func_void_RNRegion_RNCameraChange_java(private val function: (RNRegion, RNCameraChange) -> Unit): Func_void_RNRegion_RNCameraChange {
|
|
76
76
|
@DoNotStrip
|
|
77
77
|
@Keep
|
|
78
|
-
override fun invoke(region: RNRegion, camera:
|
|
78
|
+
override fun invoke(region: RNRegion, camera: RNCameraChange): Unit {
|
|
79
79
|
return this.function(region, camera)
|
|
80
80
|
}
|
|
81
81
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
///
|
|
2
|
-
///
|
|
2
|
+
/// Func_void_RNRegion_RNCameraChange_bool.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
5
|
/// Copyright © 2025 Marc Rousavy @ Margelo
|
|
@@ -22,14 +22,14 @@ import dalvik.annotation.optimization.FastNative
|
|
|
22
22
|
@DoNotStrip
|
|
23
23
|
@Keep
|
|
24
24
|
@Suppress("ClassName", "RedundantUnitReturnType")
|
|
25
|
-
fun interface
|
|
25
|
+
fun interface Func_void_RNRegion_RNCameraChange_bool: (RNRegion, RNCameraChange, Boolean) -> Unit {
|
|
26
26
|
/**
|
|
27
27
|
* Call the given JS callback.
|
|
28
28
|
* @throws Throwable if the JS function itself throws an error, or if the JS function/runtime has already been deleted.
|
|
29
29
|
*/
|
|
30
30
|
@DoNotStrip
|
|
31
31
|
@Keep
|
|
32
|
-
override fun invoke(region: RNRegion, camera:
|
|
32
|
+
override fun invoke(region: RNRegion, camera: RNCameraChange, isGesture: Boolean): Unit
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
/**
|
|
@@ -44,7 +44,7 @@ fun interface Func_void_RNRegion_RNCamera_bool: (RNRegion, RNCamera, Boolean) ->
|
|
|
44
44
|
"RedundantSuppression", "RedundantUnitReturnType", "FunctionName",
|
|
45
45
|
"ConvertSecondaryConstructorToPrimary", "ClassName", "LocalVariableName",
|
|
46
46
|
)
|
|
47
|
-
class
|
|
47
|
+
class Func_void_RNRegion_RNCameraChange_bool_cxx: Func_void_RNRegion_RNCameraChange_bool {
|
|
48
48
|
@DoNotStrip
|
|
49
49
|
@Keep
|
|
50
50
|
private val mHybridData: HybridData
|
|
@@ -57,25 +57,25 @@ class Func_void_RNRegion_RNCamera_bool_cxx: Func_void_RNRegion_RNCamera_bool {
|
|
|
57
57
|
|
|
58
58
|
@DoNotStrip
|
|
59
59
|
@Keep
|
|
60
|
-
override fun invoke(region: RNRegion, camera:
|
|
60
|
+
override fun invoke(region: RNRegion, camera: RNCameraChange, isGesture: Boolean): Unit
|
|
61
61
|
= invoke_cxx(region,camera,isGesture)
|
|
62
62
|
|
|
63
63
|
@FastNative
|
|
64
|
-
private external fun invoke_cxx(region: RNRegion, camera:
|
|
64
|
+
private external fun invoke_cxx(region: RNRegion, camera: RNCameraChange, isGesture: Boolean): Unit
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
/**
|
|
68
68
|
* Represents the JavaScript callback `(region: struct, camera: struct, isGesture: boolean) => void`.
|
|
69
|
-
* This is implemented in Java/Kotlin, via a `(RNRegion,
|
|
69
|
+
* This is implemented in Java/Kotlin, via a `(RNRegion, RNCameraChange, Boolean) -> Unit`.
|
|
70
70
|
* The callback is always coming from native.
|
|
71
71
|
*/
|
|
72
72
|
@DoNotStrip
|
|
73
73
|
@Keep
|
|
74
74
|
@Suppress("ClassName", "RedundantUnitReturnType", "unused")
|
|
75
|
-
class
|
|
75
|
+
class Func_void_RNRegion_RNCameraChange_bool_java(private val function: (RNRegion, RNCameraChange, Boolean) -> Unit): Func_void_RNRegion_RNCameraChange_bool {
|
|
76
76
|
@DoNotStrip
|
|
77
77
|
@Keep
|
|
78
|
-
override fun invoke(region: RNRegion, camera:
|
|
78
|
+
override fun invoke(region: RNRegion, camera: RNCameraChange, isGesture: Boolean): Unit {
|
|
79
79
|
return this.function(region, camera, isGesture)
|
|
80
80
|
}
|
|
81
81
|
}
|
|
@@ -180,13 +180,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
|
|
|
180
180
|
onMapReady = value?.let { it }
|
|
181
181
|
}
|
|
182
182
|
|
|
183
|
-
abstract var onMapLoaded: ((region: RNRegion, camera:
|
|
183
|
+
abstract var onMapLoaded: ((region: RNRegion, camera: RNCameraChange) -> Unit)?
|
|
184
184
|
|
|
185
|
-
private var onMapLoaded_cxx:
|
|
185
|
+
private var onMapLoaded_cxx: Func_void_RNRegion_RNCameraChange?
|
|
186
186
|
@Keep
|
|
187
187
|
@DoNotStrip
|
|
188
188
|
get() {
|
|
189
|
-
return onMapLoaded?.let {
|
|
189
|
+
return onMapLoaded?.let { Func_void_RNRegion_RNCameraChange_java(it) }
|
|
190
190
|
}
|
|
191
191
|
@Keep
|
|
192
192
|
@DoNotStrip
|
|
@@ -460,13 +460,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
|
|
|
460
460
|
onMyLocationButtonPress = value?.let { it }
|
|
461
461
|
}
|
|
462
462
|
|
|
463
|
-
abstract var onCameraChangeStart: ((region: RNRegion, camera:
|
|
463
|
+
abstract var onCameraChangeStart: ((region: RNRegion, camera: RNCameraChange, isGesture: Boolean) -> Unit)?
|
|
464
464
|
|
|
465
|
-
private var onCameraChangeStart_cxx:
|
|
465
|
+
private var onCameraChangeStart_cxx: Func_void_RNRegion_RNCameraChange_bool?
|
|
466
466
|
@Keep
|
|
467
467
|
@DoNotStrip
|
|
468
468
|
get() {
|
|
469
|
-
return onCameraChangeStart?.let {
|
|
469
|
+
return onCameraChangeStart?.let { Func_void_RNRegion_RNCameraChange_bool_java(it) }
|
|
470
470
|
}
|
|
471
471
|
@Keep
|
|
472
472
|
@DoNotStrip
|
|
@@ -474,13 +474,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
|
|
|
474
474
|
onCameraChangeStart = value?.let { it }
|
|
475
475
|
}
|
|
476
476
|
|
|
477
|
-
abstract var onCameraChange: ((region: RNRegion, camera:
|
|
477
|
+
abstract var onCameraChange: ((region: RNRegion, camera: RNCameraChange, isGesture: Boolean) -> Unit)?
|
|
478
478
|
|
|
479
|
-
private var onCameraChange_cxx:
|
|
479
|
+
private var onCameraChange_cxx: Func_void_RNRegion_RNCameraChange_bool?
|
|
480
480
|
@Keep
|
|
481
481
|
@DoNotStrip
|
|
482
482
|
get() {
|
|
483
|
-
return onCameraChange?.let {
|
|
483
|
+
return onCameraChange?.let { Func_void_RNRegion_RNCameraChange_bool_java(it) }
|
|
484
484
|
}
|
|
485
485
|
@Keep
|
|
486
486
|
@DoNotStrip
|
|
@@ -488,13 +488,13 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
|
|
|
488
488
|
onCameraChange = value?.let { it }
|
|
489
489
|
}
|
|
490
490
|
|
|
491
|
-
abstract var onCameraChangeComplete: ((region: RNRegion, camera:
|
|
491
|
+
abstract var onCameraChangeComplete: ((region: RNRegion, camera: RNCameraChange, isGesture: Boolean) -> Unit)?
|
|
492
492
|
|
|
493
|
-
private var onCameraChangeComplete_cxx:
|
|
493
|
+
private var onCameraChangeComplete_cxx: Func_void_RNRegion_RNCameraChange_bool?
|
|
494
494
|
@Keep
|
|
495
495
|
@DoNotStrip
|
|
496
496
|
get() {
|
|
497
|
-
return onCameraChangeComplete?.let {
|
|
497
|
+
return onCameraChangeComplete?.let { Func_void_RNRegion_RNCameraChange_bool_java(it) }
|
|
498
498
|
}
|
|
499
499
|
@Keep
|
|
500
500
|
@DoNotStrip
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNCameraChange.kt
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// RNCameraChange.kt
|
|
3
|
+
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
|
+
/// https://github.com/mrousavy/nitro
|
|
5
|
+
/// Copyright © 2025 Marc Rousavy @ Margelo
|
|
6
|
+
///
|
|
7
|
+
|
|
8
|
+
package com.rngooglemapsplus
|
|
9
|
+
|
|
10
|
+
import androidx.annotation.Keep
|
|
11
|
+
import com.facebook.proguard.annotations.DoNotStrip
|
|
12
|
+
import com.margelo.nitro.core.*
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* Represents the JavaScript object/struct "RNCameraChange".
|
|
17
|
+
*/
|
|
18
|
+
@DoNotStrip
|
|
19
|
+
@Keep
|
|
20
|
+
data class RNCameraChange(
|
|
21
|
+
@DoNotStrip
|
|
22
|
+
@Keep
|
|
23
|
+
val center: RNLatLng,
|
|
24
|
+
@DoNotStrip
|
|
25
|
+
@Keep
|
|
26
|
+
val zoom: Double,
|
|
27
|
+
@DoNotStrip
|
|
28
|
+
@Keep
|
|
29
|
+
val bearing: Double,
|
|
30
|
+
@DoNotStrip
|
|
31
|
+
@Keep
|
|
32
|
+
val tilt: Double
|
|
33
|
+
) {
|
|
34
|
+
private companion object {
|
|
35
|
+
/**
|
|
36
|
+
* Constructor called from C++
|
|
37
|
+
*/
|
|
38
|
+
@DoNotStrip
|
|
39
|
+
@Keep
|
|
40
|
+
@Suppress("unused")
|
|
41
|
+
@JvmStatic
|
|
42
|
+
private fun fromCpp(center: RNLatLng, zoom: Double, bearing: Double, tilt: Double): RNCameraChange {
|
|
43
|
+
return RNCameraChange(center, zoom, bearing, tilt)
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/RNInitialProps.kt
CHANGED
|
@@ -26,7 +26,10 @@ data class RNInitialProps(
|
|
|
26
26
|
val liteMode: Boolean?,
|
|
27
27
|
@DoNotStrip
|
|
28
28
|
@Keep
|
|
29
|
-
val camera: RNCamera
|
|
29
|
+
val camera: RNCamera?,
|
|
30
|
+
@DoNotStrip
|
|
31
|
+
@Keep
|
|
32
|
+
val backgroundColor: String?
|
|
30
33
|
) {
|
|
31
34
|
private companion object {
|
|
32
35
|
/**
|
|
@@ -36,8 +39,8 @@ data class RNInitialProps(
|
|
|
36
39
|
@Keep
|
|
37
40
|
@Suppress("unused")
|
|
38
41
|
@JvmStatic
|
|
39
|
-
private fun fromCpp(mapId: String?, liteMode: Boolean?, camera: RNCamera?): RNInitialProps {
|
|
40
|
-
return RNInitialProps(mapId, liteMode, camera)
|
|
42
|
+
private fun fromCpp(mapId: String?, liteMode: Boolean?, camera: RNCamera?, backgroundColor: String?): RNInitialProps {
|
|
43
|
+
return RNInitialProps(mapId, liteMode, camera, backgroundColor)
|
|
41
44
|
}
|
|
42
45
|
}
|
|
43
46
|
}
|
|
@@ -32,9 +32,6 @@ data class RNMarker(
|
|
|
32
32
|
val anchor: RNPosition?,
|
|
33
33
|
@DoNotStrip
|
|
34
34
|
@Keep
|
|
35
|
-
val showInfoWindow: Boolean?,
|
|
36
|
-
@DoNotStrip
|
|
37
|
-
@Keep
|
|
38
35
|
val title: String?,
|
|
39
36
|
@DoNotStrip
|
|
40
37
|
@Keep
|
|
@@ -69,8 +66,8 @@ data class RNMarker(
|
|
|
69
66
|
@Keep
|
|
70
67
|
@Suppress("unused")
|
|
71
68
|
@JvmStatic
|
|
72
|
-
private fun fromCpp(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?,
|
|
73
|
-
return RNMarker(id, zIndex, coordinate, anchor,
|
|
69
|
+
private fun fromCpp(id: String, zIndex: Double?, coordinate: RNLatLng, anchor: RNPosition?, title: String?, snippet: String?, opacity: Double?, flat: Boolean?, draggable: Boolean?, rotation: Double?, infoWindowAnchor: RNPosition?, iconSvg: RNMarkerSvg?, infoWindowIconSvg: RNMarkerSvg?): RNMarker {
|
|
70
|
+
return RNMarker(id, zIndex, coordinate, anchor, title, snippet, opacity, flat, draggable, rotation, infoWindowAnchor, iconSvg, infoWindowIconSvg)
|
|
74
71
|
}
|
|
75
72
|
}
|
|
76
73
|
}
|