Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3
3.0
31 changes: 8 additions & 23 deletions PasscodeLock.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
281AA9201DB626E000908E23 /* Localize.strings in Resources */ = {isa = PBXBuildFile; fileRef = 281AA9221DB626E000908E23 /* Localize.strings */; };
4A57CCF92010A437006A7B80 /* Localize.strings in Resources */ = {isa = PBXBuildFile; fileRef = 281AA9221DB626E000908E23 /* Localize.strings */; };
8F3B9D031E028815008CF18F /* PasscodeLockImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8F3B9D021E028815008CF18F /* PasscodeLockImages.xcassets */; };
C99EAF431B90B05700D61E1B /* PasscodeLock.h in Headers */ = {isa = PBXBuildFile; fileRef = C99EAF421B90B05700D61E1B /* PasscodeLock.h */; settings = {ATTRIBUTES = (Public, ); }; };
C99EAF4A1B90B05800D61E1B /* PasscodeLock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C99EAF3F1B90B05700D61E1B /* PasscodeLock.framework */; };
Expand All @@ -23,31 +24,21 @@
C9D3DF461B91BD0E008561EB /* PasscodeLockConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D3DF451B91BD0E008561EB /* PasscodeLockConfiguration.swift */; };
C9D3DF481B91F099008561EB /* PasscodeLockPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D3DF471B91F099008561EB /* PasscodeLockPresenter.swift */; };
C9DC07D51B90B1F6007A4DD0 /* PasscodeRepositoryType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07D41B90B1F6007A4DD0 /* PasscodeRepositoryType.swift */; };
C9DC07D61B90B1F6007A4DD0 /* PasscodeRepositoryType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07D41B90B1F6007A4DD0 /* PasscodeRepositoryType.swift */; };
C9DC07D81B90B261007A4DD0 /* PasscodeLockStateType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07D71B90B261007A4DD0 /* PasscodeLockStateType.swift */; };
C9DC07D91B90B261007A4DD0 /* PasscodeLockStateType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07D71B90B261007A4DD0 /* PasscodeLockStateType.swift */; };
C9DC07DB1B90B730007A4DD0 /* PasscodeLockConfigurationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07DA1B90B730007A4DD0 /* PasscodeLockConfigurationType.swift */; };
C9DC07DC1B90B730007A4DD0 /* PasscodeLockConfigurationType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07DA1B90B730007A4DD0 /* PasscodeLockConfigurationType.swift */; };
C9DC07DE1B90BA06007A4DD0 /* PasscodeLockType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07DD1B90BA06007A4DD0 /* PasscodeLockType.swift */; };
C9DC07DF1B90BA06007A4DD0 /* PasscodeLockType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07DD1B90BA06007A4DD0 /* PasscodeLockType.swift */; };
C9DC07E11B90BBFD007A4DD0 /* PasscodeLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07E01B90BBFD007A4DD0 /* PasscodeLock.swift */; };
C9DC07E21B90BBFD007A4DD0 /* PasscodeLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07E01B90BBFD007A4DD0 /* PasscodeLock.swift */; };
C9DC07E51B90BCF9007A4DD0 /* PasscodeLockTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07E41B90BCF9007A4DD0 /* PasscodeLockTests.swift */; };
C9DC07E71B90C382007A4DD0 /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9DC07E61B90C382007A4DD0 /* LocalAuthentication.framework */; };
C9DC07EA1B90C690007A4DD0 /* FakePasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07E91B90C690007A4DD0 /* FakePasscodeState.swift */; };
C9DC07EC1B90C72A007A4DD0 /* FakePasscodeRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07EB1B90C72A007A4DD0 /* FakePasscodeRepository.swift */; };
C9DC07EE1B90C7CD007A4DD0 /* FakePasscodeLockConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07ED1B90C7CD007A4DD0 /* FakePasscodeLockConfiguration.swift */; };
C9DC07F01B90C8E1007A4DD0 /* FakePasscodeLockDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07EF1B90C8E1007A4DD0 /* FakePasscodeLockDelegate.swift */; };
C9DC07F21B90C9DE007A4DD0 /* EnterPasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07F11B90C9DE007A4DD0 /* EnterPasscodeState.swift */; };
C9DC07F31B90C9DE007A4DD0 /* EnterPasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07F11B90C9DE007A4DD0 /* EnterPasscodeState.swift */; };
C9DC07F81B90CF29007A4DD0 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07F71B90CF29007A4DD0 /* Functions.swift */; };
C9DC07F91B90CF29007A4DD0 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07F71B90CF29007A4DD0 /* Functions.swift */; };
C9DC07FF1B90D24A007A4DD0 /* SetPasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07FE1B90D24A007A4DD0 /* SetPasscodeState.swift */; };
C9DC08001B90D24A007A4DD0 /* SetPasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC07FE1B90D24A007A4DD0 /* SetPasscodeState.swift */; };
C9DC08021B90D2BA007A4DD0 /* ConfirmPasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC08011B90D2BA007A4DD0 /* ConfirmPasscodeState.swift */; };
C9DC08031B90D2BA007A4DD0 /* ConfirmPasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC08011B90D2BA007A4DD0 /* ConfirmPasscodeState.swift */; };
C9DC08051B90D394007A4DD0 /* ChangePasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC08041B90D394007A4DD0 /* ChangePasscodeState.swift */; };
C9DC08061B90D394007A4DD0 /* ChangePasscodeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC08041B90D394007A4DD0 /* ChangePasscodeState.swift */; };
C9DC08081B90DAE6007A4DD0 /* EnterPasscodeStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC08071B90DAE6007A4DD0 /* EnterPasscodeStateTests.swift */; };
C9DC080A1B90DB09007A4DD0 /* FakePasscodeLock.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC08091B90DB09007A4DD0 /* FakePasscodeLock.swift */; };
C9DC080C1B90DC38007A4DD0 /* SetPasscodeStateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9DC080B1B90DC38007A4DD0 /* SetPasscodeStateTests.swift */; };
Expand Down Expand Up @@ -456,10 +447,11 @@
TargetAttributes = {
C99EAF3E1B90B05700D61E1B = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0800;
LastSwiftMigration = 0830;
};
C99EAF481B90B05700D61E1B = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0830;
};
C9D3DF0F1B91AD11008561EB = {
CreatedOnToolsVersion = 7.0;
Expand Down Expand Up @@ -525,6 +517,7 @@
C9D3DF1D1B91AD11008561EB /* LaunchScreen.storyboard in Resources */,
C9D3DF1A1B91AD11008561EB /* Assets.xcassets in Resources */,
C9D3DF181B91AD11008561EB /* Main.storyboard in Resources */,
4A57CCF92010A437006A7B80 /* Localize.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -571,24 +564,14 @@
buildActionMask = 2147483647;
files = (
C9DC07EC1B90C72A007A4DD0 /* FakePasscodeRepository.swift in Sources */,
C9DC08061B90D394007A4DD0 /* ChangePasscodeState.swift in Sources */,
C9DC080E1B90DC8F007A4DD0 /* ConfirmPasscodeStateTests.swift in Sources */,
C9DC07E51B90BCF9007A4DD0 /* PasscodeLockTests.swift in Sources */,
C9DC08031B90D2BA007A4DD0 /* ConfirmPasscodeState.swift in Sources */,
C9DC07F01B90C8E1007A4DD0 /* FakePasscodeLockDelegate.swift in Sources */,
C9DC07D91B90B261007A4DD0 /* PasscodeLockStateType.swift in Sources */,
C9DC07E21B90BBFD007A4DD0 /* PasscodeLock.swift in Sources */,
C9DC07EA1B90C690007A4DD0 /* FakePasscodeState.swift in Sources */,
C9DC08101B90DD91007A4DD0 /* ChangePasscodeStateTests.swift in Sources */,
C9DC07DC1B90B730007A4DD0 /* PasscodeLockConfigurationType.swift in Sources */,
C9DC07F31B90C9DE007A4DD0 /* EnterPasscodeState.swift in Sources */,
C9DC08001B90D24A007A4DD0 /* SetPasscodeState.swift in Sources */,
C9DC07EE1B90C7CD007A4DD0 /* FakePasscodeLockConfiguration.swift in Sources */,
C9DC080C1B90DC38007A4DD0 /* SetPasscodeStateTests.swift in Sources */,
C9DC08081B90DAE6007A4DD0 /* EnterPasscodeStateTests.swift in Sources */,
C9DC07DF1B90BA06007A4DD0 /* PasscodeLockType.swift in Sources */,
C9DC07D61B90B1F6007A4DD0 /* PasscodeRepositoryType.swift in Sources */,
C9DC07F91B90CF29007A4DD0 /* Functions.swift in Sources */,
C9DC080A1B90DB09007A4DD0 /* FakePasscodeLock.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -786,7 +769,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -805,7 +788,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLock;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand All @@ -819,6 +802,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "PasscodeLockTests/PasscodeLockTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
Expand All @@ -831,6 +815,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.yankodimitrov.PasscodeLockTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "PasscodeLockTests/PasscodeLockTests-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
1 change: 1 addition & 0 deletions PasscodeLock/Base.lproj/Localize.strings
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@
"Cancel" = "Cancel";
"Delete" = "Delete";
"UseTouchId" = "Use TouchID";
"UseFaceId" = "Use FaceID";
15 changes: 8 additions & 7 deletions PasscodeLock/Functions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,23 @@
//

import Foundation
import UIKit

func localizedStringFor(key: String, comment: String) -> String {
func localizedStringFor(_ key: String, comment: String) -> String {

let name = "Localize"
let bundle = bundleForResource(name, ofType: "strings")
return NSLocalizedString(key, tableName: name, bundle: bundle, comment: comment)

return NSLocalizedString(key, tableName: name, bundle: bundle, value: "", comment: comment)
}

func bundleForResource(name: String, ofType type: String) -> NSBundle {
func bundleForResource(_ name: String, ofType type: String) -> Bundle {

if(NSBundle.mainBundle().pathForResource(name, ofType: type) != nil) {
return NSBundle.mainBundle()
if(Bundle.main.path(forResource: name, ofType: type) != nil) {
return Bundle.main
}

return NSBundle(forClass: PasscodeLock.self)
return Bundle(for: PasscodeLock.self)
}

func defaultCustomColor() -> UIColor {
Expand Down
5 changes: 3 additions & 2 deletions PasscodeLock/PasscodeLock/ChangePasscodeState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import Foundation
import UIKit

struct ChangePasscodeState: PasscodeLockStateType {

Expand All @@ -24,10 +25,10 @@ struct ChangePasscodeState: PasscodeLockStateType {
self.title = (stringsToShow?.passcodeLockChangeTitle ?? localizedStringFor("PasscodeLockChangeTitle", comment: "Change passcode title"))
self.description = (stringsToShow?.passcodeLockChangeDescription ?? localizedStringFor("PasscodeLockChangeDescription", comment: "Change passcode description"))
self.tintColor = (tintColor ?? defaultColor)
self.font = (font ?? UIFont.systemFontOfSize(16))
self.font = (font ?? UIFont.systemFont(ofSize: 16))
}

func acceptPasscode(passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {
func acceptPasscode(_ passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

guard let currentPasscode = lock.repository.passcode else {
return
Expand Down
7 changes: 4 additions & 3 deletions PasscodeLock/PasscodeLock/ConfirmPasscodeState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import Foundation
import UIKit

struct ConfirmPasscodeState: PasscodeLockStateType {

Expand All @@ -17,7 +18,7 @@ struct ConfirmPasscodeState: PasscodeLockStateType {
var tintColor : UIColor?
var font : UIFont?

private var passcodeToConfirm: [String]
fileprivate var passcodeToConfirm: [String]

init(passcode: [String], stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

Expand All @@ -26,10 +27,10 @@ struct ConfirmPasscodeState: PasscodeLockStateType {
self.title = (stringsToShow?.passcodeLockConfirmTitle ?? localizedStringFor("PasscodeLockConfirmTitle", comment: "Confirm passcode title"))
self.description = (stringsToShow?.passcodeLockConfirmDescription ?? localizedStringFor("PasscodeLockConfirmDescription", comment: "Confirm passcode description"))
self.tintColor = (tintColor ?? defaultColor)
self.font = (font ?? UIFont.systemFontOfSize(16))
self.font = (font ?? UIFont.systemFont(ofSize: 16))
}

func acceptPasscode(passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {
func acceptPasscode(_ passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

if (passcode == passcodeToConfirm) {
lock.repository.savePasscode(passcode)
Expand Down
12 changes: 6 additions & 6 deletions PasscodeLock/PasscodeLock/EnterPasscodeState.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct EnterPasscodeState: PasscodeLockStateType {
var tintColor : UIColor?
var font : UIFont?

private var inccorectPasscodeAttempts = 0
fileprivate var inccorectPasscodeAttempts = 0

init(allowCancellation: Bool = false, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

Expand All @@ -28,10 +28,10 @@ struct EnterPasscodeState: PasscodeLockStateType {
self.title = (stringsToShow?.passcodeLockEnterTitle ?? localizedStringFor("PasscodeLockEnterTitle", comment: "Enter passcode title"))
self.description = (stringsToShow?.passcodeLockEnterDescription ?? localizedStringFor("PasscodeLockEnterDescription", comment: "Enter passcode description"))
self.tintColor = (tintColor ?? defaultColor)
self.font = (font ?? UIFont.systemFontOfSize(16))
self.font = (font ?? UIFont.systemFont(ofSize: 16))
}

mutating func acceptPasscode(passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {
mutating func acceptPasscode(_ passcode: [String], fromLock lock: PasscodeLockType, stringsToShow: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

guard let currentPasscode = lock.repository.passcode else {
return
Expand All @@ -51,9 +51,9 @@ struct EnterPasscodeState: PasscodeLockStateType {
}
}

private mutating func postNotification() {
fileprivate mutating func postNotification() {

let center = NSNotificationCenter.defaultCenter()
center.postNotificationName(PasscodeLockIncorrectPasscodeNotification, object: nil)
let center = NotificationCenter.default
center.post(name: Notification.Name(rawValue: PasscodeLockIncorrectPasscodeNotification), object: nil)
}
}
38 changes: 19 additions & 19 deletions PasscodeLock/PasscodeLock/PasscodeLock.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@
import Foundation
import LocalAuthentication

public class PasscodeLock: PasscodeLockType {
open class PasscodeLock: PasscodeLockType {

public weak var delegate: PasscodeLockTypeDelegate?
public let configuration: PasscodeLockConfigurationType
open weak var delegate: PasscodeLockTypeDelegate?
open let configuration: PasscodeLockConfigurationType

public var repository: PasscodeRepositoryType {
open var repository: PasscodeRepositoryType {
return configuration.repository
}

public var state: PasscodeLockStateType {
open var state: PasscodeLockStateType {
return lockState
}

public var isTouchIDAllowed: Bool {
open var isTouchIDAllowed: Bool {
return isTouchIDEnabled() && configuration.isTouchIDAllowed && lockState.isTouchIDAllowed
}

public var isPincodeEmpty: Bool {
open var isPincodeEmpty: Bool {
return passcode.isEmpty
}

private var lockState: PasscodeLockStateType
private lazy var passcode = [String]()
fileprivate var lockState: PasscodeLockStateType
fileprivate lazy var passcode = [String]()

public init(state: PasscodeLockStateType, configuration: PasscodeLockConfigurationType) {

Expand All @@ -41,33 +41,33 @@ public class PasscodeLock: PasscodeLockType {
self.configuration = configuration
}

public func addSign(sign: String, stringsToBeDisplayed: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {
open func addSign(_ sign: String, stringsToBeDisplayed: StringsToBeDisplayed?, tintColor: UIColor?, font: UIFont?) {

passcode.append(sign)
delegate?.passcodeLock(self, addedSignAtIndex: passcode.count - 1)

if (passcode.count >= configuration.passcodeLength) {

self.lockState.acceptPasscode(self.passcode, fromLock: self, stringsToShow: stringsToBeDisplayed, tintColor: tintColor, font: font)
self.passcode.removeAll(keepCapacity: true)
self.passcode.removeAll(keepingCapacity: true)
}
}

public func removeSign() {
open func removeSign() {

guard passcode.count > 0 else { return }

passcode.removeLast()
delegate?.passcodeLock(self, removedSignAtIndex: passcode.count)
}

public func changeStateTo(state: PasscodeLockStateType) {
open func changeStateTo(_ state: PasscodeLockStateType) {

lockState = state
delegate?.passcodeLockDidChangeState(self)
}

public func authenticateWithBiometrics(stringsToShow: StringsToBeDisplayed?) {
open func authenticateWithBiometrics(_ stringsToShow: StringsToBeDisplayed?) {

guard isTouchIDAllowed else { return }

Expand All @@ -76,16 +76,16 @@ public class PasscodeLock: PasscodeLockType {

context.localizedFallbackTitle = (stringsToShow?.passcodeLockTouchIDButton ?? localizedStringFor("PasscodeLockTouchIDButton", comment: "TouchID authentication fallback button"))

context.evaluatePolicy(.DeviceOwnerAuthenticationWithBiometrics, localizedReason: reason) {
context.evaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, localizedReason: reason) {
success, error in

self.handleTouchIDResult(success)
}
}

private func handleTouchIDResult(success: Bool) {
fileprivate func handleTouchIDResult(_ success: Bool) {

dispatch_async(dispatch_get_main_queue()) {
DispatchQueue.main.async {

if success {

Expand All @@ -94,10 +94,10 @@ public class PasscodeLock: PasscodeLockType {
}
}

private func isTouchIDEnabled() -> Bool {
fileprivate func isTouchIDEnabled() -> Bool {

let context = LAContext()

return context.canEvaluatePolicy(.DeviceOwnerAuthenticationWithBiometrics, error: nil)
return context.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: nil)
}
}
Loading