react-native-picture-selector 1.0.9 → 1.0.11

package/android/CMakeLists.txt

@@ -1,29 +1,19 @@
 cmake_minimum_required(VERSION 3.22.1)
 project(NitroPictureSelector)
 
-# ─── React Native & Nitro Modules ────────────────────────────────────────────
-find_package(ReactAndroid REQUIRED CONFIG)
-find_package(fbjni REQUIRED CONFIG)
-find_package(react-native-nitro-modules REQUIRED CONFIG)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# ─── Nitrogen-generated C++ bridge ───────────────────────────────────────────
-add_library(${CMAKE_PROJECT_NAME} SHARED
-  "${CMAKE_CURRENT_SOURCE_DIR}/../nitrogen/generated/android/NitroPictureSelectorOnLoad.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/../nitrogen/generated/android/c++/JHybridHybridPictureSelectorSpec.cpp"
-  "${CMAKE_CURRENT_SOURCE_DIR}/../nitrogen/generated/shared/c++/HybridHybridPictureSelectorSpec.cpp"
-)
+# Create empty shared library — sources are added by autolinking cmake below
+add_library(${CMAKE_PROJECT_NAME} SHARED)
 
-target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE
-  "${CMAKE_CURRENT_SOURCE_DIR}/../nitrogen/generated/shared/c++"
-  "${CMAKE_CURRENT_SOURCE_DIR}/../nitrogen/generated/android/c++"
-  "${CMAKE_CURRENT_SOURCE_DIR}/../nitrogen/generated/android/"
-)
+# Autolinking cmake handles: find_package, target_sources, target_link_libraries
+include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/NitroPictureSelector+autolinking.cmake)
 
+# Directly link libNitroModules.so from its stable cmake build output path.
+# The prefab for react-native-nitro-modules is header-only at CMake configure
+# time (fix-prefab.gradle updates it only after native build), so we link
+# the .so directly to avoid undefined symbol errors on fresh builds.
 target_link_libraries(${CMAKE_PROJECT_NAME}
-  ReactAndroid::jsi
-  ReactAndroid::reactnative
-  fbjni::fbjni
-  react-native-nitro-modules::NitroModules
-  android
-  log
+  ${CMAKE_SOURCE_DIR}/../../react-native-nitro-modules/android/build/intermediates/cmake/debug/obj/${ANDROID_ABI}/libNitroModules.so
 )

package/android/build.gradle

@@ -24,12 +24,23 @@ android {
       abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
     }
     consumerProguardFiles 'proguard-rules.pro'
+    externalNativeBuild {
+      cmake {
+        arguments "-DANDROID_STL=c++_shared"
+      }
+    }
   }
 
   buildFeatures {
     prefab true
   }
 
+  externalNativeBuild {
+    cmake {
+      path "CMakeLists.txt"
+    }
+  }
+
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_17
     targetCompatibility JavaVersion.VERSION_17
@@ -76,3 +87,16 @@ dependencies {
   // ─── Nitro bridge ────────────────────────────────────────────────────────
   implementation project(":react-native-nitro-modules")
 }
+
+afterEvaluate {
+  // Ensure react-native-nitro-modules C++ build finishes before we link against libNitroModules.so
+  tasks.configureEach { task ->
+    if (task.name.startsWith("buildCMake")) {
+      def nitroProject = rootProject.findProject(":react-native-nitro-modules")
+      def nitroTask = nitroProject?.tasks?.findByName(task.name)
+      if (nitroTask) {
+        task.dependsOn(nitroTask)
+      }
+    }
+  }
+}

package/nitrogen/generated/android/NitroPictureSelectorOnLoad.cpp

@@ -17,11 +17,11 @@
 
 #include "JHybridHybridPictureSelectorSpec.hpp"
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
 int initialize(JavaVM* vm) {
   return facebook::jni::initialize(vm, []() {
-    ::margelo::nitro::margelo::pictureselector::registerAllNatives();
+    ::margelo::pictureselector::registerAllNatives();
   });
 }
 
