From 26ed7cdd6f8eb9ccbcb632cc6b1007af820e8c5f Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Mon, 26 Mar 2018 17:48:22 +0300 Subject: [PATCH 1/2] remove code-quality, add build-scripts. fix warnings --- .gitmodules | 6 +++--- .../project.pbxproj | 15 +++++++------ LeadKitAdditions/Podfile | 5 +++-- LeadKitAdditions/Podfile.lock | 21 +++++++++++-------- .../View/BasePassCodeViewController.swift | 2 +- .../ViewModel/BasePassCodeViewModel.swift | 2 +- .../Sources/Services/BiometricsService.swift | 6 ++---- code-quality | 1 - 8 files changed, 29 insertions(+), 29 deletions(-) delete mode 160000 code-quality diff --git a/.gitmodules b/.gitmodules index 53b16c0..33d276a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "code-quality"] - path = code-quality - url = https://github.com/TouchInstinct/code-quality-ios +[submodule "build-scripts"] + path = build-scripts + url = git@github.com:TouchInstinct/BuildScripts.git diff --git a/LeadKitAdditions/LeadKitAdditions.xcodeproj/project.pbxproj b/LeadKitAdditions/LeadKitAdditions.xcodeproj/project.pbxproj index e974905..7650734 100644 --- a/LeadKitAdditions/LeadKitAdditions.xcodeproj/project.pbxproj +++ b/LeadKitAdditions/LeadKitAdditions.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 0A08E37F1F2A13BF00F9AB62 /* CellTextFieldToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A08E37E1F2A13BF00F9AB62 /* CellTextFieldToolBar.swift */; }; 248389A288C0A6D7914F0546 /* Pods_LeadKitAdditions_LeadKitAdditions_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0ED4A1B793EAA73C9E95969F /* Pods_LeadKitAdditions_LeadKitAdditions_iOS.framework */; }; + 678D26AA206935B900B05B93 /* BiometricsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 678D26A9206935B900B05B93 /* BiometricsService.swift */; }; A6CFB8D91F5024A500A42CC2 /* Error+NetworkingExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CFB8D81F5024A500A42CC2 /* Error+NetworkingExtensions.swift */; }; B326804BA6CC8B8BB136A46A /* Pods_LeadKitAdditions_LeadKitAdditions_iOS_Extensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CFD5627139CAB27705F75C07 /* Pods_LeadKitAdditions_LeadKitAdditions_iOS_Extensions.framework */; }; CAE698E81E968820000394B0 /* LeadKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = CAE698E61E968820000394B0 /* LeadKitAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -66,8 +67,6 @@ ED0C34391F2906EC00FAE9FD /* DefaultNetworkService+ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33F81F2906EC00FAE9FD /* DefaultNetworkService+ActivityIndicator.swift */; }; ED0C343B1F2906EC00FAE9FD /* DefaultNetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33F91F2906EC00FAE9FD /* DefaultNetworkService.swift */; }; ED0C343C1F2906EC00FAE9FD /* DefaultNetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33F91F2906EC00FAE9FD /* DefaultNetworkService.swift */; }; - ED0C343D1F2906EC00FAE9FD /* TouchIDService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33FA1F2906EC00FAE9FD /* TouchIDService.swift */; }; - ED0C343E1F2906EC00FAE9FD /* TouchIDService.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33FA1F2906EC00FAE9FD /* TouchIDService.swift */; }; ED0C343F1F2906EC00FAE9FD /* ValidationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33FC1F2906EC00FAE9FD /* ValidationError.swift */; }; ED0C34401F2906EC00FAE9FD /* ValidationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33FC1F2906EC00FAE9FD /* ValidationError.swift */; }; ED0C34411F2906EC00FAE9FD /* ValidationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED0C33FD1F2906EC00FAE9FD /* ValidationItem.swift */; }; @@ -87,6 +86,7 @@ 0A08E37E1F2A13BF00F9AB62 /* CellTextFieldToolBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CellTextFieldToolBar.swift; sourceTree = ""; }; 0ED4A1B793EAA73C9E95969F /* Pods_LeadKitAdditions_LeadKitAdditions_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LeadKitAdditions_LeadKitAdditions_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 49738551AC648B0AFA74E57F /* Pods-LeadKitAdditions-LeadKitAdditions iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LeadKitAdditions-LeadKitAdditions iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LeadKitAdditions-LeadKitAdditions iOS/Pods-LeadKitAdditions-LeadKitAdditions iOS.debug.xcconfig"; sourceTree = ""; }; + 678D26A9206935B900B05B93 /* BiometricsService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricsService.swift; sourceTree = ""; }; 7B7F57C5E5275C4D8DC71992 /* Pods_LeadKitAdditions.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LeadKitAdditions.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9D549FA5A7579702358E07DF /* Pods-LeadKitAdditions-LeadKitAdditions iOS Extensions.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LeadKitAdditions-LeadKitAdditions iOS Extensions.debug.xcconfig"; path = "Pods/Target Support Files/Pods-LeadKitAdditions-LeadKitAdditions iOS Extensions/Pods-LeadKitAdditions-LeadKitAdditions iOS Extensions.debug.xcconfig"; sourceTree = ""; }; A6CFB8D81F5024A500A42CC2 /* Error+NetworkingExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Error+NetworkingExtensions.swift"; sourceTree = ""; }; @@ -122,7 +122,6 @@ ED0C33F71F2906EC00FAE9FD /* DefaultNetworkService+ActivityIndicator+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DefaultNetworkService+ActivityIndicator+Extension.swift"; sourceTree = ""; }; ED0C33F81F2906EC00FAE9FD /* DefaultNetworkService+ActivityIndicator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "DefaultNetworkService+ActivityIndicator.swift"; sourceTree = ""; }; ED0C33F91F2906EC00FAE9FD /* DefaultNetworkService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultNetworkService.swift; sourceTree = ""; }; - ED0C33FA1F2906EC00FAE9FD /* TouchIDService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TouchIDService.swift; sourceTree = ""; }; ED0C33FC1F2906EC00FAE9FD /* ValidationError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidationError.swift; sourceTree = ""; }; ED0C33FD1F2906EC00FAE9FD /* ValidationItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidationItem.swift; sourceTree = ""; }; ED0C33FE1F2906EC00FAE9FD /* ValidationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidationService.swift; sourceTree = ""; }; @@ -296,7 +295,7 @@ ED0C33F21F2906EC00FAE9FD /* BaseUserService.swift */, ED0C33F31F2906EC00FAE9FD /* CellFieldsJumpingService.swift */, ED0C33F41F2906EC00FAE9FD /* MaskFieldTextProxy.swift */, - ED0C33FA1F2906EC00FAE9FD /* TouchIDService.swift */, + 678D26A9206935B900B05B93 /* BiometricsService.swift */, ); path = Services; sourceTree = ""; @@ -531,7 +530,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi"; + shellScript = ". build-scripts/xcode/build_phases/swiftlint.sh Sources"; }; E8E82E34792B38EF225575D7 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -563,7 +562,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi"; + shellScript = ". build-scripts/xcode/build_phases/swiftlint.sh Sources"; }; /* End PBXShellScriptBuildPhase section */ @@ -576,10 +575,10 @@ ED0C343B1F2906EC00FAE9FD /* DefaultNetworkService.swift in Sources */, ED0C34351F2906EC00FAE9FD /* ApiNetworkService.swift in Sources */, ED0C340F1F2906EC00FAE9FD /* PassCodeHolderProtocol.swift in Sources */, - ED0C343D1F2906EC00FAE9FD /* TouchIDService.swift in Sources */, ED0C343F1F2906EC00FAE9FD /* ValidationError.swift in Sources */, ED0C342F1F2906EC00FAE9FD /* BaseUserService.swift in Sources */, ED0C34231F2906EC00FAE9FD /* CellFieldJumpingProtocol.swift in Sources */, + 678D26AA206935B900B05B93 /* BiometricsService.swift in Sources */, ED0C34411F2906EC00FAE9FD /* ValidationItem.swift in Sources */, ED0C341F1F2906EC00FAE9FD /* UIBarButtonItem+Extensions.swift in Sources */, ED0C34091F2906EC00FAE9FD /* PassCodeConfiguration.swift in Sources */, @@ -618,9 +617,9 @@ ED0C343C1F2906EC00FAE9FD /* DefaultNetworkService.swift in Sources */, ED0C34361F2906EC00FAE9FD /* ApiNetworkService.swift in Sources */, ED0C34101F2906EC00FAE9FD /* PassCodeHolderProtocol.swift in Sources */, - ED0C343E1F2906EC00FAE9FD /* TouchIDService.swift in Sources */, ED0C34401F2906EC00FAE9FD /* ValidationError.swift in Sources */, ED0C34301F2906EC00FAE9FD /* BaseUserService.swift in Sources */, + 678D267F2069237800B05B93 /* OnlineValidationState.swift in Sources */, ED0C34241F2906EC00FAE9FD /* CellFieldJumpingProtocol.swift in Sources */, ED0C34421F2906EC00FAE9FD /* ValidationItem.swift in Sources */, ED0C34201F2906EC00FAE9FD /* UIBarButtonItem+Extensions.swift in Sources */, diff --git a/LeadKitAdditions/Podfile b/LeadKitAdditions/Podfile index 01d07e2..5f32cb8 100644 --- a/LeadKitAdditions/Podfile +++ b/LeadKitAdditions/Podfile @@ -2,10 +2,11 @@ source "https://github.com/CocoaPods/Specs.git" source "https://github.com/TouchInstinct/Podspecs.git" abstract_target 'LeadKitAdditions' do - pod 'KeychainAccess', '3.1.0' - pod 'IDZSwiftCommonCrypto' + pod "KeychainAccess", '3.1.0' + pod "IDZSwiftCommonCrypto" pod "InputMask", '3.0.0' pod "SwiftValidator", '5.0.0' + pod "SwiftLint", '~> 0.25' inhibit_all_warnings! diff --git a/LeadKitAdditions/Podfile.lock b/LeadKitAdditions/Podfile.lock index 4c2a1b4..9f71675 100644 --- a/LeadKitAdditions/Podfile.lock +++ b/LeadKitAdditions/Podfile.lock @@ -1,14 +1,14 @@ PODS: - - Alamofire (4.5.1) + - Alamofire (4.7.0) - CocoaLumberjack/Default (3.3.0) - CocoaLumberjack/Swift (3.3.0): - CocoaLumberjack/Default - IDZSwiftCommonCrypto (0.10.0) - InputMask (3.0.0) - KeychainAccess (3.1.0) - - LeadKit (0.6.5): - - LeadKit/Core (= 0.6.5) - - LeadKit/Core (0.6.5): + - LeadKit (0.6.7): + - LeadKit/Core (= 0.6.7) + - LeadKit/Core (0.6.7): - CocoaLumberjack/Swift (~> 3.3.0) - ObjectMapper (~> 3.0.0) - RxAlamofire (= 4.0.0) @@ -16,7 +16,7 @@ PODS: - RxSwift (= 4.0.0) - TableKit (~> 2.5.0) - UIScrollView-InfiniteScroll (~> 1.0.0) - - LeadKit/Core-iOS-Extension (0.6.5): + - LeadKit/Core-iOS-Extension (0.6.7): - CocoaLumberjack/Swift (~> 3.3.0) - ObjectMapper (~> 3.0.0) - RxAlamofire (= 4.0.0) @@ -31,6 +31,7 @@ PODS: - RxCocoa (4.0.0): - RxSwift (~> 4.0) - RxSwift (4.0.0) + - SwiftLint (0.25.0) - SwiftValidator (5.0.0) - TableKit (2.5.0) - UIScrollView-InfiniteScroll (1.0.2) @@ -41,23 +42,25 @@ DEPENDENCIES: - KeychainAccess (= 3.1.0) - LeadKit (~> 0.6.0) - LeadKit/Core-iOS-Extension (~> 0.6.0) + - SwiftLint (~> 0.25) - SwiftValidator (= 5.0.0) SPEC CHECKSUMS: - Alamofire: 2d95912bf4c34f164fdfc335872e8c312acaea4a + Alamofire: 907e0a98eb68cdb7f9d1f541a563d6ac5dc77b25 CocoaLumberjack: 3c8c74683302f9012bb168e1c4b7ae3c0b558431 IDZSwiftCommonCrypto: 4eef2c46e262dfbcbc1fd76365e066336680ad7d InputMask: 37c273bde6705187d80cf0b4240cb42ea92096c3 KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da - LeadKit: 583c724f25852e40eebad8af5a945e101c282fde + LeadKit: 7d84bb111e7b6aca0c5d3ac5aee6f99d375d94d4 ObjectMapper: 92230db59bf8f341a5c3a3cf0b9fbdde3cf0d87f RxAlamofire: 6ea579ac53bf14cb4bc7049a3866e5a769989b1d RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334 + SwiftLint: e14651157288e9e01d6e1a71db7014fb5744a8ea SwiftValidator: 46cdd2061962df3ee8bab3c536dea9b34191d459 TableKit: 42d4dff2944f273cdeec2ef6352064eb6a9a355b UIScrollView-InfiniteScroll: c132d6d5851daff229ab4a1060ccf70a05a051c9 -PODFILE CHECKSUM: 9ba64f509b50aaf860b0df0c12cca7969aa50842 +PODFILE CHECKSUM: d2f39766e2e1169f9216c0dc43b52873927b77cc -COCOAPODS: 1.3.1 +COCOAPODS: 1.4.0 diff --git a/LeadKitAdditions/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift b/LeadKitAdditions/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift index e441d32..3b2f735 100644 --- a/LeadKitAdditions/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift +++ b/LeadKitAdditions/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift @@ -140,7 +140,7 @@ open class BasePassCodeViewController: UIViewController, ConfigurableController var statesArray: [PinImageType] = [] for characterIndex in 0.. Date: Mon, 26 Mar 2018 17:58:55 +0300 Subject: [PATCH 2/2] change project structure for linter --- LeadKitAdditions.podspec | 8 ++++---- .../project.pbxproj | 3 ++- .../project.xcworkspace/contents.xcworkspacedata | 0 .../contents.xcworkspacedata | 0 LeadKitAdditions/Podfile => Podfile | 0 LeadKitAdditions/Podfile.lock => Podfile.lock | 0 .../Sources => Sources}/Classes/ApiResponse.swift | 0 .../Classes/BaseDateFormatter.swift | 4 ++-- .../Classes/LoadingBarButton.swift | 4 ++-- .../PassCode/Model/PassCodeConfiguration.swift | 0 .../Controllers/PassCode/Model/PassCodeError.swift | 0 .../Controllers/PassCode/Model/PassCodeHolder.swift | 8 ++++---- .../PassCode/Model/PassCodeHolderProtocol.swift | 0 .../PassCode/Model/PassCodeValidationResult.swift | 0 .../PassCode/View/BasePassCodeViewController.swift | 7 +++---- .../PassCode/ViewModel/BasePassCodeViewModel.swift | 0 .../Sources => Sources}/Enums/ApiError.swift | 0 .../Sources => Sources}/Enums/ApiErrorProtocol.swift | 4 ++-- .../Extensions/Error+NetworkingExtensions.swift | 0 .../Extensions/Observable+Extensions.swift | 4 ++-- .../Extensions/UIBarButtonItem+Extensions.swift | 4 ++-- .../Extensions/UserDefaults+UserService.swift | 0 .../Sources => Sources}/Info-iOS-Extensions.plist | 0 {LeadKitAdditions/Sources => Sources}/Info-iOS.plist | 0 .../Sources => Sources}/LeadKitAdditions.h | 0 .../Protocols/CellFieldJumpingProtocol.swift | 0 .../Protocols/CellFieldMaskProtocol.swift | 0 .../Protocols/CellFieldValidationProtocol.swift | 0 .../Protocols/CellFieldsToolBarProtocol.swift | 0 .../Protocols/FormCellViewModelProtocol.swift | 0 .../Services/BasePassCodeService.swift | 0 .../Services/BaseUserService.swift | 0 .../Services/BiometricsService.swift | 0 .../Services/CellFieldsJumpingService.swift | 0 .../Services/MaskFieldTextProxy.swift | 0 .../Services/Network/ApiNetworkService.swift | 0 ...tNetworkService+ActivityIndicator+Extension.swift | 0 .../DefaultNetworkService+ActivityIndicator.swift | 0 .../Services/Network/DefaultNetworkService.swift | 0 .../Services/ValidationService/ValidationError.swift | 0 .../Services/ValidationService/ValidationItem.swift | 12 ++++++------ .../ValidationService/ValidationService.swift | 2 +- .../Views/CellTextField/CellTextField.swift | 0 .../Views/CellTextField/CellTextFieldViewModel.swift | 0 .../Views/CellTextFieldToolBar.swift | 4 ++-- 45 files changed, 32 insertions(+), 32 deletions(-) rename {LeadKitAdditions/LeadKitAdditions.xcodeproj => LeadKitAdditions.xcodeproj}/project.pbxproj (99%) rename {LeadKitAdditions/LeadKitAdditions.xcodeproj => LeadKitAdditions.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename {LeadKitAdditions/LeadKitAdditions.xcworkspace => LeadKitAdditions.xcworkspace}/contents.xcworkspacedata (100%) rename LeadKitAdditions/Podfile => Podfile (100%) rename LeadKitAdditions/Podfile.lock => Podfile.lock (100%) rename {LeadKitAdditions/Sources => Sources}/Classes/ApiResponse.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Classes/BaseDateFormatter.swift (97%) rename {LeadKitAdditions/Sources => Sources}/Classes/LoadingBarButton.swift (96%) rename {LeadKitAdditions/Sources => Sources}/Controllers/PassCode/Model/PassCodeConfiguration.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Controllers/PassCode/Model/PassCodeError.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Controllers/PassCode/Model/PassCodeHolder.swift (96%) rename {LeadKitAdditions/Sources => Sources}/Controllers/PassCode/Model/PassCodeHolderProtocol.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Controllers/PassCode/Model/PassCodeValidationResult.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Controllers/PassCode/View/BasePassCodeViewController.swift (98%) rename {LeadKitAdditions/Sources => Sources}/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Enums/ApiError.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Enums/ApiErrorProtocol.swift (92%) rename {LeadKitAdditions/Sources => Sources}/Extensions/Error+NetworkingExtensions.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Extensions/Observable+Extensions.swift (97%) rename {LeadKitAdditions/Sources => Sources}/Extensions/UIBarButtonItem+Extensions.swift (90%) rename {LeadKitAdditions/Sources => Sources}/Extensions/UserDefaults+UserService.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Info-iOS-Extensions.plist (100%) rename {LeadKitAdditions/Sources => Sources}/Info-iOS.plist (100%) rename {LeadKitAdditions/Sources => Sources}/LeadKitAdditions.h (100%) rename {LeadKitAdditions/Sources => Sources}/Protocols/CellFieldJumpingProtocol.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Protocols/CellFieldMaskProtocol.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Protocols/CellFieldValidationProtocol.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Protocols/CellFieldsToolBarProtocol.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Protocols/FormCellViewModelProtocol.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/BasePassCodeService.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/BaseUserService.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/BiometricsService.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/CellFieldsJumpingService.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/MaskFieldTextProxy.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/Network/ApiNetworkService.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/Network/DefaultNetworkService+ActivityIndicator+Extension.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/Network/DefaultNetworkService+ActivityIndicator.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/Network/DefaultNetworkService.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/ValidationService/ValidationError.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Services/ValidationService/ValidationItem.swift (91%) rename {LeadKitAdditions/Sources => Sources}/Services/ValidationService/ValidationService.swift (97%) rename {LeadKitAdditions/Sources => Sources}/Views/CellTextField/CellTextField.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Views/CellTextField/CellTextFieldViewModel.swift (100%) rename {LeadKitAdditions/Sources => Sources}/Views/CellTextFieldToolBar.swift (95%) diff --git a/LeadKitAdditions.podspec b/LeadKitAdditions.podspec index 91d2b7a..486883e 100644 --- a/LeadKitAdditions.podspec +++ b/LeadKitAdditions.podspec @@ -10,10 +10,10 @@ Pod::Spec.new do |s| s.subspec 'Core' do |ss| ss.ios.deployment_target = '9.0' - ss.source_files = "LeadKitAdditions/Sources/**/*.swift" + ss.source_files = "Sources/**/*.swift" ss.exclude_files = [ - "LeadKitAdditions/Sources/Services/Network/DefaultNetworkService+ActivityIndicator+Extension.swift", + "Sources/Services/Network/DefaultNetworkService+ActivityIndicator+Extension.swift", ] ss.dependency "LeadKit", '~> 0.6.0' @@ -25,10 +25,10 @@ Pod::Spec.new do |s| s.subspec 'Core-iOS-Extension' do |ss| ss.platform = :ios, '9.0' - ss.source_files = "LeadKitAdditions/Sources/**/*.swift" + ss.source_files = "Sources/**/*.swift" ss.exclude_files = [ - "LeadKitAdditions/Sources/Services/Network/DefaultNetworkService+ActivityIndicator.swift", + "Sources/Services/Network/DefaultNetworkService+ActivityIndicator.swift", ] ss.dependency "LeadKit/Core-iOS-Extension", '~> 0.6.0' diff --git a/LeadKitAdditions/LeadKitAdditions.xcodeproj/project.pbxproj b/LeadKitAdditions.xcodeproj/project.pbxproj similarity index 99% rename from LeadKitAdditions/LeadKitAdditions.xcodeproj/project.pbxproj rename to LeadKitAdditions.xcodeproj/project.pbxproj index 7650734..4e90d3f 100644 --- a/LeadKitAdditions/LeadKitAdditions.xcodeproj/project.pbxproj +++ b/LeadKitAdditions.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 0A08E37F1F2A13BF00F9AB62 /* CellTextFieldToolBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A08E37E1F2A13BF00F9AB62 /* CellTextFieldToolBar.swift */; }; 248389A288C0A6D7914F0546 /* Pods_LeadKitAdditions_LeadKitAdditions_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0ED4A1B793EAA73C9E95969F /* Pods_LeadKitAdditions_LeadKitAdditions_iOS.framework */; }; 678D26AA206935B900B05B93 /* BiometricsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 678D26A9206935B900B05B93 /* BiometricsService.swift */; }; + 67B4E6EB206941CE00E233EA /* BiometricsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 678D26A9206935B900B05B93 /* BiometricsService.swift */; }; A6CFB8D91F5024A500A42CC2 /* Error+NetworkingExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6CFB8D81F5024A500A42CC2 /* Error+NetworkingExtensions.swift */; }; B326804BA6CC8B8BB136A46A /* Pods_LeadKitAdditions_LeadKitAdditions_iOS_Extensions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CFD5627139CAB27705F75C07 /* Pods_LeadKitAdditions_LeadKitAdditions_iOS_Extensions.framework */; }; CAE698E81E968820000394B0 /* LeadKitAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = CAE698E61E968820000394B0 /* LeadKitAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -619,7 +620,6 @@ ED0C34101F2906EC00FAE9FD /* PassCodeHolderProtocol.swift in Sources */, ED0C34401F2906EC00FAE9FD /* ValidationError.swift in Sources */, ED0C34301F2906EC00FAE9FD /* BaseUserService.swift in Sources */, - 678D267F2069237800B05B93 /* OnlineValidationState.swift in Sources */, ED0C34241F2906EC00FAE9FD /* CellFieldJumpingProtocol.swift in Sources */, ED0C34421F2906EC00FAE9FD /* ValidationItem.swift in Sources */, ED0C34201F2906EC00FAE9FD /* UIBarButtonItem+Extensions.swift in Sources */, @@ -628,6 +628,7 @@ ED0C34381F2906EC00FAE9FD /* DefaultNetworkService+ActivityIndicator+Extension.swift in Sources */, ED0C341E1F2906EC00FAE9FD /* Observable+Extensions.swift in Sources */, ED0C34481F2906EC00FAE9FD /* CellTextFieldViewModel.swift in Sources */, + 67B4E6EB206941CE00E233EA /* BiometricsService.swift in Sources */, ED0C341A1F2906EC00FAE9FD /* ApiErrorProtocol.swift in Sources */, ED0C34141F2906EC00FAE9FD /* BasePassCodeViewController.swift in Sources */, ED0C342E1F2906EC00FAE9FD /* BasePassCodeService.swift in Sources */, diff --git a/LeadKitAdditions/LeadKitAdditions.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/LeadKitAdditions.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from LeadKitAdditions/LeadKitAdditions.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to LeadKitAdditions.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/LeadKitAdditions/LeadKitAdditions.xcworkspace/contents.xcworkspacedata b/LeadKitAdditions.xcworkspace/contents.xcworkspacedata similarity index 100% rename from LeadKitAdditions/LeadKitAdditions.xcworkspace/contents.xcworkspacedata rename to LeadKitAdditions.xcworkspace/contents.xcworkspacedata diff --git a/LeadKitAdditions/Podfile b/Podfile similarity index 100% rename from LeadKitAdditions/Podfile rename to Podfile diff --git a/LeadKitAdditions/Podfile.lock b/Podfile.lock similarity index 100% rename from LeadKitAdditions/Podfile.lock rename to Podfile.lock diff --git a/LeadKitAdditions/Sources/Classes/ApiResponse.swift b/Sources/Classes/ApiResponse.swift similarity index 100% rename from LeadKitAdditions/Sources/Classes/ApiResponse.swift rename to Sources/Classes/ApiResponse.swift diff --git a/LeadKitAdditions/Sources/Classes/BaseDateFormatter.swift b/Sources/Classes/BaseDateFormatter.swift similarity index 97% rename from LeadKitAdditions/Sources/Classes/BaseDateFormatter.swift rename to Sources/Classes/BaseDateFormatter.swift index cec812c..a43e3f7 100644 --- a/LeadKitAdditions/Sources/Classes/BaseDateFormatter.swift +++ b/Sources/Classes/BaseDateFormatter.swift @@ -109,13 +109,13 @@ open class BaseDateFormatter { /// Transformer to workaround with dates in Mappable (ObjectMapper) objects public static var transformFromStringToDate: TransformOf { - return TransformOf(fromJSON: { (stringValue) -> Date? in + return TransformOf(fromJSON: { stringValue -> Date? in if let stringValue = stringValue { return backendDate(fromStrDate: stringValue) } else { return nil } - }, toJSON: { (dateValue) -> String? in + }, toJSON: { dateValue -> String? in if let dateValue = dateValue { return backendStrDate(withDate: dateValue) } else { diff --git a/LeadKitAdditions/Sources/Classes/LoadingBarButton.swift b/Sources/Classes/LoadingBarButton.swift similarity index 96% rename from LeadKitAdditions/Sources/Classes/LoadingBarButton.swift rename to Sources/Classes/LoadingBarButton.swift index 5db8b52..358b011 100644 --- a/LeadKitAdditions/Sources/Classes/LoadingBarButton.swift +++ b/Sources/Classes/LoadingBarButton.swift @@ -81,7 +81,7 @@ public class LoadingBarButton { } -extension Observable { +public extension Observable { /** Reactive extension for LoadingBarButton @@ -92,7 +92,7 @@ extension Observable { - Returns: - observable, that handles LoadingBarButton behaviour */ - public func changeLoadingUI(using barButton: LoadingBarButton) -> Observable { + func changeLoadingUI(using barButton: LoadingBarButton) -> Observable { return observeOn(MainScheduler.instance) .do(onSubscribe: { barButton.setState(waiting: true) diff --git a/LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeConfiguration.swift b/Sources/Controllers/PassCode/Model/PassCodeConfiguration.swift similarity index 100% rename from LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeConfiguration.swift rename to Sources/Controllers/PassCode/Model/PassCodeConfiguration.swift diff --git a/LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeError.swift b/Sources/Controllers/PassCode/Model/PassCodeError.swift similarity index 100% rename from LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeError.swift rename to Sources/Controllers/PassCode/Model/PassCodeError.swift diff --git a/LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeHolder.swift b/Sources/Controllers/PassCode/Model/PassCodeHolder.swift similarity index 96% rename from LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeHolder.swift rename to Sources/Controllers/PassCode/Model/PassCodeHolder.swift index aac5919..4780bba 100644 --- a/LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeHolder.swift +++ b/Sources/Controllers/PassCode/Model/PassCodeHolder.swift @@ -23,17 +23,17 @@ import RxSwift import RxCocoa -extension PassCodeHolderProtocol { +public extension PassCodeHolderProtocol { - public var passCodeHolderCreate: PassCodeHolderCreate? { + var passCodeHolderCreate: PassCodeHolderCreate? { return self as? PassCodeHolderCreate } - public var passCodeHolderEnter: PassCodeHolderEnter? { + var passCodeHolderEnter: PassCodeHolderEnter? { return self as? PassCodeHolderEnter } - public var passCodeHolderChange: PassCodeHolderChange? { + var passCodeHolderChange: PassCodeHolderChange? { return self as? PassCodeHolderChange } } diff --git a/LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeHolderProtocol.swift b/Sources/Controllers/PassCode/Model/PassCodeHolderProtocol.swift similarity index 100% rename from LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeHolderProtocol.swift rename to Sources/Controllers/PassCode/Model/PassCodeHolderProtocol.swift diff --git a/LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeValidationResult.swift b/Sources/Controllers/PassCode/Model/PassCodeValidationResult.swift similarity index 100% rename from LeadKitAdditions/Sources/Controllers/PassCode/Model/PassCodeValidationResult.swift rename to Sources/Controllers/PassCode/Model/PassCodeValidationResult.swift diff --git a/LeadKitAdditions/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift b/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift similarity index 98% rename from LeadKitAdditions/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift rename to Sources/Controllers/PassCode/View/BasePassCodeViewController.swift index 3b2f735..fa300c8 100644 --- a/LeadKitAdditions/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift +++ b/Sources/Controllers/PassCode/View/BasePassCodeViewController.swift @@ -53,9 +53,9 @@ open class BasePassCodeViewController: UIViewController, ConfigurableController // MARK: - IBOutlets - @IBOutlet public weak var titleLabel: UILabel? - @IBOutlet public weak var errorLabel: UILabel? - @IBOutlet public weak var dotStackView: UIStackView! + @IBOutlet private weak var titleLabel: UILabel? + @IBOutlet private weak var errorLabel: UILabel? + @IBOutlet private weak var dotStackView: UIStackView! public let disposeBag = DisposeBag() @@ -262,4 +262,3 @@ extension BasePassCodeViewController: UITextFieldDelegate { } } - diff --git a/LeadKitAdditions/Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift b/Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift similarity index 100% rename from LeadKitAdditions/Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift rename to Sources/Controllers/PassCode/ViewModel/BasePassCodeViewModel.swift diff --git a/LeadKitAdditions/Sources/Enums/ApiError.swift b/Sources/Enums/ApiError.swift similarity index 100% rename from LeadKitAdditions/Sources/Enums/ApiError.swift rename to Sources/Enums/ApiError.swift diff --git a/LeadKitAdditions/Sources/Enums/ApiErrorProtocol.swift b/Sources/Enums/ApiErrorProtocol.swift similarity index 92% rename from LeadKitAdditions/Sources/Enums/ApiErrorProtocol.swift rename to Sources/Enums/ApiErrorProtocol.swift index f94a9a8..2be4285 100644 --- a/LeadKitAdditions/Sources/Enums/ApiErrorProtocol.swift +++ b/Sources/Enums/ApiErrorProtocol.swift @@ -23,10 +23,10 @@ /// Describes error by raw value (more likely - Int code), received from back-end public protocol ApiErrorProtocol: RawRepresentable {} -extension Error { +public extension Error { /// Method indicates that error is back-end error - public func isApiError(_ apiErrorType: T) -> Bool where T.RawValue == Int { + func isApiError(_ apiErrorType: T) -> Bool where T.RawValue == Int { if let error = self as? ApiError, case let .error(code: code, message: _) = error, code == apiErrorType.rawValue { diff --git a/LeadKitAdditions/Sources/Extensions/Error+NetworkingExtensions.swift b/Sources/Extensions/Error+NetworkingExtensions.swift similarity index 100% rename from LeadKitAdditions/Sources/Extensions/Error+NetworkingExtensions.swift rename to Sources/Extensions/Error+NetworkingExtensions.swift diff --git a/LeadKitAdditions/Sources/Extensions/Observable+Extensions.swift b/Sources/Extensions/Observable+Extensions.swift similarity index 97% rename from LeadKitAdditions/Sources/Extensions/Observable+Extensions.swift rename to Sources/Extensions/Observable+Extensions.swift index c854ee9..0c66e12 100644 --- a/LeadKitAdditions/Sources/Extensions/Observable+Extensions.swift +++ b/Sources/Extensions/Observable+Extensions.swift @@ -44,10 +44,10 @@ public extension Observable { return observeOn(CurrentThreadScheduler.instance) .retryWhen { errorsObservable -> Observable in - return errorsObservable.enumerated().flatMap { + errorsObservable.enumerated().flatMap { (canRetryClosure($1) && $0 < retryLimit - 1) ? self : .error($1) } - } + } } /** diff --git a/LeadKitAdditions/Sources/Extensions/UIBarButtonItem+Extensions.swift b/Sources/Extensions/UIBarButtonItem+Extensions.swift similarity index 90% rename from LeadKitAdditions/Sources/Extensions/UIBarButtonItem+Extensions.swift rename to Sources/Extensions/UIBarButtonItem+Extensions.swift index f237bf2..79c25e2 100644 --- a/LeadKitAdditions/Sources/Extensions/UIBarButtonItem+Extensions.swift +++ b/Sources/Extensions/UIBarButtonItem+Extensions.swift @@ -22,10 +22,10 @@ import UIKit -extension UIBarButtonItem { +public extension UIBarButtonItem { /// Creates activity indicator view and bar button item (based on activity indicator) - public static var activityIndicator: (barButton: UIBarButtonItem, activityIndicator: UIActivityIndicatorView) { + static var activityIndicator: (barButton: UIBarButtonItem, activityIndicator: UIActivityIndicatorView) { let indicatorView = UIActivityIndicatorView(activityIndicatorStyle: .white) let indicatorBar = UIBarButtonItem(customView: indicatorView) return (indicatorBar, indicatorView) diff --git a/LeadKitAdditions/Sources/Extensions/UserDefaults+UserService.swift b/Sources/Extensions/UserDefaults+UserService.swift similarity index 100% rename from LeadKitAdditions/Sources/Extensions/UserDefaults+UserService.swift rename to Sources/Extensions/UserDefaults+UserService.swift diff --git a/LeadKitAdditions/Sources/Info-iOS-Extensions.plist b/Sources/Info-iOS-Extensions.plist similarity index 100% rename from LeadKitAdditions/Sources/Info-iOS-Extensions.plist rename to Sources/Info-iOS-Extensions.plist diff --git a/LeadKitAdditions/Sources/Info-iOS.plist b/Sources/Info-iOS.plist similarity index 100% rename from LeadKitAdditions/Sources/Info-iOS.plist rename to Sources/Info-iOS.plist diff --git a/LeadKitAdditions/Sources/LeadKitAdditions.h b/Sources/LeadKitAdditions.h similarity index 100% rename from LeadKitAdditions/Sources/LeadKitAdditions.h rename to Sources/LeadKitAdditions.h diff --git a/LeadKitAdditions/Sources/Protocols/CellFieldJumpingProtocol.swift b/Sources/Protocols/CellFieldJumpingProtocol.swift similarity index 100% rename from LeadKitAdditions/Sources/Protocols/CellFieldJumpingProtocol.swift rename to Sources/Protocols/CellFieldJumpingProtocol.swift diff --git a/LeadKitAdditions/Sources/Protocols/CellFieldMaskProtocol.swift b/Sources/Protocols/CellFieldMaskProtocol.swift similarity index 100% rename from LeadKitAdditions/Sources/Protocols/CellFieldMaskProtocol.swift rename to Sources/Protocols/CellFieldMaskProtocol.swift diff --git a/LeadKitAdditions/Sources/Protocols/CellFieldValidationProtocol.swift b/Sources/Protocols/CellFieldValidationProtocol.swift similarity index 100% rename from LeadKitAdditions/Sources/Protocols/CellFieldValidationProtocol.swift rename to Sources/Protocols/CellFieldValidationProtocol.swift diff --git a/LeadKitAdditions/Sources/Protocols/CellFieldsToolBarProtocol.swift b/Sources/Protocols/CellFieldsToolBarProtocol.swift similarity index 100% rename from LeadKitAdditions/Sources/Protocols/CellFieldsToolBarProtocol.swift rename to Sources/Protocols/CellFieldsToolBarProtocol.swift diff --git a/LeadKitAdditions/Sources/Protocols/FormCellViewModelProtocol.swift b/Sources/Protocols/FormCellViewModelProtocol.swift similarity index 100% rename from LeadKitAdditions/Sources/Protocols/FormCellViewModelProtocol.swift rename to Sources/Protocols/FormCellViewModelProtocol.swift diff --git a/LeadKitAdditions/Sources/Services/BasePassCodeService.swift b/Sources/Services/BasePassCodeService.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/BasePassCodeService.swift rename to Sources/Services/BasePassCodeService.swift diff --git a/LeadKitAdditions/Sources/Services/BaseUserService.swift b/Sources/Services/BaseUserService.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/BaseUserService.swift rename to Sources/Services/BaseUserService.swift diff --git a/LeadKitAdditions/Sources/Services/BiometricsService.swift b/Sources/Services/BiometricsService.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/BiometricsService.swift rename to Sources/Services/BiometricsService.swift diff --git a/LeadKitAdditions/Sources/Services/CellFieldsJumpingService.swift b/Sources/Services/CellFieldsJumpingService.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/CellFieldsJumpingService.swift rename to Sources/Services/CellFieldsJumpingService.swift diff --git a/LeadKitAdditions/Sources/Services/MaskFieldTextProxy.swift b/Sources/Services/MaskFieldTextProxy.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/MaskFieldTextProxy.swift rename to Sources/Services/MaskFieldTextProxy.swift diff --git a/LeadKitAdditions/Sources/Services/Network/ApiNetworkService.swift b/Sources/Services/Network/ApiNetworkService.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/Network/ApiNetworkService.swift rename to Sources/Services/Network/ApiNetworkService.swift diff --git a/LeadKitAdditions/Sources/Services/Network/DefaultNetworkService+ActivityIndicator+Extension.swift b/Sources/Services/Network/DefaultNetworkService+ActivityIndicator+Extension.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/Network/DefaultNetworkService+ActivityIndicator+Extension.swift rename to Sources/Services/Network/DefaultNetworkService+ActivityIndicator+Extension.swift diff --git a/LeadKitAdditions/Sources/Services/Network/DefaultNetworkService+ActivityIndicator.swift b/Sources/Services/Network/DefaultNetworkService+ActivityIndicator.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/Network/DefaultNetworkService+ActivityIndicator.swift rename to Sources/Services/Network/DefaultNetworkService+ActivityIndicator.swift diff --git a/LeadKitAdditions/Sources/Services/Network/DefaultNetworkService.swift b/Sources/Services/Network/DefaultNetworkService.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/Network/DefaultNetworkService.swift rename to Sources/Services/Network/DefaultNetworkService.swift diff --git a/LeadKitAdditions/Sources/Services/ValidationService/ValidationError.swift b/Sources/Services/ValidationService/ValidationError.swift similarity index 100% rename from LeadKitAdditions/Sources/Services/ValidationService/ValidationError.swift rename to Sources/Services/ValidationService/ValidationError.swift diff --git a/LeadKitAdditions/Sources/Services/ValidationService/ValidationItem.swift b/Sources/Services/ValidationService/ValidationItem.swift similarity index 91% rename from LeadKitAdditions/Sources/Services/ValidationService/ValidationItem.swift rename to Sources/Services/ValidationService/ValidationItem.swift index 022ac3d..934c2b5 100644 --- a/LeadKitAdditions/Sources/Services/ValidationService/ValidationItem.swift +++ b/Sources/Services/ValidationService/ValidationItem.swift @@ -75,12 +75,12 @@ public final class ValidationItem { private func validate(text: String?, isManual: Bool = false) { let error = rules.filter { - return !$0.validate(text ?? "") - } - .map { rule -> ValidationError in - return ValidationError(failedRule: rule, errorMessage: rule.errorMessage()) - } - .first + !$0.validate(text ?? "") + } + .map { rule -> ValidationError in + ValidationError(failedRule: rule, errorMessage: rule.errorMessage()) + } + .first if let validationError = error { switch validationStateHolder.value { diff --git a/LeadKitAdditions/Sources/Services/ValidationService/ValidationService.swift b/Sources/Services/ValidationService/ValidationService.swift similarity index 97% rename from LeadKitAdditions/Sources/Services/ValidationService/ValidationService.swift rename to Sources/Services/ValidationService/ValidationService.swift index c2b744f..b2c7845 100644 --- a/LeadKitAdditions/Sources/Services/ValidationService/ValidationService.swift +++ b/Sources/Services/ValidationService/ValidationService.swift @@ -96,7 +96,7 @@ public final class ValidationService { stateObservables.forEach { observable in observable .map { states -> Bool in - return states.map { $0.isValid }.reduce(true) { $0 && $1 } + states.map { $0.isValid }.reduce(true) { $0 && $1 } } .map { $0 ? ValidationServiceState.valid : .invalid } .bind(to: stateHolder) diff --git a/LeadKitAdditions/Sources/Views/CellTextField/CellTextField.swift b/Sources/Views/CellTextField/CellTextField.swift similarity index 100% rename from LeadKitAdditions/Sources/Views/CellTextField/CellTextField.swift rename to Sources/Views/CellTextField/CellTextField.swift diff --git a/LeadKitAdditions/Sources/Views/CellTextField/CellTextFieldViewModel.swift b/Sources/Views/CellTextField/CellTextFieldViewModel.swift similarity index 100% rename from LeadKitAdditions/Sources/Views/CellTextField/CellTextFieldViewModel.swift rename to Sources/Views/CellTextField/CellTextFieldViewModel.swift diff --git a/LeadKitAdditions/Sources/Views/CellTextFieldToolBar.swift b/Sources/Views/CellTextFieldToolBar.swift similarity index 95% rename from LeadKitAdditions/Sources/Views/CellTextFieldToolBar.swift rename to Sources/Views/CellTextFieldToolBar.swift index ac2003e..724870d 100644 --- a/LeadKitAdditions/Sources/Views/CellTextFieldToolBar.swift +++ b/Sources/Views/CellTextFieldToolBar.swift @@ -57,8 +57,8 @@ class CellTextFieldToolBar: UIToolbar, CellFieldsToolBarProtocol { private(set) lazy var closeButton: UIBarButtonItem = { let doneButton = UIBarButtonItem(barButtonSystemItem: .done, - target: self, - action: #selector(doneAction)) + target: self, + action: #selector(doneAction)) return doneButton }()