From 4c9617913d0ba51cdb29fa224d6309add99a5376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD=20=D0=A1=D0=BC=D0=BE=D0=BB=D0=B8?= =?UTF-8?q?=D0=BD?= Date: Wed, 17 Feb 2016 11:56:54 +0300 Subject: [PATCH] fix SwiftLint warnings --- LeadKit/LeadKit/Classes/Logging/App.swift | 2 +- LeadKit/LeadKit/Classes/Logging/Log.swift | 2 +- .../Classes/Logging/LogFormatter.swift | 2 +- ...Storyboard+InstantiateViewController.swift | 7 ++++-- .../UITableView+CellRegistration.swift | 22 ++++++++++++++----- .../UITableView+DequeueCustomCell.swift | 10 ++++++--- .../Extensions/UIView+DefaultNibName.swift | 6 +++-- .../Extensions/UIView+LoadFromNib.swift | 17 ++++++-------- .../LeadKit/Protocols/NibNameProtocol.swift | 8 ++++--- .../Protocols/ReuseIdentifierProtocol.swift | 2 +- .../Protocols/StaticNibNameProtocol.swift | 2 +- .../Protocols/StaticViewHeightProtocol.swift | 2 +- .../StoryboardIdentifierProtocol.swift | 2 +- .../Protocols/ViewHeightProtocol.swift | 2 +- .../Protocols/ViewModelBuilderProtocol.swift | 2 +- .../LeadKit/Protocols/ViewModelProtocol.swift | 2 +- 16 files changed, 54 insertions(+), 36 deletions(-) diff --git a/LeadKit/LeadKit/Classes/Logging/App.swift b/LeadKit/LeadKit/Classes/Logging/App.swift index 4c54a905..0e216bed 100644 --- a/LeadKit/LeadKit/Classes/Logging/App.swift +++ b/LeadKit/LeadKit/Classes/Logging/App.swift @@ -39,4 +39,4 @@ public class App { return returnValue! } -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Classes/Logging/Log.swift b/LeadKit/LeadKit/Classes/Logging/Log.swift index 88e59a00..f89ed958 100644 --- a/LeadKit/LeadKit/Classes/Logging/Log.swift +++ b/LeadKit/LeadKit/Classes/Logging/Log.swift @@ -41,4 +41,4 @@ public class Log { return startMessage } -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Classes/Logging/LogFormatter.swift b/LeadKit/LeadKit/Classes/Logging/LogFormatter.swift index 27afb96d..3f2efa45 100644 --- a/LeadKit/LeadKit/Classes/Logging/LogFormatter.swift +++ b/LeadKit/LeadKit/Classes/Logging/LogFormatter.swift @@ -41,4 +41,4 @@ class LogFormatter: DDDispatchQueueLogFormatter { return "\(level) \(dateAndTime) [\(logMessage.fileName):\(logMessage.line)]: \(logMessage.message)" } -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Extensions/UIStoryboard+InstantiateViewController.swift b/LeadKit/LeadKit/Extensions/UIStoryboard+InstantiateViewController.swift index 9c5cb03a..746554c9 100644 --- a/LeadKit/LeadKit/Extensions/UIStoryboard+InstantiateViewController.swift +++ b/LeadKit/LeadKit/Extensions/UIStoryboard+InstantiateViewController.swift @@ -10,11 +10,14 @@ import UIKit extension UIStoryboard { /** - method for instanciating new UIViewController subclass from storyboard using storyboard identifier provided by StoryboardIdentifierProtocol protocol implementation + method for instanciating new UIViewController subclass from storyboard using storyboard identifier + provided by StoryboardIdentifierProtocol protocol implementation - returns: UIViewController subclass instance */ + public func instantiateViewController() -> T { return instantiateViewControllerWithIdentifier(T.storyboardIdentifier()) as! T } -} \ No newline at end of file + +} diff --git a/LeadKit/LeadKit/Extensions/UITableView+CellRegistration.swift b/LeadKit/LeadKit/Extensions/UITableView+CellRegistration.swift index 35eee6e1..33e1fc95 100644 --- a/LeadKit/LeadKit/Extensions/UITableView+CellRegistration.swift +++ b/LeadKit/LeadKit/Extensions/UITableView+CellRegistration.swift @@ -10,25 +10,35 @@ import UIKit extension UITableView { /** - method which register UITableViewCell subclass for reusing in UITableView with reuse identifier provided by ReuseIdentifierProtocol protocol implementation and nib name provided by StaticNibNameProtocol protocol implementation + method which register UITableViewCell subclass for reusing in UITableView with reuse identifier + provided by ReuseIdentifierProtocol protocol implementation and nib name + provided by StaticNibNameProtocol protocol implementation - parameter cellClass: UITableViewCell subclass which implements ReuseIdentifierProtocol and StaticNibNameProtocol - see: ReuseIdentifierProtocol, StaticNibNameProtocol */ - public func registerNib(forCellClass cellClass: T.Type) { + + public func registerNib + (forCellClass cellClass: T.Type) { self.registerNib(UINib(nibName: T.nibName()), forCellReuseIdentifier: T.reuseIdentifier()) } /** - method which register UITableViewCell subclass for reusing in UITableView with reuse identifier provided by ReuseIdentifierProtocol protocol implementation and nib name provided by NibNameProtocol protocol implementation + method which register UITableViewCell subclass for reusing in UITableView with reuse identifier + provided by ReuseIdentifierProtocol protocol implementation and nib name + provided by NibNameProtocol protocol implementation - parameter cellClass: UITableViewCell subclass which implements ReuseIdentifierProtocol and NibNameProtocol - parameter interfaceIdiom: UIUserInterfaceIdiom value for NibNameProtocol - see: ReuseIdentifierProtocol, NibNameProtocol */ - public func registerNib(forCellClass cellClass: T.Type, forUserInterfaceIdiom interfaceIdiom: UIUserInterfaceIdiom) { - self.registerNib(UINib(nibName: T.nibName(forConfiguration: interfaceIdiom)), forCellReuseIdentifier: T.reuseIdentifier()) + + public func registerNib + (forCellClass cellClass: T.Type, forUserInterfaceIdiom interfaceIdiom: UIUserInterfaceIdiom) { + let nib = UINib(nibName: T.nibName(forConfiguration: interfaceIdiom)) + self.registerNib(nib, forCellReuseIdentifier: T.reuseIdentifier()) } -} \ No newline at end of file + +} diff --git a/LeadKit/LeadKit/Extensions/UITableView+DequeueCustomCell.swift b/LeadKit/LeadKit/Extensions/UITableView+DequeueCustomCell.swift index de4ae5a6..d499ee7d 100644 --- a/LeadKit/LeadKit/Extensions/UITableView+DequeueCustomCell.swift +++ b/LeadKit/LeadKit/Extensions/UITableView+DequeueCustomCell.swift @@ -10,7 +10,8 @@ import UIKit extension UITableView { /** - method for dequeueing reusable table view cell with specific class using reuse identifier provided by ReuseIdentifierProtocol implementation + method for dequeueing reusable table view cell with specific class using reuse identifier + provided by ReuseIdentifierProtocol implementation - parameter indexPath: NSIndexPath object @@ -18,7 +19,10 @@ extension UITableView { - see: ReuseIdentifierProtocol */ - public func dequeueReusableCell(forIndexPath indexPath: NSIndexPath) -> T { + + public func dequeueReusableCell + (forIndexPath indexPath: NSIndexPath) -> T { return dequeueReusableCellWithIdentifier(T.reuseIdentifier(), forIndexPath: indexPath) as! T } -} \ No newline at end of file + +} diff --git a/LeadKit/LeadKit/Extensions/UIView+DefaultNibName.swift b/LeadKit/LeadKit/Extensions/UIView+DefaultNibName.swift index 3f2a8b51..215b61b1 100644 --- a/LeadKit/LeadKit/Extensions/UIView+DefaultNibName.swift +++ b/LeadKit/LeadKit/Extensions/UIView+DefaultNibName.swift @@ -8,13 +8,15 @@ import Foundation -extension UIView : StaticNibNameProtocol { +extension UIView: StaticNibNameProtocol { /** default implementation of StaticNibNameProtocol - returns: class name string without dot (last class path component) */ + public static func nibName() -> String { return NSStringFromClass(self).componentsSeparatedByString(".").last! } -} \ No newline at end of file + +} diff --git a/LeadKit/LeadKit/Extensions/UIView+LoadFromNib.swift b/LeadKit/LeadKit/Extensions/UIView+LoadFromNib.swift index 4981ca89..b6744cdf 100644 --- a/LeadKit/LeadKit/Extensions/UIView+LoadFromNib.swift +++ b/LeadKit/LeadKit/Extensions/UIView+LoadFromNib.swift @@ -9,13 +9,6 @@ import UIKit extension UINib { - /** - convenience initialized for UINib class - - - parameter name: name of the nib - - - returns: UINib instance - */ convenience public init(nibName name: String) { self.init(nibName: name, bundle: nil) } @@ -29,12 +22,15 @@ extension UIView { - returns: UIView subclass instance */ - public static func loadFromNib(forUserInterfaceIdiom interfaceIdiom: UIUserInterfaceIdiom) -> T { + + public static func loadFromNib + (forUserInterfaceIdiom interfaceIdiom: UIUserInterfaceIdiom) -> T { return loadFromNib(named: T.nibName(forConfiguration: interfaceIdiom)) } /** - method which return UIView subclass instance loaded from nib using nib name provided by StaticNibNameProtocol implementation + method which return UIView subclass instance loaded from nib using nib name + provided by StaticNibNameProtocol implementation - returns: UIView subclass instance */ @@ -52,4 +48,5 @@ extension UIView { public static func loadFromNib(named nibName: String) -> T { return UINib(nibName: nibName).instantiateWithOwner(nil, options: nil).first as! T } -} \ No newline at end of file + +} diff --git a/LeadKit/LeadKit/Protocols/NibNameProtocol.swift b/LeadKit/LeadKit/Protocols/NibNameProtocol.swift index 5b439e4a..df950afa 100644 --- a/LeadKit/LeadKit/Protocols/NibNameProtocol.swift +++ b/LeadKit/LeadKit/Protocols/NibNameProtocol.swift @@ -25,9 +25,11 @@ public protocol AbstractNibNameProtocol { } /** - * protocol which ensures that specific type can return nib name of view for specified UserInterfaceIdiom (iPhone, iPad, AppleTV) + * protocol which ensures that specific type can return nib name of view + for specified UserInterfaceIdiom (iPhone, iPad, AppleTV) */ -public protocol NibNameProtocol : AbstractNibNameProtocol { + +public protocol NibNameProtocol: AbstractNibNameProtocol { /** static method which returns nib name for specific UIUserInterfaceIdiom value @@ -36,4 +38,4 @@ public protocol NibNameProtocol : AbstractNibNameProtocol { - returns: nib name string */ static func nibName(forConfiguration configuration: UIUserInterfaceIdiom) -> String -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Protocols/ReuseIdentifierProtocol.swift b/LeadKit/LeadKit/Protocols/ReuseIdentifierProtocol.swift index fdf88d2b..19f8c4c4 100644 --- a/LeadKit/LeadKit/Protocols/ReuseIdentifierProtocol.swift +++ b/LeadKit/LeadKit/Protocols/ReuseIdentifierProtocol.swift @@ -32,4 +32,4 @@ public protocol ReuseIdentifierProtocol: AbstractReuseIdentifierProtocol { - returns: reuse identifier */ static func reuseIdentifier() -> String -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Protocols/StaticNibNameProtocol.swift b/LeadKit/LeadKit/Protocols/StaticNibNameProtocol.swift index f5358ea6..79a7b29d 100644 --- a/LeadKit/LeadKit/Protocols/StaticNibNameProtocol.swift +++ b/LeadKit/LeadKit/Protocols/StaticNibNameProtocol.swift @@ -18,4 +18,4 @@ public protocol StaticNibNameProtocol { - returns: nib name string */ static func nibName() -> String -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Protocols/StaticViewHeightProtocol.swift b/LeadKit/LeadKit/Protocols/StaticViewHeightProtocol.swift index 3d4a09c8..0cad5416 100644 --- a/LeadKit/LeadKit/Protocols/StaticViewHeightProtocol.swift +++ b/LeadKit/LeadKit/Protocols/StaticViewHeightProtocol.swift @@ -18,4 +18,4 @@ public protocol StaticViewHeightProtocol { - returns: view height */ static func viewHeight() -> CGFloat -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Protocols/StoryboardIdentifierProtocol.swift b/LeadKit/LeadKit/Protocols/StoryboardIdentifierProtocol.swift index db8a7855..613158f2 100644 --- a/LeadKit/LeadKit/Protocols/StoryboardIdentifierProtocol.swift +++ b/LeadKit/LeadKit/Protocols/StoryboardIdentifierProtocol.swift @@ -18,4 +18,4 @@ public protocol StoryboardIdentifierProtocol { - returns: storyboard identifier string */ static func storyboardIdentifier() -> String -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Protocols/ViewHeightProtocol.swift b/LeadKit/LeadKit/Protocols/ViewHeightProtocol.swift index 407425d3..66448a52 100644 --- a/LeadKit/LeadKit/Protocols/ViewHeightProtocol.swift +++ b/LeadKit/LeadKit/Protocols/ViewHeightProtocol.swift @@ -22,4 +22,4 @@ public protocol ViewHeightProtocol { - returns: view height */ static func viewHeight(forViewModel viewModel: ViewModelType) -> CGFloat -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Protocols/ViewModelBuilderProtocol.swift b/LeadKit/LeadKit/Protocols/ViewModelBuilderProtocol.swift index 26bd6bdb..186fc7fa 100644 --- a/LeadKit/LeadKit/Protocols/ViewModelBuilderProtocol.swift +++ b/LeadKit/LeadKit/Protocols/ViewModelBuilderProtocol.swift @@ -20,4 +20,4 @@ protocol ViewModelBuilderProtocol { - returns: view model object */ func buildViewModel() -> ViewModelType -} \ No newline at end of file +} diff --git a/LeadKit/LeadKit/Protocols/ViewModelProtocol.swift b/LeadKit/LeadKit/Protocols/ViewModelProtocol.swift index a01f43f0..86d143a0 100644 --- a/LeadKit/LeadKit/Protocols/ViewModelProtocol.swift +++ b/LeadKit/LeadKit/Protocols/ViewModelProtocol.swift @@ -22,4 +22,4 @@ public protocol AbstractViewModelProtocol { - returns: nothing */ func setViewModel(viewModel: ViewModelType) -} \ No newline at end of file +}