diff --git a/LeadKit/LeadKit.xcodeproj/project.pbxproj b/LeadKit/LeadKit.xcodeproj/project.pbxproj index 925c3d45..31a95f54 100644 --- a/LeadKit/LeadKit.xcodeproj/project.pbxproj +++ b/LeadKit/LeadKit.xcodeproj/project.pbxproj @@ -19,9 +19,6 @@ 7827C9391DE4ADB2009DA4E6 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7827C9331DE4ADB2009DA4E6 /* RxSwift.framework */; }; 7834236A1DB8D0E100A79643 /* StoryboardProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 783423691DB8D0E100A79643 /* StoryboardProtocol.swift */; }; 7837F60F1CBCF5C0000D74C1 /* EstimatedViewHeightProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7837F60E1CBCF5C0000D74C1 /* EstimatedViewHeightProtocol.swift */; }; - 7845A1551E0BC97C00B527BB /* KeyboardDidNotificationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7845A1531E0BC97C00B527BB /* KeyboardDidNotificationValues.swift */; }; - 7845A1561E0BC97C00B527BB /* KeyboardWillNotificationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7845A1541E0BC97C00B527BB /* KeyboardWillNotificationValues.swift */; }; - 7845A1581E0BC9B900B527BB /* KeyboardNotificationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7845A1571E0BC9B900B527BB /* KeyboardNotificationValues.swift */; }; 786D78E81D53C378006B2CEA /* AlamofireRequest+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 786D78E71D53C378006B2CEA /* AlamofireRequest+Extensions.swift */; }; 786D78EC1D53C46E006B2CEA /* AlamofireManager+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 786D78EB1D53C46E006B2CEA /* AlamofireManager+Extensions.swift */; }; 78753E241DE58A5D006BC0FB /* CursorError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78753E231DE58A5D006BC0FB /* CursorError.swift */; }; @@ -36,7 +33,9 @@ 789CC6081DE5835600F789D3 /* CursorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789CC6071DE5835600F789D3 /* CursorType.swift */; }; 789CC60B1DE584F800F789D3 /* CursorType+Slice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789CC60A1DE584F800F789D3 /* CursorType+Slice.swift */; }; 789F5A0C1DFECB71004A3694 /* UIViewAnimationCurve+AnimationOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789F5A0B1DFECB71004A3694 /* UIViewAnimationCurve+AnimationOptions.swift */; }; + 789F5A121DFECD11004A3694 /* KeyboardDidNotificationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789F5A111DFECD11004A3694 /* KeyboardDidNotificationValues.swift */; }; 789F5A141DFECD54004A3694 /* KeyboardNotificationValuesError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789F5A131DFECD54004A3694 /* KeyboardNotificationValuesError.swift */; }; + 789F5A161DFECD82004A3694 /* KeyboardWillNotificationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789F5A151DFECD82004A3694 /* KeyboardWillNotificationValues.swift */; }; 789F5A1B1DFECF2B004A3694 /* Notification+UIKeyboardInfoValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789F5A1A1DFECF2B004A3694 /* Notification+UIKeyboardInfoValues.swift */; }; 789F5A1E1DFECF5F004A3694 /* NotificationCenter+RxKeyboardExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789F5A1D1DFECF5F004A3694 /* NotificationCenter+RxKeyboardExtensions.swift */; }; 789F5A201DFECF9F004A3694 /* KeyboardNotification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789F5A1F1DFECF9F004A3694 /* KeyboardNotification.swift */; }; @@ -96,9 +95,6 @@ 7827C9331DE4ADB2009DA4E6 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = ../../../Carthage/Build/iOS/RxSwift.framework; sourceTree = ""; }; 783423691DB8D0E100A79643 /* StoryboardProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardProtocol.swift; sourceTree = ""; }; 7837F60E1CBCF5C0000D74C1 /* EstimatedViewHeightProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EstimatedViewHeightProtocol.swift; sourceTree = ""; }; - 7845A1531E0BC97C00B527BB /* KeyboardDidNotificationValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardDidNotificationValues.swift; sourceTree = ""; }; - 7845A1541E0BC97C00B527BB /* KeyboardWillNotificationValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardWillNotificationValues.swift; sourceTree = ""; }; - 7845A1571E0BC9B900B527BB /* KeyboardNotificationValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardNotificationValues.swift; sourceTree = ""; }; 786D78E71D53C378006B2CEA /* AlamofireRequest+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AlamofireRequest+Extensions.swift"; sourceTree = ""; }; 786D78EB1D53C46E006B2CEA /* AlamofireManager+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AlamofireManager+Extensions.swift"; sourceTree = ""; }; 78753E231DE58A5D006BC0FB /* CursorError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CursorError.swift; sourceTree = ""; }; @@ -113,7 +109,9 @@ 789CC6071DE5835600F789D3 /* CursorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CursorType.swift; sourceTree = ""; }; 789CC60A1DE584F800F789D3 /* CursorType+Slice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CursorType+Slice.swift"; sourceTree = ""; }; 789F5A0B1DFECB71004A3694 /* UIViewAnimationCurve+AnimationOptions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewAnimationCurve+AnimationOptions.swift"; sourceTree = ""; }; + 789F5A111DFECD11004A3694 /* KeyboardDidNotificationValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardDidNotificationValues.swift; sourceTree = ""; }; 789F5A131DFECD54004A3694 /* KeyboardNotificationValuesError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardNotificationValuesError.swift; sourceTree = ""; }; + 789F5A151DFECD82004A3694 /* KeyboardWillNotificationValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardWillNotificationValues.swift; sourceTree = ""; }; 789F5A1A1DFECF2B004A3694 /* Notification+UIKeyboardInfoValues.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Notification+UIKeyboardInfoValues.swift"; sourceTree = ""; }; 789F5A1D1DFECF5F004A3694 /* NotificationCenter+RxKeyboardExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NotificationCenter+RxKeyboardExtensions.swift"; sourceTree = ""; }; 789F5A1F1DFECF9F004A3694 /* KeyboardNotification.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardNotification.swift; sourceTree = ""; }; @@ -204,6 +202,7 @@ 78011AAE1D48B46100EA16A2 /* Structures */ = { isa = PBXGroup; children = ( + 789F5A101DFECCFE004A3694 /* KeyboardNotificationValues */, 78011AB11D48B53600EA16A2 /* Api */, ); path = Structures; @@ -238,16 +237,6 @@ path = CGContext; sourceTree = ""; }; - 7845A1521E0BC97C00B527BB /* KeyboardNotificationValues */ = { - isa = PBXGroup; - children = ( - 7845A1571E0BC9B900B527BB /* KeyboardNotificationValues.swift */, - 7845A1531E0BC97C00B527BB /* KeyboardDidNotificationValues.swift */, - 7845A1541E0BC97C00B527BB /* KeyboardWillNotificationValues.swift */, - ); - path = KeyboardNotificationValues; - sourceTree = ""; - }; 786D78E61D53C355006B2CEA /* Alamofire */ = { isa = PBXGroup; children = ( @@ -308,6 +297,15 @@ path = UIViewAnimationCurve; sourceTree = ""; }; + 789F5A101DFECCFE004A3694 /* KeyboardNotificationValues */ = { + isa = PBXGroup; + children = ( + 789F5A111DFECD11004A3694 /* KeyboardDidNotificationValues.swift */, + 789F5A151DFECD82004A3694 /* KeyboardWillNotificationValues.swift */, + ); + path = KeyboardNotificationValues; + sourceTree = ""; + }; 789F5A191DFECF2B004A3694 /* Notification */ = { isa = PBXGroup; children = ( @@ -338,7 +336,6 @@ children = ( 78B0FC7B1C6B2BAE00358B64 /* Logging */, 78753E2A1DE58BED006BC0FB /* Cursors */, - 7845A1521E0BC97C00B527BB /* KeyboardNotificationValues */, ); path = Classes; sourceTree = ""; @@ -695,10 +692,8 @@ 788EC15A1CF64528009CFB6B /* UIStoryboard+InstantiateViewController.swift in Sources */, 787783671CA04D4A001CDC9B /* String+SizeCalculation.swift in Sources */, 78B036431DA4FEC90021D5CC /* CGImage+Transform.swift in Sources */, - 7845A1551E0BC97C00B527BB /* KeyboardDidNotificationValues.swift in Sources */, 78011A641D47ABC500EA16A2 /* UIView+DefaultReuseIdentifier.swift in Sources */, 786D78EC1D53C46E006B2CEA /* AlamofireManager+Extensions.swift in Sources */, - 7845A1581E0BC9B900B527BB /* KeyboardNotificationValues.swift in Sources */, 78B0FC811C6B2CD500358B64 /* App.swift in Sources */, 78B036491DA562C30021D5CC /* CGImage+Template.swift in Sources */, 789F5A1E1DFECF5F004A3694 /* NotificationCenter+RxKeyboardExtensions.swift in Sources */, @@ -711,12 +706,12 @@ 78A0FCC81DC366A10070B5E1 /* StoryboardProtocol+Extensions.swift in Sources */, 78B036411DA4D7060021D5CC /* UIImage+Extensions.swift in Sources */, 78A0FCC71DC366A10070B5E1 /* StoryboardProtocol+DefaultBundle.swift in Sources */, - 7845A1561E0BC97C00B527BB /* KeyboardWillNotificationValues.swift in Sources */, 78753E241DE58A5D006BC0FB /* CursorError.swift in Sources */, 786D78E81D53C378006B2CEA /* AlamofireRequest+Extensions.swift in Sources */, 78C36F811D8021DD00E7EBEA /* UIColor+Hex.swift in Sources */, 78CFEE5B1C5C45E500F50370 /* ViewModelProtocol.swift in Sources */, 789F5A1B1DFECF2B004A3694 /* Notification+UIKeyboardInfoValues.swift in Sources */, + 789F5A121DFECD11004A3694 /* KeyboardDidNotificationValues.swift in Sources */, EF5FB5691E0141610030E4BE /* UIView+Rotation.swift in Sources */, 780D23431DA412470084620D /* CGImage+Alpha.swift in Sources */, 78CFEE5A1C5C45E500F50370 /* ViewHeightProtocol.swift in Sources */, @@ -733,6 +728,7 @@ 789F5A0C1DFECB71004A3694 /* UIViewAnimationCurve+AnimationOptions.swift in Sources */, 78CFEE591C5C45E500F50370 /* StoryboardIdentifierProtocol.swift in Sources */, 78011AB31D48B53600EA16A2 /* ApiRequestParameters.swift in Sources */, + 789F5A161DFECD82004A3694 /* KeyboardWillNotificationValues.swift in Sources */, 78B0FC7D1C6B2BE200358B64 /* LogFormatter.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardDidNotificationValues.swift b/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardDidNotificationValues.swift deleted file mode 100644 index d6805024..00000000 --- a/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardDidNotificationValues.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// KeyboardDidNotificationValues.swift -// LeadKit -// -// Created by Ivan Smolin on 12/12/16. -// Copyright © 2016 Touch Instinct. All rights reserved. -// - -import UIKit - -/// Struct which keeps values from one of those notifications: -/// UIKeyboardDidShow, UIKeyboardDidHide, UIKeyboardDidChangeFrame -public final class KeyboardDidNotificationValues: KeyboardNotificationValues { - - // Animation key/value pairs are only available for the "will" family of notification. (UIWindow.h) - -} diff --git a/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardNotificationValues.swift b/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardNotificationValues.swift deleted file mode 100644 index 4fd14e9f..00000000 --- a/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardNotificationValues.swift +++ /dev/null @@ -1,38 +0,0 @@ -// -// KeyboardNotificationValues.swift -// LeadKit -// -// Created by Ivan Smolin on 22/12/16. -// Copyright © 2016 Touch Instinct. All rights reserved. -// - -import Foundation - -public class KeyboardNotificationValues { - - public let sizeBegin: CGSize - public let sizeEnd: CGSize - public let isLocal: Bool - - public init(sizeBegin: CGSize, sizeEnd: CGSize, isLocal: Bool) { - self.sizeBegin = sizeBegin - self.sizeEnd = sizeEnd - self.isLocal = isLocal - } - -} - -public extension KeyboardNotificationValues { - - public convenience init(notification: Notification) throws { - guard let sizeBegin = notification.keyboardFrameBegin?.size, - let sizeEnd = notification.keyboardFrameEnd?.size, - let isLocal = notification.keyboardIsLocal else { - - throw KeyboardNotificationValuesError.failedToInit(fromNotification: notification) - } - - self.init(sizeBegin: sizeBegin, sizeEnd: sizeEnd, isLocal: isLocal) - } - -} diff --git a/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardWillNotificationValues.swift b/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardWillNotificationValues.swift deleted file mode 100644 index 6ff26fe7..00000000 --- a/LeadKit/LeadKit/Classes/KeyboardNotificationValues/KeyboardWillNotificationValues.swift +++ /dev/null @@ -1,51 +0,0 @@ -// -// KeyboardWillNotificationValues.swift -// LeadKit -// -// Created by Ivan Smolin on 12/12/16. -// Copyright © 2016 Touch Instinct. All rights reserved. -// - -import UIKit - -/// Struct which keeps values from one of those notifications: -/// UIKeyboardWillShow, UIKeyboardWillHide, UIKeyboardWillChangeFrame -public final class KeyboardWillNotificationValues: KeyboardNotificationValues { - - public let animationDuration: TimeInterval - public let animationCurve: UIViewAnimationCurve - - public init(sizeBegin: CGSize, - sizeEnd: CGSize, - isLocal: Bool, - animationDuration: TimeInterval, - animationCurve: UIViewAnimationCurve) { - - self.animationDuration = animationDuration - self.animationCurve = animationCurve - - super.init(sizeBegin: sizeBegin, sizeEnd: sizeEnd, isLocal: isLocal) - } - -} - -public extension KeyboardWillNotificationValues { - - public convenience init(willNotification: Notification) throws { - guard let sizeBegin = willNotification.keyboardFrameBegin?.size, - let sizeEnd = willNotification.keyboardFrameEnd?.size, - let animationDuration = willNotification.keyboardAnimationDuration, - let animationCurve = willNotification.keyboardAnimationCurve, - let isLocal = willNotification.keyboardIsLocal else { - - throw KeyboardNotificationValuesError.failedToInit(fromNotification: willNotification) - } - - self.init(sizeBegin: sizeBegin, - sizeEnd: sizeEnd, - isLocal: isLocal, - animationDuration: animationDuration, - animationCurve: animationCurve) - } - -} diff --git a/LeadKit/LeadKit/Extensions/NotificationCenter/NotificationCenter+RxKeyboardExtensions.swift b/LeadKit/LeadKit/Extensions/NotificationCenter/NotificationCenter+RxKeyboardExtensions.swift index 670a4c9b..aea09595 100644 --- a/LeadKit/LeadKit/Extensions/NotificationCenter/NotificationCenter+RxKeyboardExtensions.swift +++ b/LeadKit/LeadKit/Extensions/NotificationCenter/NotificationCenter+RxKeyboardExtensions.swift @@ -18,7 +18,7 @@ extension Reactive where Base: NotificationCenter { let willShowObservable = rxNotificationCenter.notification(.UIKeyboardWillShow) .map { notification -> KeyboardNotification in - return .willShow(notificationValues: try KeyboardWillNotificationValues(willNotification: notification)) + return .willShow(notificationValues: try KeyboardWillNotificationValues(notification: notification)) } let didShowObservable = rxNotificationCenter.notification(.UIKeyboardDidShow) @@ -28,7 +28,7 @@ extension Reactive where Base: NotificationCenter { let willHideObservable = rxNotificationCenter.notification(.UIKeyboardWillHide) .map { notification -> KeyboardNotification in - return .willHide(notificationValues: try KeyboardWillNotificationValues(willNotification: notification)) + return .willHide(notificationValues: try KeyboardWillNotificationValues(notification: notification)) } let didHideObservable = rxNotificationCenter.notification(.UIKeyboardDidHide) @@ -38,7 +38,7 @@ extension Reactive where Base: NotificationCenter { let willChangeFrameObservable = rxNotificationCenter.notification(.UIKeyboardWillChangeFrame) .map { notification -> KeyboardNotification in - return .willChangeFrame(notificationValues: try KeyboardWillNotificationValues(willNotification: notification)) + return .willChangeFrame(notificationValues: try KeyboardWillNotificationValues(notification: notification)) } let didChangeFrameObservable = rxNotificationCenter.notification(.UIKeyboardDidChangeFrame) diff --git a/LeadKit/LeadKit/Structures/KeyboardNotificationValues/KeyboardDidNotificationValues.swift b/LeadKit/LeadKit/Structures/KeyboardNotificationValues/KeyboardDidNotificationValues.swift new file mode 100644 index 00000000..aa29b312 --- /dev/null +++ b/LeadKit/LeadKit/Structures/KeyboardNotificationValues/KeyboardDidNotificationValues.swift @@ -0,0 +1,38 @@ +// +// KeyboardDidNotificationValues.swift +// LeadKit +// +// Created by Ivan Smolin on 12/12/16. +// Copyright © 2016 Touch Instinct. All rights reserved. +// + +import UIKit + +/// Struct which keeps values from one of those notifications: +/// UIKeyboardDidShow, UIKeyboardDidHide, UIKeyboardDidChangeFrame +public struct KeyboardDidNotificationValues { + + let sizeBegin: CGSize + let sizeEnd: CGSize + let isLocal: Bool + + // Animation key/value pairs are only available for the "will" family of notification. (UIWindow.h) + +} + +public extension KeyboardDidNotificationValues { + + init(notification: Notification) throws { + guard let sizeBegin = notification.keyboardFrameBegin?.size, + let sizeEnd = notification.keyboardFrameEnd?.size, + let isLocal = notification.keyboardIsLocal else { + + throw KeyboardNotificationValuesError.failedToInit(fromNotification: notification) + } + + self.sizeBegin = sizeBegin + self.sizeEnd = sizeEnd + self.isLocal = isLocal + } + +} diff --git a/LeadKit/LeadKit/Structures/KeyboardNotificationValues/KeyboardWillNotificationValues.swift b/LeadKit/LeadKit/Structures/KeyboardNotificationValues/KeyboardWillNotificationValues.swift new file mode 100644 index 00000000..24c85b5c --- /dev/null +++ b/LeadKit/LeadKit/Structures/KeyboardNotificationValues/KeyboardWillNotificationValues.swift @@ -0,0 +1,42 @@ +// +// KeyboardWillNotificationValues.swift +// LeadKit +// +// Created by Ivan Smolin on 12/12/16. +// Copyright © 2016 Touch Instinct. All rights reserved. +// + +import UIKit + +/// Struct which keeps values from one of those notifications: +/// UIKeyboardWillShow, UIKeyboardWillHide, UIKeyboardWillChangeFrame +public struct KeyboardWillNotificationValues { + + let sizeBegin: CGSize + let sizeEnd: CGSize + let animationDuration: TimeInterval + let animationCurve: UIViewAnimationCurve + let isLocal: Bool + +} + +public extension KeyboardWillNotificationValues { + + init(notification: Notification) throws { + guard let sizeBegin = notification.keyboardFrameBegin?.size, + let sizeEnd = notification.keyboardFrameEnd?.size, + let animationDuration = notification.keyboardAnimationDuration, + let animationCurve = notification.keyboardAnimationCurve, + let isLocal = notification.keyboardIsLocal else { + + throw KeyboardNotificationValuesError.failedToInit(fromNotification: notification) + } + + self.sizeBegin = sizeBegin + self.sizeEnd = sizeEnd + self.animationDuration = animationDuration + self.animationCurve = animationCurve + self.isLocal = isLocal + } + +}