TouchInstinct
/
LeadKitAdditions
302
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add attempt index

This commit is contained in:
Igor Kislyuk 2018-03-23 20:00:46 +03:00
parent 8bba538e4a
commit 9baa92a303
3 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeError.swift
View File

@ -21,8 +21,22 @@
//
/// Describes error, which may occur during pass code entering
/// - codesNotMatch: Different codes
/// - wrongCode: Value is remaining attemps
/// - tooManyAttempts: Attempts limit reached
public enum PassCodeError: Error {
case codesNotMatch
case wrongCode
case wrongCode(Int)
case tooManyAttempts
}
public extension PassCodeError {
var isTooManyAttempts: Bool {
switch self {
case .tooManyAttempts:
return true
default:
return false
}
}
}

4
LeadKitAdditions/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift
View File

@ -226,8 +226,8 @@ open class BasePassCodeViewController: UIViewController, ConfigurableController
if validationResult.isValid {
self?.hideError()
} else if let pasCodeError = validationResult.error {
self?.showError(for: pasCodeError)
} else if let passCodeError = validationResult.error {
self?.showError(for: passCodeError)
}
})
.disposed(by: disposeBag)

53
LeadKitAdditions/Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift
View File

@ -77,29 +77,8 @@ open class BasePassCodeViewModel: BaseViewModel {
})
.disposed(by: disposeBag)
validationResultHolder.asDriver()
.drive(onNext: { [weak self] validationResult in
guard let sSelf = self else {
return
}
if sSelf.passCodeHolder.type == .change {
if validationResult?.isValid ?? false,
sSelf.passCodeHolder.enterStep == .repeatEnter,
let passCode = validationResult?.passCode {
sSelf.authSucceed(.passCode(passCode))
} else {
sSelf.passCodeControllerStateHolder.value = sSelf.passCodeHolder.enterStep
}
} else {
if validationResult?.isValid ?? false, let passCode = validationResult?.passCode {
sSelf.authSucceed(.passCode(passCode))
} else {
sSelf.passCodeControllerStateHolder.value = sSelf.passCodeHolder.enterStep
}
}
})
validationResultHolder.asObservable()
.bind(to: validationResultBinder)
.disposed(by: disposeBag)
}
@ -163,6 +142,29 @@ open class BasePassCodeViewModel: BaseViewModel {
}
private extension BasePassCodeViewModel {
var validationResultBinder: Binder<PassCodeValidationResult?> {
return Binder(self) { model, validationResult in
let isValid = validationResult?.isValid ?? false
let passCode = validationResult?.passCode
if model.passCodeHolder.type == .change {
if isValid, model.passCodeHolder.enterStep == .repeatEnter, let passCode = passCode {
model.authSucceed(.passCode(passCode))
} else {
model.passCodeControllerStateHolder.value = model.passCodeHolder.enterStep
}
} else {
if isValid, let passCode = passCode {
model.authSucceed(.passCode(passCode))
} else {
model.passCodeControllerStateHolder.value = model.passCodeHolder.enterStep
}
}
}
}
}
extension BasePassCodeViewModel {
private func set(passCode: String) {
@ -177,7 +179,7 @@ extension BasePassCodeViewModel {
private var shouldUpdateControllerState: Bool {
return !passCodeHolder.shouldValidate ||
!(validationResultHolder.value?.isValid ?? true) ||
validationResultHolder.value?.error == .tooManyAttempts
validationResultHolder.value?.error?.isTooManyAttempts ?? false
}
private func validateIfNeeded() {
@ -191,7 +193,8 @@ extension BasePassCodeViewModel {
attemptsNumber += 1
if let passCode = validationResult.passCode, !isEnteredPassCodeValid(passCode) {
validationResult = .invalid(.wrongCode)
assert(passCodeConfiguration.maxAttemptsNumber > attemptsNumber)
validationResult = .invalid(.wrongCode(passCodeConfiguration.maxAttemptsNumber - attemptsNumber))
}
if (!validationResult.isValid && attemptsNumber == Int(passCodeConfiguration.maxAttemptsNumber)) ||