Skip to content
This repository has been archived by the owner on Sep 5, 2023. It is now read-only.

Resolves #92, Identifier Name Violation Issues after updating to Xcode 9.3 #93

Merged
merged 6 commits into from
May 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ file_length:
type_name:
min_length: 3
max_length: 50
identifier_name:
excluded:
- id
42 changes: 21 additions & 21 deletions Sources/Extensions/UIColor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,31 @@ extension UIColor {

var rgb: UInt32 = 0

var r: CGFloat = 0.0
var g: CGFloat = 0.0
var b: CGFloat = 0.0
var a: CGFloat = 1.0
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
Expand All @@ -54,24 +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
}

let r = Float(components[0])
let g = Float(components[1])
let b = Float(components[2])
var a = Float(1.0)
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))
}
}
}
4 changes: 2 additions & 2 deletions Sources/Extensions/UIViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion Sources/Helpers/URLs.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ struct URLs {
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 ProductBaseURL: String = {
return ProductBaseURLWithLanguagePlaceholder.replacingOccurrences(of: "LANGUAGE", with: Locale.current.languageCode!)
}()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Sources/ViewControllers/RootViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class SettingsTableViewController: UITableViewController, MFMailComposeViewContr
}

override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
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:
Expand Down
30 changes: 15 additions & 15 deletions Sources/ViewControllers/User/UserViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class UserViewController: UIViewController, DataManagerClient {
}

private func loadChildVC() {
let vc: UIViewController
let childNavigationVC: UIViewController

if CredentialsController.shared.getUsername() != nil {
createLoggedIn()
Expand All @@ -31,28 +31,28 @@ class UserViewController: UIViewController, DataManagerClient {
showProductsPendingUpload()
}

vc = childNavigationController
childNavigationVC = childNavigationController

} else {
vc = createLogIn()
childNavigationVC = createLogIn()
}

transition(to: vc)
transition(to: childNavigationVC)
}

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
}
}

Expand All @@ -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)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
}

Expand Down