Run SwiftFormat

3lvis · Oct 17, 2016 · abaea90 · abaea90
1 parent 96d0a49
commit abaea90
Show file tree

Hide file tree

Showing 18 changed files with 122 additions and 105 deletions.
diff --git a/CollectionSwift/AppDelegate.swift b/CollectionSwift/AppDelegate.swift
@@ -14,6 +14,7 @@ class AppDelegate: UIResponder {
 }
 
 extension AppDelegate: UIApplicationDelegate {
+
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         self.window = UIWindow(frame: UIScreen.main.bounds)
         guard let window = self.window else { fatalError("Window not found") }

diff --git a/CollectionSwift/CollectionController.swift b/CollectionSwift/CollectionController.swift
@@ -12,7 +12,7 @@ class CollectionController: UICollectionViewController {
         let request: NSFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "User")
         request.sortDescriptors = [
             NSSortDescriptor(key: "name", ascending: true),
-            NSSortDescriptor(key: "firstLetterOfName", ascending: true)
+            NSSortDescriptor(key: "firstLetterOfName", ascending: true),
         ]
 
         let dataSource = DATASource(collectionView: collectionView, cellIdentifier: CollectionCell.Identifier, fetchRequest: request, mainContext: self.dataStack.mainContext, sectionName: "firstLetterOfName", configuration: { cell, item, indexPath in
@@ -21,7 +21,7 @@ class CollectionController: UICollectionViewController {
         })
 
         return dataSource
-        }()
+    }()
 
     init(layout: UICollectionViewLayout, dataStack: DATAStack) {
         self.dataStack = dataStack
@@ -71,22 +71,23 @@ class CollectionController: UICollectionViewController {
     func randomString() -> String {
         let letters = "ABCDEFGHIJKL"
         var string = ""
-        for _ in 0...5 {
+        for _ in 0 ... 5 {
             let token = UInt32(letters.characters.count)
             let letterIndex = Int(arc4random_uniform(token))
             let firstChar = Array(letters.characters)[letterIndex]
             string.append(firstChar)
         }
-        
+
         return string
     }
 }
 
 extension CollectionController {
+
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         guard let object = self.dataSource.objectAtIndexPath(indexPath) else { return }
 
-        if let name = object.value(forKey: "name") as? String , name.characters.first == "A" {
+        if let name = object.value(forKey: "name") as? String, name.characters.first == "A" {
             self.dataStack.performInNewBackgroundContext({ backgroundContext in
                 let backgroundObject = backgroundContext.object(with: object.objectID)
                 backgroundObject.setValue(name + "+", forKey: "name")

diff --git a/DATASourceDelegateTableSwift/AppDelegate.swift b/DATASourceDelegateTableSwift/AppDelegate.swift
@@ -14,14 +14,15 @@ class AppDelegate: UIResponder {
 }
 
 extension AppDelegate: UIApplicationDelegate {
+
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         self.window = UIWindow(frame: UIScreen.main.bounds)
         guard let window = self.window else { fatalError("Window not found") }
 
         let viewController = ViewController(dataStack: self.dataStack)
         window.rootViewController = UINavigationController(rootViewController: viewController)
         window.makeKeyAndVisible()
-        
+
         return true
     }
 }
diff --git a/DATASourceDelegateTableSwift/ViewController.swift b/DATASourceDelegateTableSwift/ViewController.swift
@@ -51,19 +51,20 @@ class ViewController: UITableViewController {
 }
 
 extension ViewController: DATASourceDelegate {
+
     func dataSource(_ dataSource: DATASource, tableView: UITableView, canEditRowAtIndexPath indexPath: IndexPath) -> Bool {
         return true
     }
 
     // This doesn't seem to be needed when implementing tableView(_:editActionsForRowAtIndexPath).
     func dataSource(_ dataSource: DATASource, tableView: UITableView, commitEditingStyle editingStyle: UITableViewCellEditingStyle, forRowAtIndexPath indexPath: IndexPath) {
-
     }
 }
 
 // MARK: - UITableViewDelegate
 
 extension ViewController {
+
     override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
         let delete = UITableViewRowAction(style: .default, title: "Delete") { action, indexPath in
             let item = self.dataSource.objectAtIndexPath(indexPath)!

diff --git a/InfiniteCollectionSwift/AppDelegate.swift b/InfiniteCollectionSwift/AppDelegate.swift
@@ -14,6 +14,7 @@ class AppDelegate: UIResponder {
 }
 
 extension AppDelegate: UIApplicationDelegate {
+
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         self.window = UIWindow(frame: UIScreen.main.bounds)
         guard let window = self.window else { fatalError("Window not found") }
@@ -28,7 +29,7 @@ extension AppDelegate: UIApplicationDelegate {
         let viewController = CollectionController(layout: layout, dataStack: self.dataStack)
         window.rootViewController = UINavigationController(rootViewController: viewController)
         window.makeKeyAndVisible()
-        
+
         return true
     }
 }
diff --git a/InfiniteCollectionSwift/CollectionController.swift b/InfiniteCollectionSwift/CollectionController.swift
@@ -12,7 +12,7 @@ class CollectionController: UICollectionViewController {
         let request: NSFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "User")
         request.sortDescriptors = [
             NSSortDescriptor(key: "name", ascending: true),
-            NSSortDescriptor(key: "firstLetterOfName", ascending: true)
+            NSSortDescriptor(key: "firstLetterOfName", ascending: true),
         ]
 
         let dataSource = DATASource(collectionView: collectionView, cellIdentifier: CollectionCell.Identifier, fetchRequest: request, mainContext: self.dataStack.mainContext, sectionName: "firstLetterOfName", configuration: { cell, item, indexPath in
@@ -57,6 +57,7 @@ class CollectionController: UICollectionViewController {
     }
 
     var loading = false
+
     override func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
         guard let collectionView = self.collectionView else { return }
         guard self.loading == false else { return }
@@ -80,7 +81,7 @@ class CollectionController: UICollectionViewController {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             self.dataStack.performInNewBackgroundContext { backgroundContext in
                 let entity = NSEntityDescription.entity(forEntityName: "User", in: backgroundContext)!
-                for i in initialIndex..<initialIndex + 18 {
+                for i in initialIndex ..< initialIndex + 18 {
                     let user = NSManagedObject(entity: entity, insertInto: backgroundContext)
                     user.setValue(String(format: "%04d", i), forKey: "name")
 
@@ -98,10 +99,11 @@ class CollectionController: UICollectionViewController {
 }
 
 extension CollectionController {
+
     override func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         guard let numberOfItems = self.collectionView?.numberOfItems(inSection: (indexPath as NSIndexPath).section) else { return }
         var items = [NSManagedObject]()
-        for i in 0..<numberOfItems {
+        for i in 0 ..< numberOfItems {
             let newIndexPath = IndexPath(row: i, section: (indexPath as NSIndexPath).section)
             if let item = self.dataSource.objectAtIndexPath(newIndexPath) {
                 items.append(item)

diff --git a/InfiniteTableSwift/AppDelegate.swift b/InfiniteTableSwift/AppDelegate.swift
@@ -14,6 +14,7 @@ class AppDelegate: UIResponder {
 }
 
 extension AppDelegate: UIApplicationDelegate {
+
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         self.window = UIWindow(frame: UIScreen.main.bounds)
         guard let window = self.window else { fatalError("Window not found") }

diff --git a/InfiniteTableSwift/ViewController.swift b/InfiniteTableSwift/ViewController.swift
@@ -10,7 +10,7 @@ class ViewController: UITableViewController {
         let request: NSFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "User")
         request.sortDescriptors = [
             NSSortDescriptor(key: "name", ascending: true),
-            NSSortDescriptor(key: "firstLetterOfName", ascending: true)
+            NSSortDescriptor(key: "firstLetterOfName", ascending: true),
         ]
 
         let dataSource = DATASource(tableView: self.tableView, cellIdentifier: ViewController.Identifier, fetchRequest: request, mainContext: self.dataStack!.mainContext, sectionName: "firstLetterOfName", configuration: { cell, item, indexPath in
@@ -49,6 +49,7 @@ class ViewController: UITableViewController {
     }
 
     var loading = false
+
     override func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
         guard let tableView = self.tableView else { return }
         guard self.loading == false else { return }
@@ -72,7 +73,7 @@ class ViewController: UITableViewController {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
             self.dataStack!.performInNewBackgroundContext { backgroundContext in
                 let entity = NSEntityDescription.entity(forEntityName: "User", in: backgroundContext)!
-                for i in initialIndex..<initialIndex + 18 {
+                for i in initialIndex ..< initialIndex + 18 {
                     let user = NSManagedObject(entity: entity, insertInto: backgroundContext)
                     user.setValue(String(format: "%04d", i), forKey: "name")
 
@@ -90,6 +91,7 @@ class ViewController: UITableViewController {
 }
 
 extension ViewController: DATASourceDelegate {
+
     func sectionIndexTitlesForDataSource(_ dataSource: DATASource, tableView: UITableView) -> [String] {
         return [String]()
     }

diff --git a/Library/InfiniteLoadingIndicator.swift b/Library/InfiniteLoadingIndicator.swift
@@ -47,7 +47,7 @@ class InfiniteLoadingIndicator: UIView {
 
             UIView.animate(withDuration: 0.3, delay: 0.0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0.5, options: [.allowUserInteraction], animations: {
                 self.frame = originalFrame
-                }, completion: nil)
+            }, completion: nil)
         }
     }
 
@@ -58,11 +58,11 @@ class InfiniteLoadingIndicator: UIView {
             newFrame.origin.y = self.parentController.view.frame.height + 10
             UIView.animate(withDuration: 0.3, delay: 0.0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0.5, options: [.allowUserInteraction], animations: { () -> Void in
                 self.frame = newFrame
-                }, completion: { finished in
-                    self.frame = originalFrame
-                    if self.superview != nil {
-                        self.removeFromSuperview()
-                    }
+            }, completion: { finished in
+                self.frame = originalFrame
+                if self.superview != nil {
+                    self.removeFromSuperview()
+                }
             })
         }
     }

diff --git a/Source/DATASource+NSFetchedResultsControllerDelegate.swift b/Source/DATASource+NSFetchedResultsControllerDelegate.swift
@@ -2,12 +2,13 @@ import UIKit
 import CoreData
 
 extension DATASource: NSFetchedResultsControllerDelegate {
+
     public func controllerWillChangeContent(_ controller: NSFetchedResultsController<NSFetchRequestResult>) {
         if let tableView = self.tableView {
             tableView.beginUpdates()
         } else if let _ = self.collectionView {
-            self.sectionChanges = [NSFetchedResultsChangeType : IndexSet]()
-            self.objectChanges = [NSFetchedResultsChangeType : Set<IndexPath>]()
+            self.sectionChanges = [NSFetchedResultsChangeType: IndexSet]()
+            self.objectChanges = [NSFetchedResultsChangeType: Set<IndexPath>]()
         }
     }
 
@@ -190,7 +191,7 @@ extension DATASource: NSFetchedResultsControllerDelegate {
                         collectionView.moveItem(at: fromIndexPath as IndexPath, to: toIndexPath as IndexPath)
                     }
 
-                    }, completion: nil)
+                }, completion: nil)
             }
         }
         self.delegate?.dataSourceDidChangeContent?(self)

diff --git a/Source/DATASource+UICollectionViewDataSource.swift b/Source/DATASource+UICollectionViewDataSource.swift
@@ -2,6 +2,7 @@ import UIKit
 import CoreData
 
 extension DATASource: UICollectionViewDataSource {
+
     public func numberOfSections(in collectionView: UICollectionView) -> Int {
         return self.fetchedResultsController.sections?.count ?? 0
     }
@@ -32,7 +33,7 @@ extension DATASource: UICollectionViewDataSource {
 
     public func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
         if let keyPath = self.fetchedResultsController.sectionNameKeyPath {
-            if self.cachedSectionNames.isEmpty || indexPath.section >= self.cachedSectionNames.count{
+            if self.cachedSectionNames.isEmpty || indexPath.section >= self.cachedSectionNames.count {
                 self.cacheSectionNames(using: keyPath)
             }
 

diff --git a/Source/DATASource+UITableViewDataSource.swift b/Source/DATASource+UITableViewDataSource.swift
@@ -2,6 +2,7 @@ import UIKit
 import CoreData
 
 extension DATASource: UITableViewDataSource {
+
     public func numberOfSections(in tableView: UITableView) -> Int {
         return self.fetchedResultsController.sections?.count ?? 0
     }
@@ -17,14 +18,14 @@ extension DATASource: UITableViewDataSource {
     }
 
     public func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        
+
         var cellIdentifier = self.cellIdentifier
-        
+
         if let value = self.delegate?.cellIdentifier?(forIndexPath: indexPath) {
             cellIdentifier = value
         }
-        
-        let cell = tableView.dequeueReusableCell(withIdentifier:  cellIdentifier, for: indexPath)
+
+        let cell = tableView.dequeueReusableCell(withIdentifier: cellIdentifier, for: indexPath)
 
         self.configure(cell, indexPath: indexPath)
 
@@ -34,40 +35,41 @@ extension DATASource: UITableViewDataSource {
     // Sections and Headers
 
     #if os(iOS)
-    public func sectionIndexTitles(for tableView: UITableView) -> [String]? {
-        if let titles = self.delegate?.sectionIndexTitlesForDataSource?(self, tableView: tableView) {
-            return titles
-        } else if let keyPath = self.fetchedResultsController.sectionNameKeyPath {
-            let request = NSFetchRequest<NSFetchRequestResult>()
-            request.entity = self.fetchedResultsController.fetchRequest.entity
-            request.resultType = .dictionaryResultType
-            request.returnsDistinctResults = true
-            request.propertiesToFetch = [keyPath]
-            request.sortDescriptors = [NSSortDescriptor(key: keyPath, ascending: true)]
-            var names = [String]()
-            var objects: [NSDictionary]?
-
-            do {
-                objects = try self.fetchedResultsController.managedObjectContext.fetch(request) as? [NSDictionary]
-            } catch {
-                print("Error")
-            }
 
-            if let objects = objects {
-                for object in objects {
-                    names.append(contentsOf: object.allValues as! [String])
+        public func sectionIndexTitles(for tableView: UITableView) -> [String]? {
+            if let titles = self.delegate?.sectionIndexTitlesForDataSource?(self, tableView: tableView) {
+                return titles
+            } else if let keyPath = self.fetchedResultsController.sectionNameKeyPath {
+                let request = NSFetchRequest<NSFetchRequestResult>()
+                request.entity = self.fetchedResultsController.fetchRequest.entity
+                request.resultType = .dictionaryResultType
+                request.returnsDistinctResults = true
+                request.propertiesToFetch = [keyPath]
+                request.sortDescriptors = [NSSortDescriptor(key: keyPath, ascending: true)]
+                var names = [String]()
+                var objects: [NSDictionary]?
+
+                do {
+                    objects = try self.fetchedResultsController.managedObjectContext.fetch(request) as? [NSDictionary]
+                } catch {
+                    print("Error")
+                }
+
+                if let objects = objects {
+                    for object in objects {
+                        names.append(contentsOf: object.allValues as! [String])
+                    }
                 }
+
+                return names
             }
 
-            return names
+            return nil
         }
 
-        return nil
-    }
-
-    public func tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, at index: Int) -> Int {
-        return self.delegate?.dataSource?(self, tableView: tableView, sectionForSectionIndexTitle: title, atIndex: index) ?? index
-    }
+        public func tableView(_ tableView: UITableView, sectionForSectionIndexTitle title: String, at index: Int) -> Int {
+            return self.delegate?.dataSource?(self, tableView: tableView, sectionForSectionIndexTitle: title, atIndex: index) ?? index
+        }
     #endif
 
     public func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {