diff --git a/Example/Example/Info.plist b/Example/Example/Info.plist
index 1b9a118..9ac034c 100644
--- a/Example/Example/Info.plist
+++ b/Example/Example/Info.plist
@@ -64,5 +64,7 @@
UIInterfaceOrientationLandscapeLeft
UIInterfaceOrientationLandscapeRight
+ UIUserInterfaceStyle
+ Light
diff --git a/Example/Example/ViewController.swift b/Example/Example/ViewController.swift
index e30b150..35f7214 100644
--- a/Example/Example/ViewController.swift
+++ b/Example/Example/ViewController.swift
@@ -75,6 +75,7 @@ extension ViewController {
@IBAction func scan(_ sender: Any) {
let vc = RCCameraViewController()
+ coder.scanningMode = .lightBackground
vc.coder = coder
vc.delegate = self
present(vc, animated: true)
@@ -82,12 +83,10 @@ extension ViewController {
@IBAction func share(_ sender: Any) {
image.size = 1000
- image.isTransparent = false
image.contentInsets = UIEdgeInsets(top: 50, left: 50, bottom: 50, right: 50)
let uiImage = try? coder.encode(image)
image.size = 300
image.contentInsets = UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8)
- image.isTransparent = true
let vc = UIActivityViewController.init(activityItems: [uiImage!], applicationActivities: nil)
present(vc, animated: true)
}
diff --git a/RoundCode.podspec b/RoundCode.podspec
index 5addb2a..7ffaf09 100644
--- a/RoundCode.podspec
+++ b/RoundCode.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RoundCode'
- s.version = '1.2.0'
+ s.version = '1.3.0'
s.summary = 'Facebook messenger style custom barcode.'
s.description = <<-DESC
Encode and decode data into custom stylish barcode.
diff --git a/Sources/Internal/RCConstants.swift b/Sources/Internal/RCConstants.swift
index 524f8ad..695ec9d 100644
--- a/Sources/Internal/RCConstants.swift
+++ b/Sources/Internal/RCConstants.swift
@@ -28,5 +28,6 @@ struct RCConstants {
static let dotSizeScale: CGFloat = 0.08
static let dotPatterns: [CGFloat] = [6, 4, 2]
static let dotPointRange = (Float(1.3)...Float(2.5))
- static let pixelThreshold = (UInt8(0)...UInt8(180))
+ static let lightBackgroundRange = UInt8(0)...UInt8(180)
+ static let darkBackgroundRange = UInt8(100)...UInt8(255)
}
diff --git a/Sources/Internal/RCError.swift b/Sources/Internal/RCError.swift
index 5855777..944a6a0 100644
--- a/Sources/Internal/RCError.swift
+++ b/Sources/Internal/RCError.swift
@@ -27,7 +27,6 @@ public enum RCError: String, LocalizedError {
case longText
case decoding
case wrongImageSize
- case wrongColors
public var errorDescription: String? {
switch self {
@@ -39,8 +38,6 @@ public enum RCError: String, LocalizedError {
return "Error decoding"
case .wrongImageSize:
return "Error decoding. Image width and height must be a equal"
- case .wrongColors:
- return "The tint colors should be in a range of \(RCConstants.pixelThreshold) grayscale with 1.0 alpha"
}
}
}
diff --git a/Sources/Internal/RCImageDecoder.swift b/Sources/Internal/RCImageDecoder.swift
index 31ae3c5..bd139e5 100644
--- a/Sources/Internal/RCImageDecoder.swift
+++ b/Sources/Internal/RCImageDecoder.swift
@@ -27,6 +27,7 @@ struct RCImageDecoder {
internal let configuration: RCCoderConfiguration
internal var size = 720
internal var bytesPerRow = 720
+ internal var pixelThreshold = RCConstants.lightBackgroundRange
}
extension RCImageDecoder {
@@ -37,7 +38,7 @@ extension RCImageDecoder {
let transform = calculateTransform(from: points)
let mapper = RCPointMapper(transform: transform, size: size)
let locations = mapper.map(points: calculateBitLocations())
- let bits = locations.map { RCConstants.pixelThreshold.contains(data[Int($0.x), Int($0.y)]) ? RCBit.one : RCBit.zero }
+ let bits = locations.map { pixelThreshold.contains(data[Int($0.x), Int($0.y)]) ? RCBit.one : RCBit.zero }
return bits
}
@@ -75,7 +76,7 @@ extension RCImageDecoder {
private func scanPixelPattern(for mode: ScanMode, data: PixelContainer) -> [PixelPattern] {
- var lastPattern = PixelPattern.init(bit: RCConstants.pixelThreshold.contains((data[0, 0])) ? RCBit.one : RCBit.zero, x: 0, y: 0, count: 0)
+ var lastPattern = PixelPattern.init(bit: pixelThreshold.contains((data[0, 0])) ? RCBit.one : RCBit.zero, x: 0, y: 0, count: 0)
var pixelPatterns = [lastPattern]
var count = 0
let maxSize = size * size
@@ -84,7 +85,7 @@ extension RCImageDecoder {
while count < maxSize {
let x = count % size
let y = count / size
- let bit = RCConstants.pixelThreshold.contains(data[x, y]) ? RCBit.one : RCBit.zero
+ let bit = pixelThreshold.contains(data[x, y]) ? RCBit.one : RCBit.zero
if lastPattern.y == y, lastPattern.bit == bit {
lastPattern.count += 1
pixelPatterns[pixelPatterns.count - 1] = lastPattern
@@ -98,7 +99,7 @@ extension RCImageDecoder {
while count < maxSize {
let x = count / size
let y = count % size
- let bit = RCConstants.pixelThreshold.contains(data[x, y]) ? RCBit.one : RCBit.zero
+ let bit = pixelThreshold.contains(data[x, y]) ? RCBit.one : RCBit.zero
if lastPattern.x == x, lastPattern.bit == bit {
lastPattern.count += 1
pixelPatterns[pixelPatterns.count - 1] = lastPattern
diff --git a/Sources/Public/RCCameraViewController.swift b/Sources/Public/RCCameraViewController.swift
index ab6a57f..e082456 100644
--- a/Sources/Public/RCCameraViewController.swift
+++ b/Sources/Public/RCCameraViewController.swift
@@ -160,7 +160,7 @@ extension RCCameraViewController {
input.device.activeVideoMaxFrameDuration = CMTimeMake(value: 1, timescale: 30)
captureSession.addInput(input)
let videoOutput = AVCaptureVideoDataOutput()
- videoOutput.setSampleBufferDelegate(self, queue: .main)
+ videoOutput.setSampleBufferDelegate(self, queue: DispatchQueue.global(qos: .userInteractive))
videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey as String: NSNumber(value: kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)]
captureSession.addOutput(videoOutput)
} catch {
@@ -197,8 +197,10 @@ extension RCCameraViewController: AVCaptureVideoDataOutputSampleBufferDelegate {
coder.imageDecoder.bytesPerRow = bytesPerRow
if let message = try? coder.decode(buffer: lumaCopy.assumingMemoryBound(to: UInt8.self)) {
captureSession.stopRunning()
- delegate?.cameraViewController(didFinishScanning: message)
- dismiss(animated: true)
+ DispatchQueue.main.async {[weak self] in
+ self?.delegate?.cameraViewController(didFinishScanning: message)
+ self?.dismiss(animated: true)
+ }
}
lumaCopy.deallocate()
CVPixelBufferUnlockBaseAddress(pixelBuffer, .readOnly)
diff --git a/Sources/Public/RCCoder.swift b/Sources/Public/RCCoder.swift
index a98957e..88e2229 100644
--- a/Sources/Public/RCCoder.swift
+++ b/Sources/Public/RCCoder.swift
@@ -25,6 +25,11 @@ import UIKit
public final class RCCoder {
public let configuration: RCCoderConfiguration
+ public var scanningMode = ScanningMode.lightBackground {
+ didSet {
+ imageDecoder.pixelThreshold = scanningMode == .lightBackground ? RCConstants.lightBackgroundRange : RCConstants.darkBackgroundRange
+ }
+ }
internal lazy var imageDecoder = RCImageDecoder(configuration: self.configuration)
internal lazy var imageEncoder = RCImageEncoder(configuration: self.configuration)
internal lazy var bitCoder = RCBitCoder(configuration: self.configuration)
@@ -53,15 +58,12 @@ public extension RCCoder {
func validate(_ text: String) -> Bool {
configuration.validate(text)
}
-
- func validateForBlackBackground(colors: [UIColor]) -> Bool {
- colors.allSatisfy { color in
- var white: CGFloat = 0
- var alpha: CGFloat = 0
- guard color.getWhite(&white, alpha: &alpha) else { return false }
- guard alpha == 1.0 else { return false }
- return RCConstants.pixelThreshold.contains(UInt8(white * 255))
- }
+}
+
+public extension RCCoder {
+ enum ScanningMode {
+ case lightBackground
+ case darkBackground
}
}
@@ -73,3 +75,4 @@ extension RCCoder {
return message
}
}
+