From c7b2d48bc4fcd2f45cb53aa41ab6d44aa4cd4785 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 18:10:10 +0300 Subject: [PATCH 1/7] DateFormatter locale parameter added --- .../Classes/BaseDateFormatter.swift | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift index a72cbbc..87080fc 100644 --- a/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift +++ b/LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift @@ -33,40 +33,44 @@ open class BaseDateFormatter { private static let apiFormatter: DateFormatter = { let dateFormatter = DateFormatter() - dateFormatter.locale = Locale.current + dateFormatter.locale = usedLocale dateFormatter.dateFormat = BaseDateFormatter.apiDateTimeFormat return dateFormatter }() private static let apiDateWithoutTimeFormatter: DateFormatter = { let dateFormatter = DateFormatter() - dateFormatter.locale = Locale.current + dateFormatter.locale = usedLocale dateFormatter.dateFormat = BaseDateFormatter.apiDateWithoutTimeFormat return dateFormatter }() private static let hourAndMinuteFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = Locale.current + dateFormater.locale = usedLocale dateFormater.dateFormat = BaseDateFormatter.hourAndMinuteDateTimeFormat return dateFormater }() private static let dayAndMonthFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = Locale.current + dateFormater.locale = usedLocale dateFormater.dateFormat = BaseDateFormatter.dayAndMonthDateTimeFormat return dateFormater }() private static let dayMonthYearFormatter: DateFormatter = { let dateFormater = DateFormatter() - dateFormater.locale = Locale.current + dateFormater.locale = usedLocale dateFormater.dateFormat = BaseDateFormatter.dayMonthYearDateTimeFormat return dateFormater }() - // MARK: Internal functions + // MARK: Public interface + + open class var usedLocale: Locale { + return .current + } public static func backendDate(fromStrDate strDate: String) -> Date? { return BaseDateFormatter.apiFormatter.date(from: strDate) From f0c89771f545a1b1e3358fa33ef67a1b81176e8e Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 18:42:30 +0300 Subject: [PATCH 2/7] Fixed: userService and profileService --- .../LeadKitAdditions/Services/BaseUserService.swift | 1 + LeadKitAdditions/LeadKitAdditions/Services/TouchIDService.swift | 2 ++ 2 files changed, 3 insertions(+) diff --git a/LeadKitAdditions/LeadKitAdditions/Services/BaseUserService.swift b/LeadKitAdditions/LeadKitAdditions/Services/BaseUserService.swift index 34eb1ff..8923c7f 100644 --- a/LeadKitAdditions/LeadKitAdditions/Services/BaseUserService.swift +++ b/LeadKitAdditions/LeadKitAdditions/Services/BaseUserService.swift @@ -53,6 +53,7 @@ open class BaseUserService { open class func clearData() { UserDefaults.standard.sessionId = nil UserDefaults.standard.userLogin = nil + UserDefaults.standard.synchronize() } } diff --git a/LeadKitAdditions/LeadKitAdditions/Services/TouchIDService.swift b/LeadKitAdditions/LeadKitAdditions/Services/TouchIDService.swift index 6eaa96e..394186d 100644 --- a/LeadKitAdditions/LeadKitAdditions/Services/TouchIDService.swift +++ b/LeadKitAdditions/LeadKitAdditions/Services/TouchIDService.swift @@ -30,6 +30,8 @@ public class TouchIDService { return LAContext() }() + public init() {} + public var canAuthenticateByTouchId: Bool { return laContext.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: nil) } From 50db3cb44e4e375c62a4c4b5fff54b9c8ec2fd57 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 18:58:13 +0300 Subject: [PATCH 3/7] NetworkService fixed --- .../Services/Network/SimpleNetworkService.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift b/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift index 2ed8156..038a066 100644 --- a/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift +++ b/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift @@ -30,7 +30,7 @@ import RxAlamofire open class SimpleNetworkService: DefaultNetworkService { // Singleton - static let shared = SimpleNetworkService() + public static let shared = SimpleNetworkService() public convenience init() { self.init(sessionManager: SimpleNetworkService.sessionManager) From 15686581573524386ab48bc593319f38a995cc15 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 19:04:36 +0300 Subject: [PATCH 4/7] Singleton removed from SimpleNetworkService --- .../Services/Network/SimpleNetworkService.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift b/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift index 038a066..24a9961 100644 --- a/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift +++ b/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift @@ -29,9 +29,6 @@ import RxAlamofire open class SimpleNetworkService: DefaultNetworkService { - // Singleton - public static let shared = SimpleNetworkService() - public convenience init() { self.init(sessionManager: SimpleNetworkService.sessionManager) } From da4c6b7a9d44541ac32d07a1bad0addb8d714ca6 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 20:00:44 +0300 Subject: [PATCH 5/7] PassCodeViewController fixed --- .../PassCode/View/BasePassCodeViewController.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/View/BasePassCodeViewController.swift b/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/View/BasePassCodeViewController.swift index e88e3a0..0aae75b 100644 --- a/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/View/BasePassCodeViewController.swift +++ b/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/View/BasePassCodeViewController.swift @@ -159,19 +159,19 @@ open class BasePassCodeViewController: UIViewController { } // override to change Images - func imageFor(type: PinImageType) -> UIImage { + open func imageFor(type: PinImageType) -> UIImage { assertionFailure("You should override this method: imageFor(type: PinImageType)") return UIImage() } // override to change error text - func errorDescription(for error: PassCodeError) -> String { + open func errorDescription(for error: PassCodeError) -> String { assertionFailure("You should override this method: errorDescription(for error: PassCodeError)") return "" } // override to change action title text - func actionTitle(for passCodeControllerState: PassCodeControllerState) -> String { + open func actionTitle(for passCodeControllerState: PassCodeControllerState) -> String { assertionFailure("You should override this method: actionTitle(for passCodeControllerState: PassCodeControllerState)") return "" } From 3f2adc24d4e122d5cd1edbdabfcdb294831d003f Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 20:06:53 +0300 Subject: [PATCH 6/7] one more passCode fix --- .../PassCode/View/BasePassCodeViewController.swift | 2 +- .../PassCode/ViewModel/BasePassCodeViewModel.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/View/BasePassCodeViewController.swift b/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/View/BasePassCodeViewController.swift index 0aae75b..7a309f1 100644 --- a/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/View/BasePassCodeViewController.swift +++ b/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/View/BasePassCodeViewController.swift @@ -50,7 +50,7 @@ open class BasePassCodeViewController: UIViewController { @IBOutlet public weak var errorLabel: UILabel? @IBOutlet public weak var dotStackView: UIStackView! - let disposeBag = DisposeBag() + public let disposeBag = DisposeBag() fileprivate lazy var fakeTextField: UITextField = { let fakeTextField = UITextField() diff --git a/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift b/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift index 333e65d..f5701fa 100644 --- a/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift +++ b/LeadKitAdditions/LeadKitAdditions/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift @@ -56,9 +56,9 @@ open class BasePassCodeViewModel: BaseViewModel { return PassCodeHolderBuilder.build(with: self.controllerType) }() - init(controllerType: PassCodeControllerType, - passCodeConfiguration: PassCodeConfiguration, - touchIdService: TouchIDService? = nil) { + public init(controllerType: PassCodeControllerType, + passCodeConfiguration: PassCodeConfiguration, + touchIdService: TouchIDService? = nil) { self.controllerType = controllerType self.passCodeConfiguration = passCodeConfiguration From b66d52f78bd3496394a09380e10f41700b0678a2 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 20:13:40 +0300 Subject: [PATCH 7/7] Version incremented --- LeadKitAdditions.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LeadKitAdditions.podspec b/LeadKitAdditions.podspec index fe1e0c9..90812f4 100644 --- a/LeadKitAdditions.podspec +++ b/LeadKitAdditions.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "LeadKitAdditions" - s.version = "0.0.5" + s.version = "0.0.6" s.summary = "iOS framework with a bunch of tools for rapid development" s.homepage = "https://github.com/NikAshanin/LeadKitAdditions" s.license = "Apache License, Version 2.0"