Merge pull request #199 from lennet/swift-format

Fixed Swiftformat
criticalmaps · Nov 24, 2019 · 26e3844 · 26e3844
2 parents cf1444e + 14b1ee7
commit 26e3844
Show file tree

Hide file tree

Showing 39 changed files with 174 additions and 179 deletions.
diff --git a/CriticalMaps.xcodeproj/project.pbxproj b/CriticalMaps.xcodeproj/project.pbxproj
@@ -1035,7 +1035,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ $CONFIGURATION = \"Debug\" ]; then\n    $SOURCE_ROOT/bin/license-plist --output-path ./Settings.bundle\nfi\n";
+			shellScript = "if [ $CONFIGURATION = \"Debug\" ]; then\n    $SOURCE_ROOT/bin/swiftformat .\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/CriticalMapsMocksForTests/MockNetworkDataProvider.swift b/CriticalMapsMocksForTests/MockNetworkDataProvider.swift
@@ -13,10 +13,10 @@ struct MockNetworkDataProvider: NetworkDataProvider {
     var data: Data?
     var response: URLResponse?
     var error: Error?
-    
-    func dataTask(with request: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) {
+
+    func dataTask(with _: URLRequest, completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) {
         completionHandler(data, response, error)
     }
-    
+
     func invalidateAndCancel() {}
 }
diff --git a/CriticalMapsMocksForTests/MockThemeController.swift b/CriticalMapsMocksForTests/MockThemeController.swift
@@ -10,7 +10,7 @@
 
 class MockThemeController: ThemeController {
     static let shared = MockThemeController()
-    
+
     private init() {
         let store = MockThemeStore()
         super.init(store: store)

diff --git a/CriticalMapsSnapshotTests/RulesDetailViewControllerSnapshotTests.swift b/CriticalMapsSnapshotTests/RulesDetailViewControllerSnapshotTests.swift
@@ -10,7 +10,6 @@
 import XCTest
 
 class RulesDetailViewControllerSnapshotTests: XCTestCase {
-
     func testGeneralAppearance() {
         // Given
         let viewController = RulesDetailViewController(rule: Rule.cork)

diff --git a/CriticalMapsSnapshotTests/TweetTableViewCellSnapshotTests.swift b/CriticalMapsSnapshotTests/TweetTableViewCellSnapshotTests.swift
@@ -12,11 +12,11 @@ import XCTest
 class TweetTableViewCellSnapshotTests: XCTestCase {
     private let size = CGSize(width: 320, height: 100)
     // use constant date in the past
-    private let tweetDate = Date(timeIntervalSince1970: 1530230956)    
-    
+    private let tweetDate = Date(timeIntervalSince1970: 1_530_230_956)
+
     override func setUp() {
         // use constant date in the past
-        FormatDisplay.currentDate = Date(timeIntervalSince1970: 1530240956)
+        FormatDisplay.currentDate = Date(timeIntervalSince1970: 1_530_240_956)
     }
 
     func testTweetTableViewCell() {
@@ -28,10 +28,10 @@ class TweetTableViewCellSnapshotTests: XCTestCase {
                                             profile_image_url_https: "haa"),
                           id_str: "test_id")
         let cell = TweetTableViewCell.fromNib()
-        
+
         // when
         cell.setup(for: tweet)
-        
+
         // then
         assertViewSnapshot(matching: cell, with: size)
     }

diff --git a/CriticalMapsSnapshotTests/XCTestCase+SnapshotTests.swift b/CriticalMapsSnapshotTests/XCTestCase+SnapshotTests.swift
@@ -12,14 +12,14 @@ import XCTest
 
 extension XCTestCase {
     func assertViewSnapshot(for themes: [Theme] = [.light, .dark],
-                              matching value: UIView,
-                              with size: CGSize? = nil,
-                              file: StaticString = #file,
-                              testName: String = #function,
-                              line: UInt = #line) {
+                            matching value: UIView,
+                            with size: CGSize? = nil,
+                            file: StaticString = #file,
+                            testName: String = #function,
+                            line: UInt = #line) {
         themes.forEach { theme in
             MockThemeController.shared.changeTheme(to: theme)
-            MockThemeController.shared.applyTheme()            
+            MockThemeController.shared.applyTheme()
             assertSnapshot(matching: value,
                            as: .image(size: size),
                            named: theme.displayName,

diff --git a/CriticalMapsUITests/CriticalMapsUITests.swift b/CriticalMapsUITests/CriticalMapsUITests.swift
@@ -9,14 +9,13 @@
 import XCTest
 
 class CriticalMapsUITests: XCTestCase {
-
     override func setUp() {
         super.setUp()
         continueAfterFailure = false
 
         let app = XCUIApplication()
         app.launchArguments += [
-            "SKIP_ANIMATIONS"
+            "SKIP_ANIMATIONS",
         ]
         setupSnapshot(app, waitForAnimations: false)
         app.launch()

diff --git a/CriticalMapsUITests/SnapshotHelper.swift b/CriticalMapsUITests/SnapshotHelper.swift
@@ -52,7 +52,7 @@ enum SnapshotError: Error, CustomDebugStringConvertible {
             return "Couldn't find Snapshot configuration files - can't detect `Users` dir"
         case .cannotFindSimulatorHomeDirectory:
             return "Couldn't find simulator home location. Please, check SIMULATOR_HOST_HOME env variable."
-        case .cannotAccessSimulatorHomeDirectory(let simulatorHostHome):
+        case let .cannotAccessSimulatorHomeDirectory(simulatorHostHome):
             return "Can't prepare environment. Simulator home location is inaccessible. Does \(simulatorHostHome) exist?"
         case .cannotRunOnPhysicalDevice:
             return "Can't use Snapshot on a physical device."
@@ -70,7 +70,6 @@ open class Snapshot: NSObject {
     }
 
     open class func setupSnapshot(_ app: XCUIApplication, waitForAnimations: Bool = true) {
-
         Snapshot.app = app
         Snapshot.waitForAnimations = waitForAnimations
 
@@ -80,7 +79,7 @@ open class Snapshot: NSObject {
             setLanguage(app)
             setLocale(app)
             setLaunchArguments(app)
-        } catch let error {
+        } catch {
             NSLog(error.localizedDescription)
         }
     }
@@ -117,7 +116,7 @@ open class Snapshot: NSObject {
             NSLog("Couldn't detect/set locale...")
         }
 
-        if locale.isEmpty && !deviceLanguage.isEmpty {
+        if locale.isEmpty, !deviceLanguage.isEmpty {
             locale = Locale(identifier: deviceLanguage).identifier
         }
 
@@ -184,7 +183,7 @@ open class Snapshot: NSObject {
 
                 let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
                 try screenshot.pngRepresentation.write(to: path)
-            } catch let error {
+            } catch {
                 NSLog("Problem writing screenshot: \(name) to \(screenshotsDir)/\(simulator)-\(name).png")
                 NSLog(error.localizedDescription)
             }
@@ -266,13 +265,13 @@ private extension XCUIElementAttributes {
 
 private extension XCUIElementQuery {
     var networkLoadingIndicators: XCUIElementQuery {
-        let isNetworkLoadingIndicator = NSPredicate { (evaluatedObject, _) in
+        let isNetworkLoadingIndicator = NSPredicate { evaluatedObject, _ in
             guard let element = evaluatedObject as? XCUIElementAttributes else { return false }
 
             return element.isNetworkLoadingIndicator
         }
 
-        return self.containing(isNetworkLoadingIndicator)
+        return containing(isNetworkLoadingIndicator)
     }
 
     var deviceStatusBars: XCUIElementQuery {
@@ -282,19 +281,19 @@ private extension XCUIElementQuery {
 
         let deviceWidth = app.windows.firstMatch.frame.width
 
-        let isStatusBar = NSPredicate { (evaluatedObject, _) in
+        let isStatusBar = NSPredicate { evaluatedObject, _ in
             guard let element = evaluatedObject as? XCUIElementAttributes else { return false }
 
             return element.isStatusBar(deviceWidth)
         }
 
-        return self.containing(isStatusBar)
+        return containing(isStatusBar)
     }
 }
 
 private extension CGFloat {
     func isBetween(_ numberA: CGFloat, and numberB: CGFloat) -> Bool {
-        return numberA...numberB ~= self
+        return numberA ... numberB ~= self
     }
 }
 

diff --git a/CriticalMass/AnnotationController.swift b/CriticalMass/AnnotationController.swift
@@ -17,6 +17,6 @@ class AnnotationController<T: IdentifiableAnnnotation, K: MKAnnotationView> {
         self.mapView = mapView
         setup()
     }
-    
+
     open func setup() {}
 }
diff --git a/CriticalMass/AppController.swift b/CriticalMass/AppController.swift
@@ -24,7 +24,7 @@ class AppController {
 
         let networkDataProvider: NetworkDataProvider
         if simulationModeEnabled {
-            networkDataProvider  = SimulationNetworkDataProvider(realNetworkDataProvider: session)
+            networkDataProvider = SimulationNetworkDataProvider(realNetworkDataProvider: session)
         } else {
             networkDataProvider = session
         }
@@ -44,7 +44,7 @@ class AppController {
     private lazy var twitterManager: TwitterManager = {
         TwitterManager(networkLayer: networkOperator, request: TwitterRequest())
     }()
-    
+
     lazy var rootViewController: UIViewController = {
         let rootViewController = MapViewController(themeController: self.themeController)
         let navigationOverlay = NavigationOverlayViewController(navigationItems: [
@@ -75,7 +75,7 @@ class AppController {
             RatingHelper().onLaunch()
         }
     }
-    
+
     public func onWillEnterForeground() {
         if #available(iOS 10.3, *) {
             RatingHelper().onEnterForeground()
@@ -85,7 +85,7 @@ class AppController {
     public func enableSimulationMode() {
         simulationModeEnabled = true
     }
-    
+
     private func getRulesViewController() -> RulesViewController {
         return RulesViewController()
     }

diff --git a/CriticalMass/AppDelegate.swift b/CriticalMass/AppDelegate.swift
@@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     lazy var appController = AppController()
 
     func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-
         // Test Configuration
         if let shouldEarlyExitForTests = configureAppForTests() {
             return shouldEarlyExitForTests
@@ -41,7 +40,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             if ProcessInfo.processInfo.arguments.contains("SKIP_ANIMATIONS") {
                 UIView.setAnimationsEnabled(false)
             }
-        
+
             if ProcessInfo.processInfo.arguments.contains("SIMULATION_MODE") {
                 appController.enableSimulationMode()
             }

diff --git a/CriticalMass/CMLogoActivityView.swift b/CriticalMass/CMLogoActivityView.swift
@@ -12,7 +12,7 @@ import UIKit
 @IBDesignable public class CMLogoActivityView: UIView, IBConstructable {
     private var angle: CGFloat = 0
     private lazy var displayLink: CADisplayLink = {
-        return CADisplayLink(target: self, selector: #selector(updateViewParameter))
+        CADisplayLink(target: self, selector: #selector(updateViewParameter))
     }()
 
     public override func draw(_: CGRect) {
@@ -105,7 +105,7 @@ public struct CriticalMapsLoader {
         //// gear
         context.saveGState()
         context.translateBy(x: 50, y: 50)
-        context.rotate(by: -angle * CGFloat.pi/180)
+        context.rotate(by: -angle * CGFloat.pi / 180)
 
         //// Bezier 4 Drawing
         context.saveGState()

diff --git a/CriticalMass/ChatInputView.swift b/CriticalMass/ChatInputView.swift
@@ -136,6 +136,6 @@ class ChatInputView: UIView {
 
 private extension String {
     var canBeSent: Bool {
-        !self.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+        !trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
     }
 }
diff --git a/CriticalMass/ChatManager.swift b/CriticalMass/ChatManager.swift
@@ -5,8 +5,8 @@
 //  Created by Leonard Thomas on 1/26/19.
 //
 
-import Foundation
 import Crypto
+import Foundation
 
 class ChatManager {
     private var cachedMessages: [ChatMessage]?

diff --git a/CriticalMass/ChatViewController.swift b/CriticalMass/ChatViewController.swift
@@ -11,6 +11,7 @@ class ChatViewController: UIViewController, ChatInputDelegate {
     private enum Constants {
         static let chatInputHeight: CGFloat = 64
     }
+
     private let chatInput = ChatInputView(frame: .zero)
     private let messagesTableViewController = MessagesTableViewController<ChatMessageTableViewCell>(style: .plain)
     private let chatManager: ChatManager

diff --git a/CriticalMass/Constants.swift b/CriticalMass/Constants.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum Constants {
     static let apiEndpoint = URL(string: "https://api.criticalmaps.net/")!
     static let criticalMapsiOSGitHubEndpoint = URL(string: "https://github.com/criticalmaps/criticalmaps-ios")!

diff --git a/CriticalMass/ErrorStateViewController.swift b/CriticalMass/ErrorStateViewController.swift
@@ -11,9 +11,9 @@ import UIKit
 typealias ReloadHandler = () -> Void
 
 class ErrorStateViewController: UIViewController, IBConstructable {
-    @IBOutlet private weak var errorTitle: UILabel!
-    @IBOutlet private weak var errorMessage: UILabel!
-    @IBOutlet private weak var retryButton: UIButton!
+    @IBOutlet private var errorTitle: UILabel!
+    @IBOutlet private var errorMessage: UILabel!
+    @IBOutlet private var retryButton: UIButton!
 
     var reloadHandler: ReloadHandler?
     var errorStateModel: ErrorStateModel!
@@ -28,7 +28,7 @@ class ErrorStateViewController: UIViewController, IBConstructable {
         errorMessage.text = errorStateModel.errorMessage
     }
 
-    @IBAction func reload(_ sender: Any) {
+    @IBAction func reload(_: Any) {
         reloadHandler?()
     }
 }

diff --git a/CriticalMass/FormatDisplay.swift b/CriticalMass/FormatDisplay.swift
@@ -31,7 +31,7 @@ private extension DateComponents {
 enum FormatDisplay {
     // inject current date to be able to keep the same time difference between tweet date and current date
     static var currentDate = Date()
-    
+
     static func dateString(for tweet: Tweet) -> String? {
         let components = Calendar.current.dateComponents([.minute, .hour, .day, .month], from: tweet.created_at, to: currentDate).dateomponentFromBiggestComponent
         let formatter = DateComponentsFormatter()

diff --git a/CriticalMass/IDProvider.swift b/CriticalMass/IDProvider.swift
@@ -10,6 +10,6 @@ import Foundation
 public protocol IDProvider {
     var id: String { get }
     var token: String { get }
-    
+
     static func hash(id: String, currentDate: Date) -> String
 }
diff --git a/CriticalMass/IDStore.swift b/CriticalMass/IDStore.swift
@@ -5,26 +5,25 @@
 //  Created by Leonard Thomas on 5/2/19.
 //
 
-import UIKit
 import Crypto
+import UIKit
 
 public class IDStore: IDProvider {
-
     public let id: String
     public let token: String
-    
+
     public init(currentDate: Date = Date()) {
         let deviceID = UIDevice.current.identifierForVendor?.uuidString ?? UUID().uuidString
 
         id = IDStore.hash(id: deviceID, currentDate: currentDate)
         token = deviceID
     }
 
-    static public func hash(id: String, currentDate: Date = Date()) -> String {
+    public static func hash(id: String, currentDate: Date = Date()) -> String {
         let format = DateFormatter()
         format.dateFormat = "yyyy-MM-dd"
         let dateString = format.string(from: currentDate)
-        
+
         return String(id + dateString).md5!
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             self.mapView = mapView
             setup()
         }
         open func setup() {}
     }