Fix for endless loop : canceling libary --> taking picture automatically

.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

Example/Supporting Files/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.10</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Package.swift

@@ -0,0 +1,31 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "ALCameraViewController",
+    platforms: [
+        .iOS(.v13)
+    ],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "ALCameraViewController",
+            targets: ["ALCameraViewController"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "ALCameraViewController",
+            dependencies: [],
+            resources: [
+                .process("CameraView.strings")
+            ])
+    ]
+)

ALCameraViewController/CameraView.strings → Sources/ALCameraViewController/CameraView.strings

@@ -14,5 +14,5 @@
 
 "permissions.settings" = "Settings";
 
-"error.cant-fetch-photo" = "Unable to fetch image";
-"error.cant-fetch-photo.description" = "Please check your network settings";
+"error.cant_fetch_photo" = "Unable to fetch image";
+"error.cant_fetch_photo.description" = "Please check your network settings";

ALCameraViewController/Utilities/CameraGlobals.swift → Sources/ALCameraViewController/Utilities/CameraGlobals.swift

@@ -17,7 +17,7 @@ internal let scale = UIScreen.main.scale
 public class CameraGlobals {
     public static let shared = CameraGlobals()
 
-    public var bundle = Bundle(for: CameraViewController.self)
+    public var bundle = Bundle.module
     public var stringsTable = "CameraView"
     public var photoLibraryThumbnailSize = CGSize(width: thumbnailDimension, height: thumbnailDimension)
     public var defaultCameraPosition = AVCaptureDevice.Position.back

ALCameraViewController/Utilities/CameraShot.swift → Sources/ALCameraViewController/Utilities/CameraShot.swift

@@ -48,6 +48,8 @@ public func takePhoto(_ stillImageOutput: AVCaptureStillImageOutput, videoOrient
                 image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .downMirrored)
             case .downMirrored:
                 image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .down)
+            @unknown default:
+                image = UIImage(cgImage: cgImage, scale: image.scale, orientation: .right)
             }
         }
 

ALCameraViewController/Utilities/PhotoLibraryAuthorizer.swift → Sources/ALCameraViewController/Utilities/PhotoLibraryAuthorizer.swift

@@ -42,6 +42,10 @@ class PhotoLibraryAuthorizer {
                 self.onDeniedOrRestricted(completion: self.completion)
             }
             break
+        @unknown default:
+            DispatchQueue.main.async {
+                self.onDeniedOrRestricted(completion: self.completion)
+            }
         }
     }
 }

ALCameraViewController/Utilities/SingleImageFetcher.swift → Sources/ALCameraViewController/Utilities/SingleImageFetcher.swift

@@ -63,7 +63,7 @@ public class SingleImageFetcher {
     private func _fetch() {
 
         guard let asset = asset else {
-            let error = errorWithKey("error.cant-fetch-photo", domain: errorDomain)
+            let error = errorWithKey("error.cant_fetch_photo", domain: errorDomain)
             failure?(error)
             return
         }
@@ -87,7 +87,7 @@ public class SingleImageFetcher {
             if let image = image {
                 self.success?(image)
             } else {
-                let error = errorWithKey("error.cant-fetch-photo", domain: self.errorDomain)
+                let error = errorWithKey("error.cant_fetch_photo", domain: self.errorDomain)
                 self.failure?(error)
             }
         }

ALCameraViewController/Utilities/SingleImageSaver.swift → Sources/ALCameraViewController/Utilities/SingleImageSaver.swift

@@ -88,7 +88,7 @@ public class SingleImageSaver {
     }
 
     private func invokeFailure() {
-        let error = errorWithKey("error.cant-fetch-photo", domain: errorDomain)
+        let error = errorWithKey("error.cant_fetch_photo", domain: errorDomain)
         failure?(error)
     }
 }

ALCameraViewController/Utilities/Utilities.swift → Sources/ALCameraViewController/Utilities/Utilities.swift

@@ -68,7 +68,7 @@ internal func errorWithKey(_ key: String, domain: String) -> NSError {
     return error
 }
 
-internal func normalizedRect(_ rect: CGRect, orientation: UIImageOrientation) -> CGRect {
+internal func normalizedRect(_ rect: CGRect, orientation: UIImage.Orientation) -> CGRect {
     let normalizedX = rect.origin.x
     let normalizedY = rect.origin.y
 
@@ -86,6 +86,8 @@ internal func normalizedRect(_ rect: CGRect, orientation: UIImageOrientation) ->
         normalizedRect = CGRect(x: 1-normalizedY-normalizedHeight, y: normalizedX, width: normalizedHeight, height: normalizedWidth)
     case .right, .rightMirrored:
         normalizedRect = CGRect(x: normalizedY, y: 1-normalizedX-normalizedWidth, width: normalizedHeight, height: normalizedWidth)
+    @unknown default:
+        normalizedRect = CGRect(x: normalizedX, y: normalizedY, width: normalizedWidth, height: normalizedHeight)
     }
 
     return normalizedRect
@@ -100,6 +102,8 @@ internal func flashImage(_ mode: AVCaptureDevice.FlashMode) -> String {
         image = "flashOnIcon"
     case .off:
         image = "flashOffIcon"
+    @unknown default:
+        image = "flashAutoIcon"
     }
     return image
 }

ALCameraViewController/Utilities/VolumeControl.swift → Sources/ALCameraViewController/Utilities/VolumeControl.swift

@@ -11,7 +11,7 @@ import MediaPlayer
 
 typealias VolumeChangeAction = (Float) -> Void
 
-public class VolumeControl {
+public class VolumeControl : NSObject {
 
     let changeKey = "AVSystemController_SystemVolumeDidChangeNotification"
 
@@ -25,12 +25,15 @@ public class VolumeControl {
     var onVolumeChange: VolumeChangeAction?
 
     init(view: UIView, onVolumeChange: VolumeChangeAction?) {
+        super.init()
         self.onVolumeChange = onVolumeChange
         view.addSubview(volumeView)
-        view.sendSubview(toBack: volumeView)
-
-        try? AVAudioSession.sharedInstance().setActive(true)
-        NotificationCenter.default.addObserver(self, selector: #selector(volumeChanged), name: NSNotification.Name(rawValue: changeKey), object: nil)
+        view.sendSubviewToBack(volumeView)
+        do {
+            try AVAudioSession.sharedInstance().setActive(true)
+            NotificationCenter.default.addObserver(self, selector: #selector(volumeChanged), name: NSNotification.Name(rawValue: changeKey), object: nil)
+
+        } catch {}
     }
 
     deinit {
@@ -40,10 +43,18 @@ public class VolumeControl {
         volumeView.removeFromSuperview()
     }
 
-    @objc func volumeChanged() {
-        guard let slider = volumeView.subviews.filter({ $0 is UISlider }).first as? UISlider else { return }
+    @objc func volumeChanged(notif: Notification) {
+        guard
+            let reason = notif.userInfo?["AVSystemController_AudioVolumeChangeReasonNotificationParameter"] as? String,
+            reason == "ExplicitVolumeChange" else {
+                return
+        }
         let volume = AVAudioSession.sharedInstance().outputVolume
-        slider.setValue(volume, animated: false)
+        let slider = volumeView.subviews.filter({ $0 is UISlider }).first as? UISlider
+        slider?.setValue(volume, animated: false)
         onVolumeChange?(volume)
     }
+
+
 }
+