@onekeyfe/react-native-image 6.7.0-alpha.412 → 6.7.0-alpha.413

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (83) hide show
  1. package/README.md +0 -12
  2. package/android/build.gradle +1 -3
  3. package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeyImageGlideRegistry.kt +1 -1
  4. package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeyImagePackage.kt +1 -2
  5. package/ios/OneKeyImageCoderBridge.h +0 -4
  6. package/ios/OneKeyImageCoderBridge.m +0 -9
  7. package/lib/module/package.json +1 -6
  8. package/lib/nitrogen/generated/android/onekeyimage+autolinking.cmake +0 -4
  9. package/lib/nitrogen/generated/android/onekeyimageOnLoad.cpp +0 -18
  10. package/lib/nitrogen/generated/ios/OneKeyImage-Swift-Cxx-Bridge.cpp +0 -17
  11. package/lib/nitrogen/generated/ios/OneKeyImage-Swift-Cxx-Bridge.hpp +15 -32
  12. package/lib/nitrogen/generated/ios/OneKeyImage-Swift-Cxx-Umbrella.hpp +0 -5
  13. package/lib/nitrogen/generated/ios/OneKeyImageAutolinking.mm +0 -8
  14. package/lib/nitrogen/generated/ios/OneKeyImageAutolinking.swift +0 -12
  15. package/nitro.json +0 -10
  16. package/nitrogen/generated/android/onekeyimage+autolinking.cmake +0 -4
  17. package/nitrogen/generated/android/onekeyimageOnLoad.cpp +0 -18
  18. package/nitrogen/generated/ios/OneKeyImage-Swift-Cxx-Bridge.cpp +0 -17
  19. package/nitrogen/generated/ios/OneKeyImage-Swift-Cxx-Bridge.hpp +15 -32
  20. package/nitrogen/generated/ios/OneKeyImage-Swift-Cxx-Umbrella.hpp +0 -5
  21. package/nitrogen/generated/ios/OneKeyImageAutolinking.mm +0 -8
  22. package/nitrogen/generated/ios/OneKeyImageAutolinking.swift +0 -12
  23. package/package.json +7 -40
  24. package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeyIcon.kt +0 -93
  25. package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeyNamedSVG.kt +0 -217
  26. package/android/src/main/java/com/margelo/nitro/onekeyimage/OneKeySVG.kt +0 -31
  27. package/ios/OneKeyIcon.swift +0 -90
  28. package/ios/OneKeyNamedSVG.swift +0 -282
  29. package/ios/tests/OneKeyIconTests.swift +0 -484
  30. package/lib/module/OneKeyIcon.nitro.js +0 -4
  31. package/lib/module/icon/assetUrls.js +0 -7
  32. package/lib/module/icon/dom.js +0 -21
  33. package/lib/module/icon/index.js +0 -29
  34. package/lib/module/icon/index.web.js +0 -32
  35. package/lib/module/icon/props.js +0 -22
  36. package/lib/nitrogen/generated/android/c++/JHybridOneKeyIconSpec.cpp +0 -67
  37. package/lib/nitrogen/generated/android/c++/JHybridOneKeyIconSpec.hpp +0 -66
  38. package/lib/nitrogen/generated/android/c++/views/JHybridOneKeyIconStateUpdater.cpp +0 -79
  39. package/lib/nitrogen/generated/android/c++/views/JHybridOneKeyIconStateUpdater.hpp +0 -54
  40. package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/HybridOneKeyIconSpec.kt +0 -65
  41. package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/views/HybridOneKeyIconManager.kt +0 -96
  42. package/lib/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/views/HybridOneKeyIconStateUpdater.kt +0 -23
  43. package/lib/nitrogen/generated/ios/c++/HybridOneKeyIconSpecSwift.cpp +0 -11
  44. package/lib/nitrogen/generated/ios/c++/HybridOneKeyIconSpecSwift.hpp +0 -89
  45. package/lib/nitrogen/generated/ios/c++/views/HybridOneKeyIconComponent.mm +0 -150
  46. package/lib/nitrogen/generated/ios/swift/HybridOneKeyIconSpec.swift +0 -56
  47. package/lib/nitrogen/generated/ios/swift/HybridOneKeyIconSpec_cxx.swift +0 -193
  48. package/lib/nitrogen/generated/shared/c++/HybridOneKeyIconSpec.cpp +0 -24
  49. package/lib/nitrogen/generated/shared/c++/HybridOneKeyIconSpec.hpp +0 -66
  50. package/lib/nitrogen/generated/shared/c++/views/HybridOneKeyIconComponent.cpp +0 -36
  51. package/lib/nitrogen/generated/shared/c++/views/HybridOneKeyIconComponent.hpp +0 -88
  52. package/lib/nitrogen/generated/shared/json/OneKeyIconConfig.json +0 -11
  53. package/lib/typescript/src/OneKeyIcon.nitro.d.ts +0 -7
  54. package/lib/typescript/src/icon/assetUrls.d.ts +0 -2
  55. package/lib/typescript/src/icon/dom.d.ts +0 -3
  56. package/lib/typescript/src/icon/index.d.ts +0 -140
  57. package/lib/typescript/src/icon/index.web.d.ts +0 -134
  58. package/lib/typescript/src/icon/props.d.ts +0 -8
  59. package/nitrogen/generated/android/c++/JHybridOneKeyIconSpec.cpp +0 -67
  60. package/nitrogen/generated/android/c++/JHybridOneKeyIconSpec.hpp +0 -66
  61. package/nitrogen/generated/android/c++/views/JHybridOneKeyIconStateUpdater.cpp +0 -79
  62. package/nitrogen/generated/android/c++/views/JHybridOneKeyIconStateUpdater.hpp +0 -54
  63. package/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/HybridOneKeyIconSpec.kt +0 -65
  64. package/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/views/HybridOneKeyIconManager.kt +0 -96
  65. package/nitrogen/generated/android/kotlin/com/margelo/nitro/onekeyimage/views/HybridOneKeyIconStateUpdater.kt +0 -23
  66. package/nitrogen/generated/ios/c++/HybridOneKeyIconSpecSwift.cpp +0 -11
  67. package/nitrogen/generated/ios/c++/HybridOneKeyIconSpecSwift.hpp +0 -89
  68. package/nitrogen/generated/ios/c++/views/HybridOneKeyIconComponent.mm +0 -150
  69. package/nitrogen/generated/ios/swift/HybridOneKeyIconSpec.swift +0 -56
  70. package/nitrogen/generated/ios/swift/HybridOneKeyIconSpec_cxx.swift +0 -193
  71. package/nitrogen/generated/shared/c++/HybridOneKeyIconSpec.cpp +0 -24
  72. package/nitrogen/generated/shared/c++/HybridOneKeyIconSpec.hpp +0 -66
  73. package/nitrogen/generated/shared/c++/views/HybridOneKeyIconComponent.cpp +0 -36
  74. package/nitrogen/generated/shared/c++/views/HybridOneKeyIconComponent.hpp +0 -88
  75. package/nitrogen/generated/shared/json/OneKeyIconConfig.json +0 -11
  76. package/scripts/configure-icon-imports.mjs +0 -7
  77. package/scripts/icon-fixtures.test.mjs +0 -398
  78. package/src/OneKeyIcon.nitro.ts +0 -8
  79. package/src/icon/assetUrls.ts +0 -4
  80. package/src/icon/dom.ts +0 -21
  81. package/src/icon/index.tsx +0 -38
  82. package/src/icon/index.web.tsx +0 -36
  83. package/src/icon/props.ts +0 -38
