Merge pull request #33 from Jake-Short/close-button-updates

Changed closeButtonAlignment from optional to required value (+ minor updates)
Jake-Short · Jan 24, 2022 · c4de1a1 · c4de1a1
2 parents 2119eec + 4ec0d26
commit c4de1a1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/ImageViewer/ImageViewer.swift b/Sources/ImageViewer/ImageViewer.swift
@@ -14,7 +14,7 @@ public struct ImageViewer: View {
     @State var dragOffset: CGSize = CGSize.zero
     @State var dragOffsetPredicted: CGSize = CGSize.zero
 
-    public init(image: Image, viewerShown: Binding<Bool>, aspectRatio: Binding<CGFloat>? = nil, caption: Text? = nil, closeButtonAlignment: CloseButtonAlignment?) {
+    public init(image: Image, viewerShown: Binding<Bool>, aspectRatio: Binding<CGFloat>? = nil, caption: Text? = nil, closeButtonAlignment: CloseButtonAlignment? = .topLeft) {
         self.image = image
         self.imageOpt = nil
 
@@ -24,7 +24,7 @@ public struct ImageViewer: View {
         self.closeButtonAlignment = closeButtonAlignment
     }
 
-    public init(image: Image?, viewerShown: Binding<Bool>, aspectRatio: Binding<CGFloat>? = nil, caption: Text? = nil, closeButtonAlignment: CloseButtonAlignment?) {
+    public init(image: Image?, viewerShown: Binding<Bool>, aspectRatio: Binding<CGFloat>? = nil, caption: Text? = nil, closeButtonAlignment: CloseButtonAlignment? = .topLeft) {
         self.image = Image(systemName: "")
         self.imageOpt = image
 
@@ -150,7 +150,6 @@ public struct ImageViewer: View {
 
 
 public class PinchZoomView: UIView {
-
     weak var delegate: PinchZoomViewDelgate?
 
     private(set) var scale: CGFloat = 0 {
@@ -239,7 +238,6 @@ public protocol PinchZoomViewDelgate: AnyObject {
 }
 
 struct PinchZoom: UIViewRepresentable {
-
     @Binding var scale: CGFloat
     @Binding var anchor: UnitPoint
     @Binding var offset: CGSize

diff --git a/Sources/ImageViewerRemote/ImageViewerRemote.swift b/Sources/ImageViewerRemote/ImageViewerRemote.swift
@@ -19,7 +19,7 @@ public struct ImageViewerRemote: View {
 
     @ObservedObject var loader: ImageLoader
 
-    public init(imageURL: String, viewerShown: Binding<Bool>, aspectRatio: Binding<CGFloat>? = nil, disableCache: Bool? = nil, caption: Text? = nil, closeButtonAlignment: CloseButtonAlignment?) {
+    public init(imageURL: String, viewerShown: Binding<Bool>, aspectRatio: Binding<CGFloat>? = nil, disableCache: Bool? = nil, caption: Text? = nil, closeButtonAlignment: CloseButtonAlignment? = .topLeft) {
         self.imageURL = imageURL
         _viewerShown = viewerShown
         self.disableCache = disableCache