✨ feat: done upgrade nitro 0.20.0

Author: baronha

android/src/main/java/com/margelo/nitro/multipleimagepicker/MultipleImagePicker.kt

@@ -11,7 +11,7 @@ class MultipleImagePicker : HybridMultipleImagePickerSpec() {
 
     override fun openPicker(
         config: NitroConfig,
-        resolved: (result: Array<Result>) -> Unit,
+        resolved: (result: Array<PickerResult>) -> Unit,
         rejected: (reject: Double) -> Unit
     ) {
         pickerModule.openPicker(config, resolved, rejected)

android/src/main/java/com/margelo/nitro/multipleimagepicker/MultipleImagePickerImp.kt

@@ -60,7 +60,7 @@ class MultipleImagePickerImp(reactContext: ReactApplicationContext?) :
     @ReactMethod
     fun openPicker(
         options: NitroConfig,
-        resolved: (result: Array<Result>) -> Unit,
+        resolved: (result: Array<PickerResult>) -> Unit,
         rejected: (reject: Double) -> Unit
     ) {
         PictureAppMaster.getInstance().app = this
@@ -150,7 +150,7 @@ class MultipleImagePickerImp(reactContext: ReactApplicationContext?) :
             .isPreviewFullScreenMode(true)
             .forResult(object : OnResultCallbackListener<LocalMedia?> {
                 override fun onResult(localMedia: ArrayList<LocalMedia?>?) {
-                    var data: Array<Result> = arrayOf()
+                    var data: Array<PickerResult> = arrayOf()
                     if (localMedia?.size == 0 || localMedia == null) {
                         resolved(arrayOf())
                         return
@@ -575,7 +575,7 @@ class MultipleImagePickerImp(reactContext: ReactApplicationContext?) :
         }.toMutableList()
     }
 
-    private fun getResult(item: LocalMedia): Result {
+    private fun getResult(item: LocalMedia): PickerResult {
 
         val type: ResultType =
             if (item.mimeType.startsWith("video/")) ResultType.VIDEO else ResultType.IMAGE
@@ -597,7 +597,7 @@ class MultipleImagePickerImp(reactContext: ReactApplicationContext?) :
         if (!path.startsWith("file://") && !path.startsWith("content://") && type == ResultType.IMAGE)
             path = "file://$path"
 
-        val media = Result(
+        val media = PickerResult(
             localIdentifier = item.id.toString(),
             width,
             height,

docs/docs/GETTING_STARTED.mdx

@@ -50,7 +50,7 @@ Install [@baronha/react-native-multiple-image-picker](https://www.npmjs.com/pack
 
 ```bash
 yarn add @baronha/react-native-multiple-image-picker
-yarn add -D react-native-nitro-modules@0.18.2
+yarn add -D react-native-nitro-modules
 cd ios && pod install
 ```
 
@@ -60,7 +60,7 @@ cd ios && pod install
 
 ```bash
 npx expo install @baronha/react-native-multiple-image-picker 
-npx expo install react-native-nitro-modules@0.18.2 -- --dev
+npx expo install react-native-nitro-modules -- --dev
 npx expo prebuild
 ```
 

example/src/index.tsx

@@ -17,7 +17,7 @@ import { StyleSheet } from 'react-native'
 import ImageGrid from '@baronha/react-native-image-grid'
 import {
   openPicker,
-  Result,
+  PickerResult,
   defaultOptions,
   Config,
   openCropper,
@@ -64,7 +64,7 @@ const parseNumber = (value: string): number | undefined => {
 
 export default function App() {
   const { background, foreground } = useTheme()
-  const [images, setImages] = useState<Result[]>([])
+  const [images, setImages] = useState<PickerResult[]>([])
   const [options, changeOptions] = useImmer<Config>(defaultOptions)
 
   const colorScheme = useColorScheme()
@@ -75,7 +75,7 @@ export default function App() {
     })
   }
 
-  const onPressImage = (_: Result, index: number) => {
+  const onPressImage = (_: PickerResult, index: number) => {
     openPreview(images, index, {})
   }
 
@@ -98,7 +98,7 @@ export default function App() {
       const response = await openCamera()
 
       setImages((prev) => {
-        return [response as Result, ...prev]
+        return [response as PickerResult, ...prev]
       })
 
       layoutEffect()
@@ -130,7 +130,7 @@ export default function App() {
     }
   }
 
-  const onRemovePhoto = (_: Result, index: number) => {
+  const onRemovePhoto = (_: PickerResult, index: number) => {
     const data = [...images].filter((__, idx) => idx !== index)
     setImages(data)
   }

ios/HybridMultipleImagePicker+Result.swift

@@ -9,7 +9,7 @@ import HXPhotoPicker
 // import Photos
 
 extension HybridMultipleImagePicker {
-    func getResult(_ asset: PhotoAsset) async throws -> Result {
+    func getResult(_ asset: PhotoAsset) async throws -> PickerResult {
         let urlResult = try await asset.urlResult()
         let url = urlResult.url
 
@@ -22,20 +22,20 @@ extension HybridMultipleImagePicker {
         let type: ResultType = .init(fromString: asset.mediaType == .video ? "video" : "image")!
         let thumbnail = asset.phAsset?.getVideoAssetThumbnail(from: url.absoluteString, in: 1)
 
-        return Result(localIdentifier: phAsset!.localIdentifier,
-                      width: asset.imageSize.width,
-                      height: asset.imageSize.height,
-                      mime: mime,
-                      size: Double(asset.fileSize),
-                      bucketId: nil,
-                      realPath: nil,
-                      parentFolderName: nil,
-                      creationDate: creationDate > 0 ? Double(creationDate) : nil,
-                      crop: false,
-                      path: "file://\(url.absoluteString)",
-                      type: type,
-                      duration: asset.videoDuration,
-                      thumbnail: thumbnail,
-                      fileName: phAsset?.fileName)
+        return PickerResult(localIdentifier: phAsset!.localIdentifier,
+                            width: asset.imageSize.width,
+                            height: asset.imageSize.height,
+                            mime: mime,
+                            size: Double(asset.fileSize),
+                            bucketId: nil,
+                            realPath: nil,
+                            parentFolderName: nil,
+                            creationDate: creationDate > 0 ? Double(creationDate) : nil,
+                            crop: false,
+                            path: "file://\(url.absoluteString)",
+                            type: type,
+                            duration: asset.videoDuration,
+                            thumbnail: thumbnail,
+                            fileName: phAsset?.fileName)
     }
 }

ios/HybridMultipleImagePicker.swift

@@ -10,17 +10,11 @@ import NitroModules
 import Photos
 
 class HybridMultipleImagePicker: HybridMultipleImagePickerSpec {
-    var hybridContext = margelo.nitro.HybridContext()
-
-    var memorySize: Int {
-        return getSizeOf(self)
-    }
-
     var selectedAssets: [PhotoAsset] = .init()
 
     var config: PickerConfiguration = .init()
 
-    func openPicker(config: NitroConfig, resolved: @escaping (([Result]) -> Void), rejected: @escaping ((Double) -> Void)) throws {
+    func openPicker(config: NitroConfig, resolved: @escaping (([PickerResult]) -> Void), rejected: @escaping ((Double) -> Void)) throws {
         setConfig(config)
 
         // get selected photo
@@ -67,7 +61,7 @@ class HybridMultipleImagePicker: HybridMultipleImagePickerSpec {
 
                 let group = DispatchGroup()
 
-                var data: [Result] = []
+                var data: [PickerResult] = []
 
                 self.selectedAssets = pickerResult.photoAssets
 

nitrogen/generated/android/MultipleImagePickerOnLoad.cpp

@@ -12,7 +12,7 @@
 #include <NitroModules/HybridObjectRegistry.hpp>
 
 #include "JHybridMultipleImagePickerSpec.hpp"
-#include "JFunc_void_std__vector_Result_.hpp"
+#include "JFunc_void_std__vector_PickerResult_.hpp"
 #include "JFunc_void_double.hpp"
 #include "JFunc_void_CropResult.hpp"
 #include "JFunc_void_CameraResult.hpp"
@@ -29,7 +29,7 @@ int initialize(JavaVM* vm) {
   return facebook::jni::initialize(vm, [] {
     // Register native JNI methods
     margelo::nitro::multipleimagepicker::JHybridMultipleImagePickerSpec::registerNatives();
-    margelo::nitro::multipleimagepicker::JFunc_void_std__vector_Result_::registerNatives();
+    margelo::nitro::multipleimagepicker::JFunc_void_std__vector_PickerResult_::registerNatives();
     margelo::nitro::multipleimagepicker::JFunc_void_double::registerNatives();
     margelo::nitro::multipleimagepicker::JFunc_void_CropResult::registerNatives();
     margelo::nitro::multipleimagepicker::JFunc_void_double::registerNatives();

nitrogen/generated/android/c++/JFunc_void_std__vector_Result_.hpp renamed to nitrogen/generated/android/c++/JFunc_void_std__vector_PickerResult_.hpp

@@ -1,5 +1,5 @@
 ///
-/// JFunc_void_std__vector_Result_.hpp
+/// JFunc_void_std__vector_PickerResult_.hpp
 /// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
 /// https://github.com/mrousavy/nitro
 /// Copyright © 2024 Marc Rousavy @ Margelo
@@ -12,8 +12,8 @@
 
 #include <functional>
 #include <vector>
-#include "Result.hpp"
-#include "JResult.hpp"
+#include "PickerResult.hpp"
+#include "JPickerResult.hpp"
 #include <string>
 #include <optional>
 #include "ResultType.hpp"
@@ -24,20 +24,20 @@ namespace margelo::nitro::multipleimagepicker {
   using namespace facebook;
 
   /**
-   * C++ representation of the callback Func_void_std__vector_Result_.
-   * This is a Kotlin `(result: Array<Result>) -> Unit`, backed by a `std::function<...>`.
+   * C++ representation of the callback Func_void_std__vector_PickerResult_.
+   * This is a Kotlin `(result: Array<PickerResult>) -> Unit`, backed by a `std::function<...>`.
    */
-  struct JFunc_void_std__vector_Result_ final: public jni::HybridClass<JFunc_void_std__vector_Result_> {
+  struct JFunc_void_std__vector_PickerResult_ final: public jni::HybridClass<JFunc_void_std__vector_PickerResult_> {
   public:
-    static jni::local_ref<JFunc_void_std__vector_Result_::javaobject> fromCpp(const std::function<void(const std::vector<Result>& /* result */)>& func) {
-      return JFunc_void_std__vector_Result_::newObjectCxxArgs(func);
+    static jni::local_ref<JFunc_void_std__vector_PickerResult_::javaobject> fromCpp(const std::function<void(const std::vector<PickerResult>& /* result */)>& func) {
+      return JFunc_void_std__vector_PickerResult_::newObjectCxxArgs(func);
     }
 
   public:
-    void call(jni::alias_ref<jni::JArrayClass<JResult>> result) {
+    void call(jni::alias_ref<jni::JArrayClass<JPickerResult>> result) {
       _func([&]() {
               size_t __size = result->size();
-              std::vector<Result> __vector;
+              std::vector<PickerResult> __vector;
               __vector.reserve(__size);
               for (size_t __i = 0; __i < __size; __i++) {
                 auto __element = result->getElement(__i);
@@ -48,17 +48,17 @@ namespace margelo::nitro::multipleimagepicker {
     }
 
   public:
-    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/multipleimagepicker/Func_void_std__vector_Result_;";
+    static auto constexpr kJavaDescriptor = "Lcom/margelo/nitro/multipleimagepicker/Func_void_std__vector_PickerResult_;";
     static void registerNatives() {
-      registerHybrid({makeNativeMethod("call", JFunc_void_std__vector_Result_::call)});
+      registerHybrid({makeNativeMethod("call", JFunc_void_std__vector_PickerResult_::call)});
     }
 
   private:
-    explicit JFunc_void_std__vector_Result_(const std::function<void(const std::vector<Result>& /* result */)>& func): _func(func) { }
+    explicit JFunc_void_std__vector_PickerResult_(const std::function<void(const std::vector<PickerResult>& /* result */)>& func): _func(func) { }
 
   private:
     friend HybridBase;
-    std::function<void(const std::vector<Result>& /* result */)> _func;
+    std::function<void(const std::vector<PickerResult>& /* result */)> _func;
   };
 
 } // namespace margelo::nitro::multipleimagepicker

nitrogen/generated/android/c++/JHybridMultipleImagePickerSpec.cpp

@@ -11,8 +11,8 @@
 namespace margelo::nitro::multipleimagepicker { struct NitroConfig; }
 // Forward declaration of `MediaType` to properly resolve imports.
 namespace margelo::nitro::multipleimagepicker { enum class MediaType; }
-// Forward declaration of `Result` to properly resolve imports.
-namespace margelo::nitro::multipleimagepicker { struct Result; }
+// Forward declaration of `PickerResult` to properly resolve imports.
+namespace margelo::nitro::multipleimagepicker { struct PickerResult; }
 // Forward declaration of `ResultType` to properly resolve imports.
 namespace margelo::nitro::multipleimagepicker { enum class ResultType; }
 // Forward declaration of `SelectBoxStyle` to properly resolve imports.
@@ -53,8 +53,8 @@ namespace margelo::nitro::multipleimagepicker { struct CameraResult; }
 #include "MediaType.hpp"
 #include "JMediaType.hpp"
 #include <vector>
-#include "Result.hpp"
-#include "JResult.hpp"
+#include "PickerResult.hpp"
+#include "JPickerResult.hpp"
 #include <string>
 #include <optional>
 #include "ResultType.hpp"
@@ -80,7 +80,7 @@ namespace margelo::nitro::multipleimagepicker { struct CameraResult; }
 #include "CameraDevice.hpp"
 #include "JCameraDevice.hpp"
 #include <functional>
-#include "JFunc_void_std__vector_Result_.hpp"
+#include "JFunc_void_std__vector_PickerResult_.hpp"
 #include "JFunc_void_double.hpp"
 #include "NitroCropConfig.hpp"
 #include "JNitroCropConfig.hpp"
@@ -118,9 +118,9 @@ namespace margelo::nitro::multipleimagepicker {
 
 
   // Methods
-  void JHybridMultipleImagePickerSpec::openPicker(const NitroConfig& config, const std::function<void(const std::vector<Result>& /* result */)>& resolved, const std::function<void(double /* reject */)>& rejected) {
-    static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JNitroConfig> /* config */, jni::alias_ref<JFunc_void_std__vector_Result_::javaobject> /* resolved */, jni::alias_ref<JFunc_void_double::javaobject> /* rejected */)>("openPicker");
-    method(_javaPart, JNitroConfig::fromCpp(config), JFunc_void_std__vector_Result_::fromCpp(resolved), JFunc_void_double::fromCpp(rejected));
+  void JHybridMultipleImagePickerSpec::openPicker(const NitroConfig& config, const std::function<void(const std::vector<PickerResult>& /* result */)>& resolved, const std::function<void(double /* reject */)>& rejected) {
+    static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<JNitroConfig> /* config */, jni::alias_ref<JFunc_void_std__vector_PickerResult_::javaobject> /* resolved */, jni::alias_ref<JFunc_void_double::javaobject> /* rejected */)>("openPicker");
+    method(_javaPart, JNitroConfig::fromCpp(config), JFunc_void_std__vector_PickerResult_::fromCpp(resolved), JFunc_void_double::fromCpp(rejected));
   }
   void JHybridMultipleImagePickerSpec::openCrop(const std::string& image, const NitroCropConfig& config, const std::function<void(const CropResult& /* result */)>& resolved, const std::function<void(double /* reject */)>& rejected) {
     static const auto method = _javaPart->getClass()->getMethod<void(jni::alias_ref<jni::JString> /* image */, jni::alias_ref<JNitroCropConfig> /* config */, jni::alias_ref<JFunc_void_CropResult::javaobject> /* resolved */, jni::alias_ref<JFunc_void_double::javaobject> /* rejected */)>("openCrop");

nitrogen/generated/android/c++/JHybridMultipleImagePickerSpec.hpp

@@ -51,7 +51,7 @@ namespace margelo::nitro::multipleimagepicker {
 
   public:
     // Methods
-    void openPicker(const NitroConfig& config, const std::function<void(const std::vector<Result>& /* result */)>& resolved, const std::function<void(double /* reject */)>& rejected) override;
+    void openPicker(const NitroConfig& config, const std::function<void(const std::vector<PickerResult>& /* result */)>& resolved, const std::function<void(double /* reject */)>& rejected) override;
     void openCrop(const std::string& image, const NitroCropConfig& config, const std::function<void(const CropResult& /* result */)>& resolved, const std::function<void(double /* reject */)>& rejected) override;
     void openPreview(const std::vector<MediaPreview>& media, double index, const NitroPreviewConfig& config) override;
     void openCamera(const NitroCameraConfig& config, const std::function<void(const CameraResult& /* result */)>& resolved, const std::function<void(double /* reject */)>& rejected) override;