7 files changed
+120
-61
No files matched your search
@@ -10,7 +10,7 @@
|
||||
<!--View Controller-->
|
||||
<scene sceneID="a2g-4i-pyL">
|
||||
<objects>
|
||||
<viewController id="0zP-ee-W0J" customClass="ViewController" customModule="RoundCode" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<viewController id="0zP-ee-W0J" customClass="ViewController" customModule="Round_Code" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="Rvj-Nv-Ukh">
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
@@ -54,7 +54,7 @@
|
||||
</segmentedControl>
|
||||
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pan-9N-son">
|
||||
<rect key="frame" x="0.0" y="88" width="414" height="774"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="32"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
@@ -89,11 +89,18 @@
|
||||
<action selector="share:" destination="0zP-ee-W0J" id="uNU-bV-PaS"/>
|
||||
</connections>
|
||||
</barButtonItem>
|
||||
<barButtonItem key="rightBarButtonItem" title="Camera" id="Ckh-RB-Kad">
|
||||
<connections>
|
||||
<action selector="scan:" destination="0zP-ee-W0J" id="h78-sA-B0C"/>
|
||||
</connections>
|
||||
</barButtonItem>
|
||||
<rightBarButtonItems>
|
||||
<barButtonItem title="Camera" id="Ckh-RB-Kad">
|
||||
<connections>
|
||||
<action selector="scan:" destination="0zP-ee-W0J" id="h78-sA-B0C"/>
|
||||
</connections>
|
||||
</barButtonItem>
|
||||
<barButtonItem title="Image" id="rwW-La-cl3">
|
||||
<connections>
|
||||
<action selector="scanImage:" destination="0zP-ee-W0J" id="Cdh-9Q-DD2"/>
|
||||
</connections>
|
||||
</barButtonItem>
|
||||
</rightBarButtonItems>
|
||||
</navigationItem>
|
||||
<connections>
|
||||
<outlet property="imageView" destination="IDN-sg-2ib" id="V1v-sS-seZ"/>
|
||||
|
||||
@@ -31,7 +31,7 @@ class ViewController: UIViewController {
|
||||
var coder = RCCoder()
|
||||
var image = RCImage(message: "")
|
||||
let colors: [[UIColor]] = [[.orange, .gray], [.orange, .magenta], [.systemGreen, .systemBlue], [.orange, .brown], [.purple, .cyan]]
|
||||
|
||||
var isScanningFromLibrary = false
|
||||
}
|
||||
|
||||
extension ViewController {
|
||||
@@ -41,6 +41,16 @@ extension ViewController {
|
||||
image.isTransparent = true
|
||||
}
|
||||
|
||||
@IBAction func scanImage(_ sender: Any) {
|
||||
isScanningFromLibrary = true
|
||||
let vc = UIImagePickerController()
|
||||
vc.sourceType = .photoLibrary
|
||||
vc.allowsEditing = true
|
||||
vc.delegate = self
|
||||
present(vc, animated: true)
|
||||
}
|
||||
|
||||
|
||||
@IBAction func scan(_ sender: Any) {
|
||||
let vc = RCCameraViewController()
|
||||
vc.delegate = self
|
||||
@@ -94,8 +104,24 @@ extension ViewController: UINavigationControllerDelegate, UIImagePickerControlle
|
||||
|
||||
func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
|
||||
let camImage = info[.editedImage] as! UIImage
|
||||
image.attachmentImage = camImage
|
||||
imageView.image = try? coder.encode(image)
|
||||
if isScanningFromLibrary {
|
||||
if let message = try? coder.decode(camImage) {
|
||||
messageLabel.text = message
|
||||
messageLabel.isHidden = false
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
|
||||
self.messageLabel.isHidden = true
|
||||
}
|
||||
}
|
||||
} else {
|
||||
image.attachmentImage = camImage
|
||||
imageView.image = try? coder.encode(image)
|
||||
}
|
||||
isScanningFromLibrary = false
|
||||
picker.dismiss(animated: true)
|
||||
}
|
||||
|
||||
func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
|
||||
isScanningFromLibrary = false
|
||||
picker.dismiss(animated: true)
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = 'RoundCode'
|
||||
s.version = '1.0.1'
|
||||
s.version = '1.1.0'
|
||||
s.summary = 'Facebook messenger style custom barcode.'
|
||||
s.description = <<-DESC
|
||||
Encode and decode data into custom stylish barcode.
|
||||
|
||||
@@ -70,7 +70,6 @@ extension RCBitCoder {
|
||||
|
||||
|
||||
func decode(_ bits: [RCBit]) throws -> String {
|
||||
guard bits.contains(.one) else { return "" }
|
||||
//starting character to bits
|
||||
var startingIndexCharacter = String(repeating: "0", count: configuration.bitesPerSymbol)
|
||||
startingIndexCharacter += String(configuration.characters.firstIndex(of: configuration.version.startingCharacter)!, radix: 2)
|
||||
|
||||
@@ -54,14 +54,16 @@ extension RCImageDecoder {
|
||||
points.append(point)
|
||||
}
|
||||
}
|
||||
let image = try fixPerspective(pointer, points: points)
|
||||
let bits = decode(image)
|
||||
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 }
|
||||
return bits
|
||||
}
|
||||
|
||||
func decode(_ image: UIImage) throws -> [RCBit] {
|
||||
let pixelData = UnsafeMutableRawPointer.allocate(byteCount: size * size, alignment: MemoryLayout<UInt8>.alignment)
|
||||
let context = generateContext(data: pixelData, size: size, bytesPerRow: self.bytesPerRow)
|
||||
let context = CGContext(data: pixelData, width: size, height: size, bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: CGColorSpaceCreateDeviceGray(), bitmapInfo: CGImageAlphaInfo.none.rawValue)
|
||||
context?.draw(image.cgImage!, in: CGRect(origin: .zero, size: CGSize(width: size, height: size)))
|
||||
let bits = try process(pointer: pixelData.assumingMemoryBound(to: UInt8.self))
|
||||
pixelData.deallocate()
|
||||
@@ -163,42 +165,21 @@ extension RCImageDecoder {
|
||||
}.first!
|
||||
}
|
||||
|
||||
private func fixPerspective(_ data: UnsafeMutablePointer<UInt8>, points: [CGPoint]) throws -> CGImage {
|
||||
guard let context = generateContext(data: data, size: size, bytesPerRow: bytesPerRow), let cgImage = context.makeImage() else {
|
||||
throw RCError.decoding
|
||||
}
|
||||
let image = UIGraphicsImageRenderer(size: CGSize(width: CGFloat(size), height: CGFloat(size))).image { context in
|
||||
let baseView = UIView(frame: context.format.bounds)
|
||||
let imageView = UIImageView(frame: context.format.bounds)
|
||||
baseView.addSubview(imageView)
|
||||
imageView.image = UIImage(cgImage: cgImage)
|
||||
imageView.layer.anchorPoint = .zero
|
||||
imageView.layer.frame = context.format.bounds
|
||||
let perspective = RCTransformation(points)
|
||||
let destination = RCTransformation([CGPoint(x: context.format.bounds.minX, y: context.format.bounds.midY),
|
||||
CGPoint(x: context.format.bounds.midX, y: context.format.bounds.minY),
|
||||
CGPoint(x: context.format.bounds.midX, y: context.format.bounds.maxY),
|
||||
CGPoint(x: context.format.bounds.maxX, y: context.format.bounds.midY)])
|
||||
let transform = perspective.perspectiveTransform(to: destination)
|
||||
imageView.transform3D = transform
|
||||
baseView.drawHierarchy(in: context.format.bounds, afterScreenUpdates: true)
|
||||
}
|
||||
guard let renderImage = image.cgImage else {
|
||||
throw RCError.decoding
|
||||
}
|
||||
return renderImage
|
||||
private func calculateTransform(from points: [CGPoint]) -> CATransform3D {
|
||||
let perspective = RCTransformation(points)
|
||||
let middleRect = CGRect(origin: .zero, size: CGSize(width: CGFloat(size), height: CGFloat(size)))
|
||||
let destination = RCTransformation([CGPoint(x: middleRect.minX, y: middleRect.midY),
|
||||
CGPoint(x: middleRect.midX, y: middleRect.minY),
|
||||
CGPoint(x: middleRect.midX, y: middleRect.maxY),
|
||||
CGPoint(x: middleRect.maxX, y: middleRect.midY)])
|
||||
return perspective.perspectiveTransform(to: destination)
|
||||
}
|
||||
|
||||
private func decode(_ image: CGImage) -> [RCBit] {
|
||||
let pixelData = UnsafeMutableRawPointer.allocate(byteCount: image.width * image.height, alignment: MemoryLayout<UInt8>.alignment)
|
||||
let context = generateContext(data: pixelData, size: image.width, bytesPerRow: image.width)
|
||||
context?.draw(image, in: CGRect(origin: .zero, size: CGSize(width: image.width, height: image.height)))
|
||||
let buffer = UnsafeMutableBufferPointer<UInt8>(start: pixelData.assumingMemoryBound(to: UInt8.self), count: image.width * image.height)
|
||||
let data = PixelContainer(rows: image.height, items: buffer)
|
||||
let size = CGFloat(data.columns)
|
||||
let lineWidth = CGFloat(image.height) * RCConstants.dotSizeScale / 5 //number of lines including spaces
|
||||
let mainRadius = CGFloat(image.height) / 2
|
||||
let startAngle = asin(CGFloat(image.height) * RCConstants.dotSizeScale / mainRadius)
|
||||
private func calculateBitLocations() -> [CGPoint] {
|
||||
let size = CGFloat(self.size)
|
||||
let lineWidth = size * RCConstants.dotSizeScale / 5 //number of lines including spaces
|
||||
let mainRadius = size / 2
|
||||
let startAngle = asin(size * RCConstants.dotSizeScale / mainRadius)
|
||||
var points = [CGPoint]()
|
||||
let center = CGPoint(x: size / 2, y: size / 2)
|
||||
(0...3).forEach { offset in
|
||||
@@ -214,15 +195,7 @@ extension RCImageDecoder {
|
||||
}
|
||||
}
|
||||
}
|
||||
let bits = points.map { data[Int($0.x), Int($0.y)] > RCConstants.pixelThreshold ? RCBit.zero : RCBit.one }
|
||||
pixelData.deallocate()
|
||||
return bits
|
||||
}
|
||||
}
|
||||
|
||||
extension RCImageDecoder {
|
||||
private func generateContext(data: UnsafeMutableRawPointer?, size: Int, bytesPerRow: Int) -> CGContext? {
|
||||
return CGContext(data: data, width: size, height: size, bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: CGColorSpaceCreateDeviceGray(), bitmapInfo: CGImageAlphaInfo.none.rawValue)
|
||||
return points
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
// MIT License
|
||||
|
||||
// Copyright (c) 2020 Haik Aslanyan
|
||||
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
|
||||
// The above copyright notice and this permission notice shall be included in all
|
||||
// copies or substantial portions of the Software.
|
||||
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
|
||||
import QuartzCore
|
||||
|
||||
struct RCPointMapper {
|
||||
|
||||
private var transform: CATransform3D
|
||||
private let denominatorX: CGFloat
|
||||
private let denominatorY: CGFloat
|
||||
private let denominatorW: CGFloat
|
||||
private let size: CGFloat
|
||||
|
||||
init(transform: CATransform3D, size: Int) {
|
||||
let translateDueToDisposition = CATransform3DMakeTranslation(-CGFloat(size) / 2, -CGFloat(size) / 2, 0)
|
||||
self.transform = CATransform3DConcat(transform, translateDueToDisposition)
|
||||
self.size = CGFloat(size)
|
||||
self.denominatorX = transform.m12 * transform.m21 - transform.m11 * transform.m22 + transform.m14 * transform.m22 * transform.m41 - transform.m12 * transform.m24 * transform.m41 - transform.m14 * transform.m21 * transform.m42 + transform.m11 * transform.m24 * transform.m42
|
||||
self.denominatorY = -transform.m12 * transform.m21 + transform.m11 * transform.m22 - transform.m14 * transform.m22 * transform.m41 + transform.m12 * transform.m24 * transform.m41 + transform.m14 * transform.m21 * transform.m42 - transform.m11 * transform.m24 * transform.m42
|
||||
self.denominatorW = transform.m12 * transform.m21 - transform.m11 * transform.m22 + transform.m14 * transform.m22 * transform.m41 - transform.m12 * transform.m24 * transform.m41 - transform.m14 * transform.m21 * transform.m42 + transform.m11 * transform.m24 * transform.m42
|
||||
}
|
||||
|
||||
func map(points: [CGPoint]) -> [CGPoint] {
|
||||
return points.map { point in
|
||||
let modelPoint = CGPoint(x: (point.x * 2.0 - size) / 2.0, y: (point.y * 2.0 - size) / 2.0)
|
||||
let x = modelPoint.x
|
||||
let y = modelPoint.y
|
||||
let xp: CGFloat = (transform.m22 * transform.m41 - transform.m21 * transform.m42 - transform.m22 * x + transform.m24 * transform.m42 * x + transform.m21 * y - transform.m24 * transform.m41 * y) / denominatorX
|
||||
let yp: CGFloat = (-transform.m11 * transform.m42 + transform.m12 * (transform.m41 - x) + transform.m14 * transform.m42 * x + transform.m11 * y - transform.m14 * transform.m41 * y) / denominatorY
|
||||
let wp: CGFloat = (transform.m12 * transform.m21 - transform.m11 * transform.m22 + transform.m14 * transform.m22 * x - transform.m12 * transform.m24 * x - transform.m14 * transform.m21 * y + transform.m11 * transform.m24 * y) / denominatorW
|
||||
let actualPoint = CGPoint(x: xp / wp, y: yp / wp)
|
||||
let isOutOfBounds = !(0...size).contains(actualPoint.x) || !(0...size).contains(actualPoint.y)
|
||||
return isOutOfBounds ? .zero : actualPoint
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -24,13 +24,12 @@ import Foundation
|
||||
|
||||
public struct RCCoderConfiguration {
|
||||
|
||||
public let version: Version
|
||||
public let version = Version.v1
|
||||
public let maxMessageCount: Int
|
||||
public let bitesPerSymbol: Int
|
||||
public let characters: [Character]
|
||||
|
||||
public init(version: Version = .v1, characters: String) {
|
||||
self.version = version
|
||||
public init(characters: String) {
|
||||
var charactersArray = characters.map({$0})
|
||||
charactersArray.append(version.startingCharacter)
|
||||
charactersArray.append(contentsOf: version.emptyCharacters)
|
||||
|
||||
Reference in new issue
Block a user