From eb22289132866ad78569e474e4153fe248e12dc9 Mon Sep 17 00:00:00 2001 From: Justin Vallely Date: Wed, 11 Sep 2019 14:41:20 -0600 Subject: [PATCH 1/8] points podspec to self --- CardScan.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CardScan.podspec b/CardScan.podspec index db60b2b2..1e84347d 100644 --- a/CardScan.podspec +++ b/CardScan.podspec @@ -9,7 +9,7 @@ CardScan is a library for scanning credit cards. s.homepage = 'https://cardscan.io' s.license = { :type => 'BSD', :file => 'LICENSE' } s.author = { 'Sam King' => 'kingst@gmail.com' } - s.source = { :git => 'https://github.com/getbouncer/cardscan-ios.git', :tag => s.version.to_s } + s.source = { :git => 'https://github.com/Ibotta/cardscan-ios.git', :tag => s.version.to_s } # lint warning, who knows #s.social_media_url = 'https://twitter.com/stk' s.default_subspec = 'Core' From 11c3b6c4c077ca5d24c8749a38ec632daf515774 Mon Sep 17 00:00:00 2001 From: Justin Vallely Date: Wed, 22 Jan 2020 14:39:42 -0700 Subject: [PATCH 2/8] deletes duplicated constraint --- CardScan/Assets/CardScan.storyboard | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CardScan/Assets/CardScan.storyboard b/CardScan/Assets/CardScan.storyboard index ef418e8e..0a4cce0b 100644 --- a/CardScan/Assets/CardScan.storyboard +++ b/CardScan/Assets/CardScan.storyboard @@ -1,9 +1,9 @@ - + - + @@ -100,7 +100,6 @@ - From 5a16a27b0d5a535c05c94630b04ef87bbf600fb6 Mon Sep 17 00:00:00 2001 From: Justin Vallely Date: Wed, 22 Jan 2020 16:20:33 -0700 Subject: [PATCH 3/8] adds outlets for torch button constraints --- CardScan/Assets/CardScan.storyboard | 2 ++ CardScan/Classes/ScanViewController.swift | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CardScan/Assets/CardScan.storyboard b/CardScan/Assets/CardScan.storyboard index 0a4cce0b..1a3e89a6 100644 --- a/CardScan/Assets/CardScan.storyboard +++ b/CardScan/Assets/CardScan.storyboard @@ -221,6 +221,8 @@ + + diff --git a/CardScan/Classes/ScanViewController.swift b/CardScan/Classes/ScanViewController.swift index 10a6736d..876e9bcb 100644 --- a/CardScan/Classes/ScanViewController.swift +++ b/CardScan/Classes/ScanViewController.swift @@ -118,6 +118,8 @@ import UIKit @IBOutlet weak var regionOfInterestAspectConstraint: NSLayoutConstraint! @IBOutlet weak var torchButton: UIButton! + @IBOutlet weak var torchButtonWidthConstraint: NSLayoutConstraint! + @IBOutlet weak var torchButtonHeightConstraint: NSLayoutConstraint! @IBOutlet weak var cornerView: CornerView! var cornerBorderColor = UIColor.green.cgColor var denyPermissionTitle = "Need camera access" From 7babde78a32e23a3f49711ef9859dfe504644e23 Mon Sep 17 00:00:00 2001 From: Justin Vallely Date: Wed, 22 Jan 2020 16:20:57 -0700 Subject: [PATCH 4/8] exposes properties for customizing the torch button size --- CardScan/Classes/ScanViewController.swift | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CardScan/Classes/ScanViewController.swift b/CardScan/Classes/ScanViewController.swift index 876e9bcb..498fe8bc 100644 --- a/CardScan/Classes/ScanViewController.swift +++ b/CardScan/Classes/ScanViewController.swift @@ -120,6 +120,8 @@ import UIKit @IBOutlet weak var torchButton: UIButton! @IBOutlet weak var torchButtonWidthConstraint: NSLayoutConstraint! @IBOutlet weak var torchButtonHeightConstraint: NSLayoutConstraint! + public var torchButtonWidth: CGFloat? + public var torchButtonHeight: CGFloat? @IBOutlet weak var cornerView: CornerView! var cornerBorderColor = UIColor.green.cgColor var denyPermissionTitle = "Need camera access" @@ -235,6 +237,12 @@ import UIKit if let color = self.cornerColor { self.cornerBorderColor = color.cgColor } + if let width = self.torchButtonWidth { + self.torchButtonWidthConstraint.constant = width + } + if let height = self.torchButtonHeight { + self.torchButtonHeightConstraint.constant = height + } } func showDenyAlert() { From de7faac81e9842d6d9defa0d3c3706d6bfdb0513 Mon Sep 17 00:00:00 2001 From: Justin Vallely Date: Wed, 22 Jan 2020 16:21:19 -0700 Subject: [PATCH 5/8] pod install adds this --- Example/Pods/Pods.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 9c5a7aad..4c390c32 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -578,6 +578,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = CF1408CF629C7361332E53B88F7BD30C; productRefGroup = 99F45B7B7FABC011494735AD103CE39E /* Products */; From fa752f3ec5e627264773216f96a570fc03beb579 Mon Sep 17 00:00:00 2001 From: Justin Vallely Date: Wed, 22 Jan 2020 16:22:37 -0700 Subject: [PATCH 6/8] adds example usage --- Example/CardScan/ViewController.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Example/CardScan/ViewController.swift b/Example/CardScan/ViewController.swift index 67ac75e3..120da39b 100644 --- a/Example/CardScan/ViewController.swift +++ b/Example/CardScan/ViewController.swift @@ -145,6 +145,9 @@ class ViewController: UIViewController, ScanEvents, ScanDelegate, FullScanString vc.cornerColor = UIColor.blue vc.torchButtonImage = ScanViewController.cameraImage() + + vc.torchButtonHeight = 44 + vc.torchButtonWidth = 44 self.present(vc, animated: true) } From b3be857e58901c93122f84dbc72e903d3004a5b8 Mon Sep 17 00:00:00 2001 From: Justin Vallely Date: Wed, 22 Jan 2020 16:27:10 -0700 Subject: [PATCH 7/8] Converts everything to a single CGSize property --- CardScan/Classes/ScanViewController.swift | 11 ++++------- Example/CardScan/ViewController.swift | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CardScan/Classes/ScanViewController.swift b/CardScan/Classes/ScanViewController.swift index 498fe8bc..68b020ac 100644 --- a/CardScan/Classes/ScanViewController.swift +++ b/CardScan/Classes/ScanViewController.swift @@ -120,8 +120,7 @@ import UIKit @IBOutlet weak var torchButton: UIButton! @IBOutlet weak var torchButtonWidthConstraint: NSLayoutConstraint! @IBOutlet weak var torchButtonHeightConstraint: NSLayoutConstraint! - public var torchButtonWidth: CGFloat? - public var torchButtonHeight: CGFloat? + public var torchButtonSize: CGSize? @IBOutlet weak var cornerView: CornerView! var cornerBorderColor = UIColor.green.cgColor var denyPermissionTitle = "Need camera access" @@ -237,11 +236,9 @@ import UIKit if let color = self.cornerColor { self.cornerBorderColor = color.cgColor } - if let width = self.torchButtonWidth { - self.torchButtonWidthConstraint.constant = width - } - if let height = self.torchButtonHeight { - self.torchButtonHeightConstraint.constant = height + if let size = self.torchButtonSize { + self.torchButtonWidthConstraint.constant = size.width + self.torchButtonHeightConstraint.constant = size.height } } diff --git a/Example/CardScan/ViewController.swift b/Example/CardScan/ViewController.swift index 120da39b..f8ef434c 100644 --- a/Example/CardScan/ViewController.swift +++ b/Example/CardScan/ViewController.swift @@ -146,8 +146,7 @@ class ViewController: UIViewController, ScanEvents, ScanDelegate, FullScanString vc.cornerColor = UIColor.blue vc.torchButtonImage = ScanViewController.cameraImage() - vc.torchButtonHeight = 44 - vc.torchButtonWidth = 44 + vc.torchButtonSize = CGSize(width: 44, height: 44) self.present(vc, animated: true) } From 0452360633ccd10ba570c2e44800e9209b55f8eb Mon Sep 17 00:00:00 2001 From: Justin Vallely Date: Wed, 22 Jan 2020 16:35:29 -0700 Subject: [PATCH 8/8] reverts podspec source --- CardScan.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CardScan.podspec b/CardScan.podspec index 324e40f1..64a7dee1 100644 --- a/CardScan.podspec +++ b/CardScan.podspec @@ -9,7 +9,7 @@ CardScan is a library for scanning credit cards. s.homepage = 'https://cardscan.io' s.license = { :type => 'BSD', :file => 'LICENSE' } s.author = { 'Sam King' => 'kingst@gmail.com' } - s.source = { :git => 'https://github.com/Ibotta/cardscan-ios.git', :tag => s.version.to_s } + s.source = { :git => 'https://github.com/getbouncer/cardscan-ios.git', :tag => s.version.to_s } # lint warning, who knows #s.social_media_url = 'https://twitter.com/stk' s.default_subspec = 'Core'