package/README.md CHANGED
@@ -95,15 +95,3 @@ pod 'SDWebImage', '5.21.7', :modular_headers => true
95
95
  pod 'SDWebImageWebPCoder', '0.14.6', :modular_headers => true
96
96
  pod 'SDWebImageSVGCoder', '1.7.0', :modular_headers => true
97
97
  ```
98
-
99
- ## Named icon resource ownership
100
-
101
- The host owns canonical SVG artwork and build output. Native builds supply a
102
- `OneKeyIcons.bundle` on iOS and `assets/icons` on Android, including the manifest.
103
- Web builds alias `#onekey-icon-assets` to a generated module exporting
104
- `iconResourceHref(name: string): string | undefined`; the default SDK provider
105
- is empty. `OneKeyIcon` props are unchanged. See [the resource contract](docs/SPEC.md#16-host-owned-icon-resources--implemented-sdk-fixture-runtime-verified).
106
-
107
- The SDK example carries 63 independent test samples. `icons:check` and
108
- `icons:test` are repository maintenance commands that require the example
109
- fixtures; npm consumers do not receive those samples or the complete catalog.
@@ -63,9 +63,7 @@ android {
63
63
  targetCompatibility JavaVersion.VERSION_1_8
64
64
  }
65
65
  sourceSets {
66
- main {
67
- java.srcDirs += ["generated/java", "generated/jni"]
68
- }
66
+ main { java.srcDirs += ["generated/java", "generated/jni"] }
69
67
  }
70
68
  }
71
69
 
