Self-maintained passcode lock
- No cancel button anywhere in the passcode lock yet - Poor UI
This commit is contained in:
parent
30ae08bed5
commit
da3c4f0bc0
10 changed files with 298 additions and 210 deletions
|
|
@ -7,46 +7,14 @@
|
|||
//
|
||||
|
||||
import Foundation
|
||||
import PasscodeLock
|
||||
import passKit
|
||||
|
||||
// add a cancel button in the passcode lock view
|
||||
struct CancelableEnterPasscodeState: PasscodeLockStateType {
|
||||
let title: String = "Enter passcode"
|
||||
let description: String = "Enter passcode"
|
||||
let isCancellableAction = true
|
||||
var isTouchIDAllowed = true
|
||||
mutating func accept(passcode: String, from lock: PasscodeLockType) {
|
||||
if lock.repository.check(passcode: passcode) {
|
||||
lock.delegate?.passcodeLockDidSucceed(lock)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// cancel means cancel the extension
|
||||
class PasscodeLockViewControllerForExtension: PasscodeLockViewController {
|
||||
var originalExtensionContest: NSExtensionContext?
|
||||
public convenience init(extensionContext: NSExtensionContext?, state: PasscodeLockStateType, configuration: PasscodeLockConfigurationType, animateOnDismiss: Bool = true) {
|
||||
self.init(state: state, configuration: configuration, animateOnDismiss: animateOnDismiss)
|
||||
originalExtensionContest = extensionContext
|
||||
}
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
cancelButton?.removeTarget(nil, action: nil, for: .allEvents)
|
||||
cancelButton?.addTarget(self, action: #selector(cancelExtension), for: .touchUpInside)
|
||||
}
|
||||
@objc func cancelExtension() {
|
||||
originalExtensionContest?.completeRequest(returningItems: [], completionHandler: nil)
|
||||
}
|
||||
}
|
||||
|
||||
class PasscodeExtensionDisplay {
|
||||
private var isPasscodePresented = false
|
||||
private let passcodeLockVC: PasscodeLockViewControllerForExtension
|
||||
private let passcodeLockVC: PasscodeLockViewController
|
||||
|
||||
init(extensionContext: NSExtensionContext?) {
|
||||
let cancelableEnter = CancelableEnterPasscodeState()
|
||||
passcodeLockVC = PasscodeLockViewControllerForExtension(extensionContext: extensionContext, state: cancelableEnter, configuration: PasscodeLockConfiguration.shared)
|
||||
passcodeLockVC = PasscodeLockViewController()
|
||||
passcodeLockVC.dismissCompletionCallback = { [weak self] in
|
||||
self?.dismiss()
|
||||
}
|
||||
|
|
@ -54,7 +22,7 @@ class PasscodeExtensionDisplay {
|
|||
|
||||
// present the passcode lock view if passcode is set and the view controller is not presented
|
||||
func presentPasscodeLockIfNeeded(_ extensionVC: ExtensionViewController) {
|
||||
guard PasscodeLockConfiguration.shared.repository.hasPasscode && !isPasscodePresented == true else {
|
||||
guard PasscodeLock.shared.hasPasscode && !isPasscodePresented == true else {
|
||||
return
|
||||
}
|
||||
isPasscodePresented = true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue