Optimization

Ramotion · May 4, 2016 · eb064a0 · eb064a0
1 parent 23bbe54
commit eb064a0
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 331 deletions.
diff --git a/RAMReel/AppDelegate.swift b/RAMReel/AppDelegate.swift
diff --git a/RAMReel/Base.lproj/LaunchScreen.xib b/RAMReel/Base.lproj/LaunchScreen.xib
diff --git a/RAMReel/Base.lproj/Main.storyboard b/RAMReel/Base.lproj/Main.storyboard
diff --git a/RAMReel/Framework/CollectionViewLayout.swift b/RAMReel/Framework/CollectionViewLayout.swift
@@ -87,16 +87,15 @@ class RAMCollectionViewLayout: UICollectionViewLayout {
 
     internal override func collectionViewContentSize() -> CGSize {
 
-        if let collectionView = self.collectionView
-        {
-            let number = collectionView.numberOfItemsInSection(0)
-            let height = CGFloat(number) * itemHeight
-
-            let size = CGSize(width: collectionView.bounds.width, height: height)
-            return size
+        guard let collectionView = self.collectionView else {
+            return CGSize.zero
         }
 
-        return CGSizeZero
+        let number = collectionView.numberOfItemsInSection(0)
+        let height = CGFloat(number) * itemHeight
+
+        let size = CGSize(width: collectionView.bounds.width, height: height)
+        return size
 
     }
 }

diff --git a/RAMReel/Framework/CollectionViewWrapper.swift b/RAMReel/Framework/CollectionViewWrapper.swift
@@ -147,20 +147,19 @@ public class CollectionViewWrapper
 
     var selectedItem: DataType?
     func indexCallback(idx: Int?) {
-        if let index = idx
-            where 0 <= index && index < data.count {
-                let item = data[index]
-                selectedItem = item
-
-                // TODO: Update cell appearance maybe?
-                // Toggle selected?
-                let indexPath = NSIndexPath(forItem: index, inSection: 0)
-                let cell = collectionView.cellForItemAtIndexPath(indexPath)
-                cell?.selected = true
-        }
-        else {
+        guard let index = idx where 0 <= index && index < data.count else {
             selectedItem = nil
+            return
         }
+
+        let item = data[index]
+        selectedItem = item
+
+        // TODO: Update cell appearance maybe?
+        // Toggle selected?
+        let indexPath = NSIndexPath(forItem: index, inSection: 0)
+        let cell = collectionView.cellForItemAtIndexPath(indexPath)
+        cell?.selected = true
     }
 
     // MARK Implementation of WrapperProtocol
@@ -183,12 +182,11 @@ public class CollectionViewWrapper
 
     func cellAttributes(rect: CGRect) -> [UICollectionViewLayoutAttributes] {
         let layout = collectionView.collectionViewLayout
-        if let attributes    = layout.layoutAttributesForElementsInRect(rect)
-        {
-            return attributes
+        guard let attributes = layout.layoutAttributesForElementsInRect(rect) else {
+            return []
         }
 
-        return []
+        return attributes
     }
 
     // MARK: Update & Adjust
@@ -201,13 +199,15 @@ public class CollectionViewWrapper
             let number    = self.collectionView.numberOfItemsInSection(0)
             let itemIndex = self.scrollDelegate.itemIndex ?? number/2
 
-            if itemIndex > 0 {
-                let inset      = self.collectionView.contentInset.top
-                let itemHeight = self.collectionLayout.itemHeight
-                let offset     = CGPoint(x: 0, y: CGFloat(itemIndex) * itemHeight - inset)
-
-                self.collectionView.contentOffset = offset
+            guard itemIndex > 0 else {
+                return
             }
+
+            let inset      = self.collectionView.contentInset.top
+            let itemHeight = self.collectionLayout.itemHeight
+            let offset     = CGPoint(x: 0, y: CGFloat(itemIndex) * itemHeight - inset)
+
+            self.collectionView.contentOffset = offset
         }
     }
 
@@ -244,8 +244,7 @@ class ScrollViewDelegate: NSObject, UIScrollViewDelegate {
     var itemIndexChangeCallback: ItemIndexChangeCallback?
     private(set) var itemIndex: Int? = nil {
         willSet (newIndex) {
-            if let callback = itemIndexChangeCallback
-            {
+            if let callback = itemIndexChangeCallback {
                 callback(newIndex)
             }
         }

diff --git a/RAMReel/Framework/RAMReel.swift b/RAMReel/Framework/RAMReel.swift
@@ -145,10 +145,17 @@ public class RAMReel
     /// Visual appearance theme
     public var theme: Theme = RAMTheme.sharedTheme {
         didSet {
-            if theme.font != oldValue.font || theme.listBackgroundColor != oldValue.listBackgroundColor || theme.textColor != oldValue.textColor {
-                updateVisuals()
-                updatePlaceholder(self.placeholder)
+            guard theme.font != oldValue.font
+                    ||
+                    theme.listBackgroundColor != oldValue.listBackgroundColor
+                    ||
+                    theme.textColor != oldValue.textColor
+                else {
+                    return
             }
+
+            updateVisuals()
+            updatePlaceholder(self.placeholder)
         }
     }
 

diff --git a/RAMReel/Framework/RAMTextField.swift b/RAMReel/Framework/RAMTextField.swift
@@ -22,7 +22,7 @@ public class RAMTextField: UITextField {
      Overriding UIView's drawRect method to add line in the bottom of the Text Field
 
      - parameter rect: Rect that should be updated. This override ignores this parameter and redraws all text field
-    */
+     */
     override public func drawRect(rect: CGRect) {
         let rect = self.bounds
         let ctx = UIGraphicsGetCurrentContext()
@@ -50,7 +50,7 @@ extension UITextField {
 
     /**
      Overriding `UITextField` `tintColor` property to make it affect close image tint color.
-    */
+     */
     public override var tintColor: UIColor! {
         get {
             return super.tintColor
@@ -61,13 +61,14 @@ extension UITextField {
 
             let subviews = self.subviews
             for view in subviews {
-                if let button = view as? UIButton
-                {
-                    let states: [UIControlState] = [.Normal, .Highlighted]
-                    states.forEach { state -> Void in
-                        let image = button.imageForState(state)?.tintedImage(self.tintColor)
-                        button.setImage(image, forState: state)
-                    }
+                guard let button = view as? UIButton else {
+                    break
+                }
+
+                let states: [UIControlState] = [.Normal, .Highlighted]
+                states.forEach { state -> Void in
+                    let image = button.imageForState(state)?.tintedImage(self.tintColor)
+                    button.setImage(image, forState: state)
                 }
             }
         }
@@ -83,7 +84,7 @@ extension UIImage {
      Create new image by applying a tint.
 
      - parameter color: New image tint color.
-    */
+     */
     public func tintedImage(color: UIColor) -> UIImage {
         let size = self.size
 

diff --git a/RAMReel/Images.xcassets/AppIcon.appiconset/Contents.json b/RAMReel/Images.xcassets/AppIcon.appiconset/Contents.json