@@ -266,7 +266,7 @@ private class OneKeySvgDecoder : ResourceDecoder<InputStream, SVG> {
266
266
  options: Options,
267
267
  ): Resource<SVG> {
268
268
  val svg = try {
269
- OneKeySVG.parse(source)
269
+ SVG.getFromInputStream(source)
270
270
  } catch (error: SVGParseException) {
271
271
  throw IOException("Cannot decode SVG", error)
272
272
  }
@@ -5,7 +5,6 @@ import com.facebook.react.bridge.NativeModule
5
5
  import com.facebook.react.bridge.ReactApplicationContext
6
6
  import com.facebook.react.module.model.ReactModuleInfoProvider
7
7
  import com.facebook.react.uimanager.ViewManager
8
- import com.margelo.nitro.onekeyimage.views.HybridOneKeyIconManager
9
8
  import com.margelo.nitro.onekeyimage.views.HybridOneKeyImageManager
10
9
 
11
10
  class OneKeyImagePackage : BaseReactPackage() {
@@ -18,7 +17,7 @@ class OneKeyImagePackage : BaseReactPackage() {
18
17
  reactContext: ReactApplicationContext,
19
18
  ): List<ViewManager<*, *>> {
20
19
  OneKeyImageGlideRegistry.ensureRegistered(reactContext)
21
- return listOf(HybridOneKeyImageManager(), HybridOneKeyIconManager())
20
+ return listOf(HybridOneKeyImageManager())
22
21
  }
23
22
 
24
23
  companion object {
@@ -1,5 +1,4 @@
1
1
  #import <Foundation/Foundation.h>
2
- #import <UIKit/UIKit.h>
3
2
 
4
3
  NS_ASSUME_NONNULL_BEGIN
5
4
 
@@ -9,9 +8,6 @@ NS_ASSUME_NONNULL_BEGIN
9
8
 
10
9
  + (void)addCodersToManager:(id)manager NS_SWIFT_NAME(addCoders(to:));
11
10
  + (void)ensureWebPCoderRegistered;
12
- // A zero target preserves the decoder's intrinsic/vector result.
13
- + (nullable UIImage *)decodeSVGData:(NSData *)data pixelSize:(CGSize)pixelSize
14
- NS_SWIFT_NAME(decodeSVG(_:pixelSize:));
15
11
 
16
12
  @end
17
13
 
@@ -6,15 +6,6 @@
6
6
 
7
7
  @implementation OneKeyImageCoderBridge
8
8
 
9
- + (UIImage *)decodeSVGData:(NSData *)data pixelSize:(CGSize)pixelSize {
10
- NSDictionary *options = nil;
11
- if (isfinite(pixelSize.width) && isfinite(pixelSize.height) && pixelSize.width > 0 && pixelSize.height > 0) {
12
- options = @{SDImageCoderDecodeThumbnailPixelSize: [NSValue valueWithCGSize:pixelSize],
13
- SDImageCoderDecodePreserveAspectRatio: @YES};
14
- }
15
- return [SDImageSVGCoder.sharedCoder decodedImageWithData:data options:options];
16
- }
17
-
18
9
  + (void)addCodersToManager:(id)manager {
19
10
  SDImageCodersManager *coderManager = (SDImageCodersManager *)manager;
20
11
  [coderManager addCoder:SDImageSVGCoder.sharedCoder];
@@ -1,6 +1 @@
1
- {
2
- "type": "module",
3
- "imports": {
4
- "#onekey-icon-assets": "./icon/assetUrls.js"
5
- }
6
- }
1
+ {"type":"module"}
@@ -33,14 +33,10 @@ target_sources(
33
33
  # Autolinking Setup
34
34
  ../nitrogen/generated/android/onekeyimageOnLoad.cpp
35
35
  # Shared Nitrogen C++ sources
36
- ../nitrogen/generated/shared/c++/HybridOneKeyIconSpec.cpp
37
- ../nitrogen/generated/shared/c++/views/HybridOneKeyIconComponent.cpp
38
36
  ../nitrogen/generated/shared/c++/HybridOneKeyImageCacheSpec.cpp
39
37
  ../nitrogen/generated/shared/c++/HybridOneKeyImageSpec.cpp
40
38
  ../nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.cpp
41
39
  # Android-specific Nitrogen C++ sources
42
- ../nitrogen/generated/android/c++/JHybridOneKeyIconSpec.cpp
43
- ../nitrogen/generated/android/c++/views/JHybridOneKeyIconStateUpdater.cpp
44
40
  ../nitrogen/generated/android/c++/JHybridOneKeyImageCacheSpec.cpp
45
41
  ../nitrogen/generated/android/c++/JHybridOneKeyImageSpec.cpp
46
42
  ../nitrogen/generated/android/c++/views/JHybridOneKeyImageStateUpdater.cpp
@@ -15,8 +15,6 @@
15
15
  #include <fbjni/fbjni.h>
16
16
  #include <NitroModules/HybridObjectRegistry.hpp>
17
17
 
18
- #include "JHybridOneKeyIconSpec.hpp"
19
- #include "views/JHybridOneKeyIconStateUpdater.hpp"
20
18
  #include "JHybridOneKeyImageCacheSpec.hpp"
21
19
  #include "JHybridOneKeyImageSpec.hpp"
22
20
  #include "JFunc_void.hpp"
@@ -49,22 +47,12 @@ struct JHybridOneKeyImageCacheSpecImpl: public jni::JavaClass<JHybridOneKeyImage
49
47
  return javaPart->getJHybridOneKeyImageCacheSpec();
50
48
  }
51
49
  };
52
- struct JHybridOneKeyIconSpecImpl: public jni::JavaClass<JHybridOneKeyIconSpecImpl, JHybridOneKeyIconSpec::JavaPart> {
53
- static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/onekeyimage/HybridOneKeyIcon;";
54
- static std::shared_ptr<JHybridOneKeyIconSpec> create() {
55
- static const auto constructorFn = javaClassStatic()->getConstructor<JHybridOneKeyIconSpecImpl::javaobject()>();
56
- jni::local_ref<JHybridOneKeyIconSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
57
- return javaPart->getJHybridOneKeyIconSpec();
58
- }
59
- };
60
50
 
61
51
  void registerAllNatives() {
62
52
  using namespace margelo::nitro;
63
53
  using namespace margelo::nitro::onekeyimage;
64
54
 
65
55
  // Register native JNI methods
66
- margelo::nitro::onekeyimage::JHybridOneKeyIconSpec::CxxPart::registerNatives();
67
- margelo::nitro::onekeyimage::views::JHybridOneKeyIconStateUpdater::registerNatives();
68
56
  margelo::nitro::onekeyimage::JHybridOneKeyImageCacheSpec::CxxPart::registerNatives();
69
57
  margelo::nitro::onekeyimage::JHybridOneKeyImageSpec::CxxPart::registerNatives();
70
58
  margelo::nitro::onekeyimage::JFunc_void_cxx::registerNatives();
@@ -85,12 +73,6 @@ void registerAllNatives() {
85
73
  return JHybridOneKeyImageCacheSpecImpl::create();
86
74
  }
87
75
  );
88
- HybridObjectRegistry::registerHybridObjectConstructor(
89
- "OneKeyIcon",
90
- []() -> std::shared_ptr<HybridObject> {
91
- return JHybridOneKeyIconSpecImpl::create();
92
- }
93
- );
94
76
  }
95
77
 
96
78
  } // namespace margelo::nitro::onekeyimage
@@ -8,7 +8,6 @@
8
8
  #include "OneKeyImage-Swift-Cxx-Bridge.hpp"
9
9
 
10
10
  // Include C++ implementation defined types
11
- #include "HybridOneKeyIconSpecSwift.hpp"
12
11
  #include "HybridOneKeyImageCacheSpecSwift.hpp"
13
12
  #include "HybridOneKeyImageSpecSwift.hpp"
14
13
  #include "OneKeyImage-Swift-Cxx-Umbrella.hpp"
@@ -16,22 +15,6 @@
16
15
 
17
16
  namespace margelo::nitro::onekeyimage::bridge::swift {
18
17
 
19
- // pragma MARK: std::shared_ptr<HybridOneKeyIconSpec>
20
- std::shared_ptr<HybridOneKeyIconSpec> create_std__shared_ptr_HybridOneKeyIconSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
21
- OneKeyImage::HybridOneKeyIconSpec_cxx swiftPart = OneKeyImage::HybridOneKeyIconSpec_cxx::fromUnsafe(swiftUnsafePointer);
22
- return std::make_shared<margelo::nitro::onekeyimage::HybridOneKeyIconSpecSwift>(swiftPart);
23
- }
24
- void* NON_NULL get_std__shared_ptr_HybridOneKeyIconSpec_(std__shared_ptr_HybridOneKeyIconSpec_ cppType) {
25
- std::shared_ptr<margelo::nitro::onekeyimage::HybridOneKeyIconSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::onekeyimage::HybridOneKeyIconSpecSwift>(cppType);
26
- #ifdef NITRO_DEBUG
27
- if (swiftWrapper == nullptr) [[unlikely]] {
28
- throw std::runtime_error("Class \"HybridOneKeyIconSpec\" is not implemented in Swift!");
29
- }
30
- #endif
31
- OneKeyImage::HybridOneKeyIconSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
32
- return swiftPart.toUnsafe();
33
- }
34
-
35
18
  // pragma MARK: std::function<void(bool /* result */)>
36
19
  Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept {
37
20
  auto swiftClosure = OneKeyImage::Func_void_bool::fromUnsafe(swiftClosureWrapper);
@@ -8,8 +8,6 @@
8
8
  #pragma once
9
9
 
10
10
  // Forward declarations of C++ defined types
11
- // Forward declaration of `HybridOneKeyIconSpec` to properly resolve imports.
12
- namespace margelo::nitro::onekeyimage { class HybridOneKeyIconSpec; }
13
11
  // Forward declaration of `HybridOneKeyImageCacheSpec` to properly resolve imports.
14
12
  namespace margelo::nitro::onekeyimage { class HybridOneKeyImageCacheSpec; }
15
13
  // Forward declaration of `HybridOneKeyImageSpec` to properly resolve imports.
@@ -28,15 +26,12 @@ namespace margelo::nitro::onekeyimage { struct OneKeyImagePreloadSource; }
28
26
  namespace margelo::nitro::onekeyimage { enum class OneKeyImageVariant; }
29
27
 
30
28
  // Forward declarations of Swift defined types
31
- // Forward declaration of `HybridOneKeyIconSpec_cxx` to properly resolve imports.
32
- namespace OneKeyImage { class HybridOneKeyIconSpec_cxx; }
33
29
  // Forward declaration of `HybridOneKeyImageCacheSpec_cxx` to properly resolve imports.
34
30
  namespace OneKeyImage { class HybridOneKeyImageCacheSpec_cxx; }
35
31
  // Forward declaration of `HybridOneKeyImageSpec_cxx` to properly resolve imports.
36
32
  namespace OneKeyImage { class HybridOneKeyImageSpec_cxx; }
37
33
 
38
34
  // Include C++ defined types
39
- #include "HybridOneKeyIconSpec.hpp"
40
35
  #include "HybridOneKeyImageCacheSpec.hpp"
41
36
  #include "HybridOneKeyImageSpec.hpp"
42
37
  #include "OneKeyImageCachePolicy.hpp"
@@ -61,33 +56,6 @@ namespace OneKeyImage { class HybridOneKeyImageSpec_cxx; }
61
56
  */
62
57
  namespace margelo::nitro::onekeyimage::bridge::swift {
63
58
 
64
- // pragma MARK: std::optional<std::string>
65
- /**
66
- * Specialized version of `std::optional<std::string>`.
67
- */
68
- using std__optional_std__string_ = std::optional<std::string>;
69
- inline std::optional<std::string> create_std__optional_std__string_(const std::string& value) noexcept {
70
- return std::optional<std::string>(value);
71
- }
72
- inline bool has_value_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
73
- return optional.has_value();
74
- }
75
- inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
76
- return optional.value();
77
- }
78
-
79
- // pragma MARK: std::shared_ptr<HybridOneKeyIconSpec>
80
- /**
81
- * Specialized version of `std::shared_ptr<HybridOneKeyIconSpec>`.
82
- */
83
- using std__shared_ptr_HybridOneKeyIconSpec_ = std::shared_ptr<HybridOneKeyIconSpec>;
84
- std::shared_ptr<HybridOneKeyIconSpec> create_std__shared_ptr_HybridOneKeyIconSpec_(void* NON_NULL swiftUnsafePointer) noexcept;
85
- void* NON_NULL get_std__shared_ptr_HybridOneKeyIconSpec_(std__shared_ptr_HybridOneKeyIconSpec_ cppType);
86
-
87
- // pragma MARK: std::weak_ptr<HybridOneKeyIconSpec>
88
- using std__weak_ptr_HybridOneKeyIconSpec_ = std::weak_ptr<HybridOneKeyIconSpec>;
89
- inline std__weak_ptr_HybridOneKeyIconSpec_ weakify_std__shared_ptr_HybridOneKeyIconSpec_(const std::shared_ptr<HybridOneKeyIconSpec>& strong) noexcept { return strong; }
90
-
91
59
  // pragma MARK: std::shared_ptr<Promise<bool>>
92
60
  /**
93
61
  * Specialized version of `std::shared_ptr<Promise<bool>>`.
@@ -144,6 +112,21 @@ namespace margelo::nitro::onekeyimage::bridge::swift {
144
112
  return Func_void_std__exception_ptr_Wrapper(std::move(value));
145
113
  }
146
114
 
115
+ // pragma MARK: std::optional<std::string>
116
+ /**
117
+ * Specialized version of `std::optional<std::string>`.
118
+ */
119
+ using std__optional_std__string_ = std::optional<std::string>;
120
+ inline std::optional<std::string> create_std__optional_std__string_(const std::string& value) noexcept {
121
+ return std::optional<std::string>(value);
122
+ }
123
+ inline bool has_value_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
124
+ return optional.has_value();
125
+ }
126
+ inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
127
+ return optional.value();
128
+ }
129
+
147
130
  // pragma MARK: std::optional<OneKeyImageCachePolicy>
