Merge pull request #6 from aslanyanhaik/develop

Develop

Example/Example/Base.lproj/Main.storyboard

@@ -43,7 +43,7 @@
                                 <rect key="frame" x="20" y="93" width="374" height="32"/>
                                 <segments>
                                     <segment title="Orange"/>
-                                    <segment title="Magenta"/>
+                                    <segment title="Red"/>
                                     <segment title="Green"/>
                                     <segment title="Brown"/>
                                     <segment title="Cyan"/>
@@ -84,11 +84,18 @@
                         <viewLayoutGuide key="safeArea" id="aXm-cj-1eD"/>
                     </view>
                     <navigationItem key="navigationItem" id="XgG-ZM-i9d">
-                        <barButtonItem key="leftBarButtonItem" title="Share" id="so2-d3-VCF">
-                            <connections>
-                                <action selector="share:" destination="0zP-ee-W0J" id="uNU-bV-PaS"/>
-                            </connections>
-                        </barButtonItem>
+                        <leftBarButtonItems>
+                            <barButtonItem title="Share" id="so2-d3-VCF">
+                                <connections>
+                                    <action selector="share:" destination="0zP-ee-W0J" id="uNU-bV-PaS"/>
+                                </connections>
+                            </barButtonItem>
+                            <barButtonItem title="Config" id="33c-Ng-bhx">
+                                <connections>
+                                    <action selector="changeConfig:" destination="0zP-ee-W0J" id="izA-qU-8it"/>
+                                </connections>
+                            </barButtonItem>
+                        </leftBarButtonItems>
                         <rightBarButtonItems>
                             <barButtonItem title="Camera" id="Ckh-RB-Kad">
                                 <connections>

Example/Example/Info.plist

@@ -22,8 +22,8 @@
 	<true/>
 	<key>NSAppleMusicUsageDescription</key>
 	<string>To scan roundcodes</string>
-  <key>NSPhotoLibraryAddUsageDescription</key>
-  <string>To save RoundCode images</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>To save RoundCode images</string>
 	<key>NSCameraUsageDescription</key>
 	<string>To scan roundcodes</string>
 	<key>UIApplicationSceneManifest</key>

Example/Example/ViewController.swift

