Merge remote-tracking branch 'origin/master' into develop

Author: Heart

.DS_Store

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -15,7 +15,6 @@
 		3EC5EF8523C447EE0063A687 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3EC5EF8423C447EE0063A687 /* Preview Assets.xcassets */; };
 		3EC5EF8823C447EE0063A687 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3EC5EF8623C447EE0063A687 /* LaunchScreen.storyboard */; };
 		3EC5EF9223C448A20063A687 /* ModalScannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC5EF9123C448A20063A687 /* ModalScannerView.swift */; };
-		3ECBC9C2267C4E1E00C1089D /* CarBode in Frameworks */ = {isa = PBXBuildFile; productRef = 3ECBC9C1267C4E1E00C1089D /* CarBode */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -29,14 +28,14 @@
 		3EC5EF8723C447EE0063A687 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		3EC5EF8923C447EE0063A687 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3EC5EF9123C448A20063A687 /* ModalScannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalScannerView.swift; sourceTree = "<group>"; };
+		B4DA34042CA7D61900A817E5 /* CarBode-Barcode-Scanner-For-SwiftUI-master */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "CarBode-Barcode-Scanner-For-SwiftUI-master"; path = ..; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		3EC5EF7523C447EA0063A687 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3ECBC9C2267C4E1E00C1089D /* CarBode in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -87,6 +86,7 @@
 		4FE393DE2521C1FD007165D3 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				B4DA34042CA7D61900A817E5 /* CarBode-Barcode-Scanner-For-SwiftUI-master */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -108,7 +108,6 @@
 			);
 			name = ExampleProject;
 			packageProductDependencies = (
-				3ECBC9C1267C4E1E00C1089D /* CarBode */,
 			);
 			productName = ExampleProject;
 			productReference = 3EC5EF7823C447EA0063A687 /* ExampleProject.app */;
@@ -139,7 +138,6 @@
 			);
 			mainGroup = 3EC5EF6F23C447EA0063A687;
 			packageReferences = (
-				3ECBC9C0267C4E1E00C1089D /* XCRemoteSwiftPackageReference "CarBode-Barcode-Scanner-For-SwiftUI" */,
 			);
 			productRefGroup = 3EC5EF7923C447EA0063A687 /* Products */;
 			projectDirPath = "";
@@ -310,9 +308,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"ExampleProject/Preview Content\"";
-				DEVELOPMENT_TEAM = 5PN9LL8N5M;
+				DEVELOPMENT_TEAM = Y9Y97FRR32;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = ExampleProject/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -330,9 +329,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_ASSET_PATHS = "\"ExampleProject/Preview Content\"";
-				DEVELOPMENT_TEAM = 5PN9LL8N5M;
+				DEVELOPMENT_TEAM = Y9Y97FRR32;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = ExampleProject/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -366,25 +366,6 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
-
-/* Begin XCRemoteSwiftPackageReference section */
-		3ECBC9C0267C4E1E00C1089D /* XCRemoteSwiftPackageReference "CarBode-Barcode-Scanner-For-SwiftUI" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/heart/CarBode-Barcode-Scanner-For-SwiftUI";
-			requirement = {
-				branch = develop;
-				kind = branch;
-			};
-		};
-/* End XCRemoteSwiftPackageReference section */
-
-/* Begin XCSwiftPackageProductDependency section */
-		3ECBC9C1267C4E1E00C1089D /* CarBode */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 3ECBC9C0267C4E1E00C1089D /* XCRemoteSwiftPackageReference "CarBode-Barcode-Scanner-For-SwiftUI" */;
-			productName = CarBode;
-		};
-/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 3EC5EF7023C447EA0063A687 /* Project object */;
 }

ExampleProject/.DS_Store

@@ -52,6 +52,7 @@ struct cameraFrame: Shape {
 struct ModalScannerView: View {
     @State var barcodeValue = ""
     @State var torchIsOn = false
+    @State var zoom = 2.0
     @State var showingAlert = false
     @State var cameraPosition = AVCaptureDevice.Position.back
 
@@ -63,6 +64,15 @@ struct ModalScannerView: View {
 
             if cameraPosition == .back{
                 Text("Using back camera")
+                
+                Picker("Zoom", selection: $zoom) {
+                    Text("0.5x")
+                        .tag(1.0)
+                    Text("1.0x")
+                        .tag(2.0)
+                }
+                .pickerStyle(.segmented)
+                .padding(.horizontal)
             }else{
                 Text("Using front camera")
             }
@@ -93,6 +103,7 @@ struct ModalScannerView: View {
             CBScanner(
                 supportBarcode: .constant([.qr, .code128]),
                 torchLightIsOn: $torchIsOn,
+                zoom:$zoom,
                 cameraPosition: $cameraPosition,
                 mockBarCode: .constant(BarcodeData(value:"My Test Data", type: .qr))
             ){

ExampleProject/ExampleProject.xcodeproj/project.pbxproj

@@ -1,12 +1,12 @@
-// swift-tools-version:5.1
+// 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: "CarBode",
     platforms: [
-        .iOS(.v13)
+        .iOS(.v14)
     ],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.

ExampleProject/ExampleProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -2,7 +2,7 @@
 
 <img src="./logo/coffee.png" height="100">
 
-[Buy me a coffee.](#donation)
+[Buy me a coffee.](#donate-to-support-this-project)
 
 ---
 

ExampleProject/ExampleProject/.DS_Store

@@ -7,6 +7,7 @@
 
 import UIKit
 
+
 public struct BarcodeFrame {
 
     public let corners:[CGPoint]

ExampleProject/ExampleProject/ModalScannerView.swift

@@ -9,8 +9,6 @@
 import SwiftUI
 import AVFoundation
 
-
-
 public struct CBScanner: UIViewRepresentable {
 
     public typealias OnFound = (BarcodeData)->Void
@@ -24,6 +22,9 @@ public struct CBScanner: UIViewRepresentable {
     @Binding
     public var torchLightIsOn:Bool
 
+    @Binding
+    public var zoom:Double
+    
     @Binding
     public var scanInterval: Double
 
@@ -40,6 +41,7 @@ public struct CBScanner: UIViewRepresentable {
 
     public init(supportBarcode:Binding<[AVMetadataObject.ObjectType]> ,
          torchLightIsOn: Binding<Bool> = .constant(false),
+                zoom: Binding<Double> = .constant(2.0),
          scanInterval: Binding<Double> = .constant(3.0),
          cameraPosition: Binding<AVCaptureDevice.Position> = .constant(.back),
          mockBarCode: Binding<BarcodeData> = .constant(BarcodeData(value: "barcode value", type: .qr)),
@@ -48,6 +50,7 @@ public struct CBScanner: UIViewRepresentable {
          onDraw: OnDraw? = nil
     ) {
         _torchLightIsOn = torchLightIsOn
+        _zoom = zoom
         _supportBarcode = supportBarcode
         _scanInterval = scanInterval
         _cameraPosition = cameraPosition
@@ -73,8 +76,9 @@ public struct CBScanner: UIViewRepresentable {
     }
 
     public func updateUIView(_ uiView: CameraPreview, context: UIViewRepresentableContext<CBScanner>) {
-        
+
         uiView.setTorchLight(isOn: torchLightIsOn)
+        uiView.zoom(to: zoom)
         uiView.setCamera(position: cameraPosition)
         uiView.scanInterval = scanInterval
         uiView.setSupportedBarcode(supportBarcode: supportBarcode)