148
131
  /**
149
132
  * Specialized version of `std::optional<OneKeyImageCachePolicy>`.
@@ -8,8 +8,6 @@
8
8
  #pragma once
9
9
 
10
10
  // Forward declarations of C++ defined types
11
- // Forward declaration of `HybridOneKeyIconSpec` to properly resolve imports.
12
- namespace margelo::nitro::onekeyimage { class HybridOneKeyIconSpec; }
13
11
  // Forward declaration of `HybridOneKeyImageCacheSpec` to properly resolve imports.
14
12
  namespace margelo::nitro::onekeyimage { class HybridOneKeyImageCacheSpec; }
15
13
  // Forward declaration of `HybridOneKeyImageSpec` to properly resolve imports.
@@ -28,7 +26,6 @@ namespace margelo::nitro::onekeyimage { struct OneKeyImagePreloadSource; }
28
26
  namespace margelo::nitro::onekeyimage { enum class OneKeyImageVariant; }
29
27
 
30
28
  // Include C++ defined types
31
- #include "HybridOneKeyIconSpec.hpp"
32
29
  #include "HybridOneKeyImageCacheSpec.hpp"
33
30
  #include "HybridOneKeyImageSpec.hpp"
34
31
  #include "OneKeyImageCachePolicy.hpp"
@@ -56,8 +53,6 @@ namespace margelo::nitro::onekeyimage { enum class OneKeyImageVariant; }
56
53
  #include <NitroModules/DateToChronoDate.hpp>
57
54
 
58
55
  // Forward declarations of Swift defined types
59
- // Forward declaration of `HybridOneKeyIconSpec_cxx` to properly resolve imports.
60
- namespace OneKeyImage { class HybridOneKeyIconSpec_cxx; }
61
56
  // Forward declaration of `HybridOneKeyImageCacheSpec_cxx` to properly resolve imports.
62
57
  namespace OneKeyImage { class HybridOneKeyImageCacheSpec_cxx; }
63
58
  // Forward declaration of `HybridOneKeyImageSpec_cxx` to properly resolve imports.
@@ -12,7 +12,6 @@
12
12
 
13
13
  #include "HybridOneKeyImageSpecSwift.hpp"
14
14
  #include "HybridOneKeyImageCacheSpecSwift.hpp"
15
- #include "HybridOneKeyIconSpecSwift.hpp"
16
15
 
17
16
  @interface OneKeyImageAutolinking : NSObject
18
17
  @end
@@ -37,13 +36,6 @@
37
36
  return hybridObject;
38
37
  }
39
38
  );
40
- HybridObjectRegistry::registerHybridObjectConstructor(
41
- "OneKeyIcon",
42
- []() -> std::shared_ptr<HybridObject> {
43
- std::shared_ptr<HybridOneKeyIconSpec> hybridObject = OneKeyImage::OneKeyImageAutolinking::createOneKeyIcon();
44
- return hybridObject;
45
- }
46
- );
47
39
  }
48
40
 
49
41
  @end
@@ -35,16 +35,4 @@ public final class OneKeyImageAutolinking {
35
35
  public static func isOneKeyImageCacheRecyclable() -> Bool {
36
36
  return HybridOneKeyImageCache.self is any RecyclableView.Type
37
37
  }
38
-
39
- public static func createOneKeyIcon() -> bridge.std__shared_ptr_HybridOneKeyIconSpec_ {
40
- let hybridObject = HybridOneKeyIcon()
41
- return { () -> bridge.std__shared_ptr_HybridOneKeyIconSpec_ in
42
- let __cxxWrapped = hybridObject.getCxxWrapper()
43
- return __cxxWrapped.getCxxPart()
44
- }()
45
- }
46
-
47
- public static func isOneKeyIconRecyclable() -> Bool {
48
- return HybridOneKeyIcon.self is any RecyclableView.Type
49
- }
50
38
  }
package/nitro.json CHANGED
@@ -25,16 +25,6 @@
25
25
  "language": "kotlin",
26
26
  "implementationClassName": "HybridOneKeyImageCache"
27
27
  }
28
- },
29
- "OneKeyIcon": {
30
- "ios": {
31
- "language": "swift",
32
- "implementationClassName": "HybridOneKeyIcon"
33
- },
34
- "android": {
35
- "language": "kotlin",
36
- "implementationClassName": "HybridOneKeyIcon"
37
- }
38
28
  }
39
29
  },
40
30
  "ignorePaths": ["node_modules"]
@@ -33,14 +33,10 @@ target_sources(
33
33
  # Autolinking Setup
34
34
  ../nitrogen/generated/android/onekeyimageOnLoad.cpp
35
35
  # Shared Nitrogen C++ sources
36
- ../nitrogen/generated/shared/c++/HybridOneKeyIconSpec.cpp
37
- ../nitrogen/generated/shared/c++/views/HybridOneKeyIconComponent.cpp
38
36
  ../nitrogen/generated/shared/c++/HybridOneKeyImageCacheSpec.cpp
39
37
  ../nitrogen/generated/shared/c++/HybridOneKeyImageSpec.cpp
40
38
  ../nitrogen/generated/shared/c++/views/HybridOneKeyImageComponent.cpp
41
39
  # Android-specific Nitrogen C++ sources
42
- ../nitrogen/generated/android/c++/JHybridOneKeyIconSpec.cpp
43
- ../nitrogen/generated/android/c++/views/JHybridOneKeyIconStateUpdater.cpp
44
40
  ../nitrogen/generated/android/c++/JHybridOneKeyImageCacheSpec.cpp
45
41
  ../nitrogen/generated/android/c++/JHybridOneKeyImageSpec.cpp
46
42
  ../nitrogen/generated/android/c++/views/JHybridOneKeyImageStateUpdater.cpp
@@ -15,8 +15,6 @@
15
15
  #include <fbjni/fbjni.h>
16
16
  #include <NitroModules/HybridObjectRegistry.hpp>
17
17
 
18
- #include "JHybridOneKeyIconSpec.hpp"
19
- #include "views/JHybridOneKeyIconStateUpdater.hpp"
20
18
  #include "JHybridOneKeyImageCacheSpec.hpp"
21
19
  #include "JHybridOneKeyImageSpec.hpp"
22
20
  #include "JFunc_void.hpp"
@@ -49,22 +47,12 @@ struct JHybridOneKeyImageCacheSpecImpl: public jni::JavaClass<JHybridOneKeyImage
49
47
  return javaPart->getJHybridOneKeyImageCacheSpec();
50
48
  }
51
49
  };
52
- struct JHybridOneKeyIconSpecImpl: public jni::JavaClass<JHybridOneKeyIconSpecImpl, JHybridOneKeyIconSpec::JavaPart> {
53
- static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/onekeyimage/HybridOneKeyIcon;";
54
- static std::shared_ptr<JHybridOneKeyIconSpec> create() {
55
- static const auto constructorFn = javaClassStatic()->getConstructor<JHybridOneKeyIconSpecImpl::javaobject()>();
56
- jni::local_ref<JHybridOneKeyIconSpec::JavaPart> javaPart = javaClassStatic()->newObject(constructorFn);
57
- return javaPart->getJHybridOneKeyIconSpec();
58
- }
59
- };
60
50
 
61
51
  void registerAllNatives() {
62
52
  using namespace margelo::nitro;
63
53
  using namespace margelo::nitro::onekeyimage;
64
54
 
65
55
  // Register native JNI methods
66
- margelo::nitro::onekeyimage::JHybridOneKeyIconSpec::CxxPart::registerNatives();
67
- margelo::nitro::onekeyimage::views::JHybridOneKeyIconStateUpdater::registerNatives();
68
56
  margelo::nitro::onekeyimage::JHybridOneKeyImageCacheSpec::CxxPart::registerNatives();
69
57
  margelo::nitro::onekeyimage::JHybridOneKeyImageSpec::CxxPart::registerNatives();
70
58
  margelo::nitro::onekeyimage::JFunc_void_cxx::registerNatives();
@@ -85,12 +73,6 @@ void registerAllNatives() {
85
73
  return JHybridOneKeyImageCacheSpecImpl::create();
86
74
  }
87
75
  );
88
- HybridObjectRegistry::registerHybridObjectConstructor(
89
- "OneKeyIcon",
90
- []() -> std::shared_ptr<HybridObject> {
91
- return JHybridOneKeyIconSpecImpl::create();
92
- }
93
- );
94
76
  }
95
77
 
96
78
  } // namespace margelo::nitro::onekeyimage
@@ -8,7 +8,6 @@
8
8
  #include "OneKeyImage-Swift-Cxx-Bridge.hpp"
9
9
 
10
10
  // Include C++ implementation defined types
11
- #include "HybridOneKeyIconSpecSwift.hpp"
12
11
  #include "HybridOneKeyImageCacheSpecSwift.hpp"
13
12
  #include "HybridOneKeyImageSpecSwift.hpp"
14
13
  #include "OneKeyImage-Swift-Cxx-Umbrella.hpp"
@@ -16,22 +15,6 @@
16
15
 
17
16
  namespace margelo::nitro::onekeyimage::bridge::swift {
18
17
 
19
- // pragma MARK: std::shared_ptr<HybridOneKeyIconSpec>
20
- std::shared_ptr<HybridOneKeyIconSpec> create_std__shared_ptr_HybridOneKeyIconSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
21
- OneKeyImage::HybridOneKeyIconSpec_cxx swiftPart = OneKeyImage::HybridOneKeyIconSpec_cxx::fromUnsafe(swiftUnsafePointer);
22
- return std::make_shared<margelo::nitro::onekeyimage::HybridOneKeyIconSpecSwift>(swiftPart);
23
- }
24
- void* NON_NULL get_std__shared_ptr_HybridOneKeyIconSpec_(std__shared_ptr_HybridOneKeyIconSpec_ cppType) {
25
- std::shared_ptr<margelo::nitro::onekeyimage::HybridOneKeyIconSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::onekeyimage::HybridOneKeyIconSpecSwift>(cppType);
26
- #ifdef NITRO_DEBUG
27
- if (swiftWrapper == nullptr) [[unlikely]] {
28
- throw std::runtime_error("Class \"HybridOneKeyIconSpec\" is not implemented in Swift!");
29
- }
30
- #endif
31
- OneKeyImage::HybridOneKeyIconSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
32
- return swiftPart.toUnsafe();
33
- }
34
-
35
18
  // pragma MARK: std::function<void(bool /* result */)>
