Move @IBInspectable to UIDesignable

trafi · Jan 26, 2017 · c8f0cc1 · c8f0cc1
1 parent 4ffff23
commit c8f0cc1
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 51 deletions.
diff --git a/TextStyle/Source/Extensions/UIButton.swift b/TextStyle/Source/Extensions/UIButton.swift
@@ -21,16 +21,9 @@ extension UIButton: TextStylable {
 
 // MARK: Interface Builder
 
-public extension UIButton {
-    #if TARGET_INTERFACE_BUILDER
-    @IBInspectable var textStyle: String {
+extension UIButton {
+    var textStyle: String {
         get { return "" }
-        set { set(textStyleIBString: newValue) }
+        set { set(textStyle: newValue) }
     }
-    #else
-    internal var textStyle: String {
-        get { return "" }
-        set { set(textStyleIBString: newValue) }
-    }
-    #endif
 }
diff --git a/TextStyle/Source/Extensions/UILabel.swift b/TextStyle/Source/Extensions/UILabel.swift
@@ -26,16 +26,9 @@ extension UILabel: TextStylable {
 
 // MARK: Interface Builder
 
-public extension UILabel {
-    #if TARGET_INTERFACE_BUILDER
-    @IBInspectable var textStyle: String {
+extension UILabel {
+    var textStyle: String {
         get { return "" }
-        set { set(textStyleIBString: newValue) }
+        set { set(textStyle: newValue) }
     }
-    #else
-    internal var textStyle: String {
-        get { return "" }
-        set { set(textStyleIBString: newValue) }
-    }
-    #endif
 }
diff --git a/TextStyle/Source/Extensions/UITextField.swift b/TextStyle/Source/Extensions/UITextField.swift
@@ -26,16 +26,9 @@ extension UITextField: TextStylable {
 
 // MARK: Interface Builder
 
-public extension UITextField {
-    #if TARGET_INTERFACE_BUILDER
-    @IBInspectable var textStyle: String {
+extension UITextField {
+    var textStyle: String {
         get { return "" }
-        set { set(textStyleIBString: newValue) }
+        set { set(textStyle: newValue) }
     }
-    #else
-    internal var textStyle: String {
-        get { return "" }
-        set { set(textStyleIBString: newValue) }
-    }
-    #endif
 }
diff --git a/TextStyle/Source/Extensions/UITextView.swift b/TextStyle/Source/Extensions/UITextView.swift
@@ -26,16 +26,9 @@ extension UITextView: TextStylable {
 
 // MARK: Interface Builder
 
-public extension UITextView {
-    #if TARGET_INTERFACE_BUILDER
-    @IBInspectable var textStyle: String {
+extension UITextView {
+    var textStyle: String {
         get { return "" }
-        set { set(textStyleIBString: newValue) }
+        set { set(textStyle: newValue) }
     }
-    #else
-    internal var textStyle: String {
-        get { return "" }
-        set { set(textStyleIBString: newValue) }
-    }
-    #endif
 }
diff --git a/TextStyle/Source/IBInspectable.swift b/TextStyle/Source/IBInspectable.swift
@@ -29,8 +29,31 @@ public protocol IBInspectable {
 }
 
 extension TextStylable {
-    func set(textStyleIBString string: String) {
-        guard let textStyle = (TextStyle.self as? IBInspectable.Type)?.stylesDictionary[string] else { return }
+    func set(textStyle key: String) {
+        guard let textStyle = (TextStyle.self as? IBInspectable.Type)?.stylesDictionary[key] else { return }
         set(textStyle: textStyle)
     }
 }
+
+/**
+ Makes your text styles accessible from Interface Builder.
+
+ ## Implementation
+
+     @IBDesignable public class UILabelDesignable: UILabel, IBTextStylable {
+         @IBInspectable public var textStyle: String {
+             get { return "" }
+             set { set(textStyleIBString: newValue) }
+         }
+     }
+
+ */
+public protocol IBTextStylable: TextStylable {
+    var textStyle: String { get set }
+    func set(textStyleIBString textStyleString: String)
+}
+public extension IBTextStylable {
+    func set(textStyleIBString textStyleString: String) {
+        set(textStyle: textStyleString)
+    }
+}
diff --git a/TextStyle/Source/UIDesignable.swift b/TextStyle/Source/UIDesignable.swift
@@ -7,15 +7,36 @@
 //
 
 import UIKit
+import TextStyle
 
 /// `UILabel` that renders in Interface Builder as an `@IBDesignbale`
-@IBDesignable public class UILabelDesignable: UILabel {}
+@IBDesignable public class UILabelDesignable: UILabel, IBTextStylable {
+    @IBInspectable public var textStyle: String {
+        get { return "" }
+        set { set(textStyleIBString: newValue) }
+    }
+}
 
 /// `UITextField` that renders in Interface Builder as an `@IBDesignbale`
-@IBDesignable public class UITextFieldDesignable: UITextField {}
+@IBDesignable public class UITextFieldDesignable: UITextField, IBTextStylable {
+    @IBInspectable public var textStyle: String {
+        get { return "" }
+        set { set(textStyleIBString: newValue) }
+    }
+}
 
 /// `UITextView` that renders in Interface Builder as an `@IBDesignbale`
-@IBDesignable public class UITextViewDesignable: UITextView {}
+@IBDesignable public class UITextViewDesignable: UITextView, IBTextStylable {
+    @IBInspectable public var textStyle: String {
+        get { return "" }
+        set { set(textStyleIBString: newValue) }
+    }
+}
 
 /// `Button` that renders in Interface Builder as an `@IBDesignbale`
-@IBDesignable public class UIButtonDesignable: UIButton {}
+@IBDesignable public class UIButtonDesignable: UIButton, IBTextStylable {
+    @IBInspectable public var textStyle: String {
+        get { return "" }
+        set { set(textStyleIBString: newValue) }
+    }
+}
diff --git a/TextStyleExample/Base.lproj/Main.storyboard b/TextStyleExample/Base.lproj/Main.storyboard
@@ -22,7 +22,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TextStyle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7oE-pw-Z5X" customClass="UILabelDesignable" customModule="TextStyle">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TextStyle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7oE-pw-Z5X" customClass="UILabelDesignable" customModule="TextStyleExample" customModuleProvider="target">
                                 <rect key="frame" x="16" y="28" width="343" height="21.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -31,7 +31,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="textStyle" value="header"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Helps you manage text styles in your app." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="505-Fq-rz2" customClass="UILabelDesignable" customModule="TextStyle">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Helps you manage text styles in your app." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="505-Fq-rz2" customClass="UILabelDesignable" customModule="TextStyleExample" customModuleProvider="target">
                                 <rect key="frame" x="16" y="57.5" width="343" height="19.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -40,7 +40,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="textStyle" value="body"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Still in beta" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FgL-GY-FZ6" customClass="UILabelDesignable" customModule="TextStyle">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Still in beta" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FgL-GY-FZ6" customClass="UILabelDesignable" customModule="TextStyleExample" customModuleProvider="target">
                                 <rect key="frame" x="16" y="85" width="343" height="14.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -49,13 +49,13 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="textStyle" value="footer"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yoc-Ct-220">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yoc-Ct-220" customClass="UILabelDesignable" customModule="TextStyleExample" customModuleProvider="target">
                                 <rect key="frame" x="16" y="107.5" width="343" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AttrubutedLabel" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BGk-XY-H1b">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AttrubutedLabel" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BGk-XY-H1b" customClass="UILabelDesignable" customModule="TextStyleExample" customModuleProvider="target">
                                 <rect key="frame" x="16" y="136" width="343" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>