From ac06a94ace327601474ff15a2fb98824ca49e832 Mon Sep 17 00:00:00 2001 From: Gil Date: Mon, 26 Feb 2018 10:51:58 -0800 Subject: Auto-style swift sources (#847) * Fix bash style issues * Exclude additional build output directories * Format swift files with scripts/style.sh * Reformat swift sources * Allow swiftformat 0.32.0 on travis --- Example/tvOSSample/tvOSSample/AppDelegate.swift | 2 -- .../tvOSSample/AuthLoginViewController.swift | 27 +++++++--------------- .../tvOSSample/tvOSSample/AuthViewController.swift | 6 ++--- .../tvOSSample/DatabaseViewController.swift | 4 ++-- .../tvOSSample/EmailLoginViewController.swift | 9 ++++---- .../tvOSSample/StorageViewController.swift | 16 ++++++------- 6 files changed, 26 insertions(+), 38 deletions(-) (limited to 'Example/tvOSSample') diff --git a/Example/tvOSSample/tvOSSample/AppDelegate.swift b/Example/tvOSSample/tvOSSample/AppDelegate.swift index 9a0d052..723a3c4 100644 --- a/Example/tvOSSample/tvOSSample/AppDelegate.swift +++ b/Example/tvOSSample/tvOSSample/AppDelegate.swift @@ -17,7 +17,6 @@ import FirebaseCore @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate { - var window: UIWindow? func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { @@ -26,4 +25,3 @@ class AppDelegate: UIResponder, UIApplicationDelegate { return true } } - diff --git a/Example/tvOSSample/tvOSSample/AuthLoginViewController.swift b/Example/tvOSSample/tvOSSample/AuthLoginViewController.swift index dcf72d4..65e0316 100644 --- a/Example/tvOSSample/tvOSSample/AuthLoginViewController.swift +++ b/Example/tvOSSample/tvOSSample/AuthLoginViewController.swift @@ -16,25 +16,14 @@ import UIKit import FirebaseAuth class AuthLoginViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() - override func viewDidLoad() { - super.viewDidLoad() + // Do any additional setup after loading the view. + } - // Do any additional setup after loading the view. - } - - override func didReceiveMemoryWarning() { - super.didReceiveMemoryWarning() - // Dispose of any resources that can be recreated. - } - - /* - // MARK: - Navigation - - // In a storyboard-based application, you will often want to do a little preparation before navigation - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - // Get the new view controller using segue.destinationViewController. - // Pass the selected object to the new view controller. - } - */ + override func didReceiveMemoryWarning() { + super.didReceiveMemoryWarning() + // Dispose of any resources that can be recreated. + } } diff --git a/Example/tvOSSample/tvOSSample/AuthViewController.swift b/Example/tvOSSample/tvOSSample/AuthViewController.swift index 72351d3..56276ed 100644 --- a/Example/tvOSSample/tvOSSample/AuthViewController.swift +++ b/Example/tvOSSample/tvOSSample/AuthViewController.swift @@ -20,13 +20,13 @@ class AuthViewController: UIViewController { // MARK: - User Interface /// A stackview containing all of the buttons to providers (Email, OAuth, etc). - @IBOutlet weak var providers: UIStackView! + @IBOutlet var providers: UIStackView! /// A stackview containing a signed in label and sign out button. - @IBOutlet weak var signedIn: UIStackView! + @IBOutlet var signedIn: UIStackView! /// A label to display the status for the signed in user. - @IBOutlet weak var signInStatus: UILabel! + @IBOutlet var signInStatus: UILabel! // MARK: - User Actions diff --git a/Example/tvOSSample/tvOSSample/DatabaseViewController.swift b/Example/tvOSSample/tvOSSample/DatabaseViewController.swift index 712c48f..2b710fa 100644 --- a/Example/tvOSSample/tvOSSample/DatabaseViewController.swift +++ b/Example/tvOSSample/tvOSSample/DatabaseViewController.swift @@ -30,7 +30,7 @@ class DatabaseViewController: UIViewController { // MARK: - Interface /// Label to display the current value. - @IBOutlet weak var currentValue: UILabel! + @IBOutlet var currentValue: UILabel! // MARK: - User Actions @@ -65,7 +65,7 @@ class DatabaseViewController: UIViewController { // Observe the current value, and update the UI every time it changes. let ref = Database.database().reference(withPath: Constants.databasePath) - ref.observe(.value) { [weak self] (snapshot) in + ref.observe(.value) { [weak self] snapshot in guard let value = snapshot.value as? Int else { print("Error grabbing value from Snapshot!") return diff --git a/Example/tvOSSample/tvOSSample/EmailLoginViewController.swift b/Example/tvOSSample/tvOSSample/EmailLoginViewController.swift index 60dfc43..9bea765 100644 --- a/Example/tvOSSample/tvOSSample/EmailLoginViewController.swift +++ b/Example/tvOSSample/tvOSSample/EmailLoginViewController.swift @@ -19,6 +19,7 @@ protocol EmailLoginDelegate { func emailLogin(_ controller: EmailLoginViewController, signedInAs user: User) func emailLogin(_ controller: EmailLoginViewController, failedWithError error: Error) } + class EmailLoginViewController: UIViewController { // MARK: - Public Properties @@ -27,15 +28,15 @@ class EmailLoginViewController: UIViewController { // MARK: - User Interface - @IBOutlet private weak var emailAddress: UITextField! - @IBOutlet private weak var password: UITextField! + @IBOutlet private var emailAddress: UITextField! + @IBOutlet private var password: UITextField! // MARK: - User Actions @IBAction func logInButtonHit(_ sender: UIButton) { guard let (email, password) = validatedInputs() else { return } - Auth.auth().signIn(withEmail: email, password: password) { [unowned self] (user, error) in + Auth.auth().signIn(withEmail: email, password: password) { [unowned self] user, error in guard let user = user else { print("Error signing in: \(error!)") self.delegate?.emailLogin(self, failedWithError: error!) @@ -50,7 +51,7 @@ class EmailLoginViewController: UIViewController { @IBAction func signUpButtonHit(_ sender: UIButton) { guard let (email, password) = validatedInputs() else { return } - Auth.auth().createUser(withEmail: email, password: password) { [unowned self] (user, error) in + Auth.auth().createUser(withEmail: email, password: password) { [unowned self] user, error in guard let user = user else { print("Error signing up: \(error!)") self.delegate?.emailLogin(self, failedWithError: error!) diff --git a/Example/tvOSSample/tvOSSample/StorageViewController.swift b/Example/tvOSSample/tvOSSample/StorageViewController.swift index 4416649..2e91d92 100644 --- a/Example/tvOSSample/tvOSSample/StorageViewController.swift +++ b/Example/tvOSSample/tvOSSample/StorageViewController.swift @@ -31,7 +31,7 @@ class StorageViewController: UIViewController { case failed(String) /// Equatable support for UIState. - static func ==(lhs: StorageViewController.UIState, rhs: StorageViewController.UIState) -> Bool { + static func == (lhs: StorageViewController.UIState, rhs: StorageViewController.UIState) -> Bool { switch (lhs, rhs) { case (.cleared, .cleared): return true case (.downloading, .downloading): return true @@ -52,16 +52,16 @@ class StorageViewController: UIViewController { // MARK: Interface /// Image view to display the downloaded image. - @IBOutlet weak var imageView: UIImageView! + @IBOutlet var imageView: UIImageView! /// The download button. - @IBOutlet weak var downloadButton: UIButton! + @IBOutlet var downloadButton: UIButton! /// The clear button. - @IBOutlet weak var clearButton: UIButton! + @IBOutlet var clearButton: UIButton! /// A visual representation of the state. - @IBOutlet weak var stateLabel: UILabel! + @IBOutlet var stateLabel: UILabel! // MARK: - User Actions @@ -72,7 +72,7 @@ class StorageViewController: UIViewController { let storage = Storage.storage() let ref = storage.reference(withPath: Constants.downloadPath) // TODO: Show progress bar here using proper API. - let task = ref.getData(maxSize: Constants.maxSize) { [unowned self] (data, error) in + let task = ref.getData(maxSize: Constants.maxSize) { [unowned self] data, error in guard let data = data else { self.state = .failed("Error downloading: \(error!.localizedDescription)") return @@ -114,7 +114,7 @@ class StorageViewController: UIViewController { stateLabel.text = "State: Downloading..." // Download complete, ensure the download button is still off and enable the clear button. - case (_, .downloaded(let image)): + case let (_, .downloaded(image)): imageView.image = image stateLabel.text = "State: Image downloaded!" @@ -124,7 +124,7 @@ class StorageViewController: UIViewController { stateLabel.text = "State: Pending download" // An error occurred. - case (_, .failed(let error)): + case let (_, .failed(error)): stateLabel.text = "State: \(error)" // For now, as the default, throw a fatal error because it's an unexpected state. This will -- cgit v1.2.3