From bd3103202aee784e2acf754afec7c5f30f95ce07 Mon Sep 17 00:00:00 2001 From: Yannick Loriot Date: Thu, 8 Sep 2016 12:33:27 +0200 Subject: [PATCH] Use QRCodeReaderViewControllerBuilder instead of QRCodeViewControllerBuilder --- CHANGELOG.md | 7 +++++++ .../Base.lproj/Main.storyboard | 17 ++++++++--------- Example/QRCodeReader.swift/ViewController.swift | 2 +- ...r.swift => QRCodeReaderViewController.swift} | 4 ++-- ... => QRCodeReaderViewControllerBuilder.swift} | 10 +++++----- 5 files changed, 23 insertions(+), 17 deletions(-) rename QRCodeReader/{QRCodeViewController.swift => QRCodeReaderViewController.swift} (98%) rename QRCodeReader/{QRCodeViewControllerBuilder.swift => QRCodeReaderViewControllerBuilder.swift} (85%) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf1a32..367b1de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ Released on 2016-06-15. - Swift 3 supports +- Use `QRCodeReaderViewControllerBuilder` instead of `QRCodeViewControllerBuilder` + `QRCodeReader`: - Use `didFindCode` instead of `didFindCodeBlock` - Use `isRunning` instead of `running` @@ -12,6 +14,11 @@ Released on 2016-06-15. - `hasFrontDevice` is a property - `isTorchAvailable` is a property +## [Version 6.1.0](https://github.com/yannickl/QRCodeReader.swift/releases/tag/6.1.0) +Released on 2016-08-03. + +- Hide/Display cancel button + ## [Version 6.0.0](https://github.com/yannickl/QRCodeReader.swift/releases/tag/6.0.0) Released on 2016-03-22. diff --git a/Example/QRCodeReader.swift/Base.lproj/Main.storyboard b/Example/QRCodeReader.swift/Base.lproj/Main.storyboard index 29f067c..2267600 100644 --- a/Example/QRCodeReader.swift/Base.lproj/Main.storyboard +++ b/Example/QRCodeReader.swift/Base.lproj/Main.storyboard @@ -1,8 +1,9 @@ - + - + + @@ -14,26 +15,24 @@ - + - - - + diff --git a/Example/QRCodeReader.swift/ViewController.swift b/Example/QRCodeReader.swift/ViewController.swift index 86ea005..c1b5e42 100644 --- a/Example/QRCodeReader.swift/ViewController.swift +++ b/Example/QRCodeReader.swift/ViewController.swift @@ -29,7 +29,7 @@ import AVFoundation class ViewController: UIViewController, QRCodeReaderViewControllerDelegate { lazy var reader: QRCodeReaderViewController = { - let builder = QRCodeViewControllerBuilder { builder in + let builder = QRCodeReaderViewControllerBuilder { builder in builder.reader = QRCodeReader(metadataObjectTypes: [AVMetadataObjectTypeQRCode]) builder.showTorchButton = true } diff --git a/QRCodeReader/QRCodeViewController.swift b/QRCodeReader/QRCodeReaderViewController.swift similarity index 98% rename from QRCodeReader/QRCodeViewController.swift rename to QRCodeReader/QRCodeReaderViewController.swift index 11bb70a..967f65b 100644 --- a/QRCodeReader/QRCodeViewController.swift +++ b/QRCodeReader/QRCodeReaderViewController.swift @@ -106,7 +106,7 @@ public class QRCodeReaderViewController: UIViewController { - parameter showTorchButton: Flag to display the toggle torch button. If the value is true and there is no torch the button will not be displayed. */ public convenience init(cancelButtonTitle: String, codeReader reader: QRCodeReader, startScanningAtLoad startScan: Bool = true, showSwitchCameraButton showSwitch: Bool = true, showTorchButton showTorch: Bool = false) { - self.init(builder: QRCodeViewControllerBuilder { builder in + self.init(builder: QRCodeReaderViewControllerBuilder { builder in builder.cancelButtonTitle = cancelButtonTitle builder.reader = reader builder.startScanningAtLoad = startScan @@ -120,7 +120,7 @@ public class QRCodeReaderViewController: UIViewController { - parameter builder: A QRCodeViewController builder object. */ - required public init(builder: QRCodeViewControllerBuilder) { + required public init(builder: QRCodeReaderViewControllerBuilder) { startScanningAtLoad = builder.startScanningAtLoad codeReader = builder.reader showSwitchCameraButton = builder.showSwitchCameraButton diff --git a/QRCodeReader/QRCodeViewControllerBuilder.swift b/QRCodeReader/QRCodeReaderViewControllerBuilder.swift similarity index 85% rename from QRCodeReader/QRCodeViewControllerBuilder.swift rename to QRCodeReader/QRCodeReaderViewControllerBuilder.swift index 8cb316d..f7177d7 100644 --- a/QRCodeReader/QRCodeViewControllerBuilder.swift +++ b/QRCodeReader/QRCodeReaderViewControllerBuilder.swift @@ -30,14 +30,14 @@ import Foundation The QRCodeViewControllerBuilder aims to create a simple configuration object for the QRCode view controller. */ -public final class QRCodeViewControllerBuilder { +public final class QRCodeReaderViewControllerBuilder { // MARK: - Configuring the QRCodeViewController Objects /** The builder block. The block gives a reference of builder you can configure. */ - public typealias QRCodeViewControllerBuilderBlock = (QRCodeViewControllerBuilder) -> Void + public typealias QRCodeReaderViewControllerBuilderBlock = (QRCodeReaderViewControllerBuilder) -> Void /** The title to use for the cancel button. @@ -72,11 +72,11 @@ public final class QRCodeViewControllerBuilder { public init() {} /** - Initialize a QRCodeViewController builder with default values. + Initialize a QRCodeReaderViewController builder with default values. - - parameter buildBlock: A QRCodeViewController builder block to configure itself. + - parameter buildBlock: A QRCodeReaderViewController builder block to configure itself. */ - public init(buildBlock: QRCodeViewControllerBuilderBlock) { + public init(buildBlock: QRCodeReaderViewControllerBuilderBlock) { buildBlock(self) } }