36
19
  Func_void_bool create_Func_void_bool(void* NON_NULL swiftClosureWrapper) noexcept {
37
20
  auto swiftClosure = OneKeyImage::Func_void_bool::fromUnsafe(swiftClosureWrapper);
@@ -8,8 +8,6 @@
8
8
  #pragma once
9
9
 
10
10
  // Forward declarations of C++ defined types
11
- // Forward declaration of `HybridOneKeyIconSpec` to properly resolve imports.
12
- namespace margelo::nitro::onekeyimage { class HybridOneKeyIconSpec; }
13
11
  // Forward declaration of `HybridOneKeyImageCacheSpec` to properly resolve imports.
14
12
  namespace margelo::nitro::onekeyimage { class HybridOneKeyImageCacheSpec; }
15
13
  // Forward declaration of `HybridOneKeyImageSpec` to properly resolve imports.
@@ -28,15 +26,12 @@ namespace margelo::nitro::onekeyimage { struct OneKeyImagePreloadSource; }
28
26
  namespace margelo::nitro::onekeyimage { enum class OneKeyImageVariant; }
29
27
 
30
28
  // Forward declarations of Swift defined types
31
- // Forward declaration of `HybridOneKeyIconSpec_cxx` to properly resolve imports.
32
- namespace OneKeyImage { class HybridOneKeyIconSpec_cxx; }
33
29
  // Forward declaration of `HybridOneKeyImageCacheSpec_cxx` to properly resolve imports.
34
30
  namespace OneKeyImage { class HybridOneKeyImageCacheSpec_cxx; }
35
31
  // Forward declaration of `HybridOneKeyImageSpec_cxx` to properly resolve imports.
36
32
  namespace OneKeyImage { class HybridOneKeyImageSpec_cxx; }
37
33
 
38
34
  // Include C++ defined types
39
- #include "HybridOneKeyIconSpec.hpp"
40
35
  #include "HybridOneKeyImageCacheSpec.hpp"
41
36
  #include "HybridOneKeyImageSpec.hpp"
42
37
  #include "OneKeyImageCachePolicy.hpp"
@@ -61,33 +56,6 @@ namespace OneKeyImage { class HybridOneKeyImageSpec_cxx; }
61
56
  */
62
57
  namespace margelo::nitro::onekeyimage::bridge::swift {
63
58
 
64
- // pragma MARK: std::optional<std::string>
65
- /**
66
- * Specialized version of `std::optional<std::string>`.
67
- */
68
- using std__optional_std__string_ = std::optional<std::string>;
69
- inline std::optional<std::string> create_std__optional_std__string_(const std::string& value) noexcept {
70
- return std::optional<std::string>(value);
71
- }
72
- inline bool has_value_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
73
- return optional.has_value();
74
- }
75
- inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
76
- return optional.value();
77
- }
78
-
79
- // pragma MARK: std::shared_ptr<HybridOneKeyIconSpec>
80
- /**
81
- * Specialized version of `std::shared_ptr<HybridOneKeyIconSpec>`.
82
- */
83
- using std__shared_ptr_HybridOneKeyIconSpec_ = std::shared_ptr<HybridOneKeyIconSpec>;
84
- std::shared_ptr<HybridOneKeyIconSpec> create_std__shared_ptr_HybridOneKeyIconSpec_(void* NON_NULL swiftUnsafePointer) noexcept;
85
- void* NON_NULL get_std__shared_ptr_HybridOneKeyIconSpec_(std__shared_ptr_HybridOneKeyIconSpec_ cppType);
86
-
87
- // pragma MARK: std::weak_ptr<HybridOneKeyIconSpec>
88
- using std__weak_ptr_HybridOneKeyIconSpec_ = std::weak_ptr<HybridOneKeyIconSpec>;
89
- inline std__weak_ptr_HybridOneKeyIconSpec_ weakify_std__shared_ptr_HybridOneKeyIconSpec_(const std::shared_ptr<HybridOneKeyIconSpec>& strong) noexcept { return strong; }
90
-
91
59
  // pragma MARK: std::shared_ptr<Promise<bool>>
