From ee1191bd84a1b021829263017442e0b9d972d32e Mon Sep 17 00:00:00 2001 From: as3842 Date: Fri, 4 May 2018 14:51:01 -0400 Subject: [PATCH 1/6] Added swiftlint:disable:next identifier_name --- Sources/Extensions/UIColor.swift | 4 ++++ .../Settings/SettingsTableViewController.swift | 1 + 2 files changed, 5 insertions(+) diff --git a/Sources/Extensions/UIColor.swift b/Sources/Extensions/UIColor.swift index 460cdc34c46..192f3e39986 100644 --- a/Sources/Extensions/UIColor.swift +++ b/Sources/Extensions/UIColor.swift @@ -19,10 +19,12 @@ extension UIColor { var rgb: UInt32 = 0 + // swiftlint:disable identifier_name var r: CGFloat = 0.0 var g: CGFloat = 0.0 var b: CGFloat = 0.0 var a: CGFloat = 1.0 + // swiftlint:enable identifier_name let length = hexSanitized.count @@ -59,10 +61,12 @@ extension UIColor { return nil } + // swiftlint:disable identifier_name let r = Float(components[0]) let g = Float(components[1]) let b = Float(components[2]) var a = Float(1.0) + // swiftlint:enable identifier_name if components.count >= 4 { a = Float(components[3]) diff --git a/Sources/ViewControllers/Settings/SettingsTableViewController.swift b/Sources/ViewControllers/Settings/SettingsTableViewController.swift index e1eaacf41a7..ede1b5d52b4 100644 --- a/Sources/ViewControllers/Settings/SettingsTableViewController.swift +++ b/Sources/ViewControllers/Settings/SettingsTableViewController.swift @@ -32,6 +32,7 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr } override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + // swiftlint:disable:next identifier_name guard let Settings = SettingsSection(rawValue: section) else { return "" } switch Settings { case .item: From c74f399c2aaf5dae467e31a9e5613765ed5a5948 Mon Sep 17 00:00:00 2001 From: as3842 Date: Fri, 4 May 2018 15:24:23 -0400 Subject: [PATCH 2/6] Changed variable from Settings to settings --- .../Settings/SettingsTableViewController.swift | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Sources/ViewControllers/Settings/SettingsTableViewController.swift b/Sources/ViewControllers/Settings/SettingsTableViewController.swift index ede1b5d52b4..1cc9131900c 100644 --- a/Sources/ViewControllers/Settings/SettingsTableViewController.swift +++ b/Sources/ViewControllers/Settings/SettingsTableViewController.swift @@ -32,9 +32,8 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr } override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { - // swiftlint:disable:next identifier_name - guard let Settings = SettingsSection(rawValue: section) else { return "" } - switch Settings { + guard let settings = SettingsSection(rawValue: section) else { return "" } + switch settings { case .item: return "settings.tab-bar.item".localized case .information: From 542c6896dc5c5666892933f6bb260e2f285664a1 Mon Sep 17 00:00:00 2001 From: as3842 Date: Fri, 4 May 2018 17:38:43 -0400 Subject: [PATCH 3/6] Renamed variable r to red, g to green, b to blue, a to alpha --- Sources/Extensions/UIColor.swift | 46 +++++++++++++++----------------- Sources/Helpers/URLs.swift | 3 +-- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/Sources/Extensions/UIColor.swift b/Sources/Extensions/UIColor.swift index 192f3e39986..f28f7d7d123 100644 --- a/Sources/Extensions/UIColor.swift +++ b/Sources/Extensions/UIColor.swift @@ -19,33 +19,31 @@ extension UIColor { var rgb: UInt32 = 0 - // swiftlint:disable identifier_name - var r: CGFloat = 0.0 - var g: CGFloat = 0.0 - var b: CGFloat = 0.0 - var a: CGFloat = 1.0 - // swiftlint:enable identifier_name + var red: CGFloat = 0.0 + var green: CGFloat = 0.0 + var blue: CGFloat = 0.0 + var alpha: CGFloat = 1.0 let length = hexSanitized.count guard Scanner(string: hexSanitized).scanHexInt32(&rgb) else { return nil } if length == 6 { - r = CGFloat((rgb & 0xFF0000) >> 16) / 255.0 - g = CGFloat((rgb & 0x00FF00) >> 8) / 255.0 - b = CGFloat(rgb & 0x0000FF) / 255.0 + red = CGFloat((rgb & 0xFF0000) >> 16) / 255.0 + green = CGFloat((rgb & 0x00FF00) >> 8) / 255.0 + blue = CGFloat(rgb & 0x0000FF) / 255.0 } else if length == 8 { - r = CGFloat((rgb & 0xFF000000) >> 24) / 255.0 - g = CGFloat((rgb & 0x00FF0000) >> 16) / 255.0 - b = CGFloat((rgb & 0x0000FF00) >> 8) / 255.0 - a = CGFloat(rgb & 0x000000FF) / 255.0 + red = CGFloat((rgb & 0xFF000000) >> 24) / 255.0 + green = CGFloat((rgb & 0x00FF0000) >> 16) / 255.0 + blue = CGFloat((rgb & 0x0000FF00) >> 8) / 255.0 + alpha = CGFloat(rgb & 0x000000FF) / 255.0 } else { return nil } - self.init(red: r, green: g, blue: b, alpha: a) + self.init(red: red, green: green, blue: blue, alpha: alpha) } // MARK: - Computed Properties @@ -56,26 +54,24 @@ extension UIColor { // MARK: - From UIColor to String - func toHex(alpha: Bool = false) -> String? { + func toHex(alphaBool: Bool = false) -> String? { guard let components = cgColor.components, components.count >= 3 else { return nil } - // swiftlint:disable identifier_name - let r = Float(components[0]) - let g = Float(components[1]) - let b = Float(components[2]) - var a = Float(1.0) - // swiftlint:enable identifier_name + let red = Float(components[0]) + let green = Float(components[1]) + let blue = Float(components[2]) + var alpha = Float(1.0) if components.count >= 4 { - a = Float(components[3]) + alpha = Float(components[3]) } - if alpha { - return String(format: "%02lX%02lX%02lX%02lX", lroundf(r * 255), lroundf(g * 255), lroundf(b * 255), lroundf(a * 255)) + if alphaBool { + return String(format: "%02lX%02lX%02lX%02lX", lroundf(red * 255), lroundf(green * 255), lroundf(blue * 255), lroundf(alpha * 255)) } else { - return String(format: "%02lX%02lX%02lX", lroundf(r * 255), lroundf(g * 255), lroundf(b * 255)) + return String(format: "%02lX%02lX%02lX", lroundf(red * 255), lroundf(green * 255), lroundf(blue * 255)) } } } diff --git a/Sources/Helpers/URLs.swift b/Sources/Helpers/URLs.swift index 82adfb676e6..9383686c34a 100644 --- a/Sources/Helpers/URLs.swift +++ b/Sources/Helpers/URLs.swift @@ -19,8 +19,7 @@ struct URLs { static let OpenBeautyFacts = "itms-apps://itunes.apple.com/us/app/open-beauty-facts/id1122926380?mt=8" static let SupportOpenFoodFacts = "https://www.helloasso.com/associations/open-food-facts/formulaires/1/widget/en" static let TranslateOpenFoodFacts = "https://crowdin.com/project/openfoodfacts" - static let FrequentlyAskedQuestions = "https://world.openfoodfacts.org/faq" - + static let FrequentlyAskedQuestions = "https://world.openfoodfacts.org/faq" static let ProductBaseURL: String = { return ProductBaseURLWithLanguagePlaceholder.replacingOccurrences(of: "LANGUAGE", with: Locale.current.languageCode!) }() From a51cfeb53f22d8b9a480059feb843d6ec685c514 Mon Sep 17 00:00:00 2001 From: as3842 Date: Fri, 4 May 2018 18:06:59 -0400 Subject: [PATCH 4/6] Renamed each "vc" variable to its specific view controller name --- Sources/Extensions/UIViewController.swift | 4 +-- Sources/Helpers/URLs.swift | 2 +- .../Detail/ProductDetailViewController.swift | 24 +++++++-------- .../ViewControllers/RootViewController.swift | 4 +-- .../User/UserViewController.swift | 30 +++++++++---------- ...redientsFormTableViewControllerTests.swift | 4 +-- ...ionTableFormTableViewControllerTests.swift | 4 +-- .../SummaryFormTableViewControllerTests.swift | 4 +-- .../Search/SearchViewControllerSpec.swift | 6 ++-- 9 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Sources/Extensions/UIViewController.swift b/Sources/Extensions/UIViewController.swift index 12ca0ece63c..34424af7d81 100644 --- a/Sources/Extensions/UIViewController.swift +++ b/Sources/Extensions/UIViewController.swift @@ -29,8 +29,8 @@ extension UIViewController { } func openUrlInApp(_ url: URL, showAlert: Bool? = nil) { - let vc = SFSafariViewController(url: url, entersReaderIfAvailable: false) - present(vc, animated: true) + let SFSafariVC = SFSafariViewController(url: url, entersReaderIfAvailable: false) + present(SFSafariVC, animated: true) if showAlert == true { NotificationBanner(title: "product-detail.edit-alert.title".localized, diff --git a/Sources/Helpers/URLs.swift b/Sources/Helpers/URLs.swift index 9383686c34a..9604119c9f0 100644 --- a/Sources/Helpers/URLs.swift +++ b/Sources/Helpers/URLs.swift @@ -19,7 +19,7 @@ struct URLs { static let OpenBeautyFacts = "itms-apps://itunes.apple.com/us/app/open-beauty-facts/id1122926380?mt=8" static let SupportOpenFoodFacts = "https://www.helloasso.com/associations/open-food-facts/formulaires/1/widget/en" static let TranslateOpenFoodFacts = "https://crowdin.com/project/openfoodfacts" - static let FrequentlyAskedQuestions = "https://world.openfoodfacts.org/faq" + static let FrequentlyAskedQuestions = "https://world.openfoodfacts.org/faq" static let ProductBaseURL: String = { return ProductBaseURLWithLanguagePlaceholder.replacingOccurrences(of: "LANGUAGE", with: Locale.current.languageCode!) }() diff --git a/Sources/ViewControllers/Products/Detail/ProductDetailViewController.swift b/Sources/ViewControllers/Products/Detail/ProductDetailViewController.swift index 3c5ea444e45..0cf7caf7b25 100644 --- a/Sources/ViewControllers/Products/Detail/ProductDetailViewController.swift +++ b/Sources/ViewControllers/Products/Detail/ProductDetailViewController.swift @@ -64,30 +64,30 @@ class ProductDetailViewController: ButtonBarPagerTabStripViewController, DataMan fileprivate func getSummaryVC() -> UIViewController { let form = createSummaryForm() - let vc = SummaryFormTableViewController(with: form, dataManager: dataManager) - vc.delegate = self - return vc + let summaryFormTableVC = SummaryFormTableViewController(with: form, dataManager: dataManager) + summaryFormTableVC.delegate = self + return summaryFormTableVC } fileprivate func getIngredientsVC() -> UIViewController { let form = createIngredientsForm() - let vc = IngredientsFormTableViewController(with: form, dataManager: dataManager) - vc.delegate = self - return vc + let ingredientsFormTableVC = IngredientsFormTableViewController(with: form, dataManager: dataManager) + ingredientsFormTableVC.delegate = self + return ingredientsFormTableVC } fileprivate func getNutritionVC() -> UIViewController? { guard let form = createNutritionForm() else { return nil } - let vc = FormTableViewController(with: form, dataManager: dataManager) - vc.delegate = self - return vc + let formTableVC = FormTableViewController(with: form, dataManager: dataManager) + formTableVC.delegate = self + return formTableVC } fileprivate func getNutritionTableVC() -> UIViewController { let form = createNutritionTableForm() - let vc = NutritionTableFormTableViewController(with: form, dataManager: dataManager) - vc.delegate = self - return vc + let nutritionTableFormTableVC = NutritionTableFormTableViewController(with: form, dataManager: dataManager) + nutritionTableFormTableVC.delegate = self + return nutritionTableFormTableVC } // MARK: - Form creation methods diff --git a/Sources/ViewControllers/RootViewController.swift b/Sources/ViewControllers/RootViewController.swift index 289180357f8..626dd4f1d5e 100644 --- a/Sources/ViewControllers/RootViewController.swift +++ b/Sources/ViewControllers/RootViewController.swift @@ -65,8 +65,8 @@ class RootViewController: UIViewController { private func showScan() { for child in tabBarVC.viewControllers ?? [] { - if let vc = child as? SearchViewController { - vc.scanBarcode() + if let searchVC = child as? SearchViewController { + searchVC.scanBarcode() break } } diff --git a/Sources/ViewControllers/User/UserViewController.swift b/Sources/ViewControllers/User/UserViewController.swift index 4a60d3076be..a0e39cfcce6 100644 --- a/Sources/ViewControllers/User/UserViewController.swift +++ b/Sources/ViewControllers/User/UserViewController.swift @@ -22,7 +22,7 @@ class UserViewController: UIViewController, DataManagerClient { } private func loadChildVC() { - let vc: UIViewController + let UIVC: UIViewController if CredentialsController.shared.getUsername() != nil { createLoggedIn() @@ -31,28 +31,28 @@ class UserViewController: UIViewController, DataManagerClient { showProductsPendingUpload() } - vc = childNavigationController + UIVC = childNavigationController } else { - vc = createLogIn() + UIVC = createLogIn() } - transition(to: vc) + transition(to: UIVC) } private func createLoggedIn() { - let vc = LoggedInViewController.loadFromStoryboard(named: .user) as LoggedInViewController - vc.dataManager = dataManager - vc.delegate = self + let loggedInVC = LoggedInViewController.loadFromStoryboard(named: .user) as LoggedInViewController + loggedInVC.dataManager = dataManager + loggedInVC.delegate = self - childNavigationController.pushViewController(vc, animated: true) + childNavigationController.pushViewController(loggedInVC, animated: true) } private func createLogIn() -> LoginViewController { - let vc = LoginViewController.loadFromStoryboard(named: .user) as LoginViewController - vc.dataManager = dataManager - vc.delegate = self - return vc + let loginVC = LoginViewController.loadFromStoryboard(named: .user) as LoginViewController + loginVC.dataManager = dataManager + loginVC.delegate = self + return loginVC } } @@ -67,8 +67,8 @@ extension UserViewController: UserViewControllerDelegate { } func showProductsPendingUpload() { - let vc = PendingUploadTableViewController.loadFromStoryboard(named: .user) as PendingUploadTableViewController - vc.dataManager = dataManager - childNavigationController.pushViewController(vc, animated: true) + let pendingUploadTableVC = PendingUploadTableViewController.loadFromStoryboard(named: .user) as PendingUploadTableViewController + pendingUploadTableVC.dataManager = dataManager + childNavigationController.pushViewController(pendingUploadTableVC, animated: true) } } diff --git a/Tests/ViewControllers/Products/Detail/Ingredients/IngredientsFormTableViewControllerTests.swift b/Tests/ViewControllers/Products/Detail/Ingredients/IngredientsFormTableViewControllerTests.swift index c283501c606..8963cbac3eb 100644 --- a/Tests/ViewControllers/Products/Detail/Ingredients/IngredientsFormTableViewControllerTests.swift +++ b/Tests/ViewControllers/Products/Detail/Ingredients/IngredientsFormTableViewControllerTests.swift @@ -32,9 +32,9 @@ class IngredientsFormTableViewControllerTests: XCTestCase { // MARK: - Init func testInitWithFormAndProductApi() { - let vc = SummaryFormTableViewController(with: form, dataManager: dataManager) + let summaryFormTableVC = SummaryFormTableViewController(with: form, dataManager: dataManager) - expect(vc).notTo(beNil()) + expect(summaryFormTableVC).notTo(beNil()) } // MARK: - getCell diff --git a/Tests/ViewControllers/Products/Detail/NutritionTable/NutritionTableFormTableViewControllerTests.swift b/Tests/ViewControllers/Products/Detail/NutritionTable/NutritionTableFormTableViewControllerTests.swift index cee5189446e..dc4d1f27582 100644 --- a/Tests/ViewControllers/Products/Detail/NutritionTable/NutritionTableFormTableViewControllerTests.swift +++ b/Tests/ViewControllers/Products/Detail/NutritionTable/NutritionTableFormTableViewControllerTests.swift @@ -32,9 +32,9 @@ class NutritionTableFormTableViewControllerTests: XCTestCase { // MARK: - Init func testInitWithFormAndProductApi() { - let vc = SummaryFormTableViewController(with: form, dataManager: dataManager) + let summaryFormTableVC = SummaryFormTableViewController(with: form, dataManager: dataManager) - expect(vc).notTo(beNil()) + expect(summaryFormTableVC).notTo(beNil()) } // MARK: - getCell diff --git a/Tests/ViewControllers/Products/Detail/Summary/SummaryFormTableViewControllerTests.swift b/Tests/ViewControllers/Products/Detail/Summary/SummaryFormTableViewControllerTests.swift index 59b28d1aac0..9c6a26b047e 100644 --- a/Tests/ViewControllers/Products/Detail/Summary/SummaryFormTableViewControllerTests.swift +++ b/Tests/ViewControllers/Products/Detail/Summary/SummaryFormTableViewControllerTests.swift @@ -32,9 +32,9 @@ class SummaryFormTableViewControllerTests: XCTestCase { // MARK: - Init func testInitWithFormAndProductApi() { - let vc = SummaryFormTableViewController(with: form, dataManager: dataManager) + let summaryFormTableVC = SummaryFormTableViewController(with: form, dataManager: dataManager) - expect(vc).notTo(beNil()) + expect(summaryFormTableVC).notTo(beNil()) } // MARK: - getCell diff --git a/Tests/ViewControllers/Products/Search/SearchViewControllerSpec.swift b/Tests/ViewControllers/Products/Search/SearchViewControllerSpec.swift index bc7e440f114..e90a80ec54a 100644 --- a/Tests/ViewControllers/Products/Search/SearchViewControllerSpec.swift +++ b/Tests/ViewControllers/Products/Search/SearchViewControllerSpec.swift @@ -73,9 +73,9 @@ class SearchViewControllerSpec: QuickSpec { viewController.showHistory(UIBarButtonItem()) expect(navigationControllerMock.pushedViewController is HistoryTableViewController).to(beTrue()) - let vc = navigationControllerMock.pushedViewController as! HistoryTableViewController - expect(vc.dataManager).toNot(beNil()) - expect(vc.delegate).toNot(beNil()) + let historyTableVC = navigationControllerMock.pushedViewController as! HistoryTableViewController + expect(historyTableVC.dataManager).toNot(beNil()) + expect(historyTableVC.delegate).toNot(beNil()) } } From 04302f2051e343e426aac32518eba36b4f84ee39 Mon Sep 17 00:00:00 2001 From: as3842 Date: Sat, 5 May 2018 11:19:53 -0400 Subject: [PATCH 5/6] Renamed "UIVC" to childNavigationVC --- Sources/ViewControllers/User/UserViewController.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/ViewControllers/User/UserViewController.swift b/Sources/ViewControllers/User/UserViewController.swift index a0e39cfcce6..cec0345aeb3 100644 --- a/Sources/ViewControllers/User/UserViewController.swift +++ b/Sources/ViewControllers/User/UserViewController.swift @@ -22,7 +22,7 @@ class UserViewController: UIViewController, DataManagerClient { } private func loadChildVC() { - let UIVC: UIViewController + let childNavigationVC: UIViewController if CredentialsController.shared.getUsername() != nil { createLoggedIn() @@ -31,13 +31,13 @@ class UserViewController: UIViewController, DataManagerClient { showProductsPendingUpload() } - UIVC = childNavigationController + childNavigationVC = childNavigationController } else { - UIVC = createLogIn() + childNavigationVC = createLogIn() } - transition(to: UIVC) + transition(to: childNavigationVC) } private func createLoggedIn() { From 08449a3ec7f4312b35a1891fa3300ffa71aafa05 Mon Sep 17 00:00:00 2001 From: as3842 Date: Fri, 11 May 2018 16:13:00 -0400 Subject: [PATCH 6/6] Renamed SFSafariVC to sfSafariVC. Also excluded "id" in .swiftlint file --- .swiftlint.yml | 3 +++ Sources/Extensions/UIViewController.swift | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 7cf7ee8f2c5..dded6098f6e 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -17,3 +17,6 @@ file_length: type_name: min_length: 3 max_length: 50 +identifier_name: + excluded: + - id \ No newline at end of file diff --git a/Sources/Extensions/UIViewController.swift b/Sources/Extensions/UIViewController.swift index 34424af7d81..f7820b289e0 100644 --- a/Sources/Extensions/UIViewController.swift +++ b/Sources/Extensions/UIViewController.swift @@ -29,8 +29,8 @@ extension UIViewController { } func openUrlInApp(_ url: URL, showAlert: Bool? = nil) { - let SFSafariVC = SFSafariViewController(url: url, entersReaderIfAvailable: false) - present(SFSafariVC, animated: true) + let sfSafariVC = SFSafariViewController(url: url, entersReaderIfAvailable: false) + present(sfSafariVC, animated: true) if showAlert == true { NotificationBanner(title: "product-detail.edit-alert.title".localized,