Rename all IBOutlets

JakeLin · JakeLin · commit 050f401b8105 · 2015-09-30T09:14:45.000+10:00
diff --git a/Design/SwiftWeather.sketch b/Design/SwiftWeather.sketch
diff --git a/SwiftWeather/Base.lproj/Main.storyboard b/SwiftWeather/Base.lproj/Main.storyboard
@@ -104,6 +104,8 @@
                                                                         <color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     </userDefinedRuntimeAttribute>
                                                                     <userDefinedRuntimeAttribute type="string" keyPath="timeText" value="12:00"/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="icon" value=""/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="temperature" value="10"/>
                                                                 </userDefinedRuntimeAttributes>
                                                                 <variation key="heightClass=compact" fixedFrame="YES">
                                                                     <rect key="frame" x="0.0" y="0.0" width="56.5" height="112.5"/>
@@ -118,6 +120,9 @@
                                                                         <color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     </userDefinedRuntimeAttribute>
                                                                     <userDefinedRuntimeAttribute type="string" keyPath="timeText" value="14:00"/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="icon" value=""/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="time" value="14:00"/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="temperature" value="8"/>
                                                                 </userDefinedRuntimeAttributes>
                                                                 <variation key="heightClass=compact" fixedFrame="YES">
                                                                     <rect key="frame" x="86.5" y="0.0" width="56" height="112.5"/>
@@ -140,6 +145,9 @@
                                                                         <color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     </userDefinedRuntimeAttribute>
                                                                     <userDefinedRuntimeAttribute type="string" keyPath="timeText" value="17:00"/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="icon" value=""/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="time" value="17:00"/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="temperature" value="12"/>
                                                                 </userDefinedRuntimeAttributes>
                                                             </view>
                                                             <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mjK-Yg-kU1" customClass="ForecastView" customModule="SwiftWeather" customModuleProvider="target">
@@ -151,6 +159,9 @@
                                                                         <color key="value" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     </userDefinedRuntimeAttribute>
                                                                     <userDefinedRuntimeAttribute type="string" keyPath="timeText" value="20:00"/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="icon" value=""/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="time" value="20:00"/>
+                                                                    <userDefinedRuntimeAttribute type="string" keyPath="temperature" value="4"/>
                                                                 </userDefinedRuntimeAttributes>
                                                             </view>
                                                         </subviews>
@@ -239,13 +250,13 @@
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="icon" destination="hId-DS-ttH" id="5El-Md-alk"/>
-                        <outlet property="location" destination="COR-kZ-hOu" id="Jfd-NG-sB9"/>
-                        <outlet property="temperature" destination="lFc-pa-Aur" id="vI1-dL-cWd"/>
-                        <outletCollection property="forecasts" destination="y4d-hQ-IEP" collectionClass="NSMutableArray" id="mF5-bA-7Yo"/>
-                        <outletCollection property="forecasts" destination="X03-jw-bPo" collectionClass="NSMutableArray" id="cCg-FO-8S7"/>
-                        <outletCollection property="forecasts" destination="8G3-c1-MSy" collectionClass="NSMutableArray" id="0zT-MU-FbZ"/>
-                        <outletCollection property="forecasts" destination="mjK-Yg-kU1" collectionClass="NSMutableArray" id="wKk-E8-dIH"/>
+                        <outlet property="iconLabel" destination="hId-DS-ttH" id="LPc-4x-ucb"/>
+                        <outlet property="locationLabel" destination="COR-kZ-hOu" id="ksQ-LM-5Vo"/>
+                        <outlet property="temperatureLabel" destination="lFc-pa-Aur" id="3ka-Ce-vTD"/>
+                        <outletCollection property="forecastViews" destination="y4d-hQ-IEP" collectionClass="NSMutableArray" id="lX3-ak-UIi"/>
+                        <outletCollection property="forecastViews" destination="X03-jw-bPo" collectionClass="NSMutableArray" id="4an-ne-Yc5"/>
+                        <outletCollection property="forecastViews" destination="8G3-c1-MSy" collectionClass="NSMutableArray" id="YFy-Ee-oNH"/>
+                        <outletCollection property="forecastViews" destination="mjK-Yg-kU1" collectionClass="NSMutableArray" id="k54-Ye-toO"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
diff --git a/SwiftWeather/ForecastView.swift b/SwiftWeather/ForecastView.swift
@@ -12,9 +12,9 @@ import UIKit
   // Our custom view from the XIB file
   var view: UIView!
   
-  @IBOutlet weak var time: UILabel!
-  @IBOutlet weak var icon: UILabel!
-  @IBOutlet weak var temperature: UILabel!
+  @IBOutlet weak var timeLabel: UILabel!
+  @IBOutlet weak var iconLabel: UILabel!
+  @IBOutlet weak var temperatureLabel: UILabel!
   
   // MARK: - init
   override init(frame: CGRect) {
@@ -39,63 +39,63 @@ import UIKit
   }
   
   // MARK: - IBInspectable
