From 36200eaeb9c84d96caee65c724551725007f7b14 Mon Sep 17 00:00:00 2001 From: Grigory Date: Thu, 8 Jun 2017 16:15:36 +0300 Subject: [PATCH] build fix --- .../Sources/Protocols/CellFieldJumpingProtocol.swift | 2 +- .../Sources/Protocols/CellFieldMaskProtocol.swift | 2 +- .../Sources/Services/CellFieldsJumpingService.swift | 8 ++++---- .../Sources/Services/MaskFieldTextProxy.swift | 10 +++++----- .../Services/ValidationService/ValidationItem.swift | 4 ++-- .../Views/CellTextField/CellTextFieldViewModel.swift | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LeadKitAdditions/Sources/Protocols/CellFieldJumpingProtocol.swift b/LeadKitAdditions/Sources/Protocols/CellFieldJumpingProtocol.swift index 176bb81..91e375f 100644 --- a/LeadKitAdditions/Sources/Protocols/CellFieldJumpingProtocol.swift +++ b/LeadKitAdditions/Sources/Protocols/CellFieldJumpingProtocol.swift @@ -34,5 +34,5 @@ extension CellFieldJumpingProtocol { }) .addDisposableTo(disposeBag) } - + } diff --git a/LeadKitAdditions/Sources/Protocols/CellFieldMaskProtocol.swift b/LeadKitAdditions/Sources/Protocols/CellFieldMaskProtocol.swift index 493fb62..e3e9df3 100644 --- a/LeadKitAdditions/Sources/Protocols/CellFieldMaskProtocol.swift +++ b/LeadKitAdditions/Sources/Protocols/CellFieldMaskProtocol.swift @@ -10,5 +10,5 @@ extension CellFieldMaskProtocol { var haveMask: Bool { return maskFieldTextProxy != nil } - + } diff --git a/LeadKitAdditions/Sources/Services/CellFieldsJumpingService.swift b/LeadKitAdditions/Sources/Services/CellFieldsJumpingService.swift index daac2c7..31a8cac 100644 --- a/LeadKitAdditions/Sources/Services/CellFieldsJumpingService.swift +++ b/LeadKitAdditions/Sources/Services/CellFieldsJumpingService.swift @@ -78,7 +78,7 @@ class CellFieldsJumpingService { field.shouldGoForward.asObservable() .subscribe(onNext: { - if let nextActive = cellFields.nextActive(from: offset) { + if let nextActive = cellFields.nextActive(from: offset) { nextActive.shouldBecomeFirstResponder.onNext() } else { self.didDone.onNext() @@ -99,7 +99,7 @@ class CellFieldsJumpingService { toolBar.shouldGoForward.asObservable() .subscribe(onNext: { [weak self] in - if let nextActive = self?.cellFields.nextActive(from: index) { + if let nextActive = self?.cellFields.nextActive(from: index) { nextActive.shouldBecomeFirstResponder.onNext() } else { self?.didDone.onNext() @@ -109,7 +109,7 @@ class CellFieldsJumpingService { toolBar.shouldGoBackward.asObservable() .subscribe(onNext: { [weak self] in - if let previousActive = self?.cellFields.previousActive(from: index) { + if let previousActive = self?.cellFields.previousActive(from: index) { previousActive.shouldBecomeFirstResponder.onNext() } }) @@ -123,7 +123,7 @@ class CellFieldsJumpingService { return toolBar } - + } extension Array where Element == CellFieldJumpingProtocol { diff --git a/LeadKitAdditions/Sources/Services/MaskFieldTextProxy.swift b/LeadKitAdditions/Sources/Services/MaskFieldTextProxy.swift index 67012c8..1a67202 100644 --- a/LeadKitAdditions/Sources/Services/MaskFieldTextProxy.swift +++ b/LeadKitAdditions/Sources/Services/MaskFieldTextProxy.swift @@ -11,19 +11,19 @@ class MaskFieldTextProxy: NSObject { private(set) var field: UITextField? - private let maskedDelegate: PolyMaskTextFieldDelegate + private let maskedProxy: PolyMaskTextFieldDelegate init(primaryFormat: String, affineFormats: [String] = []) { - maskedDelegate = PolyMaskTextFieldDelegate(primaryFormat: primaryFormat, affineFormats: affineFormats) + maskedProxy = PolyMaskTextFieldDelegate(primaryFormat: primaryFormat, affineFormats: affineFormats) super.init() - maskedDelegate.listener = self + maskedProxy.listener = self } func configure(with field: UITextField) { self.field = field - field.delegate = maskedDelegate + field.delegate = maskedProxy } private func bindData() { @@ -36,7 +36,7 @@ class MaskFieldTextProxy: NSObject { return } - self?.maskedDelegate.put(text: value, into: textField) + self?.maskedProxy.put(text: value, into: textField) }) .addDisposableTo(disposeBag) } diff --git a/LeadKitAdditions/Sources/Services/ValidationService/ValidationItem.swift b/LeadKitAdditions/Sources/Services/ValidationService/ValidationItem.swift index d14ee84..1f3574f 100644 --- a/LeadKitAdditions/Sources/Services/ValidationService/ValidationItem.swift +++ b/LeadKitAdditions/Sources/Services/ValidationService/ValidationItem.swift @@ -70,10 +70,10 @@ class ValidationItem { @discardableResult private func validate(text: String?, isManual: Bool = false) -> Bool { - let error = rules.filter{ + let error = rules.filter { return !$0.validate(text ?? "") } - .map{ rule -> ValidationError in + .map { rule -> ValidationError in return ValidationError(failedRule: rule, errorMessage: rule.errorMessage()) } .first diff --git a/LeadKitAdditions/Sources/Views/CellTextField/CellTextFieldViewModel.swift b/LeadKitAdditions/Sources/Views/CellTextField/CellTextFieldViewModel.swift index f8088ec..5f819db 100644 --- a/LeadKitAdditions/Sources/Views/CellTextField/CellTextFieldViewModel.swift +++ b/LeadKitAdditions/Sources/Views/CellTextField/CellTextFieldViewModel.swift @@ -26,5 +26,5 @@ class CellTextFieldViewModel: CellFieldJumpingProtocol { self.placeholder = placeholder self.textFieldSettingsBlock = textFieldSettingsBlock } - + }