@@ -30,17 +30,39 @@ class ViewController: UIViewController {
   @IBOutlet weak var messageLabel: UILabel!
   var coder = RCCoder()
   var image = RCImage(message: "")
-  let colors: [[UIColor]] = [[.orange, .gray], [.orange, .magenta], [.systemGreen, .systemBlue], [.orange, .brown], [.purple, .cyan]]
+  let colors: [[UIColor]] = [[.orange, .magenta], [.systemPink, .systemTeal], [.systemTeal, .systemGreen], [.orange, .brown], [.purple, .cyan]]
   var isScanningFromLibrary = false
 }
 
 extension ViewController {
   
-  override func viewDidLoad() {
-    super.viewDidLoad()
-    image.isTransparent = true
+  @IBAction func changeConfig(_ sender: Any) {
+    textField.text = ""
+    image.message = ""
+    imageView.image = try? coder.encode(image)
+    let vc = UIAlertController(title: "Select Configuration", message: nil, preferredStyle: .actionSheet)
+    let uuidAction = UIAlertAction(title: "UUID", style: .default) { _ in
+      self.coder = RCCoder(configuration: .uuidConfiguration)
+    }
+    let numericAction = UIAlertAction(title: "Numeric", style: .default) { _ in
+      self.coder = RCCoder(configuration: .numericConfiguration)
+    }
+    let shortAction = UIAlertAction(title: "Short", style: .default) { _ in
+      self.coder = RCCoder(configuration: .shortConfiguration)
+    }
+    let defaultAction = UIAlertAction(title: "Default", style: .default) { _ in
+      self.coder = RCCoder(configuration: .defaultConfiguration)
+    }
+    let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)
+    vc.addAction(uuidAction)
+    vc.addAction(numericAction)
+    vc.addAction(shortAction)
+    vc.addAction(defaultAction)
+    vc.addAction(cancelAction)
+    present(vc, animated: true)
   }
   
+  
   @IBAction func scanImage(_ sender: Any) {
     isScanningFromLibrary = true
     let vc = UIImagePickerController()
@@ -53,6 +75,7 @@ extension ViewController {
   
   @IBAction func scan(_ sender: Any) {
     let vc = RCCameraViewController()
+    vc.coder = coder
     vc.delegate = self
     present(vc, animated: true)
   }

RoundCode.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'RoundCode'
-  s.version          = '1.1.0'
+  s.version          = '1.2.0'
   s.summary          = 'Facebook messenger style custom barcode.'
   s.description      = <<-DESC
                      Encode and decode data into custom stylish barcode.

Sources/Internal/RCConstants.swift

@@ -28,5 +28,5 @@ 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 = 180
+  static let pixelThreshold = (UInt8(0)...UInt8(180))
 }

Sources/Internal/RCError.swift

@@ -27,6 +27,7 @@ public enum RCError: String, LocalizedError {
   case longText
   case decoding
   case wrongImageSize
+  case wrongColors
 
   public var errorDescription: String? {
     switch self {
@@ -38,6 +39,8 @@ 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"
     }
   }
 }

Sources/Internal/RCImageDecoder.swift

@@ -27,37 +27,17 @@ struct RCImageDecoder {
   internal let configuration: RCCoderConfiguration
   internal var size = 720
   internal var bytesPerRow = 720
-  internal var padding = 0
-  private var sectionSize: Int {
-    self.size / 5
-  }
 }
 
 extension RCImageDecoder {
   func process(pointer: UnsafeMutablePointer<UInt8>) throws -> [RCBit] {
     let bufferData = UnsafeMutableBufferPointer<UInt8>(start: pointer, count: size * bytesPerRow)
     let data = PixelContainer(rows: bytesPerRow, items: bufferData)
-    var points = [CGPoint]()
-    for side in Side.allCases {
-      switch side {
-        case .left:
-          let point = try scanControlPoint(for: data, region: (padding, (size - sectionSize) / 2), side: side)
-          points.append(point)
-        case .top:
-          let point = try scanControlPoint(for: data, region: ((size - sectionSize) / 2, padding), side: side)
-          points.append(point)
-        case .right:
-          let point = try scanControlPoint(for: data, region: (size - sectionSize - padding, (size - sectionSize) / 2), side: side)
-          points.append(point)
-        case .bottom:
-          let point = try scanControlPoint(for: data, region: ((size - sectionSize) / 2, size - sectionSize - padding), side: side)
-          points.append(point)
-      }
-    }
+    let points = try scanControlPoints(for: data)
     let transform = calculateTransform(from: points)
     let mapper = RCPointMapper(transform: transform, size: size)
     let locations = mapper.map(points: calculateBitLocations())
-    let bits = locations.map { data[Int($0.x), Int($0.y)] > RCConstants.pixelThreshold ? RCBit.zero : RCBit.one }
+    let bits = locations.map { RCConstants.pixelThreshold.contains(data[Int($0.x), Int($0.y)]) ? RCBit.one : RCBit.zero }
     return bits
   }
   
@@ -72,47 +52,67 @@ extension RCImageDecoder {
 }
 
 extension RCImageDecoder {
-  private func scanControlPoint(for data: PixelContainer, region: (x: Int, y: Int), side: Side) throws -> CGPoint {
-    
-    func scan(region: (x: Int, y: Int, size: Int), data: PixelContainer, coordinate: (Int) -> (x: Int, y: Int), comparison: (PixelPattern, (x: Int, y: Int)) -> Bool) -> [PixelPattern] {
-      var lastPattern = PixelPattern(bit: data[region.x, region.y] > RCConstants.pixelThreshold ? RCBit.zero : RCBit.one, x: region.x, y: region.y, count: 0)
-      var pixelPatterns = [lastPattern]
-      var count = 0
-      let maxSize = region.size * region.size
-      while count < maxSize {
-        let coordinate = coordinate(count)
-        let bit = data[coordinate.x, coordinate.y] > RCConstants.pixelThreshold ? RCBit.zero : RCBit.one
-        if comparison(lastPattern, coordinate), lastPattern.bit == bit {
-          lastPattern.count += 1
-          pixelPatterns[pixelPatterns.count - 1] = lastPattern
-        } else {
-          lastPattern = PixelPattern(bit: bit, x: coordinate.x, y: coordinate.y, count: 1)
-          pixelPatterns.append(lastPattern)
-        }
-        count += 1
+  private func scanControlPoints(for data: PixelContainer) throws -> [CGPoint] {
+    var horizontalPatterns = [PixelPattern]()
+    var verticalPatterns = [PixelPattern]()
+    var points = [CGPoint]()
+    for side in Side.allCases {
+      switch side {
+        case .left:
+          horizontalPatterns = scanPixelPattern(for: .horizontal, data: data)
+          points.append(try controlPoint(for: horizontalPatterns, side: side))
+        case .right:
+          points.append(try controlPoint(for: horizontalPatterns, side: side))
+        case .top:
+          verticalPatterns = scanPixelPattern(for: .vertical, data: data)
+          points.append(try controlPoint(for: verticalPatterns, side: side))
+        case .bottom:
+          points.append(try controlPoint(for: verticalPatterns, side: side))
       }
-      return pixelPatterns
     }
-    
-    let pixelPatterns: [PixelPattern]
-    switch side {
-      case .left, .right:
-        pixelPatterns = scan(region: (region.x, region.y, sectionSize), data: data, coordinate: { count in
-          let x = count % sectionSize + region.x
-          let y = count / sectionSize + region.y
-          return (x, y)
-        }, comparison: { (pattern, coordinate) in
-          return pattern.y == coordinate.y
-        })
-      case .top, .bottom:
-        pixelPatterns = scan(region: (region.x, region.y, sectionSize), data: data, coordinate: { count in
-          let x = count / sectionSize + region.x
-          let y = count % sectionSize + region.y
-          return (x, y)
-        }, comparison: { (pattern, coordinate) in
-          return pattern.x == coordinate.x
-        })
+    return points
+  }
+
+  
+  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 pixelPatterns = [lastPattern]
+    var count = 0
+    let maxSize = size * size
+    switch mode {
+      case .horizontal:
+        while count < maxSize {
+          let x = count % size
+          let y = count / size
+          let bit = RCConstants.pixelThreshold.contains(data[x, y]) ? RCBit.one : RCBit.zero
+          if lastPattern.y == y, lastPattern.bit == bit {
+            lastPattern.count += 1
+            pixelPatterns[pixelPatterns.count - 1] = lastPattern
+          } else {
+            lastPattern = PixelPattern(bit: bit, x: x, y: y, count: 1)
+            pixelPatterns.append(lastPattern)
+          }
+          count += 1
+      }
+      case .vertical:
+        while count < maxSize {
+          let x = count / size
+          let y = count % size
+          let bit = RCConstants.pixelThreshold.contains(data[x, y]) ? RCBit.one : RCBit.zero
+          if lastPattern.x == x, lastPattern.bit == bit {
+            lastPattern.count += 1
+            pixelPatterns[pixelPatterns.count - 1] = lastPattern
+          } else {
+            lastPattern = PixelPattern(bit: bit, x: x, y: y, count: 1)
+            pixelPatterns.append(lastPattern)
+          }
+          count += 1
+      }
     }
+    return pixelPatterns
+  }
+  
+  private func controlPoint(for pixelPatterns: [PixelPattern], side: Side) throws -> CGPoint {
     let controlPoints = try pixelPatterns.withUnsafeBufferPointer { (pixelPatternsBuffer) -> [CGPoint] in
       var points = [CGPoint]()
       guard pixelPatternsBuffer.count >= 5 else { throw RCError.decoding }
@@ -164,7 +164,7 @@ extension RCImageDecoder {
       }
     }.first!
   }
-  
+    
   private func calculateTransform(from points: [CGPoint]) -> CATransform3D {
     let perspective = RCTransformation(points)
     let middleRect = CGRect(origin: .zero, size: CGSize(width: CGFloat(size), height: CGFloat(size)))
@@ -215,6 +215,11 @@ extension RCImageDecoder {
     case right
   }
   
+  enum ScanMode {
+    case horizontal
+    case vertical
+  }
+  
   final class PixelContainer {
     let rows: Int
     var columns: Int { data.count / rows }

Sources/Public/RCCameraViewController.swift

@@ -23,7 +23,7 @@
 import UIKit
 import AVFoundation
 
-public final class RCCameraViewController: UIViewController, UIImagePickerControllerDelegate {
+public final class RCCameraViewController: UIViewController {
   
   //MARK: Public properties
   public weak var delegate: RCCameraViewControllerDelegate?
@@ -113,7 +113,6 @@ public extension RCCameraViewController {
     super.viewDidLayoutSubviews()
     configureMaskLayer()
     videoPreviewLayer?.frame = view.bounds
-    calculateScanArea()
   }
 }
 
@@ -157,7 +156,6 @@ extension RCCameraViewController {
     guard let captureDevice = AVCaptureDevice.default(for: .video) else { return }
     do {
       captureSession.sessionPreset = .hd1280x720
-      calculateScanArea()
       let input = try AVCaptureDeviceInput(device: captureDevice)
       input.device.activeVideoMaxFrameDuration = CMTimeMake(value: 1, timescale: 30)
       captureSession.addInput(input)
@@ -170,12 +168,6 @@ extension RCCameraViewController {
     }
   }
   
-  private func calculateScanArea() {
-    let actualWidth = view.frame.height / 16 * 9
-    let sideArea = (actualWidth - view.frame.width * 0.9) / 2
-    coder.imageDecoder.padding = Int(sideArea / actualWidth * 720)
-  }
-  
   private func configureVideoPreview(orientation: AVCaptureVideoOrientation = .portrait) {
     videoPreviewLayer?.removeFromSuperlayer()
     videoPreviewLayer = AVCaptureVideoPreviewLayer(session: captureSession)

Sources/Public/RCCoder.swift

@@ -44,7 +44,6 @@ public extension RCCoder {
   func decode(_ image: UIImage) throws -> String {
     guard image.size.width == image.size.height else { throw RCError.wrongImageSize }
     imageDecoder.size = image.cgImage!.height
-    imageDecoder.padding = 0
     imageDecoder.bytesPerRow = image.cgImage!.height
     let bits = try imageDecoder.decode(image)
     let message = try bitCoder.decode(bits)
@@ -54,6 +53,16 @@ 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))
+    }
+  }
 }
 
 extension RCCoder {