react-native-google-maps-plus 1.10.3-dev.1 → 1.11.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/RNGoogleMapsPlus.podspec +1 -1
- package/android/gradle.properties +2 -2
- package/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt +8 -0
- package/android/src/main/java/com/rngooglemapsplus/RNGoogleMapsPlusView.kt +7 -0
- package/ios/GoogleMapViewImpl.swift +10 -0
- package/ios/RNGoogleMapsPlusView.swift +4 -0
- package/lib/nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json +1 -0
- package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts +2 -0
- package/lib/typescript/src/RNGoogleMapsPlusView.nitro.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.cpp +9 -0
- package/nitrogen/generated/android/c++/JHybridRNGoogleMapsPlusViewSpec.hpp +2 -0
- package/nitrogen/generated/android/c++/views/JHybridRNGoogleMapsPlusViewStateUpdater.cpp +4 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/rngooglemapsplus/HybridRNGoogleMapsPlusViewSpec.kt +6 -0
- package/nitrogen/generated/ios/c++/HybridRNGoogleMapsPlusViewSpecSwift.hpp +7 -0
- package/nitrogen/generated/ios/c++/views/HybridRNGoogleMapsPlusViewComponent.mm +5 -0
- package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec.swift +1 -0
- package/nitrogen/generated/ios/swift/HybridRNGoogleMapsPlusViewSpec_cxx.swift +24 -0
- package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.cpp +2 -0
- package/nitrogen/generated/shared/c++/HybridRNGoogleMapsPlusViewSpec.hpp +2 -0
- package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.cpp +12 -0
- package/nitrogen/generated/shared/c++/views/HybridRNGoogleMapsPlusViewComponent.hpp +1 -0
- package/nitrogen/generated/shared/json/RNGoogleMapsPlusViewConfig.json +1 -0
- package/package.json +1 -1
- package/src/RNGoogleMapsPlusView.nitro.ts +3 -0
package/RNGoogleMapsPlus.podspec
CHANGED
|
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
|
|
|
25
25
|
s.dependency 'React-callinvoker'
|
|
26
26
|
|
|
27
27
|
s.dependency 'GoogleMaps', '10.7.0'
|
|
28
|
-
s.dependency 'Google-Maps-iOS-Utils', '
|
|
28
|
+
s.dependency 'Google-Maps-iOS-Utils', '7.0.0'
|
|
29
29
|
s.dependency 'SVGKit', '3.0.0'
|
|
30
30
|
|
|
31
31
|
load 'nitrogen/generated/ios/RNGoogleMapsPlus+autolinking.rb'
|
|
@@ -3,7 +3,7 @@ RNGoogleMapsPlus_minSdkVersion=26
|
|
|
3
3
|
RNGoogleMapsPlus_targetSdkVersion=36
|
|
4
4
|
RNGoogleMapsPlus_compileSdkVersion=36
|
|
5
5
|
RNGoogleMapsPlus_ndkVersion=27.1.12297006
|
|
6
|
-
RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.
|
|
7
|
-
RNGoogleMapsPlus_googlePlayServicesMapsVersion=
|
|
6
|
+
RNGoogleMapsPlus_googlePlayServicesBaseVersion=18.10.0
|
|
7
|
+
RNGoogleMapsPlus_googlePlayServicesMapsVersion=20.0.0
|
|
8
8
|
RNGoogleMapsPlus_googlePlayServicesLocationVersion=21.3.0
|
|
9
9
|
RNGoogleMapsPlus_mapsUtilsVersion=3.20.1
|
|
@@ -236,6 +236,7 @@ class GoogleMapsViewImpl(
|
|
|
236
236
|
buildingEnabled = buildingEnabled
|
|
237
237
|
trafficEnabled = trafficEnabled
|
|
238
238
|
indoorEnabled = indoorEnabled
|
|
239
|
+
transitEnabled = transitEnabled
|
|
239
240
|
customMapStyle = customMapStyle
|
|
240
241
|
mapType = mapType
|
|
241
242
|
userInterfaceStyle = userInterfaceStyle
|
|
@@ -332,6 +333,12 @@ class GoogleMapsViewImpl(
|
|
|
332
333
|
onUi { googleMap?.isIndoorEnabled = value ?: false }
|
|
333
334
|
}
|
|
334
335
|
|
|
336
|
+
var transitEnabled: Boolean? = null
|
|
337
|
+
set(value) {
|
|
338
|
+
field = value
|
|
339
|
+
onUi { googleMap?.isTransitEnabled = value ?: false }
|
|
340
|
+
}
|
|
341
|
+
|
|
335
342
|
var customMapStyle: MapStyleOptions? = null
|
|
336
343
|
set(value) {
|
|
337
344
|
field = value
|
|
@@ -834,6 +841,7 @@ class GoogleMapsViewImpl(
|
|
|
834
841
|
setInfoWindowAdapter(null)
|
|
835
842
|
isTrafficEnabled = false
|
|
836
843
|
isIndoorEnabled = false
|
|
844
|
+
isTransitEnabled = false
|
|
837
845
|
myLocationEnabled = false
|
|
838
846
|
setLocationSource(null)
|
|
839
847
|
setLatLngBoundsForCameraTarget(null)
|
|
@@ -90,6 +90,13 @@ class RNGoogleMapsPlusView(
|
|
|
90
90
|
view.indoorEnabled = value
|
|
91
91
|
}
|
|
92
92
|
|
|
93
|
+
override var transitEnabled: Boolean? = null
|
|
94
|
+
set(value) {
|
|
95
|
+
if (field == value) return
|
|
96
|
+
field = value
|
|
97
|
+
view.transitEnabled = value
|
|
98
|
+
}
|
|
99
|
+
|
|
93
100
|
override var customMapStyle: String? = null
|
|
94
101
|
set(value) {
|
|
95
102
|
if (field == value) return
|
|
@@ -132,6 +132,7 @@ GMSIndoorDisplayDelegate {
|
|
|
132
132
|
({ self.buildingEnabled = self.buildingEnabled })()
|
|
133
133
|
({ self.trafficEnabled = self.trafficEnabled })()
|
|
134
134
|
({ self.indoorEnabled = self.indoorEnabled })()
|
|
135
|
+
({ self.transitEnabled = self.transitEnabled })()
|
|
135
136
|
({ self.customMapStyle = self.customMapStyle })()
|
|
136
137
|
({ self.mapType = self.mapType })()
|
|
137
138
|
({ self.userInterfaceStyle = self.userInterfaceStyle })()
|
|
@@ -247,6 +248,14 @@ GMSIndoorDisplayDelegate {
|
|
|
247
248
|
}
|
|
248
249
|
}
|
|
249
250
|
|
|
251
|
+
var transitEnabled: Bool? {
|
|
252
|
+
didSet {
|
|
253
|
+
onMain {
|
|
254
|
+
self.mapView?.isTransitEnabled = self.transitEnabled ?? false
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
|
|
250
259
|
var customMapStyle: GMSMapStyle? {
|
|
251
260
|
didSet {
|
|
252
261
|
onMain {
|
|
@@ -772,6 +781,7 @@ GMSIndoorDisplayDelegate {
|
|
|
772
781
|
self.mapView?.clear()
|
|
773
782
|
self.mapView?.isTrafficEnabled = false
|
|
774
783
|
self.mapView?.isIndoorEnabled = false
|
|
784
|
+
self.mapView?.isTransitEnabled = false
|
|
775
785
|
self.mapView?.isMyLocationEnabled = false
|
|
776
786
|
self.mapView?.cameraTargetBounds = nil
|
|
777
787
|
self.mapView?.layer.removeAllAnimations()
|
|
@@ -70,6 +70,10 @@ final class RNGoogleMapsPlusView: HybridRNGoogleMapsPlusViewSpec {
|
|
|
70
70
|
didSet { impl.indoorEnabled = indoorEnabled }
|
|
71
71
|
}
|
|
72
72
|
|
|
73
|
+
var transitEnabled: Bool? {
|
|
74
|
+
didSet { impl.transitEnabled = transitEnabled }
|
|
75
|
+
}
|
|
76
|
+
|
|
73
77
|
var customMapStyle: String? {
|
|
74
78
|
didSet {
|
|
75
79
|
if let value = customMapStyle {
|
|
@@ -18,6 +18,8 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
|
|
|
18
18
|
trafficEnabled?: boolean;
|
|
19
19
|
/** Enables indoor maps. */
|
|
20
20
|
indoorEnabled?: boolean;
|
|
21
|
+
/** Enables transit layer. */
|
|
22
|
+
transitEnabled?: boolean;
|
|
21
23
|
/**
|
|
22
24
|
* JSON map style string.
|
|
23
25
|
* Must be a Google Maps StyleSpec JSON.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RNGoogleMapsPlusView.nitro.d.ts","sourceRoot":"","sources":["../../../src/RNGoogleMapsPlusView.nitro.ts"],"names":[],"mappings":"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"}
|
|
@@ -291,6 +291,15 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
291
291
|
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* indoorEnabled */)>("setIndoorEnabled");
|
|
292
292
|
method(_javaPart, indoorEnabled.has_value() ? jni::JBoolean::valueOf(indoorEnabled.value()) : nullptr);
|
|
293
293
|
}
|
|
294
|
+
std::optional<bool> JHybridRNGoogleMapsPlusViewSpec::getTransitEnabled() {
|
|
295
|
+
static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JBoolean>()>("getTransitEnabled");
|
|
296
|
+
auto __result = method(_javaPart);
|
|
297
|
+
return __result != nullptr ? std::make_optional(static_cast<bool>(__result->value())) : std::nullopt;
|
|
298
|
+
}
|
|
299
|
+
void JHybridRNGoogleMapsPlusViewSpec::setTransitEnabled(std::optional<bool> transitEnabled) {
|
|
300
|
+
static const auto method = javaClassStatic()->getMethod<void(jni::alias_ref<jni::JBoolean> /* transitEnabled */)>("setTransitEnabled");
|
|
301
|
+
method(_javaPart, transitEnabled.has_value() ? jni::JBoolean::valueOf(transitEnabled.value()) : nullptr);
|
|
302
|
+
}
|
|
294
303
|
std::optional<std::string> JHybridRNGoogleMapsPlusViewSpec::getCustomMapStyle() {
|
|
295
304
|
static const auto method = javaClassStatic()->getMethod<jni::local_ref<jni::JString>()>("getCustomMapStyle");
|
|
296
305
|
auto __result = method(_javaPart);
|
|
@@ -62,6 +62,8 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
62
62
|
void setTrafficEnabled(std::optional<bool> trafficEnabled) override;
|
|
63
63
|
std::optional<bool> getIndoorEnabled() override;
|
|
64
64
|
void setIndoorEnabled(std::optional<bool> indoorEnabled) override;
|
|
65
|
+
std::optional<bool> getTransitEnabled() override;
|
|
66
|
+
void setTransitEnabled(std::optional<bool> transitEnabled) override;
|
|
65
67
|
std::optional<std::string> getCustomMapStyle() override;
|
|
66
68
|
void setCustomMapStyle(const std::optional<std::string>& customMapStyle) override;
|
|
67
69
|
std::optional<RNUserInterfaceStyle> getUserInterfaceStyle() override;
|
|
@@ -60,6 +60,10 @@ void JHybridRNGoogleMapsPlusViewStateUpdater::updateViewProps(jni::alias_ref<jni
|
|
|
60
60
|
view->setIndoorEnabled(props.indoorEnabled.value);
|
|
61
61
|
// TODO: Set isDirty = false
|
|
62
62
|
}
|
|
63
|
+
if (props.transitEnabled.isDirty) {
|
|
64
|
+
view->setTransitEnabled(props.transitEnabled.value);
|
|
65
|
+
// TODO: Set isDirty = false
|
|
66
|
+
}
|
|
63
67
|
if (props.customMapStyle.isDirty) {
|
|
64
68
|
view->setCustomMapStyle(props.customMapStyle.value);
|
|
65
69
|
// TODO: Set isDirty = false
|
|
@@ -79,6 +79,12 @@ abstract class HybridRNGoogleMapsPlusViewSpec: HybridView() {
|
|
|
79
79
|
@set:Keep
|
|
80
80
|
abstract var indoorEnabled: Boolean?
|
|
81
81
|
|
|
82
|
+
@get:DoNotStrip
|
|
83
|
+
@get:Keep
|
|
84
|
+
@set:DoNotStrip
|
|
85
|
+
@set:Keep
|
|
86
|
+
abstract var transitEnabled: Boolean?
|
|
87
|
+
|
|
82
88
|
@get:DoNotStrip
|
|
83
89
|
@get:Keep
|
|
84
90
|
@set:DoNotStrip
|
|
@@ -236,6 +236,13 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
236
236
|
inline void setIndoorEnabled(std::optional<bool> indoorEnabled) noexcept override {
|
|
237
237
|
_swiftPart.setIndoorEnabled(indoorEnabled);
|
|
238
238
|
}
|
|
239
|
+
inline std::optional<bool> getTransitEnabled() noexcept override {
|
|
240
|
+
auto __result = _swiftPart.getTransitEnabled();
|
|
241
|
+
return __result;
|
|
242
|
+
}
|
|
243
|
+
inline void setTransitEnabled(std::optional<bool> transitEnabled) noexcept override {
|
|
244
|
+
_swiftPart.setTransitEnabled(transitEnabled);
|
|
245
|
+
}
|
|
239
246
|
inline std::optional<std::string> getCustomMapStyle() noexcept override {
|
|
240
247
|
auto __result = _swiftPart.getCustomMapStyle();
|
|
241
248
|
return __result;
|
|
@@ -116,6 +116,11 @@ using namespace margelo::nitro::rngooglemapsplus::views;
|
|
|
116
116
|
swiftPart.setIndoorEnabled(newViewProps.indoorEnabled.value);
|
|
117
117
|
newViewProps.indoorEnabled.isDirty = false;
|
|
118
118
|
}
|
|
119
|
+
// transitEnabled: optional
|
|
120
|
+
if (newViewProps.transitEnabled.isDirty) {
|
|
121
|
+
swiftPart.setTransitEnabled(newViewProps.transitEnabled.value);
|
|
122
|
+
newViewProps.transitEnabled.isDirty = false;
|
|
123
|
+
}
|
|
119
124
|
// customMapStyle: optional
|
|
120
125
|
if (newViewProps.customMapStyle.isDirty) {
|
|
121
126
|
swiftPart.setCustomMapStyle(newViewProps.customMapStyle.value);
|
|
@@ -17,6 +17,7 @@ public protocol HybridRNGoogleMapsPlusViewSpec_protocol: HybridObject, HybridVie
|
|
|
17
17
|
var buildingEnabled: Bool? { get set }
|
|
18
18
|
var trafficEnabled: Bool? { get set }
|
|
19
19
|
var indoorEnabled: Bool? { get set }
|
|
20
|
+
var transitEnabled: Bool? { get set }
|
|
20
21
|
var customMapStyle: String? { get set }
|
|
21
22
|
var userInterfaceStyle: RNUserInterfaceStyle? { get set }
|
|
22
23
|
var mapZoomConfig: RNMapZoomConfig? { get set }
|
|
@@ -244,6 +244,30 @@ open class HybridRNGoogleMapsPlusViewSpec_cxx {
|
|
|
244
244
|
}
|
|
245
245
|
}
|
|
246
246
|
|
|
247
|
+
public final var transitEnabled: bridge.std__optional_bool_ {
|
|
248
|
+
@inline(__always)
|
|
249
|
+
get {
|
|
250
|
+
return { () -> bridge.std__optional_bool_ in
|
|
251
|
+
if let __unwrappedValue = self.__implementation.transitEnabled {
|
|
252
|
+
return bridge.create_std__optional_bool_(__unwrappedValue)
|
|
253
|
+
} else {
|
|
254
|
+
return .init()
|
|
255
|
+
}
|
|
256
|
+
}()
|
|
257
|
+
}
|
|
258
|
+
@inline(__always)
|
|
259
|
+
set {
|
|
260
|
+
self.__implementation.transitEnabled = { () -> Bool? in
|
|
261
|
+
if bridge.has_value_std__optional_bool_(newValue) {
|
|
262
|
+
let __unwrapped = bridge.get_std__optional_bool_(newValue)
|
|
263
|
+
return __unwrapped
|
|
264
|
+
} else {
|
|
265
|
+
return nil
|
|
266
|
+
}
|
|
267
|
+
}()
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
|
|
247
271
|
public final var customMapStyle: bridge.std__optional_std__string_ {
|
|
248
272
|
@inline(__always)
|
|
249
273
|
get {
|
|
@@ -26,6 +26,8 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
26
26
|
prototype.registerHybridSetter("trafficEnabled", &HybridRNGoogleMapsPlusViewSpec::setTrafficEnabled);
|
|
27
27
|
prototype.registerHybridGetter("indoorEnabled", &HybridRNGoogleMapsPlusViewSpec::getIndoorEnabled);
|
|
28
28
|
prototype.registerHybridSetter("indoorEnabled", &HybridRNGoogleMapsPlusViewSpec::setIndoorEnabled);
|
|
29
|
+
prototype.registerHybridGetter("transitEnabled", &HybridRNGoogleMapsPlusViewSpec::getTransitEnabled);
|
|
30
|
+
prototype.registerHybridSetter("transitEnabled", &HybridRNGoogleMapsPlusViewSpec::setTransitEnabled);
|
|
29
31
|
prototype.registerHybridGetter("customMapStyle", &HybridRNGoogleMapsPlusViewSpec::getCustomMapStyle);
|
|
30
32
|
prototype.registerHybridSetter("customMapStyle", &HybridRNGoogleMapsPlusViewSpec::setCustomMapStyle);
|
|
31
33
|
prototype.registerHybridGetter("userInterfaceStyle", &HybridRNGoogleMapsPlusViewSpec::getUserInterfaceStyle);
|
|
@@ -137,6 +137,8 @@ namespace margelo::nitro::rngooglemapsplus {
|
|
|
137
137
|
virtual void setTrafficEnabled(std::optional<bool> trafficEnabled) = 0;
|
|
138
138
|
virtual std::optional<bool> getIndoorEnabled() = 0;
|
|
139
139
|
virtual void setIndoorEnabled(std::optional<bool> indoorEnabled) = 0;
|
|
140
|
+
virtual std::optional<bool> getTransitEnabled() = 0;
|
|
141
|
+
virtual void setTransitEnabled(std::optional<bool> transitEnabled) = 0;
|
|
140
142
|
virtual std::optional<std::string> getCustomMapStyle() = 0;
|
|
141
143
|
virtual void setCustomMapStyle(const std::optional<std::string>& customMapStyle) = 0;
|
|
142
144
|
virtual std::optional<RNUserInterfaceStyle> getUserInterfaceStyle() = 0;
|
|
@@ -86,6 +86,16 @@ namespace margelo::nitro::rngooglemapsplus::views {
|
|
|
86
86
|
throw std::runtime_error(std::string("RNGoogleMapsPlusView.indoorEnabled: ") + exc.what());
|
|
87
87
|
}
|
|
88
88
|
}()),
|
|
89
|
+
transitEnabled([&]() -> CachedProp<std::optional<bool>> {
|
|
90
|
+
try {
|
|
91
|
+
const react::RawValue* rawValue = rawProps.at("transitEnabled", nullptr, nullptr);
|
|
92
|
+
if (rawValue == nullptr) return sourceProps.transitEnabled;
|
|
93
|
+
const auto& [runtime, value] = (std::pair<jsi::Runtime*, jsi::Value>)*rawValue;
|
|
94
|
+
return CachedProp<std::optional<bool>>::fromRawValue(*runtime, value, sourceProps.transitEnabled);
|
|
95
|
+
} catch (const std::exception& exc) {
|
|
96
|
+
throw std::runtime_error(std::string("RNGoogleMapsPlusView.transitEnabled: ") + exc.what());
|
|
97
|
+
}
|
|
98
|
+
}()),
|
|
89
99
|
customMapStyle([&]() -> CachedProp<std::optional<std::string>> {
|
|
90
100
|
try {
|
|
91
101
|
const react::RawValue* rawValue = rawProps.at("customMapStyle", nullptr, nullptr);
|
|
@@ -485,6 +495,7 @@ namespace margelo::nitro::rngooglemapsplus::views {
|
|
|
485
495
|
buildingEnabled(other.buildingEnabled),
|
|
486
496
|
trafficEnabled(other.trafficEnabled),
|
|
487
497
|
indoorEnabled(other.indoorEnabled),
|
|
498
|
+
transitEnabled(other.transitEnabled),
|
|
488
499
|
customMapStyle(other.customMapStyle),
|
|
489
500
|
userInterfaceStyle(other.userInterfaceStyle),
|
|
490
501
|
mapZoomConfig(other.mapZoomConfig),
|
|
@@ -533,6 +544,7 @@ namespace margelo::nitro::rngooglemapsplus::views {
|
|
|
533
544
|
case hashString("buildingEnabled"): return true;
|
|
534
545
|
case hashString("trafficEnabled"): return true;
|
|
535
546
|
case hashString("indoorEnabled"): return true;
|
|
547
|
+
case hashString("transitEnabled"): return true;
|
|
536
548
|
case hashString("customMapStyle"): return true;
|
|
537
549
|
case hashString("userInterfaceStyle"): return true;
|
|
538
550
|
case hashString("mapZoomConfig"): return true;
|
|
@@ -72,6 +72,7 @@ namespace margelo::nitro::rngooglemapsplus::views {
|
|
|
72
72
|
CachedProp<std::optional<bool>> buildingEnabled;
|
|
73
73
|
CachedProp<std::optional<bool>> trafficEnabled;
|
|
74
74
|
CachedProp<std::optional<bool>> indoorEnabled;
|
|
75
|
+
CachedProp<std::optional<bool>> transitEnabled;
|
|
75
76
|
CachedProp<std::optional<std::string>> customMapStyle;
|
|
76
77
|
CachedProp<std::optional<RNUserInterfaceStyle>> userInterfaceStyle;
|
|
77
78
|
CachedProp<std::optional<RNMapZoomConfig>> mapZoomConfig;
|
package/package.json
CHANGED
|
@@ -56,6 +56,9 @@ export interface RNGoogleMapsPlusViewProps extends HybridViewProps {
|
|
|
56
56
|
/** Enables indoor maps. */
|
|
57
57
|
indoorEnabled?: boolean;
|
|
58
58
|
|
|
59
|
+
/** Enables transit layer. */
|
|
60
|
+
transitEnabled?: boolean;
|
|
61
|
+
|
|
59
62
|
/**
|
|
60
63
|
* JSON map style string.
|
|
61
64
|
* Must be a Google Maps StyleSpec JSON.
|