@onekeyfe/react-native-segment-slider 3.0.86-alpha.0 → 3.0.87
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/README.md +3 -13
- package/android/src/main/java/com/margelo/nitro/segmentslider/HybridSegmentSlider.kt +7 -31
- package/ios/HybridSegmentSlider.swift +8 -34
- package/lib/nitrogen/generated/android/c++/JFunc_void.hpp +3 -3
- package/lib/nitrogen/generated/android/c++/JFunc_void_double.hpp +3 -3
- package/lib/nitrogen/generated/android/c++/JHybridSegmentSliderSpec.cpp +63 -71
- package/lib/nitrogen/generated/android/c++/JHybridSegmentSliderSpec.hpp +20 -24
- package/lib/nitrogen/generated/android/c++/views/JHybridSegmentSliderStateUpdater.cpp +77 -81
- package/lib/nitrogen/generated/android/c++/views/JHybridSegmentSliderStateUpdater.hpp +4 -4
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/Func_void.kt +1 -3
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/Func_void_double.kt +1 -3
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/HybridSegmentSliderSpec.kt +19 -25
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/segmentsliderOnLoad.kt +1 -1
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/views/HybridSegmentSliderManager.kt +40 -10
- package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/views/HybridSegmentSliderStateUpdater.kt +1 -1
- package/lib/nitrogen/generated/android/segmentslider+autolinking.cmake +1 -1
- package/lib/nitrogen/generated/android/segmentslider+autolinking.gradle +1 -1
- package/lib/nitrogen/generated/android/segmentsliderOnLoad.cpp +30 -20
- package/lib/nitrogen/generated/android/segmentsliderOnLoad.hpp +14 -5
- package/lib/nitrogen/generated/ios/SegmentSlider+autolinking.rb +4 -2
- package/lib/nitrogen/generated/ios/SegmentSlider-Swift-Cxx-Bridge.cpp +1 -1
- package/lib/nitrogen/generated/ios/SegmentSlider-Swift-Cxx-Bridge.hpp +3 -3
- package/lib/nitrogen/generated/ios/SegmentSlider-Swift-Cxx-Umbrella.hpp +1 -1
- package/lib/nitrogen/generated/ios/SegmentSliderAutolinking.mm +1 -1
- package/lib/nitrogen/generated/ios/SegmentSliderAutolinking.swift +9 -8
- package/lib/nitrogen/generated/ios/c++/HybridSegmentSliderSpecSwift.cpp +1 -1
- package/lib/nitrogen/generated/ios/c++/HybridSegmentSliderSpecSwift.hpp +7 -7
- package/lib/nitrogen/generated/ios/c++/views/HybridSegmentSliderComponent.mm +27 -6
- package/lib/nitrogen/generated/ios/swift/Func_void.swift +1 -2
- package/lib/nitrogen/generated/ios/swift/Func_void_double.swift +1 -2
- package/lib/nitrogen/generated/ios/swift/HybridSegmentSliderSpec.swift +3 -5
- package/lib/nitrogen/generated/ios/swift/HybridSegmentSliderSpec_cxx.swift +18 -13
- package/lib/nitrogen/generated/shared/c++/HybridSegmentSliderSpec.cpp +1 -3
- package/lib/nitrogen/generated/shared/c++/HybridSegmentSliderSpec.hpp +1 -3
- package/lib/nitrogen/generated/shared/c++/views/HybridSegmentSliderComponent.cpp +11 -47
- package/lib/nitrogen/generated/shared/c++/views/HybridSegmentSliderComponent.hpp +9 -7
- package/lib/nitrogen/generated/shared/json/SegmentSliderConfig.json +0 -1
- package/lib/typescript/src/SegmentSlider.nitro.d.ts +0 -8
- package/lib/typescript/src/SegmentSlider.nitro.d.ts.map +1 -1
- package/nitrogen/generated/android/c++/JFunc_void.hpp +3 -3
- package/nitrogen/generated/android/c++/JFunc_void_double.hpp +3 -3
- package/nitrogen/generated/android/c++/JHybridSegmentSliderSpec.cpp +63 -71
- package/nitrogen/generated/android/c++/JHybridSegmentSliderSpec.hpp +20 -24
- package/nitrogen/generated/android/c++/views/JHybridSegmentSliderStateUpdater.cpp +77 -81
- package/nitrogen/generated/android/c++/views/JHybridSegmentSliderStateUpdater.hpp +4 -4
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/Func_void.kt +1 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/Func_void_double.kt +1 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/HybridSegmentSliderSpec.kt +19 -25
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/segmentsliderOnLoad.kt +1 -1
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/views/HybridSegmentSliderManager.kt +40 -10
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/views/HybridSegmentSliderStateUpdater.kt +1 -1
- package/nitrogen/generated/android/segmentslider+autolinking.cmake +1 -1
- package/nitrogen/generated/android/segmentslider+autolinking.gradle +1 -1
- package/nitrogen/generated/android/segmentsliderOnLoad.cpp +30 -20
- package/nitrogen/generated/android/segmentsliderOnLoad.hpp +14 -5
- package/nitrogen/generated/ios/SegmentSlider+autolinking.rb +4 -2
- package/nitrogen/generated/ios/SegmentSlider-Swift-Cxx-Bridge.cpp +1 -1
- package/nitrogen/generated/ios/SegmentSlider-Swift-Cxx-Bridge.hpp +3 -3
- package/nitrogen/generated/ios/SegmentSlider-Swift-Cxx-Umbrella.hpp +1 -1
- package/nitrogen/generated/ios/SegmentSliderAutolinking.mm +1 -1
- package/nitrogen/generated/ios/SegmentSliderAutolinking.swift +9 -8
- package/nitrogen/generated/ios/c++/HybridSegmentSliderSpecSwift.cpp +1 -1
- package/nitrogen/generated/ios/c++/HybridSegmentSliderSpecSwift.hpp +7 -7
- package/nitrogen/generated/ios/c++/views/HybridSegmentSliderComponent.mm +27 -6
- package/nitrogen/generated/ios/swift/Func_void.swift +1 -2
- package/nitrogen/generated/ios/swift/Func_void_double.swift +1 -2
- package/nitrogen/generated/ios/swift/HybridSegmentSliderSpec.swift +3 -5
- package/nitrogen/generated/ios/swift/HybridSegmentSliderSpec_cxx.swift +18 -13
- package/nitrogen/generated/shared/c++/HybridSegmentSliderSpec.cpp +1 -3
- package/nitrogen/generated/shared/c++/HybridSegmentSliderSpec.hpp +1 -3
- package/nitrogen/generated/shared/c++/views/HybridSegmentSliderComponent.cpp +11 -47
- package/nitrogen/generated/shared/c++/views/HybridSegmentSliderComponent.hpp +9 -7
- package/nitrogen/generated/shared/json/SegmentSliderConfig.json +0 -1
- package/package.json +4 -4
- package/src/SegmentSlider.nitro.ts +1 -12
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// HybridSegmentSliderSpec.hpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#pragma once
|
|
@@ -18,33 +18,33 @@ namespace margelo::nitro::segmentslider {
|
|
|
18
18
|
|
|
19
19
|
using namespace facebook;
|
|
20
20
|
|
|
21
|
-
class JHybridSegmentSliderSpec: public
|
|
22
|
-
public virtual HybridSegmentSliderSpec {
|
|
21
|
+
class JHybridSegmentSliderSpec: public virtual HybridSegmentSliderSpec, public virtual JHybridObject {
|
|
23
22
|
public:
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
HybridBase
|
|
33
|
-
|
|
23
|
+
struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
|
|
24
|
+
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/segmentslider/HybridSegmentSliderSpec;";
|
|
25
|
+
std::shared_ptr<JHybridSegmentSliderSpec> getJHybridSegmentSliderSpec();
|
|
26
|
+
};
|
|
27
|
+
struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
|
|
28
|
+
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/segmentslider/HybridSegmentSliderSpec$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 JHybridSegmentSliderSpec(const jni::local_ref<JHybridSegmentSliderSpec::JavaPart>& javaPart):
|
|
38
|
+
HybridObject(HybridSegmentSliderSpec::TAG),
|
|
39
|
+
JHybridObject(javaPart),
|
|
40
|
+
_javaPart(jni::make_global(javaPart)) {}
|
|
36
41
|
~JHybridSegmentSliderSpec() 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
|
-
|
|
43
|
-
void dispose() noexcept override;
|
|
44
|
-
std::string toString() override;
|
|
45
|
-
|
|
46
|
-
public:
|
|
47
|
-
inline const jni::global_ref<JHybridSegmentSliderSpec::javaobject>& getJavaPart() const noexcept {
|
|
47
|
+
inline const jni::global_ref<JHybridSegmentSliderSpec::JavaPart>& getJavaPart() const noexcept {
|
|
48
48
|
return _javaPart;
|
|
49
49
|
}
|
|
50
50
|
|
|
@@ -68,8 +68,6 @@ namespace margelo::nitro::segmentslider {
|
|
|
68
68
|
void setCenterOrigin(bool centerOrigin) override;
|
|
69
69
|
bool getSnapTapToSegment() override;
|
|
70
70
|
void setSnapTapToSegment(bool snapTapToSegment) override;
|
|
71
|
-
bool getAlignSegmentMarksToIntegerValues() override;
|
|
72
|
-
void setAlignSegmentMarksToIntegerValues(bool alignSegmentMarksToIntegerValues) override;
|
|
73
71
|
std::string getFillColor() override;
|
|
74
72
|
void setFillColor(const std::string& fillColor) override;
|
|
75
73
|
std::string getTrackColor() override;
|
|
@@ -100,9 +98,7 @@ namespace margelo::nitro::segmentslider {
|
|
|
100
98
|
void setValue(double value) override;
|
|
101
99
|
|
|
102
100
|
private:
|
|
103
|
-
|
|
104
|
-
using HybridBase::HybridBase;
|
|
105
|
-
jni::global_ref<JHybridSegmentSliderSpec::javaobject> _javaPart;
|
|
101
|
+
jni::global_ref<JHybridSegmentSliderSpec::JavaPart> _javaPart;
|
|
106
102
|
};
|
|
107
103
|
|
|
108
104
|
} // namespace margelo::nitro::segmentslider
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
/// JHybridSegmentSliderStateUpdater.cpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#include "JHybridSegmentSliderStateUpdater.hpp"
|
|
9
9
|
#include "views/HybridSegmentSliderComponent.hpp"
|
|
10
10
|
#include <NitroModules/NitroDefines.hpp>
|
|
11
|
+
#include <react/fabric/StateWrapperImpl.h>
|
|
11
12
|
|
|
12
13
|
namespace margelo::nitro::segmentslider::views {
|
|
13
14
|
|
|
@@ -15,125 +16,120 @@ using namespace facebook;
|
|
|
15
16
|
using ConcreteStateData = react::ConcreteState<HybridSegmentSliderState>;
|
|
16
17
|
|
|
17
18
|
void JHybridSegmentSliderStateUpdater::updateViewProps(jni::alias_ref<jni::JClass> /* class */,
|
|
18
|
-
jni::alias_ref<JHybridSegmentSliderSpec::
|
|
19
|
+
jni::alias_ref<JHybridSegmentSliderSpec::JavaPart> javaView,
|
|
19
20
|
jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface) {
|
|
20
|
-
JHybridSegmentSliderSpec
|
|
21
|
+
std::shared_ptr<JHybridSegmentSliderSpec> hybridView = javaView->getJHybridSegmentSliderSpec();
|
|
21
22
|
|
|
22
23
|
// Get concrete StateWrapperImpl from passed StateWrapper interface object
|
|
23
24
|
jobject rawStateWrapper = stateWrapperInterface.get();
|
|
24
|
-
if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) {
|
|
25
|
+
if (!stateWrapperInterface->isInstanceOf(react::StateWrapperImpl::javaClassStatic())) [[unlikely]] {
|
|
25
26
|
throw std::runtime_error("StateWrapper is not a StateWrapperImpl");
|
|
26
27
|
}
|
|
27
28
|
auto stateWrapper = jni::alias_ref<react::StateWrapperImpl::javaobject>{
|
|
28
29
|
static_cast<react::StateWrapperImpl::javaobject>(rawStateWrapper)};
|
|
29
|
-
|
|
30
30
|
std::shared_ptr<const react::State> state = stateWrapper->cthis()->getState();
|
|
31
|
-
auto concreteState = std::
|
|
31
|
+
auto concreteState = std::static_pointer_cast<const ConcreteStateData>(state);
|
|
32
32
|
const HybridSegmentSliderState& data = concreteState->getData();
|
|
33
|
-
const std::
|
|
34
|
-
if (
|
|
33
|
+
const std::shared_ptr<HybridSegmentSliderProps>& props = data.getProps();
|
|
34
|
+
if (props == nullptr) [[unlikely]] {
|
|
35
35
|
// Props aren't set yet!
|
|
36
36
|
throw std::runtime_error("HybridSegmentSliderState's data doesn't contain any props!");
|
|
37
37
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
if (props.min.isDirty) {
|
|
44
|
-
view->setMin(props.min.value);
|
|
45
|
-
// TODO: Set isDirty = false
|
|
38
|
+
|
|
39
|
+
// Update all props if they are dirty
|
|
40
|
+
if (props->defaultValue.isDirty) {
|
|
41
|
+
hybridView->setDefaultValue(props->defaultValue.value);
|
|
42
|
+
props->defaultValue.isDirty = false;
|
|
46
43
|
}
|
|
47
|
-
if (props.
|
|
48
|
-
|
|
49
|
-
|
|
44
|
+
if (props->min.isDirty) {
|
|
45
|
+
hybridView->setMin(props->min.value);
|
|
46
|
+
props->min.isDirty = false;
|
|
50
47
|
}
|
|
51
|
-
if (props.
|
|
52
|
-
|
|
53
|
-
|
|
48
|
+
if (props->max.isDirty) {
|
|
49
|
+
hybridView->setMax(props->max.value);
|
|
50
|
+
props->max.isDirty = false;
|
|
54
51
|
}
|
|
55
|
-
if (props.
|
|
56
|
-
|
|
57
|
-
|
|
52
|
+
if (props->segments.isDirty) {
|
|
53
|
+
hybridView->setSegments(props->segments.value);
|
|
54
|
+
props->segments.isDirty = false;
|
|
58
55
|
}
|
|
59
|
-
if (props.
|
|
60
|
-
|
|
61
|
-
|
|
56
|
+
if (props->sliderHeight.isDirty) {
|
|
57
|
+
hybridView->setSliderHeight(props->sliderHeight.value);
|
|
58
|
+
props->sliderHeight.isDirty = false;
|
|
62
59
|
}
|
|
63
|
-
if (props.
|
|
64
|
-
|
|
65
|
-
|
|
60
|
+
if (props->disabled.isDirty) {
|
|
61
|
+
hybridView->setDisabled(props->disabled.value);
|
|
62
|
+
props->disabled.isDirty = false;
|
|
66
63
|
}
|
|
67
|
-
if (props.
|
|
68
|
-
|
|
69
|
-
|
|
64
|
+
if (props->showBubble.isDirty) {
|
|
65
|
+
hybridView->setShowBubble(props->showBubble.value);
|
|
66
|
+
props->showBubble.isDirty = false;
|
|
70
67
|
}
|
|
71
|
-
if (props.
|
|
72
|
-
|
|
73
|
-
|
|
68
|
+
if (props->centerOrigin.isDirty) {
|
|
69
|
+
hybridView->setCenterOrigin(props->centerOrigin.value);
|
|
70
|
+
props->centerOrigin.isDirty = false;
|
|
74
71
|
}
|
|
75
|
-
if (props.
|
|
76
|
-
|
|
77
|
-
|
|
72
|
+
if (props->snapTapToSegment.isDirty) {
|
|
73
|
+
hybridView->setSnapTapToSegment(props->snapTapToSegment.value);
|
|
74
|
+
props->snapTapToSegment.isDirty = false;
|
|
78
75
|
}
|
|
79
|
-
if (props
|
|
80
|
-
|
|
81
|
-
|
|
76
|
+
if (props->fillColor.isDirty) {
|
|
77
|
+
hybridView->setFillColor(props->fillColor.value);
|
|
78
|
+
props->fillColor.isDirty = false;
|
|
82
79
|
}
|
|
83
|
-
if (props
|
|
84
|
-
|
|
85
|
-
|
|
80
|
+
if (props->trackColor.isDirty) {
|
|
81
|
+
hybridView->setTrackColor(props->trackColor.value);
|
|
82
|
+
props->trackColor.isDirty = false;
|
|
86
83
|
}
|
|
87
|
-
if (props
|
|
88
|
-
|
|
89
|
-
|
|
84
|
+
if (props->thumbColor.isDirty) {
|
|
85
|
+
hybridView->setThumbColor(props->thumbColor.value);
|
|
86
|
+
props->thumbColor.isDirty = false;
|
|
90
87
|
}
|
|
91
|
-
if (props
|
|
92
|
-
|
|
93
|
-
|
|
88
|
+
if (props->thumbBorderColor.isDirty) {
|
|
89
|
+
hybridView->setThumbBorderColor(props->thumbBorderColor.value);
|
|
90
|
+
props->thumbBorderColor.isDirty = false;
|
|
94
91
|
}
|
|
95
|
-
if (props
|
|
96
|
-
|
|
97
|
-
|
|
92
|
+
if (props->markActiveColor.isDirty) {
|
|
93
|
+
hybridView->setMarkActiveColor(props->markActiveColor.value);
|
|
94
|
+
props->markActiveColor.isDirty = false;
|
|
98
95
|
}
|
|
99
|
-
if (props
|
|
100
|
-
|
|
101
|
-
|
|
96
|
+
if (props->markInactiveColor.isDirty) {
|
|
97
|
+
hybridView->setMarkInactiveColor(props->markInactiveColor.value);
|
|
98
|
+
props->markInactiveColor.isDirty = false;
|
|
102
99
|
}
|
|
103
|
-
if (props
|
|
104
|
-
|
|
105
|
-
|
|
100
|
+
if (props->markBorderColor.isDirty) {
|
|
101
|
+
hybridView->setMarkBorderColor(props->markBorderColor.value);
|
|
102
|
+
props->markBorderColor.isDirty = false;
|
|
106
103
|
}
|
|
107
|
-
if (props
|
|
108
|
-
|
|
109
|
-
|
|
104
|
+
if (props->bubbleColor.isDirty) {
|
|
105
|
+
hybridView->setBubbleColor(props->bubbleColor.value);
|
|
106
|
+
props->bubbleColor.isDirty = false;
|
|
110
107
|
}
|
|
111
|
-
if (props
|
|
112
|
-
|
|
113
|
-
|
|
108
|
+
if (props->bubbleTextColor.isDirty) {
|
|
109
|
+
hybridView->setBubbleTextColor(props->bubbleTextColor.value);
|
|
110
|
+
props->bubbleTextColor.isDirty = false;
|
|
114
111
|
}
|
|
115
|
-
if (props
|
|
116
|
-
|
|
117
|
-
|
|
112
|
+
if (props->onChange.isDirty) {
|
|
113
|
+
hybridView->setOnChange(props->onChange.value);
|
|
114
|
+
props->onChange.isDirty = false;
|
|
118
115
|
}
|
|
119
|
-
if (props
|
|
120
|
-
|
|
121
|
-
|
|
116
|
+
if (props->onSlideStart.isDirty) {
|
|
117
|
+
hybridView->setOnSlideStart(props->onSlideStart.value);
|
|
118
|
+
props->onSlideStart.isDirty = false;
|
|
122
119
|
}
|
|
123
|
-
if (props
|
|
124
|
-
|
|
125
|
-
|
|
120
|
+
if (props->onSlideComplete.isDirty) {
|
|
121
|
+
hybridView->setOnSlideComplete(props->onSlideComplete.value);
|
|
122
|
+
props->onSlideComplete.isDirty = false;
|
|
126
123
|
}
|
|
127
124
|
|
|
128
125
|
// Update hybridRef if it changed
|
|
129
|
-
if (props
|
|
126
|
+
if (props->hybridRef.isDirty) {
|
|
130
127
|
// hybridRef changed - call it with new this
|
|
131
|
-
const auto& maybeFunc = props
|
|
128
|
+
const auto& maybeFunc = props->hybridRef.value;
|
|
132
129
|
if (maybeFunc.has_value()) {
|
|
133
|
-
|
|
134
|
-
maybeFunc.value()(shared);
|
|
130
|
+
maybeFunc.value()(hybridView);
|
|
135
131
|
}
|
|
136
|
-
|
|
132
|
+
props->hybridRef.isDirty = false;
|
|
137
133
|
}
|
|
138
134
|
}
|
|
139
135
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// JHybridSegmentSliderStateUpdater.hpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#pragma once
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
#endif
|
|
13
13
|
|
|
14
14
|
#include <fbjni/fbjni.h>
|
|
15
|
-
#include <react/fabric/StateWrapperImpl.h>
|
|
16
15
|
#include <react/fabric/CoreComponentsRegistry.h>
|
|
16
|
+
#include <react/fabric/StateWrapperImpl.h>
|
|
17
17
|
#include <react/renderer/core/ConcreteComponentDescriptor.h>
|
|
18
18
|
#include <NitroModules/NitroDefines.hpp>
|
|
19
19
|
#include <NitroModules/JStateWrapper.hpp>
|
|
@@ -24,13 +24,13 @@ namespace margelo::nitro::segmentslider::views {
|
|
|
24
24
|
|
|
25
25
|
using namespace facebook;
|
|
26
26
|
|
|
27
|
-
class JHybridSegmentSliderStateUpdater: public jni::JavaClass<JHybridSegmentSliderStateUpdater> {
|
|
27
|
+
class JHybridSegmentSliderStateUpdater final: public jni::JavaClass<JHybridSegmentSliderStateUpdater> {
|
|
28
28
|
public:
|
|
29
29
|
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/segmentslider/views/HybridSegmentSliderStateUpdater;";
|
|
30
30
|
|
|
31
31
|
public:
|
|
32
32
|
static void updateViewProps(jni::alias_ref<jni::JClass> /* class */,
|
|
33
|
-
jni::alias_ref<JHybridSegmentSliderSpec::
|
|
33
|
+
jni::alias_ref<JHybridSegmentSliderSpec::JavaPart> view,
|
|
34
34
|
jni::alias_ref<JStateWrapper::javaobject> stateWrapperInterface);
|
|
35
35
|
|
|
36
36
|
public:
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// Func_void.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.segmentslider
|
|
@@ -10,7 +10,6 @@ package com.margelo.nitro.segmentslider
|
|
|
10
10
|
import androidx.annotation.Keep
|
|
11
11
|
import com.facebook.jni.HybridData
|
|
12
12
|
import com.facebook.proguard.annotations.DoNotStrip
|
|
13
|
-
import dalvik.annotation.optimization.FastNative
|
|
14
13
|
|
|
15
14
|
|
|
16
15
|
/**
|
|
@@ -59,7 +58,6 @@ class Func_void_cxx: Func_void {
|
|
|
59
58
|
override fun invoke(): Unit
|
|
60
59
|
= invoke_cxx()
|
|
61
60
|
|
|
62
|
-
@FastNative
|
|
63
61
|
private external fun invoke_cxx(): Unit
|
|
64
62
|
}
|
|
65
63
|
|
package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/Func_void_double.kt
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// Func_void_double.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.segmentslider
|
|
@@ -10,7 +10,6 @@ package com.margelo.nitro.segmentslider
|
|
|
10
10
|
import androidx.annotation.Keep
|
|
11
11
|
import com.facebook.jni.HybridData
|
|
12
12
|
import com.facebook.proguard.annotations.DoNotStrip
|
|
13
|
-
import dalvik.annotation.optimization.FastNative
|
|
14
13
|
|
|
15
14
|
|
|
16
15
|
/**
|
|
@@ -59,7 +58,6 @@ class Func_void_double_cxx: Func_void_double {
|
|
|
59
58
|
override fun invoke(value: Double): Unit
|
|
60
59
|
= invoke_cxx(value)
|
|
61
60
|
|
|
62
|
-
@FastNative
|
|
63
61
|
private external fun invoke_cxx(value: Double): Unit
|
|
64
62
|
}
|
|
65
63
|
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// HybridSegmentSliderSpec.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.segmentslider
|
|
@@ -10,6 +10,8 @@ package com.margelo.nitro.segmentslider
|
|
|
10
10
|
import androidx.annotation.Keep
|
|
11
11
|
import com.facebook.jni.HybridData
|
|
12
12
|
import com.facebook.proguard.annotations.DoNotStrip
|
|
13
|
+
import dalvik.annotation.optimization.FastNative
|
|
14
|
+
import com.margelo.nitro.core.HybridObject
|
|
13
15
|
import com.margelo.nitro.views.HybridView
|
|
14
16
|
|
|
15
17
|
/**
|
|
@@ -24,23 +26,6 @@ import com.margelo.nitro.views.HybridView
|
|
|
24
26
|
"LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
|
|
25
27
|
)
|
|
26
28
|
abstract class HybridSegmentSliderSpec: HybridView() {
|
|
27
|
-
@DoNotStrip
|
|
28
|
-
private var mHybridData: HybridData = initHybrid()
|
|
29
|
-
|
|
30
|
-
init {
|
|
31
|
-
super.updateNative(mHybridData)
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
override fun updateNative(hybridData: HybridData) {
|
|
35
|
-
mHybridData = hybridData
|
|
36
|
-
super.updateNative(hybridData)
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
// Default implementation of `HybridObject.toString()`
|
|
40
|
-
override fun toString(): String {
|
|
41
|
-
return "[HybridObject SegmentSlider]"
|
|
42
|
-
}
|
|
43
|
-
|
|
44
29
|
// Properties
|
|
45
30
|
@get:DoNotStrip
|
|
46
31
|
@get:Keep
|
|
@@ -96,12 +81,6 @@ abstract class HybridSegmentSliderSpec: HybridView() {
|
|
|
96
81
|
@set:Keep
|
|
97
82
|
abstract var snapTapToSegment: Boolean
|
|
98
83
|
|
|
99
|
-
@get:DoNotStrip
|
|
100
|
-
@get:Keep
|
|
101
|
-
@set:DoNotStrip
|
|
102
|
-
@set:Keep
|
|
103
|
-
abstract var alignSegmentMarksToIntegerValues: Boolean
|
|
104
|
-
|
|
105
84
|
@get:DoNotStrip
|
|
106
85
|
@get:Keep
|
|
107
86
|
@set:DoNotStrip
|
|
@@ -203,7 +182,22 @@ abstract class HybridSegmentSliderSpec: HybridView() {
|
|
|
203
182
|
@Keep
|
|
204
183
|
abstract fun setValue(value: Double): Unit
|
|
205
184
|
|
|
206
|
-
|
|
185
|
+
// Default implementation of `HybridObject.toString()`
|
|
186
|
+
override fun toString(): String {
|
|
187
|
+
return "[HybridObject SegmentSlider]"
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
// C++ backing class
|
|
191
|
+
@DoNotStrip
|
|
192
|
+
@Keep
|
|
193
|
+
protected open class CxxPart(javaPart: HybridSegmentSliderSpec): HybridObject.CxxPart(javaPart) {
|
|
194
|
+
// C++ JHybridSegmentSliderSpec::CxxPart::initHybrid(...)
|
|
195
|
+
@FastNative
|
|
196
|
+
external override fun initHybrid(): HybridData
|
|
197
|
+
}
|
|
198
|
+
override fun createCxxPart(): CxxPart {
|
|
199
|
+
return CxxPart(this)
|
|
200
|
+
}
|
|
207
201
|
|
|
208
202
|
companion object {
|
|
209
203
|
protected const val TAG = "HybridSegmentSliderSpec"
|
package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/segmentslider/segmentsliderOnLoad.kt
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// segmentsliderOnLoad.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.segmentslider
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// HybridSegmentSliderManager.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.segmentslider.views
|
|
@@ -12,13 +12,20 @@ import com.facebook.react.uimanager.ReactStylesDiffMap
|
|
|
12
12
|
import com.facebook.react.uimanager.SimpleViewManager
|
|
13
13
|
import com.facebook.react.uimanager.StateWrapper
|
|
14
14
|
import com.facebook.react.uimanager.ThemedReactContext
|
|
15
|
+
import com.margelo.nitro.R.id.associated_hybrid_view_tag
|
|
16
|
+
import com.margelo.nitro.views.RecyclableView
|
|
15
17
|
import com.margelo.nitro.segmentslider.*
|
|
16
18
|
|
|
17
19
|
/**
|
|
18
20
|
* Represents the React Native `ViewManager` for the "SegmentSlider" Nitro HybridView.
|
|
19
21
|
*/
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
public class HybridSegmentSliderManager: SimpleViewManager<View>() {
|
|
23
|
+
init {
|
|
24
|
+
if (RecyclableView::class.java.isAssignableFrom(HybridSegmentSlider::class.java)) {
|
|
25
|
+
// Enable view recycling
|
|
26
|
+
super.setupViewRecycling()
|
|
27
|
+
}
|
|
28
|
+
}
|
|
22
29
|
|
|
23
30
|
override fun getName(): String {
|
|
24
31
|
return "SegmentSlider"
|
|
@@ -27,17 +34,13 @@ open class HybridSegmentSliderManager: SimpleViewManager<View>() {
|
|
|
27
34
|
override fun createViewInstance(reactContext: ThemedReactContext): View {
|
|
28
35
|
val hybridView = HybridSegmentSlider(reactContext)
|
|
29
36
|
val view = hybridView.view
|
|
30
|
-
|
|
37
|
+
view.setTag(associated_hybrid_view_tag, hybridView)
|
|
31
38
|
return view
|
|
32
39
|
}
|
|
33
40
|
|
|
34
|
-
override fun onDropViewInstance(view: View) {
|
|
35
|
-
super.onDropViewInstance(view)
|
|
36
|
-
views.remove(view)
|
|
37
|
-
}
|
|
38
|
-
|
|
39
41
|
override fun updateState(view: View, props: ReactStylesDiffMap, stateWrapper: StateWrapper): Any? {
|
|
40
|
-
val hybridView =
|
|
42
|
+
val hybridView = getHybridView(view)
|
|
43
|
+
?: throw Error("Couldn't find view $view in local views table!")
|
|
41
44
|
|
|
42
45
|
// 1. Update each prop individually
|
|
43
46
|
hybridView.beforeUpdate()
|
|
@@ -47,4 +50,31 @@ open class HybridSegmentSliderManager: SimpleViewManager<View>() {
|
|
|
47
50
|
// 2. Continue in base View props
|
|
48
51
|
return super.updateState(view, props, stateWrapper)
|
|
49
52
|
}
|
|
53
|
+
|
|
54
|
+
override fun onDropViewInstance(view: View) {
|
|
55
|
+
val hybridView = getHybridView(view)
|
|
56
|
+
hybridView?.onDropView()
|
|
57
|
+
return super.onDropViewInstance(view)
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? {
|
|
61
|
+
super.prepareToRecycleView(reactContext, view)
|
|
62
|
+
val hybridView = getHybridView(view)
|
|
63
|
+
?: return null
|
|
64
|
+
|
|
65
|
+
@Suppress("USELESS_IS_CHECK")
|
|
66
|
+
if (hybridView is RecyclableView) {
|
|
67
|
+
// Recycle in it's implementation
|
|
68
|
+
hybridView.prepareForRecycle()
|
|
69
|
+
|
|
70
|
+
// Maybe update the view if it changed
|
|
71
|
+
return hybridView.view
|
|
72
|
+
} else {
|
|
73
|
+
return null
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
private fun getHybridView(view: View): HybridSegmentSlider? {
|
|
78
|
+
return view.getTag(associated_hybrid_view_tag) as? HybridSegmentSlider
|
|
79
|
+
}
|
|
50
80
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// HybridSegmentSliderStateUpdater.kt
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
package com.margelo.nitro.segmentslider.views
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
# segmentslider+autolinking.cmake
|
|
3
3
|
# This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
# https://github.com/mrousavy/nitro
|
|
5
|
-
# Copyright ©
|
|
5
|
+
# Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
#
|
|
7
7
|
|
|
8
8
|
# This is a CMake file that adds all files generated by Nitrogen
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// segmentslider+autolinking.gradle
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
/// This is a Gradle file that adds all files generated by Nitrogen
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// segmentsliderOnLoad.cpp
|
|
3
3
|
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
4
|
/// https://github.com/mrousavy/nitro
|
|
5
|
-
/// Copyright ©
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
6
|
///
|
|
7
7
|
|
|
8
8
|
#ifndef BUILDING_SEGMENTSLIDER_WITH_GENERATED_CMAKE_PROJECT
|
|
@@ -24,27 +24,37 @@
|
|
|
24
24
|
namespace margelo::nitro::segmentslider {
|
|
25
25
|
|
|
26
26
|
int initialize(JavaVM* vm) {
|
|
27
|
+
return facebook::jni::initialize(vm, []() {
|
|
28
|
+
::margelo::nitro::segmentslider::registerAllNatives();
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
struct JHybridSegmentSliderSpecImpl: public jni::JavaClass<JHybridSegmentSliderSpecImpl, JHybridSegmentSliderSpec::JavaPart> {
|
|
33
|
+
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/segmentslider/HybridSegmentSlider;";
|
|
34
|
+
static std::shared_ptr<JHybridSegmentSliderSpec> create() {
|
|
35
|
+
static const auto constructorFn = javaClassStatic()->getConstructor<JHybridSegmentSliderSpecImpl::javaobject()>();
|
|
36
|
+
jni::local_ref<JHybridSegmentSliderSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
|
|
37
|
+
return javaPart->getJHybridSegmentSliderSpec();
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
|
|
41
|
+
void registerAllNatives() {
|
|
27
42
|
using namespace margelo::nitro;
|
|
28
43
|
using namespace margelo::nitro::segmentslider;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
auto instance = object.create();
|
|
44
|
-
return instance->cthis()->shared();
|
|
45
|
-
}
|
|
46
|
-
);
|
|
47
|
-
});
|
|
44
|
+
|
|
45
|
+
// Register native JNI methods
|
|
46
|
+
margelo::nitro::segmentslider::JHybridSegmentSliderSpec::CxxPart::registerNatives();
|
|
47
|
+
margelo::nitro::segmentslider::JFunc_void_double_cxx::registerNatives();
|
|
48
|
+
margelo::nitro::segmentslider::JFunc_void_cxx::registerNatives();
|
|
49
|
+
margelo::nitro::segmentslider::views::JHybridSegmentSliderStateUpdater::registerNatives();
|
|
50
|
+
|
|
51
|
+
// Register Nitro Hybrid Objects
|
|
52
|
+
HybridObjectRegistry::registerHybridObjectConstructor(
|
|
53
|
+
"SegmentSlider",
|
|
54
|
+
[]() -> std::shared_ptr<HybridObject> {
|
|
55
|
+
return JHybridSegmentSliderSpecImpl::create();
|
|
56
|
+
}
|
|
57
|
+
);
|
|
48
58
|
}
|
|
49
59
|
|
|
50
60
|
} // namespace margelo::nitro::segmentslider
|