fix argument order of ImagePickerButton

swiftui-packages · Sep 24, 2022 · 5c4e813 · 5c4e813
1 parent 56d6d24
commit 5c4e813
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/Sources/ImagePickerModule/ImagePickerButton.swift b/Sources/ImagePickerModule/ImagePickerButton.swift
@@ -28,20 +28,6 @@ public struct ImagePickerButton<Content: View, DefaultImageContent: View>: View
     @State private var showSelectedImage: Bool = false
     @State private var showCameraAccessRequiredAlert: Bool = false
 
-    public init(
-        selectedImage: Binding<UIImage?>,
-        noCameraAccessStrategy: NoCameraAccessStrategy = NoCameraAccessStrategy.showToSettings,
-        onDelete: (() -> Void)? = nil,
-        label: @escaping () -> Content,
-        defaultImageContent: (() -> DefaultImageContent)?
-    ) {
-        self._selectedImage = selectedImage
-        self.noCameraAccessStrategy = noCameraAccessStrategy
-        self.onDelete = onDelete
-        self.label = label()
-        self.defaultImageContent = defaultImageContent
-    }
-
     public var body: some View {
 
         ZStack {
@@ -177,6 +163,28 @@ public struct ImagePickerButton<Content: View, DefaultImageContent: View>: View
 
 }
 
+
+
+extension ImagePickerButton {
+
+    public init(
+        selectedImage: Binding<UIImage?>,
+        noCameraAccessStrategy: NoCameraAccessStrategy = NoCameraAccessStrategy.showToSettings,
+        label: @escaping () -> Content,
+        onDelete: (() -> Void)? = nil,
+        defaultImageContent: (() -> DefaultImageContent)?
+    ) {
+        self._selectedImage = selectedImage
+        self.noCameraAccessStrategy = noCameraAccessStrategy
+        self.onDelete = onDelete
+        self.label = label()
+        self.defaultImageContent = defaultImageContent
+    }
+
+}
+
+
+
 extension ImagePickerButton where DefaultImageContent == EmptyView {
 
     public init(
@@ -188,8 +196,8 @@ extension ImagePickerButton where DefaultImageContent == EmptyView {
         self.init(
             selectedImage: selectedImage,
             noCameraAccessStrategy: noCameraAccessStrategy,
-            onDelete: onDelete,
             label: label,
+            onDelete: onDelete,
             defaultImageContent: nil
         )
     }

diff --git a/Sources/ImagePickerModule/ImagePickerModuleDemo.swift b/Sources/ImagePickerModule/ImagePickerModuleDemo.swift
@@ -56,16 +56,16 @@ public struct ImagePickerDemo: View {
 
                 ImagePickerButton(
                     selectedImage: self.$selectedImage,
-                    onDelete: {},
                     label: { Image(systemName: "photo") },
+                    onDelete: {},
                     defaultImageContent: { Image(systemName: "photo") }
                 )
 
                 ImagePickerButton(
                     selectedImage: self.$selectedImage,
                     noCameraAccessStrategy: .hideOption,
-                    onDelete: {},
                     label: { Image(systemName: "photo") },
+                    onDelete: {},
                     defaultImageContent: { Image(systemName: "photo") }
                 )
             }