From 04a558b70f4b6247e2290ba9b9dcf4ff67c7b285 Mon Sep 17 00:00:00 2001 From: Igor Kislyuk Date: Wed, 26 Apr 2017 11:46:38 +0300 Subject: [PATCH] Fix. Remove duplications --- LeadKit/LeadKit/Classes/Views/XibView.swift | 7 +------ .../UIViewController/UIViewController+XibName.swift | 2 +- LeadKit/LeadKit/Functions/Any+TypeName.swift | 4 ++++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/LeadKit/LeadKit/Classes/Views/XibView.swift b/LeadKit/LeadKit/Classes/Views/XibView.swift index b9049845..b94db6fe 100644 --- a/LeadKit/LeadKit/Classes/Views/XibView.swift +++ b/LeadKit/LeadKit/Classes/Views/XibView.swift @@ -27,12 +27,7 @@ open class XibView: UIView { /// Nib name used to instantiate inner view open var innerViewNibName: String { - let clsName = String(describing: type(of: self)) - if let typeRange = clsName.range(of: ".Type") { - return clsName.substring(to: typeRange.lowerBound) - } else { - return clsName - } + return className(of: self) } public convenience init() { diff --git a/LeadKit/LeadKit/Extensions/UIViewController/UIViewController+XibName.swift b/LeadKit/LeadKit/Extensions/UIViewController/UIViewController+XibName.swift index 91b65bac..4a41f581 100644 --- a/LeadKit/LeadKit/Extensions/UIViewController/UIViewController+XibName.swift +++ b/LeadKit/LeadKit/Extensions/UIViewController/UIViewController+XibName.swift @@ -30,7 +30,7 @@ extension UIViewController { - returns: type name string */ open class var xibName: String { - return className(of: self) + return typeName(of: self) } } diff --git a/LeadKit/LeadKit/Functions/Any+TypeName.swift b/LeadKit/LeadKit/Functions/Any+TypeName.swift index addad2a9..6de9cb91 100644 --- a/LeadKit/LeadKit/Functions/Any+TypeName.swift +++ b/LeadKit/LeadKit/Functions/Any+TypeName.swift @@ -35,3 +35,7 @@ public func className(of type: T) -> String { return clsName } } + +public func typeName(of type: T.Type) -> String { + return String(describing: type) +}