diff --git a/LeadKit/LeadKit.xcodeproj/project.pbxproj b/LeadKit/LeadKit.xcodeproj/project.pbxproj index ff9c54e5..6255ecc8 100644 --- a/LeadKit/LeadKit.xcodeproj/project.pbxproj +++ b/LeadKit/LeadKit.xcodeproj/project.pbxproj @@ -56,7 +56,7 @@ 789CC60B1DE584F800F789D3 /* CursorType+Slice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789CC60A1DE584F800F789D3 /* CursorType+Slice.swift */; }; 78A0FCC71DC366A10070B5E1 /* StoryboardProtocol+DefaultBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A0FCC51DC366A10070B5E1 /* StoryboardProtocol+DefaultBundle.swift */; }; 78A0FCC81DC366A10070B5E1 /* StoryboardProtocol+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A0FCC61DC366A10070B5E1 /* StoryboardProtocol+Extensions.swift */; }; - 78A74EA91C6B373700FE9724 /* UIView+DefaultNibName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A74EA81C6B373700FE9724 /* UIView+DefaultNibName.swift */; }; + 78A74EA91C6B373700FE9724 /* UIView+DefaultXibName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78A74EA81C6B373700FE9724 /* UIView+DefaultXibName.swift */; }; 78B036411DA4D7060021D5CC /* UIImage+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B036401DA4D7060021D5CC /* UIImage+Extensions.swift */; }; 78B036431DA4FEC90021D5CC /* CGImage+Transform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B036421DA4FEC90021D5CC /* CGImage+Transform.swift */; }; 78B036451DA561D00021D5CC /* CGImage+Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78B036441DA561D00021D5CC /* CGImage+Utils.swift */; }; @@ -73,7 +73,7 @@ 78CFEE351C5C456B00F50370 /* LeadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 78CFEE2A1C5C456B00F50370 /* LeadKit.framework */; }; 78CFEE541C5C45E500F50370 /* UIView+LoadFromNib.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78CFEE481C5C45E500F50370 /* UIView+LoadFromNib.swift */; }; 78CFEE561C5C45E500F50370 /* ReuseIdentifierProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78CFEE4B1C5C45E500F50370 /* ReuseIdentifierProtocol.swift */; }; - 78CFEE571C5C45E500F50370 /* StaticNibNameProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78CFEE4C1C5C45E500F50370 /* StaticNibNameProtocol.swift */; }; + 78CFEE571C5C45E500F50370 /* XibNameProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78CFEE4C1C5C45E500F50370 /* XibNameProtocol.swift */; }; 78CFEE581C5C45E500F50370 /* StaticViewHeightProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78CFEE4D1C5C45E500F50370 /* StaticViewHeightProtocol.swift */; }; 78CFEE591C5C45E500F50370 /* StoryboardIdentifierProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78CFEE4E1C5C45E500F50370 /* StoryboardIdentifierProtocol.swift */; }; 78CFEE5A1C5C45E500F50370 /* ViewHeightProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78CFEE4F1C5C45E500F50370 /* ViewHeightProtocol.swift */; }; @@ -157,7 +157,7 @@ 789CC60A1DE584F800F789D3 /* CursorType+Slice.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CursorType+Slice.swift"; sourceTree = ""; }; 78A0FCC51DC366A10070B5E1 /* StoryboardProtocol+DefaultBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StoryboardProtocol+DefaultBundle.swift"; sourceTree = ""; }; 78A0FCC61DC366A10070B5E1 /* StoryboardProtocol+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StoryboardProtocol+Extensions.swift"; sourceTree = ""; }; - 78A74EA81C6B373700FE9724 /* UIView+DefaultNibName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIView+DefaultNibName.swift"; path = "LeadKit/Extensions/UIView/UIView+DefaultNibName.swift"; sourceTree = SOURCE_ROOT; }; + 78A74EA81C6B373700FE9724 /* UIView+DefaultXibName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIView+DefaultXibName.swift"; path = "LeadKit/Extensions/UIView/UIView+DefaultXibName.swift"; sourceTree = SOURCE_ROOT; }; 78B036401DA4D7060021D5CC /* UIImage+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Extensions.swift"; sourceTree = ""; }; 78B036421DA4FEC90021D5CC /* CGImage+Transform.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CGImage+Transform.swift"; sourceTree = ""; }; 78B036441DA561D00021D5CC /* CGImage+Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CGImage+Utils.swift"; sourceTree = ""; }; @@ -177,7 +177,7 @@ 78CFEE3B1C5C456B00F50370 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 78CFEE481C5C45E500F50370 /* UIView+LoadFromNib.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "UIView+LoadFromNib.swift"; path = "LeadKit/Extensions/UIView/UIView+LoadFromNib.swift"; sourceTree = SOURCE_ROOT; }; 78CFEE4B1C5C45E500F50370 /* ReuseIdentifierProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReuseIdentifierProtocol.swift; sourceTree = ""; }; - 78CFEE4C1C5C45E500F50370 /* StaticNibNameProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StaticNibNameProtocol.swift; sourceTree = ""; }; + 78CFEE4C1C5C45E500F50370 /* XibNameProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XibNameProtocol.swift; sourceTree = ""; }; 78CFEE4D1C5C45E500F50370 /* StaticViewHeightProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StaticViewHeightProtocol.swift; sourceTree = ""; }; 78CFEE4E1C5C45E500F50370 /* StoryboardIdentifierProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StoryboardIdentifierProtocol.swift; sourceTree = ""; }; 78CFEE4F1C5C45E500F50370 /* ViewHeightProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewHeightProtocol.swift; sourceTree = ""; }; @@ -580,7 +580,7 @@ 780F56CB1E0D7ACA004530B6 /* ObservableMappable.swift */, 78CFEE4B1C5C45E500F50370 /* ReuseIdentifierProtocol.swift */, 787682F91CAD40C200532AB3 /* StaticEstimatedViewHeightProtocol.swift */, - 78CFEE4C1C5C45E500F50370 /* StaticNibNameProtocol.swift */, + 78CFEE4C1C5C45E500F50370 /* XibNameProtocol.swift */, 78CFEE4D1C5C45E500F50370 /* StaticViewHeightProtocol.swift */, 78CFEE4E1C5C45E500F50370 /* StoryboardIdentifierProtocol.swift */, 783423691DB8D0E100A79643 /* StoryboardProtocol.swift */, @@ -615,7 +615,7 @@ 78E59B2C1C786CD500C6BFE9 /* UIView */ = { isa = PBXGroup; children = ( - 78A74EA81C6B373700FE9724 /* UIView+DefaultNibName.swift */, + 78A74EA81C6B373700FE9724 /* UIView+DefaultXibName.swift */, 78011A631D47ABC500EA16A2 /* UIView+DefaultReuseIdentifier.swift */, 78CFEE481C5C45E500F50370 /* UIView+LoadFromNib.swift */, EF5FB5681E0141610030E4BE /* UIView+Rotation.swift */, @@ -936,7 +936,7 @@ 789CC60B1DE584F800F789D3 /* CursorType+Slice.swift in Sources */, 78753E2C1DE58BF9006BC0FB /* StaticCursor.swift in Sources */, 78D4B54A1DA64EAB005B0764 /* Any+TypeName.swift in Sources */, - 78CFEE571C5C45E500F50370 /* StaticNibNameProtocol.swift in Sources */, + 78CFEE571C5C45E500F50370 /* XibNameProtocol.swift in Sources */, 67DC650C1E979C0A002F2FFF /* AnyLoadingIndicator.swift in Sources */, 788EC15A1CF64528009CFB6B /* UIStoryboard+InstantiateViewController.swift in Sources */, 787783671CA04D4A001CDC9B /* String+SizeCalculation.swift in Sources */, @@ -979,7 +979,7 @@ 78CFEE5A1C5C45E500F50370 /* ViewHeightProtocol.swift in Sources */, 787682FA1CAD40C300532AB3 /* StaticEstimatedViewHeightProtocol.swift in Sources */, CA1FE7091E27D7DE00968901 /* UIDevice+Extensions.swift in Sources */, - 78A74EA91C6B373700FE9724 /* UIView+DefaultNibName.swift in Sources */, + 78A74EA91C6B373700FE9724 /* UIView+DefaultXibName.swift in Sources */, CAE698C21E965B47000394B0 /* TableDirector+Extensions.swift in Sources */, CAA707D91E2E61A50022D732 /* ConfigurableController.swift in Sources */, 7884DB9C1DC1439200E52A63 /* UserDefaults+MappableDataTypes.swift in Sources */, diff --git a/LeadKit/LeadKit/Extensions/UICollectionView/UICollectionView+CellRegistration.swift b/LeadKit/LeadKit/Extensions/UICollectionView/UICollectionView+CellRegistration.swift index a6022f67..0ff6ecb1 100644 --- a/LeadKit/LeadKit/Extensions/UICollectionView/UICollectionView+CellRegistration.swift +++ b/LeadKit/LeadKit/Extensions/UICollectionView/UICollectionView+CellRegistration.swift @@ -34,9 +34,9 @@ public extension UICollectionView { /// - bundle: The bundle in which to search for the nib file. /// If you specify nil, this method looks for the nib file in the main bundle. public func registerNib(forCellClass cellClass: T.Type, bundle: Bundle? = nil) - where T: ReuseIdentifierProtocol, T: UICollectionViewCell, T: StaticNibNameProtocol { + where T: ReuseIdentifierProtocol, T: UICollectionViewCell, T: XibNameProtocol { - register(UINib(nibName: T.nibName, bundle: bundle), forCellWithReuseIdentifier: T.reuseIdentifier) + register(UINib(nibName: T.xibName, bundle: bundle), forCellWithReuseIdentifier: T.reuseIdentifier) } } diff --git a/LeadKit/LeadKit/Extensions/UIView/UIView+DefaultNibName.swift b/LeadKit/LeadKit/Extensions/UIView/UIView+DefaultXibName.swift similarity index 94% rename from LeadKit/LeadKit/Extensions/UIView/UIView+DefaultNibName.swift rename to LeadKit/LeadKit/Extensions/UIView/UIView+DefaultXibName.swift index 11a7c61f..55f06fd3 100644 --- a/LeadKit/LeadKit/Extensions/UIView/UIView+DefaultNibName.swift +++ b/LeadKit/LeadKit/Extensions/UIView/UIView+DefaultXibName.swift @@ -22,14 +22,14 @@ import UIKit -extension UIView: StaticNibNameProtocol { +extension UIView: XibNameProtocol { /** default implementation of StaticNibNameProtocol - returns: class name string */ - open class var nibName: String { + open class var xibName: String { return className(of: self) } diff --git a/LeadKit/LeadKit/Extensions/UIView/UIView+LoadFromNib.swift b/LeadKit/LeadKit/Extensions/UIView/UIView+LoadFromNib.swift index 72bbc6b2..087edbce 100644 --- a/LeadKit/LeadKit/Extensions/UIView/UIView+LoadFromNib.swift +++ b/LeadKit/LeadKit/Extensions/UIView/UIView+LoadFromNib.swift @@ -30,8 +30,8 @@ public extension UIView { /// - Parameter bundle: The bundle in which to search for the nib file. /// If you specify nil, this method looks for the nib file in the main bundle. /// - Returns: UIView or UIView subclass instance - public static func loadFromNib(bundle: Bundle? = nil) -> T where T: StaticNibNameProtocol, T: UIView { - return loadFromNib(named: T.nibName, bundle: bundle) + public static func loadFromNib(bundle: Bundle? = nil) -> T where T: XibNameProtocol, T: UIView { + return loadFromNib(named: T.xibName, bundle: bundle) } /// Method which loads UIView (or subclass) instance from nib using given nib name parameter diff --git a/LeadKit/LeadKit/Protocols/StaticNibNameProtocol.swift b/LeadKit/LeadKit/Protocols/XibNameProtocol.swift similarity index 94% rename from LeadKit/LeadKit/Protocols/StaticNibNameProtocol.swift rename to LeadKit/LeadKit/Protocols/XibNameProtocol.swift index 40140d39..f288d321 100644 --- a/LeadKit/LeadKit/Protocols/StaticNibNameProtocol.swift +++ b/LeadKit/LeadKit/Protocols/XibNameProtocol.swift @@ -25,9 +25,9 @@ import Foundation /** * protocol which ensures that specific type can return nib name of view */ -public protocol StaticNibNameProtocol { +public protocol XibNameProtocol { /** - returns: nib name string */ - static var nibName: String { get } + static var xibName: String { get } }