92
60
  /**
93
61
  * Specialized version of `std::shared_ptr<Promise<bool>>`.
@@ -144,6 +112,21 @@ namespace margelo::nitro::onekeyimage::bridge::swift {
144
112
  return Func_void_std__exception_ptr_Wrapper(std::move(value));
145
113
  }
146
114
 
115
+ // pragma MARK: std::optional<std::string>
116
+ /**
117
+ * Specialized version of `std::optional<std::string>`.
118
+ */
119
+ using std__optional_std__string_ = std::optional<std::string>;
120
+ inline std::optional<std::string> create_std__optional_std__string_(const std::string& value) noexcept {
121
+ return std::optional<std::string>(value);
122
+ }
123
+ inline bool has_value_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
124
+ return optional.has_value();
125
+ }
126
+ inline std::string get_std__optional_std__string_(const std::optional<std::string>& optional) noexcept {
127
+ return optional.value();
128
+ }
129
+
147
130
  // pragma MARK: std::optional<OneKeyImageCachePolicy>
148
131
  /**
149
132
  * Specialized version of `std::optional<OneKeyImageCachePolicy>`.
@@ -8,8 +8,6 @@
8
8
  #pragma once
9
9
 
10
10
  // Forward declarations of C++ defined types
11
- // Forward declaration of `HybridOneKeyIconSpec` to properly resolve imports.
12
- namespace margelo::nitro::onekeyimage { class HybridOneKeyIconSpec; }
13
11
  // Forward declaration of `HybridOneKeyImageCacheSpec` to properly resolve imports.
14
12
  namespace margelo::nitro::onekeyimage { class HybridOneKeyImageCacheSpec; }
15
13
  // Forward declaration of `HybridOneKeyImageSpec` to properly resolve imports.
@@ -28,7 +26,6 @@ namespace margelo::nitro::onekeyimage { struct OneKeyImagePreloadSource; }
28
26
  namespace margelo::nitro::onekeyimage { enum class OneKeyImageVariant; }
29
27
 
30
28
  // Include C++ defined types
31
- #include "HybridOneKeyIconSpec.hpp"
32
29
  #include "HybridOneKeyImageCacheSpec.hpp"
33
30
  #include "HybridOneKeyImageSpec.hpp"
34
31
  #include "OneKeyImageCachePolicy.hpp"
@@ -56,8 +53,6 @@ namespace margelo::nitro::onekeyimage { enum class OneKeyImageVariant; }
56
53
  #include <NitroModules/DateToChronoDate.hpp>
57
54
 
58
55
  // Forward declarations of Swift defined types
59
- // Forward declaration of `HybridOneKeyIconSpec_cxx` to properly resolve imports.
60
- namespace OneKeyImage { class HybridOneKeyIconSpec_cxx; }
61
56
  // Forward declaration of `HybridOneKeyImageCacheSpec_cxx` to properly resolve imports.
62
57
  namespace OneKeyImage { class HybridOneKeyImageCacheSpec_cxx; }
63
58
  // Forward declaration of `HybridOneKeyImageSpec_cxx` to properly resolve imports.
@@ -12,7 +12,6 @@
12
12
 
13
13
  #include "HybridOneKeyImageSpecSwift.hpp"
14
14
  #include "HybridOneKeyImageCacheSpecSwift.hpp"
15
- #include "HybridOneKeyIconSpecSwift.hpp"
16
15
 
17
16
  @interface OneKeyImageAutolinking : NSObject
18
17
  @end
@@ -37,13 +36,6 @@
37
36
  return hybridObject;
38
37
  }
39
38
  );
40
- HybridObjectRegistry::registerHybridObjectConstructor(
41
- "OneKeyIcon",
42
- []() -> std::shared_ptr<HybridObject> {
43
- std::shared_ptr<HybridOneKeyIconSpec> hybridObject = OneKeyImage::OneKeyImageAutolinking::createOneKeyIcon();
44
- return hybridObject;
45
- }
46
- );
47
39
  }
48
40
 
49
41
  @end
@@ -35,16 +35,4 @@ public final class OneKeyImageAutolinking {
35
35
  public static func isOneKeyImageCacheRecyclable() -> Bool {
36
36
  return HybridOneKeyImageCache.self is any RecyclableView.Type
37
37
  }
38
-
39
- public static func createOneKeyIcon() -> bridge.std__shared_ptr_HybridOneKeyIconSpec_ {
40
- let hybridObject = HybridOneKeyIcon()
41
- return { () -> bridge.std__shared_ptr_HybridOneKeyIconSpec_ in
42
- let __cxxWrapped = hybridObject.getCxxWrapper()
43
- return __cxxWrapped.getCxxPart()
44
- }()
45
- }
46
-
47
- public static func isOneKeyIconRecyclable() -> Bool {
48
- return HybridOneKeyIcon.self is any RecyclableView.Type
49
- }
50
38
  }