@@ -29,13 +29,13 @@ int initialize(JavaVM* vm) {
 
 void registerAllNatives() {
   using namespace margelo::nitro;
-  using namespace margelo::nitro::margelo::pictureselector;
+  using namespace margelo::pictureselector;
 
   // Register native JNI methods
-  margelo::nitro::margelo::pictureselector::JHybridHybridPictureSelectorSpec::CxxPart::registerNatives();
+  margelo::pictureselector::JHybridHybridPictureSelectorSpec::CxxPart::registerNatives();
 
   // Register Nitro Hybrid Objects
   
 }
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/NitroPictureSelectorOnLoad.hpp

@@ -9,7 +9,7 @@
 #include <functional>
 #include <NitroModules/NitroDefines.hpp>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   [[deprecated("Use registerNatives() instead.")]]
   int initialize(JavaVM* vm);
@@ -23,7 +23,7 @@ namespace margelo::nitro::margelo::pictureselector {
    * JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
    *   return facebook::jni::initialize(vm, []() {
    *     // register all NitroPictureSelector HybridObjects
-   *     margelo::nitro::margelo::pictureselector::registerNatives();
+   *     margelo::pictureselector::registerNatives();
    *     // any other custom registrations go here.
    *   });
    * }
@@ -31,4 +31,4 @@ namespace margelo::nitro::margelo::pictureselector {
    */
   void registerAllNatives();
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/c++/JCompressOptions.hpp

@@ -12,7 +12,7 @@
 
 #include <optional>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   using namespace facebook;
 
@@ -66,4 +66,4 @@ namespace margelo::nitro::margelo::pictureselector {
     }
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/c++/JCropOptions.hpp

@@ -12,7 +12,7 @@
 
 #include <optional>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   using namespace facebook;
 
@@ -70,4 +70,4 @@ namespace margelo::nitro::margelo::pictureselector {
     }
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/c++/JHybridHybridPictureSelectorSpec.cpp

@@ -8,17 +8,17 @@
 #include "JHybridHybridPictureSelectorSpec.hpp"
 
 // Forward declaration of `MediaAsset` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct MediaAsset; }
+namespace margelo::pictureselector { struct MediaAsset; }
 // Forward declaration of `PictureSelectorOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct PictureSelectorOptions; }
+namespace margelo::pictureselector { struct PictureSelectorOptions; }
 // Forward declaration of `MediaType` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class MediaType; }
+namespace margelo::pictureselector { enum class MediaType; }
 // Forward declaration of `CropOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CropOptions; }
+namespace margelo::pictureselector { struct CropOptions; }
 // Forward declaration of `CompressOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CompressOptions; }
+namespace margelo::pictureselector { struct CompressOptions; }
 // Forward declaration of `PickerTheme` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class PickerTheme; }
+namespace margelo::pictureselector { enum class PickerTheme; }
 
 #include "MediaAsset.hpp"
 #include <vector>
@@ -38,7 +38,7 @@ namespace margelo::nitro::margelo::pictureselector { enum class PickerTheme; }
 #include "PickerTheme.hpp"
 #include "JPickerTheme.hpp"
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   std::shared_ptr<JHybridHybridPictureSelectorSpec> JHybridHybridPictureSelectorSpec::JavaPart::getJHybridHybridPictureSelectorSpec() {
     auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
@@ -122,4 +122,4 @@ namespace margelo::nitro::margelo::pictureselector {
     }();
   }
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/c++/JHybridHybridPictureSelectorSpec.hpp

@@ -14,7 +14,7 @@
 
 
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   using namespace facebook;
 
@@ -61,4 +61,4 @@ namespace margelo::nitro::margelo::pictureselector {
     jni::global_ref<JHybridHybridPictureSelectorSpec::JavaPart> _javaPart;
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/c++/JMediaAsset.hpp

@@ -13,7 +13,7 @@
 #include <optional>
 #include <string>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   using namespace facebook;
 
@@ -95,4 +95,4 @@ namespace margelo::nitro::margelo::pictureselector {
     }
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/c++/JMediaType.hpp

@@ -10,7 +10,7 @@
 #include <fbjni/fbjni.h>
 #include "MediaType.hpp"
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   using namespace facebook;
 
@@ -58,4 +58,4 @@ namespace margelo::nitro::margelo::pictureselector {
     }
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/c++/JPickerTheme.hpp

@@ -10,7 +10,7 @@
 #include <fbjni/fbjni.h>
 #include "PickerTheme.hpp"
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   using namespace facebook;
 
@@ -61,4 +61,4 @@ namespace margelo::nitro::margelo::pictureselector {
     }
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/android/c++/JPictureSelectorOptions.hpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   using namespace facebook;
 
@@ -118,4 +118,4 @@ namespace margelo::nitro::margelo::pictureselector {
     }
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/ios/NitroPictureSelector-Swift-Cxx-Bridge.cpp

@@ -12,7 +12,7 @@
 #include "NitroPictureSelector-Swift-Cxx-Umbrella.hpp"
 #include <NitroModules/NitroDefines.hpp>
 
-namespace margelo::nitro::margelo::pictureselector::bridge::swift {
+namespace margelo::pictureselector::bridge::swift {
 
   // pragma MARK: std::function<void(const std::vector<MediaAsset>& /* result */)>
   Func_void_std__vector_MediaAsset_ create_Func_void_std__vector_MediaAsset_(void* NON_NULL swiftClosureWrapper) noexcept {
@@ -33,10 +33,10 @@ namespace margelo::nitro::margelo::pictureselector::bridge::swift {
   // pragma MARK: std::shared_ptr<HybridHybridPictureSelectorSpec>
   std::shared_ptr<HybridHybridPictureSelectorSpec> create_std__shared_ptr_HybridHybridPictureSelectorSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
     NitroPictureSelector::HybridHybridPictureSelectorSpec_cxx swiftPart = NitroPictureSelector::HybridHybridPictureSelectorSpec_cxx::fromUnsafe(swiftUnsafePointer);
-    return std::make_shared<margelo::nitro::margelo::pictureselector::HybridHybridPictureSelectorSpecSwift>(swiftPart);
+    return std::make_shared<margelo::pictureselector::HybridHybridPictureSelectorSpecSwift>(swiftPart);
   }
   void* NON_NULL get_std__shared_ptr_HybridHybridPictureSelectorSpec_(std__shared_ptr_HybridHybridPictureSelectorSpec_ cppType) {
-    std::shared_ptr<margelo::nitro::margelo::pictureselector::HybridHybridPictureSelectorSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::margelo::pictureselector::HybridHybridPictureSelectorSpecSwift>(cppType);
+    std::shared_ptr<margelo::pictureselector::HybridHybridPictureSelectorSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::pictureselector::HybridHybridPictureSelectorSpecSwift>(cppType);
     #ifdef NITRO_DEBUG
     if (swiftWrapper == nullptr) [[unlikely]] {
       throw std::runtime_error("Class \"HybridHybridPictureSelectorSpec\" is not implemented in Swift!");
@@ -46,4 +46,4 @@ namespace margelo::nitro::margelo::pictureselector::bridge::swift {
     return swiftPart.toUnsafe();
   }
 
-} // namespace margelo::nitro::margelo::pictureselector::bridge::swift
+} // namespace margelo::pictureselector::bridge::swift

package/nitrogen/generated/ios/NitroPictureSelector-Swift-Cxx-Bridge.hpp

@@ -9,17 +9,17 @@
 
 // Forward declarations of C++ defined types
 // Forward declaration of `CompressOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CompressOptions; }
+namespace margelo::pictureselector { struct CompressOptions; }
 // Forward declaration of `CropOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CropOptions; }
+namespace margelo::pictureselector { struct CropOptions; }
 // Forward declaration of `HybridHybridPictureSelectorSpec` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { class HybridHybridPictureSelectorSpec; }
+namespace margelo::pictureselector { class HybridHybridPictureSelectorSpec; }
 // Forward declaration of `MediaAsset` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct MediaAsset; }
+namespace margelo::pictureselector { struct MediaAsset; }
 // Forward declaration of `MediaType` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class MediaType; }
+namespace margelo::pictureselector { enum class MediaType; }
 // Forward declaration of `PickerTheme` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class PickerTheme; }
+namespace margelo::pictureselector { enum class PickerTheme; }
 
 // Forward declarations of Swift defined types
 // Forward declaration of `HybridHybridPictureSelectorSpec_cxx` to properly resolve imports.
@@ -46,7 +46,7 @@ namespace NitroPictureSelector { class HybridHybridPictureSelectorSpec_cxx; }
  * Contains specialized versions of C++ templated types so they can be accessed from Swift,
  * as well as helper functions to interact with those C++ types from Swift.
  */
-namespace margelo::nitro::margelo::pictureselector::bridge::swift {
+namespace margelo::pictureselector::bridge::swift {
 
   // pragma MARK: std::optional<std::string>
   /**
@@ -267,4 +267,4 @@ namespace margelo::nitro::margelo::pictureselector::bridge::swift {
     return Result<std::shared_ptr<Promise<std::vector<MediaAsset>>>>::withError(error);
   }
 
-} // namespace margelo::nitro::margelo::pictureselector::bridge::swift
+} // namespace margelo::pictureselector::bridge::swift

package/nitrogen/generated/ios/NitroPictureSelector-Swift-Cxx-Umbrella.hpp

@@ -9,19 +9,19 @@
 
 // Forward declarations of C++ defined types
 // Forward declaration of `CompressOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CompressOptions; }
+namespace margelo::pictureselector { struct CompressOptions; }
 // Forward declaration of `CropOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CropOptions; }
+namespace margelo::pictureselector { struct CropOptions; }
 // Forward declaration of `HybridHybridPictureSelectorSpec` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { class HybridHybridPictureSelectorSpec; }
+namespace margelo::pictureselector { class HybridHybridPictureSelectorSpec; }
 // Forward declaration of `MediaAsset` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct MediaAsset; }
+namespace margelo::pictureselector { struct MediaAsset; }
 // Forward declaration of `MediaType` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class MediaType; }
+namespace margelo::pictureselector { enum class MediaType; }
 // Forward declaration of `PickerTheme` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class PickerTheme; }
+namespace margelo::pictureselector { enum class PickerTheme; }
 // Forward declaration of `PictureSelectorOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct PictureSelectorOptions; }
+namespace margelo::pictureselector { struct PictureSelectorOptions; }
 
 // Include C++ defined types
 #include "CompressOptions.hpp"

package/nitrogen/generated/ios/c++/HybridHybridPictureSelectorSpecSwift.cpp

@@ -7,5 +7,5 @@
 
 #include "HybridHybridPictureSelectorSpecSwift.hpp"
 
-namespace margelo::nitro::margelo::pictureselector {
-} // namespace margelo::nitro::margelo::pictureselector
+namespace margelo::pictureselector {
+} // namespace margelo::pictureselector

package/nitrogen/generated/ios/c++/HybridHybridPictureSelectorSpecSwift.hpp

@@ -13,17 +13,17 @@
 namespace NitroPictureSelector { class HybridHybridPictureSelectorSpec_cxx; }
 
 // Forward declaration of `MediaAsset` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct MediaAsset; }
+namespace margelo::pictureselector { struct MediaAsset; }
 // Forward declaration of `PictureSelectorOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct PictureSelectorOptions; }
+namespace margelo::pictureselector { struct PictureSelectorOptions; }
 // Forward declaration of `MediaType` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class MediaType; }
+namespace margelo::pictureselector { enum class MediaType; }
 // Forward declaration of `CropOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CropOptions; }
+namespace margelo::pictureselector { struct CropOptions; }
 // Forward declaration of `CompressOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CompressOptions; }
+namespace margelo::pictureselector { struct CompressOptions; }
 // Forward declaration of `PickerTheme` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class PickerTheme; }
+namespace margelo::pictureselector { enum class PickerTheme; }
 
 #include "MediaAsset.hpp"
 #include <vector>
@@ -38,7 +38,7 @@ namespace margelo::nitro::margelo::pictureselector { enum class PickerTheme; }
 
 #include "NitroPictureSelector-Swift-Cxx-Umbrella.hpp"
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   /**
    * The C++ part of HybridHybridPictureSelectorSpec_cxx.swift.
@@ -107,4 +107,4 @@ namespace margelo::nitro::margelo::pictureselector {
     NitroPictureSelector::HybridHybridPictureSelectorSpec_cxx _swiftPart;
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/shared/c++/CompressOptions.hpp

@@ -32,7 +32,7 @@
 
 #include <optional>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   /**
    * A struct which can be represented as a JavaScript object (CompressOptions).
@@ -52,23 +52,23 @@ namespace margelo::nitro::margelo::pictureselector {
     friend bool operator==(const CompressOptions& lhs, const CompressOptions& rhs) = default;
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector
 
 namespace margelo::nitro {
 
   // C++ CompressOptions <> JS CompressOptions (object)
   template <>
-  struct JSIConverter<margelo::nitro::margelo::pictureselector::CompressOptions> final {
-    static inline margelo::nitro::margelo::pictureselector::CompressOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::pictureselector::CompressOptions> final {
+    static inline margelo::pictureselector::CompressOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return margelo::nitro::margelo::pictureselector::CompressOptions(
+      return margelo::pictureselector::CompressOptions(
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "enabled"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "quality"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "maxWidth"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "maxHeight")))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::margelo::pictureselector::CompressOptions& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::pictureselector::CompressOptions& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "enabled"), JSIConverter<bool>::toJSI(runtime, arg.enabled));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "quality"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.quality));

package/nitrogen/generated/shared/c++/CropOptions.hpp

@@ -32,7 +32,7 @@
 
 #include <optional>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   /**
    * A struct which can be represented as a JavaScript object (CropOptions).
@@ -53,16 +53,16 @@ namespace margelo::nitro::margelo::pictureselector {
     friend bool operator==(const CropOptions& lhs, const CropOptions& rhs) = default;
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector
 
 namespace margelo::nitro {
 
   // C++ CropOptions <> JS CropOptions (object)
   template <>
-  struct JSIConverter<margelo::nitro::margelo::pictureselector::CropOptions> final {
-    static inline margelo::nitro::margelo::pictureselector::CropOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::pictureselector::CropOptions> final {
+    static inline margelo::pictureselector::CropOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return margelo::nitro::margelo::pictureselector::CropOptions(
+      return margelo::pictureselector::CropOptions(
         JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "enabled"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "freeStyle"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "circular"))),
@@ -70,7 +70,7 @@ namespace margelo::nitro {
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "ratioY")))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::margelo::pictureselector::CropOptions& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::pictureselector::CropOptions& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "enabled"), JSIConverter<bool>::toJSI(runtime, arg.enabled));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "freeStyle"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.freeStyle));

package/nitrogen/generated/shared/c++/HybridHybridPictureSelectorSpec.cpp

@@ -7,7 +7,7 @@
 
 #include "HybridHybridPictureSelectorSpec.hpp"
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   void HybridHybridPictureSelectorSpec::loadHybridMethods() {
     // load base methods/properties
@@ -19,4 +19,4 @@ namespace margelo::nitro::margelo::pictureselector {
     });
   }
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/shared/c++/HybridHybridPictureSelectorSpec.hpp

@@ -14,16 +14,16 @@
 #endif
 
 // Forward declaration of `MediaAsset` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct MediaAsset; }
+namespace margelo::pictureselector { struct MediaAsset; }
 // Forward declaration of `PictureSelectorOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct PictureSelectorOptions; }
+namespace margelo::pictureselector { struct PictureSelectorOptions; }
 
 #include "MediaAsset.hpp"
 #include <vector>
 #include <NitroModules/Promise.hpp>
 #include "PictureSelectorOptions.hpp"
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   using namespace margelo::nitro;
 
@@ -66,4 +66,4 @@ namespace margelo::nitro::margelo::pictureselector {
       static constexpr auto TAG = "HybridPictureSelector";
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector

package/nitrogen/generated/shared/c++/MediaAsset.hpp

@@ -33,7 +33,7 @@
 #include <string>
 #include <optional>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   /**
    * A struct which can be represented as a JavaScript object (MediaAsset).
@@ -60,16 +60,16 @@ namespace margelo::nitro::margelo::pictureselector {
     friend bool operator==(const MediaAsset& lhs, const MediaAsset& rhs) = default;
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector
 
 namespace margelo::nitro {
 
   // C++ MediaAsset <> JS MediaAsset (object)
   template <>
-  struct JSIConverter<margelo::nitro::margelo::pictureselector::MediaAsset> final {
-    static inline margelo::nitro::margelo::pictureselector::MediaAsset fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::pictureselector::MediaAsset> final {
+    static inline margelo::pictureselector::MediaAsset fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return margelo::nitro::margelo::pictureselector::MediaAsset(
+      return margelo::pictureselector::MediaAsset(
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "uri"))),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "type"))),
         JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "mimeType"))),
@@ -83,7 +83,7 @@ namespace margelo::nitro {
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "bucketName")))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::margelo::pictureselector::MediaAsset& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::pictureselector::MediaAsset& arg) {
       jsi::Object obj(runtime);
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "uri"), JSIConverter<std::string>::toJSI(runtime, arg.uri));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "type"), JSIConverter<std::string>::toJSI(runtime, arg.type));

package/nitrogen/generated/shared/c++/MediaType.hpp

@@ -23,7 +23,7 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   /**
    * An enum which can be represented as a JavaScript union (MediaType).
@@ -34,28 +34,28 @@ namespace margelo::nitro::margelo::pictureselector {
     ALL      SWIFT_NAME(all) = 2,
   } CLOSED_ENUM;
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector
 
 namespace margelo::nitro {
 
   // C++ MediaType <> JS MediaType (union)
   template <>
-  struct JSIConverter<margelo::nitro::margelo::pictureselector::MediaType> final {
-    static inline margelo::nitro::margelo::pictureselector::MediaType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::pictureselector::MediaType> final {
+    static inline margelo::pictureselector::MediaType fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {
-        case hashString("image"): return margelo::nitro::margelo::pictureselector::MediaType::IMAGE;
-        case hashString("video"): return margelo::nitro::margelo::pictureselector::MediaType::VIDEO;
-        case hashString("all"): return margelo::nitro::margelo::pictureselector::MediaType::ALL;
+        case hashString("image"): return margelo::pictureselector::MediaType::IMAGE;
+        case hashString("video"): return margelo::pictureselector::MediaType::VIDEO;
+        case hashString("all"): return margelo::pictureselector::MediaType::ALL;
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum MediaType - invalid value!");
       }
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::margelo::pictureselector::MediaType arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::pictureselector::MediaType arg) {
       switch (arg) {
-        case margelo::nitro::margelo::pictureselector::MediaType::IMAGE: return JSIConverter<std::string>::toJSI(runtime, "image");
-        case margelo::nitro::margelo::pictureselector::MediaType::VIDEO: return JSIConverter<std::string>::toJSI(runtime, "video");
-        case margelo::nitro::margelo::pictureselector::MediaType::ALL: return JSIConverter<std::string>::toJSI(runtime, "all");
+        case margelo::pictureselector::MediaType::IMAGE: return JSIConverter<std::string>::toJSI(runtime, "image");
+        case margelo::pictureselector::MediaType::VIDEO: return JSIConverter<std::string>::toJSI(runtime, "video");
+        case margelo::pictureselector::MediaType::ALL: return JSIConverter<std::string>::toJSI(runtime, "all");
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert MediaType to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");

package/nitrogen/generated/shared/c++/PickerTheme.hpp

@@ -23,7 +23,7 @@
 #error NitroModules cannot be found! Are you sure you installed NitroModules properly?
 #endif
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   /**
    * An enum which can be represented as a JavaScript union (PickerTheme).
@@ -35,30 +35,30 @@ namespace margelo::nitro::margelo::pictureselector {
     DARK      SWIFT_NAME(dark) = 3,
   } CLOSED_ENUM;
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector
 
 namespace margelo::nitro {
 
   // C++ PickerTheme <> JS PickerTheme (union)
   template <>
-  struct JSIConverter<margelo::nitro::margelo::pictureselector::PickerTheme> final {
-    static inline margelo::nitro::margelo::pictureselector::PickerTheme fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::pictureselector::PickerTheme> final {
+    static inline margelo::pictureselector::PickerTheme fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       std::string unionValue = JSIConverter<std::string>::fromJSI(runtime, arg);
       switch (hashString(unionValue.c_str(), unionValue.size())) {
-        case hashString("default"): return margelo::nitro::margelo::pictureselector::PickerTheme::DEFAULT;
-        case hashString("wechat"): return margelo::nitro::margelo::pictureselector::PickerTheme::WECHAT;
-        case hashString("white"): return margelo::nitro::margelo::pictureselector::PickerTheme::WHITE;
-        case hashString("dark"): return margelo::nitro::margelo::pictureselector::PickerTheme::DARK;
+        case hashString("default"): return margelo::pictureselector::PickerTheme::DEFAULT;
+        case hashString("wechat"): return margelo::pictureselector::PickerTheme::WECHAT;
+        case hashString("white"): return margelo::pictureselector::PickerTheme::WHITE;
+        case hashString("dark"): return margelo::pictureselector::PickerTheme::DARK;
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert \"" + unionValue + "\" to enum PickerTheme - invalid value!");
       }
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::nitro::margelo::pictureselector::PickerTheme arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, margelo::pictureselector::PickerTheme arg) {
       switch (arg) {
-        case margelo::nitro::margelo::pictureselector::PickerTheme::DEFAULT: return JSIConverter<std::string>::toJSI(runtime, "default");
-        case margelo::nitro::margelo::pictureselector::PickerTheme::WECHAT: return JSIConverter<std::string>::toJSI(runtime, "wechat");
-        case margelo::nitro::margelo::pictureselector::PickerTheme::WHITE: return JSIConverter<std::string>::toJSI(runtime, "white");
-        case margelo::nitro::margelo::pictureselector::PickerTheme::DARK: return JSIConverter<std::string>::toJSI(runtime, "dark");
+        case margelo::pictureselector::PickerTheme::DEFAULT: return JSIConverter<std::string>::toJSI(runtime, "default");
+        case margelo::pictureselector::PickerTheme::WECHAT: return JSIConverter<std::string>::toJSI(runtime, "wechat");
+        case margelo::pictureselector::PickerTheme::WHITE: return JSIConverter<std::string>::toJSI(runtime, "white");
+        case margelo::pictureselector::PickerTheme::DARK: return JSIConverter<std::string>::toJSI(runtime, "dark");
         default: [[unlikely]]
           throw std::invalid_argument("Cannot convert PickerTheme to JS - invalid value: "
                                     + std::to_string(static_cast<int>(arg)) + "!");

package/nitrogen/generated/shared/c++/PictureSelectorOptions.hpp

@@ -29,13 +29,13 @@
 #endif
 
 // Forward declaration of `MediaType` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class MediaType; }
+namespace margelo::pictureselector { enum class MediaType; }
 // Forward declaration of `CropOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CropOptions; }
+namespace margelo::pictureselector { struct CropOptions; }
 // Forward declaration of `CompressOptions` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { struct CompressOptions; }
+namespace margelo::pictureselector { struct CompressOptions; }
 // Forward declaration of `PickerTheme` to properly resolve imports.
-namespace margelo::nitro::margelo::pictureselector { enum class PickerTheme; }
+namespace margelo::pictureselector { enum class PickerTheme; }
 
 #include "MediaType.hpp"
 #include <optional>
@@ -45,7 +45,7 @@ namespace margelo::nitro::margelo::pictureselector { enum class PickerTheme; }
 #include <string>
 #include <vector>
 
-namespace margelo::nitro::margelo::pictureselector {
+namespace margelo::pictureselector {
 
   /**
    * A struct which can be represented as a JavaScript object (PictureSelectorOptions).
@@ -71,38 +71,38 @@ namespace margelo::nitro::margelo::pictureselector {
     friend bool operator==(const PictureSelectorOptions& lhs, const PictureSelectorOptions& rhs) = default;
   };
 
-} // namespace margelo::nitro::margelo::pictureselector
+} // namespace margelo::pictureselector
 
 namespace margelo::nitro {
 
   // C++ PictureSelectorOptions <> JS PictureSelectorOptions (object)
   template <>
-  struct JSIConverter<margelo::nitro::margelo::pictureselector::PictureSelectorOptions> final {
-    static inline margelo::nitro::margelo::pictureselector::PictureSelectorOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+  struct JSIConverter<margelo::pictureselector::PictureSelectorOptions> final {
+    static inline margelo::pictureselector::PictureSelectorOptions fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
       jsi::Object obj = arg.asObject(runtime);
-      return margelo::nitro::margelo::pictureselector::PictureSelectorOptions(
-        JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::MediaType>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "mediaType"))),
+      return margelo::pictureselector::PictureSelectorOptions(
+        JSIConverter<std::optional<margelo::pictureselector::MediaType>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "mediaType"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "maxCount"))),
         JSIConverter<std::optional<bool>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "enableCamera"))),
-        JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::CropOptions>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "crop"))),
-        JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::CompressOptions>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "compress"))),
+        JSIConverter<std::optional<margelo::pictureselector::CropOptions>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "crop"))),
+        JSIConverter<std::optional<margelo::pictureselector::CompressOptions>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "compress"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "maxVideoDuration"))),
         JSIConverter<std::optional<double>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "minVideoDuration"))),
-        JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::PickerTheme>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "theme"))),
+        JSIConverter<std::optional<margelo::pictureselector::PickerTheme>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "theme"))),
         JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "themeColor"))),
         JSIConverter<std::optional<std::vector<std::string>>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "selectedAssets")))
       );
     }
-    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::margelo::pictureselector::PictureSelectorOptions& arg) {
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::pictureselector::PictureSelectorOptions& arg) {
       jsi::Object obj(runtime);
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "mediaType"), JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::MediaType>>::toJSI(runtime, arg.mediaType));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "mediaType"), JSIConverter<std::optional<margelo::pictureselector::MediaType>>::toJSI(runtime, arg.mediaType));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "maxCount"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.maxCount));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "enableCamera"), JSIConverter<std::optional<bool>>::toJSI(runtime, arg.enableCamera));
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "crop"), JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::CropOptions>>::toJSI(runtime, arg.crop));
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "compress"), JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::CompressOptions>>::toJSI(runtime, arg.compress));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "crop"), JSIConverter<std::optional<margelo::pictureselector::CropOptions>>::toJSI(runtime, arg.crop));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "compress"), JSIConverter<std::optional<margelo::pictureselector::CompressOptions>>::toJSI(runtime, arg.compress));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "maxVideoDuration"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.maxVideoDuration));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "minVideoDuration"), JSIConverter<std::optional<double>>::toJSI(runtime, arg.minVideoDuration));
-      obj.setProperty(runtime, PropNameIDCache::get(runtime, "theme"), JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::PickerTheme>>::toJSI(runtime, arg.theme));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "theme"), JSIConverter<std::optional<margelo::pictureselector::PickerTheme>>::toJSI(runtime, arg.theme));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "themeColor"), JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.themeColor));
       obj.setProperty(runtime, PropNameIDCache::get(runtime, "selectedAssets"), JSIConverter<std::optional<std::vector<std::string>>>::toJSI(runtime, arg.selectedAssets));
       return obj;
@@ -115,14 +115,14 @@ namespace margelo::nitro {
       if (!nitro::isPlainObject(runtime, obj)) {
         return false;
       }
-      if (!JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::MediaType>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "mediaType")))) return false;
+      if (!JSIConverter<std::optional<margelo::pictureselector::MediaType>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "mediaType")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "maxCount")))) return false;
       if (!JSIConverter<std::optional<bool>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "enableCamera")))) return false;
-      if (!JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::CropOptions>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "crop")))) return false;
-      if (!JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::CompressOptions>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "compress")))) return false;
+      if (!JSIConverter<std::optional<margelo::pictureselector::CropOptions>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "crop")))) return false;
+      if (!JSIConverter<std::optional<margelo::pictureselector::CompressOptions>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "compress")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "maxVideoDuration")))) return false;
       if (!JSIConverter<std::optional<double>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "minVideoDuration")))) return false;
-      if (!JSIConverter<std::optional<margelo::nitro::margelo::pictureselector::PickerTheme>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "theme")))) return false;
+      if (!JSIConverter<std::optional<margelo::pictureselector::PickerTheme>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "theme")))) return false;
       if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "themeColor")))) return false;
       if (!JSIConverter<std::optional<std::vector<std::string>>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "selectedAssets")))) return false;
       return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-picture-selector",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "High-performance photo/video picker for React Native using Nitro Modules",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",