From 2e6cf69b03d1cce48aa3ac3c5bb54e914c98f223 Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Sat, 4 Jul 2020 22:05:20 +0200 Subject: [PATCH] Enable SwiftLint rule 'convenience_type' and fix all violations --- .swiftlint.yml | 2 +- passExtension/Helpers/OnePasswordExtensionConstants.swift | 6 +++--- passKit/Helpers/Colors.swift | 2 +- passKit/Helpers/Utils.swift | 2 +- passKit/Parser/Constants.swift | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.swiftlint.yml b/.swiftlint.yml index 245fc71..250dd34 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -25,7 +25,7 @@ whitelist_rules: - contains_over_filter_is_empty - contains_over_first_not_nil - control_statement -# - convenience_type + - convenience_type - custom_rules # - cyclomatic_complexity - deployment_target diff --git a/passExtension/Helpers/OnePasswordExtensionConstants.swift b/passExtension/Helpers/OnePasswordExtensionConstants.swift index 53c922c..48f9787 100644 --- a/passExtension/Helpers/OnePasswordExtensionConstants.swift +++ b/passExtension/Helpers/OnePasswordExtensionConstants.swift @@ -7,7 +7,7 @@ // // This file contains constants from https://github.com/agilebits/onepassword-app-extension/ -class OnePasswordExtensionActions { +enum OnePasswordExtensionActions { static let findLogin = "org.appextension.find-login-action" static let saveLogin = "org.appextension.save-login-action" static let changePassword = "org.appextension.change-password-action" @@ -15,7 +15,7 @@ class OnePasswordExtensionActions { static let fillBrowser = "org.appextension.fill-browser-action" } -class OnePasswordExtensionKey { +enum OnePasswordExtensionKey { // Login Dictionary keys - Used to get or set the properties of a 1Password Login static let URLStringKey = "url_string" static let usernameKey = "username" @@ -38,7 +38,7 @@ class OnePasswordExtensionKey { } // Errors codes -class OnePasswordExtensionError { +enum OnePasswordExtensionError { static let errorDomain = "OnePasswordExtension" static let errorCodeCancelledByUser = 0 static let errorCodeAPINotAvailable = 1 diff --git a/passKit/Helpers/Colors.swift b/passKit/Helpers/Colors.swift index e56fdae..737b971 100644 --- a/passKit/Helpers/Colors.swift +++ b/passKit/Helpers/Colors.swift @@ -6,7 +6,7 @@ // Copyright © 2019 Bob Sun. All rights reserved. // -public struct Colors { +public enum Colors { public static let label: UIColor = { if #available(iOS 13.0, *) { return .label diff --git a/passKit/Helpers/Utils.swift b/passKit/Helpers/Utils.swift index 4317695..18faeca 100644 --- a/passKit/Helpers/Utils.swift +++ b/passKit/Helpers/Utils.swift @@ -6,7 +6,7 @@ // Copyright © 2017 Bob Sun. All rights reserved. // -public class Utils { +public enum Utils { public static func copyToPasteboard(textToCopy: String?) { guard textToCopy != nil else { return diff --git a/passKit/Parser/Constants.swift b/passKit/Parser/Constants.swift index 065ba4e..711b9d2 100644 --- a/passKit/Parser/Constants.swift +++ b/passKit/Parser/Constants.swift @@ -6,7 +6,7 @@ // Copyright © 2018 Bob Sun. All rights reserved. // -public struct Constants { +public enum Constants { static let OTP_SECRET = "otp_secret" static let OTP_TYPE = "otp_type" static let OTP_ALGORITHM = "otp_algorithm"