[Refactor] Cleaning bits of Code Smell discovered.

* RealTImeVC needs a proper refactoring * But once again i int get paid enough for this shit yooo
TosinAF · Sep 17, 2015 · eaf0a66 · eaf0a66
1 parent f24d88e
commit eaf0a66
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/HopperBus/Controllers/RealTimeViewController.swift b/HopperBus/Controllers/RealTimeViewController.swift
@@ -253,6 +253,10 @@ class RealTimeViewController: GAITrackedViewController {
 
 extension RealTimeViewController: UIPickerViewDelegate, UIPickerViewDataSource {
 
+    var pickerViewComponentLabelHeight: CGFloat {
+        return UIFont.systemFontOfSize(UIFont.systemFontSize()).lineHeight * 2 * UIScreen.mainScreen().scale
+    }
+
     func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int {
         return 2
     }
@@ -270,16 +274,10 @@ extension RealTimeViewController: UIPickerViewDelegate, UIPickerViewDataSource {
     }
 
     func pickerView(pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusingView view: UIView?) -> UIView {
-        var label : UILabel
+
+        let label : UILabel
         if view == nil {
-            let height = UIFont.systemFontOfSize(UIFont.systemFontSize()).lineHeight * 2 * UIScreen.mainScreen().scale
-            label = UILabel(frame: CGRectMake(0, 0, 0, height))
-            label.textAlignment = .Center
-            label.numberOfLines = 2
-            label.lineBreakMode = .ByTruncatingTail
-            label.autoresizingMask = .FlexibleWidth
-            label.textColor = UIColor.whiteColor()
-            label.font = UIFont(name: "Avenir-Book", size: 17.0)
+            label = createPickerViewLabel()
         } else {
             label = view as! UILabel
         }
@@ -307,11 +305,22 @@ extension RealTimeViewController: UIPickerViewDelegate, UIPickerViewDataSource {
     }
 
     func pickerView(pickerView: UIPickerView, rowHeightForComponent component: Int) -> CGFloat {
-        return UIFont.systemFontOfSize(UIFont.systemFontSize()).lineHeight * 2 * UIScreen.mainScreen().scale
+        return pickerViewComponentLabelHeight
+    }
+
+    func createPickerViewLabel() -> UILabel {
+        let label = UILabel(frame: CGRectMake(0, 0, 0, pickerViewComponentLabelHeight))
+        label.textAlignment = .Center
+        label.numberOfLines = 2
+        label.lineBreakMode = .ByTruncatingTail
+        label.autoresizingMask = .FlexibleWidth
+        label.textColor = .whiteColor()
+        label.font = UIFont(name: "Avenir-Book", size: 17.0)
+        return label
     }
 }
 
-// Mark: - RealTimeViewModel Delegate 
+// Mark: - RealTimeViewModel Delegate
 
 extension RealTimeViewController: RealTimeViewModelDelegate {
 

diff --git a/HopperBus/Models/RouteViewModelContainer.swift b/HopperBus/Models/RouteViewModelContainer.swift
@@ -76,13 +76,3 @@ class RouteViewModelContainer {
         }
     }
 }
-
-extension NSDate {
-    class func currentTimeAsString() -> String {
-        let dateFormatter = NSDateFormatter()
-        dateFormatter.timeStyle = .ShortStyle
-        dateFormatter.locale = NSLocale(localeIdentifier: "en_US_POSIX")
-        dateFormatter.dateFormat = "HH:mm"
-        return dateFormatter.stringFromDate(NSDate())
-    }
-}
diff --git a/HopperBus/Utility/Extensions.swift b/HopperBus/Utility/Extensions.swift
@@ -203,4 +203,12 @@ extension NSDate {
         let components2 = NSCalendar.currentCalendar().components(componentFlags, fromDate:secondDate)
         return  ( (components1.year == components2.year) && (components1.month == components2.month) && (components1.day == components2.day) )
     }
+
+    class func currentTimeAsString() -> String {
+        let dateFormatter = NSDateFormatter()
+        dateFormatter.timeStyle = .ShortStyle
+        dateFormatter.locale = NSLocale(localeIdentifier: "en_US_POSIX")
+        dateFormatter.dateFormat = "HH:mm"
+        return dateFormatter.stringFromDate(NSDate())
+    }
 }