Fix SwiftLint violations

Author: alejandro-isaza

.swiftlint.yml

@@ -1,7 +1,7 @@
 disabled_rules:
   - line_length
   - type_body_length
-  - variable_name
-  - variable_name_min_length
   - file_length
+  - trailing_comma
   - valid_docs
+  - variable_name

C4/Core/Color.swift

@@ -91,7 +91,6 @@ public class Color {
         internalColor = CGColor(colorSpace: colorSpace, components: [CGFloat(red), CGFloat(green), CGFloat(blue), CGFloat(alpha)])!
     }
 
-
     /// Initializes and returns a new Color object based on specified color values.
     /// ````
     /// let c = Color(hue: 1.0, saturation: 0.0, brightness: 0.0, alpha: 1.0)

C4/Core/EventSource.swift

@@ -93,7 +93,7 @@ extension NSObject : EventSource {
     @discardableResult
     public func on(event notificationName: String, from sender: AnyObject?, run executionBlock: @escaping (Void) -> Void) -> AnyObject {
         let nc = NotificationCenter.default
-        return nc.addObserver(forName: NSNotification.Name(rawValue: notificationName), object: sender, queue: OperationQueue.current, using: { notification in
+        return nc.addObserver(forName: NSNotification.Name(rawValue: notificationName), object: sender, queue: OperationQueue.current, using: { _ in
             executionBlock()
         })
     }

C4/Core/Foundation.swift

@@ -19,7 +19,6 @@
 
 import CoreGraphics
 
-
 /// Prints a string to the console. Replacement for the noisy NSlog.
 ///
 /// ````
@@ -32,7 +31,6 @@ public func C4Log<T>(_ value: T) {
     print("[C4Log] \(value)")
 }
 
-
 /// Returns a rectangle that contains all of the specified coordinates in an array.
 ///
 /// ````
@@ -61,6 +59,6 @@ public func CGRectMakeFromPoints(_ points: [CGPoint]) -> CGRect {
 ///
 /// - parameter delay:  The amount of time in seconds to wait before executing the block of code.
 /// - parameter action: A block of code to perform after the delay.
-public func wait(_ seconds: Double, action: @escaping ()->()) {
+public func wait(_ seconds: Double, action: @escaping () -> Void) {
     DispatchQueue.main.asyncAfter(wallDeadline: DispatchWallTime.now() + seconds, execute: action)
 }

C4/Core/Path.swift

@@ -33,7 +33,6 @@ public enum FillRule {
     case EvenOdd
 }
 
-
 /// A Path is a sequence of geometric segments which can be straight lines or curves.
 @IBDesignable
 public class Path: Equatable {
@@ -86,9 +85,7 @@ public class Path: Equatable {
 
     /// A CGPathRef representation of the receiver's path.
     public var CGPath: CoreGraphics.CGPath {
-        get {
-            return internalPath
-        }
+        return internalPath
     }
 }
 

C4/Core/Point.swift

@@ -96,9 +96,7 @@ public struct Point: Equatable, CustomStringConvertible {
     ///
     /// - returns: A string formatted to look like {x,y}
     public var description: String {
-        get {
-            return "{\(x), \(y)}"
-        }
+        return "{\(x), \(y)}"
     }
 }
 

C4/Core/Rect.swift

@@ -119,7 +119,7 @@ public struct Rect: Equatable, CustomStringConvertible {
         self.init(f.origin, f.size)
     }
 
-    //MARK: - Comparing
+    // MARK: - Comparing
 
     /// Returns whether two rectangles intersect.
     /// ````
@@ -135,7 +135,7 @@ public struct Rect: Equatable, CustomStringConvertible {
         return CGRect(self).intersects(CGRect(rect))
     }
 
-    //MARK: - Center & Max
+    // MARK: - Center & Max
 
     /// The center point of the receiver.
     /// ````
@@ -158,9 +158,7 @@ public struct Rect: Equatable, CustomStringConvertible {
     /// r.max //-> {15,15}
     /// ````
     public var max: Point {
-        get {
-            return Point(origin.x + size.width, origin.y + size.height)
-        }
+        return Point(origin.x + size.width, origin.y + size.height)
     }
 
     /// Checks to see if the receiver has zero size and position
@@ -173,7 +171,7 @@ public struct Rect: Equatable, CustomStringConvertible {
         return origin.isZero() && size.isZero()
     }
 
-    //MARK: - Membership
+    // MARK: - Membership
 
     /// Returns whether a rectangle contains a specified point.
     /// ````
@@ -206,13 +204,11 @@ public struct Rect: Equatable, CustomStringConvertible {
     /// A string representation of the rect.
     /// - returns: A string formatted to look like {{x,y},{w,h}}
     public var description: String {
-        get {
-            return "{\(origin),\(size)}"
-        }
+        return "{\(origin),\(size)}"
     }
 }
 
-//MARK: - Comparing
+// MARK: - Comparing
 
 /// Checks to see if two Rects share identical origin and size
 ///
@@ -228,7 +224,7 @@ public func == (lhs: Rect, rhs: Rect) -> Bool {
     return lhs.origin == rhs.origin && lhs.size == rhs.size
 }
 
-//MARK: - Manipulating
+// MARK: - Manipulating
 
 /// Returns the intersection of two rectangles.
 ///

C4/Core/Size.swift

@@ -80,9 +80,7 @@ public struct Size: Equatable, Comparable, CustomStringConvertible {
     ///
     /// - returns: A string formatted to look like {w,h}
     public var description: String {
-        get {
-            return "{\(width),\(height)}"
-        }
+        return "{\(width),\(height)}"
     }
 }
 

C4/Core/Transform.swift

@@ -277,7 +277,6 @@ public func * (t: Transform, s: Double) -> Transform {
     return r
 }
 
-
 /// Transform matrix scalar multiplication
 /// - parameter s: A scalar value to apply to the transform
 /// - parameter t: The transform to scale
@@ -286,7 +285,6 @@ public func * (s: Double, t: Transform) -> Transform {
     return t * s
 }
 
-
 /// Concatenate two transformations. This is the same as t2 * t1.
 /// - parameter t1: The first transform to contatenate
 /// - parameter t2: The second transform to contatenate

C4/UI/Animation.swift

@@ -69,7 +69,6 @@ public class Animation {
     private var completionObservers: [AnyObject] = []
     private var cancelObservers: [AnyObject] = []
 
-
     static var stack = [Animation]()
     static var currentAnimation: Animation? {
         return stack.last
@@ -102,7 +101,7 @@ public class Animation {
     /// - returns: the observer object.
     public func addCompletionObserver(_ action: @escaping () -> Void) -> AnyObject {
         let nc = NotificationCenter.default
-        let observer = nc.addObserver(forName: NSNotification.Name(rawValue: AnimationCompletedEvent), object: self, queue: OperationQueue.current, using: { notification in
+        let observer = nc.addObserver(forName: NSNotification.Name(rawValue: AnimationCompletedEvent), object: self, queue: OperationQueue.current, using: { _ in
             action()
         })
         completionObservers.append(observer)
@@ -135,7 +134,7 @@ public class Animation {
     /// - returns: the observer object.
     public func addCancelObserver(_ action: @escaping () -> Void) -> AnyObject {
         let nc = NotificationCenter.default
-        let observer = nc.addObserver(forName: NSNotification.Name(rawValue: AnimationCancelledEvent), object: self, queue: OperationQueue.current, using: { notification in
+        let observer = nc.addObserver(forName: NSNotification.Name(rawValue: AnimationCancelledEvent), object: self, queue: OperationQueue.current, using: { _ in
             action()
         })
         cancelObservers.append(observer)

C4/UI/AudioPlayer.swift

@@ -98,16 +98,12 @@ public class AudioPlayer: NSObject, AVAudioPlayerDelegate {
 
     /// Returns the total duration, in seconds, of the sound associated with the audio player. (read-only)
     public var duration: Double {
-        get {
-            return Double(player.duration)
-        }
+        return Double(player.duration)
     }
 
     /// Returns true if the receiver's current playback rate > 0. Otherwise returns false.
     public var playing: Bool {
-        get {
-            return player.isPlaying
-        }
+        return player.isPlaying
     }
 
     /// The audio player’s stereo pan position.

C4/UI/Camera.swift

@@ -37,7 +37,7 @@ public class Camera: View {
     var input: AVCaptureDeviceInput?
     var stillImageOutput: AVCaptureStillImageOutput?
     var captureSession: AVCaptureSession?
-    var didCaptureAction: (()->())?
+    var didCaptureAction: (() -> Void)?
     var orientationObserver: AnyObject?
 
     class CameraView: UIView {
@@ -51,9 +51,7 @@ public class Camera: View {
     }
 
     var previewLayer: PreviewLayer {
-        get {
-            return self.cameraView.previewLayer
-        }
+        return self.cameraView.previewLayer
     }
 
     var cameraView: CameraView {
@@ -139,7 +137,7 @@ public class Camera: View {
     func initializeOutput(_ device: AVCaptureDevice) {
         if stillImageOutput == nil {
             stillImageOutput = AVCaptureStillImageOutput()
-            stillImageOutput?.outputSettings = [AVVideoCodecKey : AVVideoCodecJPEG]
+            stillImageOutput?.outputSettings = [AVVideoCodecKey: AVVideoCodecJPEG]
         }
     }
 
@@ -182,7 +180,7 @@ public class Camera: View {
             updateOrientation()
             connection.videoOrientation = previewLayer.connection.videoOrientation
 
-            stillImageOutput?.captureStillImageAsynchronously(from: connection) { imageSampleBuffer, error in
+            stillImageOutput?.captureStillImageAsynchronously(from: connection) { imageSampleBuffer, _ in
                 guard imageSampleBuffer != nil else {
                     print("Couldn't capture image from still image output")
                     return
@@ -218,7 +216,7 @@ public class Camera: View {
         return image
     }
 
-    public func didCaptureImage(_ action: (()->())?) {
+    public func didCaptureImage(_ action: (() -> Void)?) {
         didCaptureAction = action
     }
 }

C4/UI/Curve.swift

@@ -46,7 +46,7 @@ public class Curve: Shape {
         }
         set {
             let diff = newValue - center
-            batchUpdates() {
+            batchUpdates {
                 self.endPoints.0 += diff
                 self.endPoints.1 += diff
                 self.controlPoints.0 += diff
@@ -62,7 +62,7 @@ public class Curve: Shape {
         }
         set {
             let diff = newValue - origin
-            batchUpdates() {
+            batchUpdates {
                 self.endPoints.0 += diff
                 self.endPoints.1 += diff
                 self.controlPoints.0 += diff

C4/UI/Font.swift

@@ -113,7 +113,6 @@ public class Font {
         return Font(font: UIFont.italicSystemFont(ofSize: CGFloat(size)))
     }
 
-
     /// Returns a font object that is the same as the receiver but which has the specified size instead.
     /// ````
     /// let f = Font(name: "Avenir Next")

C4/UI/Image.swift

@@ -33,12 +33,10 @@ public class Image: View, NSCopying {
 
     /// Shape's contents are drawn on a ShapeLayer.
     public var imageLayer: ImageLayer {
-        get {
-            return self.imageView.imageLayer
-        }
+        return self.imageView.imageLayer
     }
 
-    //MARK: Initializers
+    // MARK: Initializers
 
     /// Initializes an empty Image
     public override init() {
@@ -288,7 +286,7 @@ public class Image: View, NSCopying {
         return img
     }
 
-    //MARK: Properties
+    // MARK: Properties
 
     /// Returns the UIImageView of the object.
     /// - returns: A UIImageView object.
@@ -299,27 +297,21 @@ public class Image: View, NSCopying {
     /// Returns a UIImage representation of the receiver.
     /// - returns:	A UIImage object.
     public var uiimage: UIImage {
-        get {
-            let layer = imageView.layer as CALayer
-            let contents = layer.contents as! CGImage // swiftlint:disable:this force_cast
-            return UIImage(cgImage: contents, scale: CGFloat(scale), orientation: imageView.image!.imageOrientation)
-        }
+        let layer = imageView.layer as CALayer
+        let contents = layer.contents as! CGImage // swiftlint:disable:this force_cast
+        return UIImage(cgImage: contents, scale: CGFloat(scale), orientation: imageView.image!.imageOrientation)
     }
 
     /// Returns a CGImageRef representation of the receiver.
     /// - returns:	A CGImageRef object.
     public var cgImage: CGImage {
-        get {
-            return uiimage.cgImage!
-        }
+        return uiimage.cgImage!
     }
 
     /// Returns a CIImage representation of the receiver. Generally, this would be used to work with filters.
     /// - returns:	A CIImage object.
     public var ciImage: CIImage {
-        get {
-            return CIImage(cgImage: cgImage)
-        }
+        return CIImage(cgImage: cgImage)
     }
 
     /// An object that provides the contents of the layer. Animatable.
@@ -350,7 +342,6 @@ public class Image: View, NSCopying {
         }
     }
 
-
     /// The scale factor of the image. (read-only)
     var scale: Double {
         return Double(imageView.image!.scale)
@@ -402,19 +393,15 @@ public class Image: View, NSCopying {
     internal var _originalSize: Size = Size()
     /// The original size of the receiver when it was initialized.
     public var originalSize: Size {
-        get {
-            return _originalSize
-        }
+        return _originalSize
     }
 
     /// The original width/height ratio of the receiver when it was initialized.
     public var originalRatio: Double {
-        get {
-            return _originalSize.width / _originalSize.height
-        }
+        return _originalSize.width / _originalSize.height
     }
 
-    //MARK: Filters
+    // MARK: Filters
     lazy internal var output: CIImage = self.ciImage
     lazy internal var filterQueue: DispatchQueue = {
         return DispatchQueue.global(qos: .background)

C4/UI/ImageLayer.swift

@@ -55,7 +55,6 @@ public class ImageLayer: CALayer {
         return animation
     }
 
-
     private var _rotation = 0.0
 
     /// The value of the receiver's current rotation state.