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

Update name & refactor error

This commit is contained in:
Igor Kislyuk 2018-03-23 15:21:12 +03:00
parent ce2c69e854
commit 7b6e73e789
20 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LeadKitAdditions/Sources/Classes/ApiResponse.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Classes/BaseDateFormatter.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Classes/LoadingBarButton.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeConfiguration.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

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

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

8
LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeHolder.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal
@ -81,7 +81,7 @@ public class PassCodeHolderCreate: PassCodeHolderProtocol {
if let passCode = passCode {
return .valid(passCode)
} else {
return .inValid(.codesNotMatch)
return .invalid(.codesNotMatch)
}
}
@ -112,7 +112,7 @@ public class PassCodeHolderEnter: PassCodeHolderProtocol {
if let passCode = passCode {
return .valid(passCode)
} else {
return .inValid(nil)
return .invalid(nil)
}
}
@ -178,7 +178,7 @@ public class PassCodeHolderChange: PassCodeHolderProtocol {
if let passCode = passCode {
return .valid(passCode)
} else {
return .inValid(enterStep == .newEnter ? nil : .codesNotMatch)
return .invalid(enterStep == .newEnter ? nil : .codesNotMatch)
}
}

2
LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeHolderProtocol.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

22
LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeValidationResult.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal
@ -24,33 +24,35 @@
public enum PassCodeValidationResult {
case valid(String)
case inValid(PassCodeError?)
case invalid(PassCodeError?)
public var isValid: Bool {
}
public extension PassCodeValidationResult {
var isValid: Bool {
switch self {
case .valid:
return true
default:
case .invalid(_):
return false
}
}
public var passCode: String? {
var passCode: String? {
switch self {
case let .valid(passCode):
return passCode
default:
case .invalid(_):
return nil
}
}
public var error: PassCodeError? {
var error: PassCodeError? {
switch self {
case let .inValid(error):
case let .invalid(error):
return error
default:
case .valid(_):
return nil
}
}
}

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

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal
@ -180,12 +180,12 @@ extension BasePassCodeViewModel {
attemptsNumber += 1
if let passCode = validationResult.passCode, !isEnteredPassCodeValid(passCode) {
validationResult = .inValid(.wrongCode)
validationResult = .invalid(.wrongCode)
}
if (!validationResult.isValid && attemptsNumber == Int(passCodeConfiguration.maxAttemptsNumber)) ||
attemptsNumber > Int(passCodeConfiguration.maxAttemptsNumber) {
validationResult = .inValid(.tooManyAttempts)
validationResult = .invalid(.tooManyAttempts)
}
}

2
LeadKitAdditions/Sources/Enums/ApiError.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Enums/ApiErrorProtocol.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Extensions/Observable+Extensions.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Extensions/UIBarButtonItem+Extensions.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Extensions/UserDefaults+UserService.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Services/BasePassCodeService.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Services/BaseUserService.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Services/Network/ApiNetworkService.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Services/Network/DefaultNetworkService+ActivityIndicator.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Services/Network/DefaultNetworkService.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal

2
LeadKitAdditions/Sources/Services/TouchIDService.swift
View File

@ -1,5 +1,5 @@
//
// Copyright (c) 2017 Touch Instinct
// Copyright (c) 2018 Touch Instinct
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the Software), to deal