-  @IBInspectable var timeText: String? {
+  @IBInspectable var time: String? {
     get {
-      return time.text
+      return timeLabel.text
     }
     
     set {
-      time.text = newValue
+      timeLabel.text = newValue
     }
   }
   
-  @IBInspectable var iconText: String? {
+  @IBInspectable var icon: String? {
     get {
-      return icon.text
+      return iconLabel.text
     }
     
     set {
-      icon.text = newValue
+      iconLabel.text = newValue
     }
   }
   
-  @IBInspectable var temperatureText: String? {
+  @IBInspectable var temperature: String? {
     get {
-      return temperature.text
+      return temperatureLabel.text
     }
     
     set {
-      temperature.text = newValue
+      temperatureLabel.text = newValue
     }
   }
   
   @IBInspectable var timeColor: UIColor {
     get {
-      return time.textColor
+      return timeLabel.textColor
     }
     
     set {
-      time.textColor = newValue
+      timeLabel.textColor = newValue
     }
   }
   
   @IBInspectable var iconColor: UIColor {
     get {
-      return icon.textColor
+      return iconLabel.textColor
     }
     
     set {
-      icon.textColor = newValue
+      iconLabel.textColor = newValue
     }
   }
   
   @IBInspectable var temperatureColor: UIColor {
     get {
-      return temperature.textColor
+      return temperatureLabel.textColor
     }
     
     set {
-      temperature.textColor = newValue
+      temperatureLabel.textColor = newValue
     }
   }
   
diff --git a/SwiftWeather/ForecastView.xib b/SwiftWeather/ForecastView.xib
@@ -12,9 +12,9 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ForecastView" customModule="SwiftWeather" customModuleProvider="target">
             <connections>
-                <outlet property="icon" destination="FBM-RY-zwQ" id="uB8-oG-vxx"/>
-                <outlet property="temperature" destination="6xK-hW-gim" id="PPN-gB-HNZ"/>
-                <outlet property="time" destination="dWn-ZV-dZz" id="gZZ-Tg-TRZ"/>
+                <outlet property="iconLabel" destination="FBM-RY-zwQ" id="lTz-7J-bkC"/>
+                <outlet property="temperatureLabel" destination="6xK-hW-gim" id="fWn-n6-waY"/>
+                <outlet property="timeLabel" destination="dWn-ZV-dZz" id="mpF-lZ-cXC"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
diff --git a/SwiftWeather/WeatherViewController.swift b/SwiftWeather/WeatherViewController.swift
@@ -10,10 +10,10 @@ import UIKit
 
 class WeatherViewController: UIViewController {
   
-  @IBOutlet weak var location: UILabel!
-  @IBOutlet weak var icon: UILabel!
-  @IBOutlet weak var temperature: UILabel!
-  @IBOutlet var forecasts: [ForecastView]!
+  @IBOutlet weak var locationLabel: UILabel!
+  @IBOutlet weak var iconLabel: UILabel!
+  @IBOutlet weak var temperatureLabel: UILabel!
+  @IBOutlet var forecastViews: [ForecastView]!
   
   override func viewDidLoad() {
     super.viewDidLoad()

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import UIKit`
`12`	`12`	`// Our custom view from the XIB file`
`13`	`13`	`var view: UIView!`
`14`	`14`
`15`		`- @IBOutlet weak var time: UILabel!`
`16`		`- @IBOutlet weak var icon: UILabel!`
`17`		`- @IBOutlet weak var temperature: UILabel!`
	`15`	`+ @IBOutlet weak var timeLabel: UILabel!`
	`16`	`+ @IBOutlet weak var iconLabel: UILabel!`
	`17`	`+ @IBOutlet weak var temperatureLabel: UILabel!`
`18`	`18`
`19`	`19`	`// MARK: - init`
`20`	`20`	`override init(frame: CGRect) {`
`@@ -39,63 +39,63 @@ import UIKit`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// MARK: - IBInspectable`
`42`		`- @IBInspectable var timeText: String? {`
	`42`	`+ @IBInspectable var time: String? {`
`43`	`43`	`get {`
`44`		`- return time.text`
	`44`	`+ return timeLabel.text`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`set {`
`48`		`- time.text = newValue`
	`48`	`+ timeLabel.text = newValue`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`- @IBInspectable var iconText: String? {`
	`52`	`+ @IBInspectable var icon: String? {`
`53`	`53`	`get {`
`54`		`- return icon.text`
	`54`	`+ return iconLabel.text`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`set {`
`58`		`- icon.text = newValue`
	`58`	`+ iconLabel.text = newValue`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- @IBInspectable var temperatureText: String? {`
	`62`	`+ @IBInspectable var temperature: String? {`
`63`	`63`	`get {`
`64`		`- return temperature.text`
	`64`	`+ return temperatureLabel.text`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`set {`
`68`		`- temperature.text = newValue`
	`68`	`+ temperatureLabel.text = newValue`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@IBInspectable var timeColor: UIColor {`
`73`	`73`	`get {`
`74`		`- return time.textColor`
	`74`	`+ return timeLabel.textColor`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`set {`
`78`		`- time.textColor = newValue`
	`78`	`+ timeLabel.textColor = newValue`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@IBInspectable var iconColor: UIColor {`
`83`	`83`	`get {`
`84`		`- return icon.textColor`
	`84`	`+ return iconLabel.textColor`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`set {`
`88`		`- icon.textColor = newValue`
	`88`	`+ iconLabel.textColor = newValue`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`@IBInspectable var temperatureColor: UIColor {`
`93`	`93`	`get {`
`94`		`- return temperature.textColor`
	`94`	`+ return temperatureLabel.textColor`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`set {`
`98`		`- temperature.textColor = newValue`
	`98`	`+ temperatureLabel.textColor = newValue`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`