Merge pull request #483 from Adyen/format-project-github-action

Format project
Adyen · May 5, 2021 · cc11366 · cc11366
2 parents d323485 + 33fb592
commit cc11366
Show file tree

Hide file tree

Showing 41 changed files with 128 additions and 114 deletions.
diff --git a/Adyen/Components/Stored Payment Method/StoredPaymentMethodComponent.swift b/Adyen/Components/Stored Payment Method/StoredPaymentMethodComponent.swift
@@ -31,7 +31,7 @@ public final class StoredPaymentMethodComponent: PaymentComponent, PresentableCo
 
         let displayInformation = storedPaymentMethod.localizedDisplayInformation(using: localizationParameters)
         let alertController = UIAlertController(title: localizedString(.dropInStoredTitle,
-                                                                          localizationParameters, storedPaymentMethod.name),
+                                                                       localizationParameters, storedPaymentMethod.name),
                                                 message: displayInformation.title,
                                                 preferredStyle: .alert)
 
@@ -41,8 +41,8 @@ public final class StoredPaymentMethodComponent: PaymentComponent, PresentableCo
         alertController.addAction(cancelAction)
 
         let submitActionTitle = localizedSubmitButtonTitle(with: payment?.amount,
-                                                              style: .immediate,
-                                                              localizationParameters)
+                                                           style: .immediate,
+                                                           localizationParameters)
         let submitAction = UIAlertAction(title: submitActionTitle, style: .default) { _ in
             let details = StoredPaymentDetails(paymentMethod: self.storedPaymentMethod)
             self.submit(data: PaymentComponentData(paymentMethodDetails: details))

diff --git a/Adyen/Formatters/NumericFormatter.swift b/Adyen/Formatters/NumericFormatter.swift
@@ -19,7 +19,7 @@ open class NumericFormatter: Adyen.Formatter {
 
     /// :nodoc:
     open func sanitizedValue(for value: String) -> String {
-        let sanitizedString = value.filter { $0.isNumber }
+        let sanitizedString = value.filter(\.isNumber)
 
         // Converts all non-latin digits to latin digits
         let latinString = sanitizedString.applyingTransform(StringTransform.toLatin, reverse: false) ?? sanitizedString

diff --git a/Adyen/Helpers/UIButtonHelpers.swift b/Adyen/Helpers/UIButtonHelpers.swift
@@ -12,7 +12,7 @@ extension UIButton {
     /// Sets `translatesAutoresizingMaskIntoConstraints` to `false`
     /// Sets `adjustsFontForContentSizeCategory` to the `titleLabel` to `true`
     /// - Parameter style: `ButtonStyle` to be applied
-    convenience public init(style: ButtonStyle) {
+    public convenience init(style: ButtonStyle) {
         self.init()
         translatesAutoresizingMaskIntoConstraints = false
         adyen.apply(style)

diff --git a/Adyen/Helpers/UILabelHelpers.swift b/Adyen/Helpers/UILabelHelpers.swift
@@ -12,7 +12,7 @@ extension UILabel {
     /// Sets `translatesAutoresizingMaskIntoConstraints` to `false`
     /// Sets `adjustsFontForContentSizeCategory` to `true`
     /// - Parameter style: `TextStyle` to be applied
-    convenience public init(style: TextStyle) {
+    public convenience init(style: TextStyle) {
         self.init()
         translatesAutoresizingMaskIntoConstraints = false
         adyen.apply(style)

diff --git a/Adyen/Helpers/UIProgressViewHelpers.swift b/Adyen/Helpers/UIProgressViewHelpers.swift
@@ -7,7 +7,7 @@
 import UIKit
 
 extension UIProgressView {
-    convenience public init(style: ProgressViewStyle) {
+    public convenience init(style: ProgressViewStyle) {
         self.init()
 
         backgroundColor = style.backgroundColor

diff --git a/Adyen/UI/Form/Items/Text/FormTextInputItem.swift b/Adyen/UI/Form/Items/Text/FormTextInputItem.swift
@@ -11,7 +11,7 @@ import Foundation
 public final class FormTextInputItem: FormTextItem {
 
     /// :nodoc:
-    public override init(style: FormTextItemStyle = .init()) {
+    override public init(style: FormTextItemStyle = .init()) {
         super.init(style: style)
     }
 

diff --git a/Adyen/UI/Form/Items/Value Pickers/Abstract/BasePickerInputControl.swift b/Adyen/UI/Form/Items/Value Pickers/Abstract/BasePickerInputControl.swift
@@ -61,7 +61,7 @@ internal class BasePickerInputControl: UIControl, PickerTextInputControl {
     }
 
     /// The phone code label.
-    internal lazy var valueLabel: UILabel = UILabel(style: style)
+    internal lazy var valueLabel = UILabel(style: style)
 
     override internal var accessibilityIdentifier: String? {
         didSet {

diff --git a/Adyen/UI/View Controllers/ADYViewController.swift b/Adyen/UI/View Controllers/ADYViewController.swift
@@ -8,7 +8,7 @@ import UIKit
 
 /// :nodoc:
 /// `ADYViewController` serves as a height-aware `UIViewController`
-final public class ADYViewController: UIViewController {
+public final class ADYViewController: UIViewController {
 
     /// :nodoc:
     private let contentView: UIView
@@ -39,7 +39,8 @@ final public class ADYViewController: UIViewController {
             return view.systemLayoutSizeFitting(
                 targetSize,
                 withHorizontalFittingPriority: .required,
-                verticalFittingPriority: .fittingSizeLevel)
+                verticalFittingPriority: .fittingSizeLevel
+            )
         }
 
         // swiftlint:disable:next unused_setter_value

diff --git a/Adyen/Utilities/Localization.swift b/Adyen/Utilities/Localization.swift
@@ -44,12 +44,12 @@ public func localizedString(_ key: LocalizationKey, _ parameters: LocalizationPa
 private func fallbackLocalizedString(key: String) -> String {
     let localizedFallback = NSLocalizedString(key, tableName: nil, bundle: Bundle.coreInternalResources, comment: "")
 
-    if localizedFallback != key && localizedFallback.isEmpty == false {
+    if localizedFallback != key, localizedFallback.isEmpty == false {
         return localizedFallback
     } else {
-    // Fallback to en-US
+        // Fallback to en-US
         return Bundle.coreInternalResources.path(forResource: "en-US", ofType: "lproj")
-            .flatMap(Bundle.init(path: ))
+            .flatMap(Bundle.init(path:))
             .map { NSLocalizedString(key, tableName: nil, bundle: $0, comment: "") } ?? key
     }
 }
@@ -118,7 +118,7 @@ public func localizedSubmitButtonTitle(with amount: Payment.Amount?,
                                        _ parameters: LocalizationParameters?) -> String {
     if let amount = amount, amount.value == 0 {
         return localizedZeroPaymentAuthorisationButtonTitle(style: style,
-                                                               parameters)
+                                                            parameters)
     }
     guard let formattedAmount = amount?.formatted else {
         return localizedString(.submitButton, parameters)

diff --git a/AdyenActions/UI/UI Style/QRCodeComponentStyle.swift b/AdyenActions/UI/UI Style/QRCodeComponentStyle.swift
@@ -33,7 +33,7 @@ public struct QRCodeComponentStyle: ViewStyle {
     public var logoCornerRounding: CornerRounding = .fixed(5)
 
     /// :nodoc:
-    public var backgroundColor: UIColor = UIColor.Adyen.componentBackground
+    public var backgroundColor = UIColor.Adyen.componentBackground
 
     /// Initializes the QR code component style with the default style
     public init() {}

diff --git a/AdyenActions/UI/View Controllers/QR Code/QRCodeView.swift b/AdyenActions/UI/View Controllers/QR Code/QRCodeView.swift
@@ -7,7 +7,7 @@
 import Adyen
 import UIKit
 
-internal protocol QRCodeViewDelegate: class {
+internal protocol QRCodeViewDelegate: AnyObject {
 
     func copyToPasteboard()
 }
@@ -44,7 +44,7 @@ internal final class QRCodeView: UIView, Localizable, Observer {
         addCopyButton()
     }
 
-    internal override func layoutSubviews() {
+    override internal func layoutSubviews() {
         super.layoutSubviews()
 
         copyButton.adyen.round(using: model.style.copyButton.cornerRounding)

diff --git a/AdyenActions/UI/View Controllers/Voucher/GenericVoucherViewModel.swift b/AdyenActions/UI/View Controllers/Voucher/GenericVoucherViewModel.swift
@@ -61,22 +61,26 @@ extension GenericVoucherView {
             internal var text = TextStyle(
                 font: .preferredFont(forTextStyle: .footnote),
                 color: UIColor.Adyen.componentLabel,
-                textAlignment: .center)
+                textAlignment: .center
+            )
 
             internal var amount = TextStyle(
                 font: UIFont.preferredFont(forTextStyle: .callout).adyen.font(with: .bold),
                 color: UIColor.Adyen.componentLabel,
-                textAlignment: .center)
+                textAlignment: .center
+            )
 
             internal var codeText = TextStyle(
                 font: UIFont.preferredFont(forTextStyle: .title1).adyen.font(with: .bold),
                 color: UIColor.Adyen.componentLabel,
-                textAlignment: .center)
+                textAlignment: .center
+            )
 
             internal var fieldValueText = TextStyle(
                 font: UIFont.preferredFont(forTextStyle: .footnote).adyen.font(with: .semibold),
                 color: UIColor.Adyen.componentLabel,
-                textAlignment: .center)
+                textAlignment: .center
+            )
 
             internal var mainButton: ButtonStyle
 

diff --git a/AdyenCard/Components/Card/CardViewController.swift b/AdyenCard/Components/Card/CardViewController.swift
@@ -215,8 +215,8 @@ internal class CardViewController: FormViewController {
         let item = FormButtonItem(style: formStyle.mainButtonItem)
         item.identifier = ViewIdentifierBuilder.build(scopeInstance: scope, postfix: "payButtonItem")
         item.title = localizedSubmitButtonTitle(with: payment?.amount,
-                                                   style: .immediate,
-                                                   localizationParameters)
+                                                style: .immediate,
+                                                localizationParameters)
         item.buttonSelectionHandler = { [weak self] in
             self?.cardDelegate?.didSelectSubmitButton()
         }

diff --git a/AdyenCard/Components/Stored Card/StoredCardAlertManager.swift b/AdyenCard/Components/Stored Card/StoredCardAlertManager.swift
@@ -85,8 +85,8 @@ internal final class StoredCardAlertManager: NSObject, UITextFieldDelegate, Loca
 
     private lazy var submitAction: UIAlertAction = {
         let actionTitle = localizedSubmitButtonTitle(with: amount,
-                                                        style: .immediate,
-                                                        localizationParameters)
+                                                     style: .immediate,
+                                                     localizationParameters)
         let action = UIAlertAction(title: actionTitle, style: .default) { [unowned self] _ in
             self.submit()
         }

diff --git a/AdyenComponents/BLIK/BLIKComponent.swift b/AdyenComponents/BLIK/BLIKComponent.swift
@@ -85,8 +85,8 @@ public final class BLIKComponent: PaymentComponent, PresentableComponent, Locali
         let item = FormButtonItem(style: style.mainButtonItem)
         item.identifier = ViewIdentifierBuilder.build(scopeInstance: self, postfix: "payButtonItem")
         item.title = localizedSubmitButtonTitle(with: payment?.amount,
-                                                   style: .immediate,
-                                                   localizationParameters)
+                                                style: .immediate,
+                                                localizationParameters)
         item.buttonSelectionHandler = { [weak self] in
             self?.didSelectSubmitButton()
         }

diff --git a/AdyenComponents/SEPA Direct Debit/SEPADirectDebitComponent.swift b/AdyenComponents/SEPA Direct Debit/SEPADirectDebitComponent.swift
@@ -119,8 +119,8 @@ public final class SEPADirectDebitComponent: PaymentComponent, PresentableCompon
         let item = FormButtonItem(style: style.mainButtonItem)
         item.identifier = ViewIdentifierBuilder.build(scopeInstance: self, postfix: "payButtonItem")
         item.title = localizedSubmitButtonTitle(with: payment?.amount,
-                                                   style: .immediate,
-                                                   localizationParameters)
+                                                style: .immediate,
+                                                localizationParameters)
         item.buttonSelectionHandler = { [weak self] in
             self?.didSelectSubmitButton()
         }

diff --git a/AdyenDropIn/Components/PaymentMethodListComponent.swift b/AdyenDropIn/Components/PaymentMethodListComponent.swift
@@ -58,7 +58,7 @@ internal final class PaymentMethodListComponent: ComponentLoader, PresentableCom
 
         let storedSection = ListSection(items: components.stored.map(item(for:)))
         let regularSectionTitle = components.stored.isEmpty ? nil : localizedString(.paymentMethodsOtherMethods,
-                                                                                       localizationParameters)
+                                                                                    localizationParameters)
         let regularSection = ListSection(title: regularSectionTitle,
                                          items: components.regular.map(item(for:)))
 

diff --git a/AdyenDropIn/Components/PreApplePayComponent.swift b/AdyenDropIn/Components/PreApplePayComponent.swift
@@ -4,8 +4,8 @@
 // This file is open source and available under the MIT license. See the LICENSE file for more info.
 //
 
-import UIKit
 import Adyen
+import UIKit
 #if canImport(AdyenComponents)
     import AdyenComponents
 #endif
@@ -47,7 +47,7 @@ internal final class PreApplePayComponent: Localizable, PresentableComponent, Fi
     internal let requiresModalPresentation: Bool = true
 
     /// :nodoc:
-    internal init (configuration: ApplePayComponent.Configuration) throws {
+    internal init(configuration: ApplePayComponent.Configuration) throws {
         self._payment = configuration.payment
         self.paymentMethod = configuration.paymentMethod
 
@@ -66,7 +66,9 @@ internal final class PreApplePayComponent: Localizable, PresentableComponent, Fi
             hint: amount.formatted,
             style: PreApplePayView.Model.Style(
                 hintLabel: TextStyle(font: .preferredFont(forTextStyle: .footnote), color: UIColor.Adyen.componentSecondaryLabel),
-                backgroundColor: UIColor.Adyen.componentBackground))
+                backgroundColor: UIColor.Adyen.componentBackground
+            )
+        )
     }
 
 }

diff --git a/AdyenDropIn/Components/PreselectedPaymentMethodComponent.swift b/AdyenDropIn/Components/PreselectedPaymentMethodComponent.swift
@@ -85,8 +85,8 @@ internal final class PreselectedPaymentMethodComponent: ComponentLoader,
     private lazy var submitButtonItem: FormButtonItem = {
         let item = FormButtonItem(style: style.mainButtonItem)
         item.title = localizedSubmitButtonTitle(with: payment?.amount,
-                                                   style: .immediate,
-                                                   localizationParameters)
+                                                style: .immediate,
+                                                localizationParameters)
         item.identifier = ViewIdentifierBuilder.build(scopeInstance: self, postfix: "submitButton")
         let component = self.defaultComponent
         item.buttonSelectionHandler = { [weak self] in

diff --git a/AdyenDropIn/Utilities/ComponentManager.swift b/AdyenDropIn/Utilities/ComponentManager.swift
@@ -121,7 +121,8 @@ internal final class ComponentManager {
             summaryItems: applePay.summaryItems,
             merchantIdentifier: applePay.merchantIdentifier,
             requiredBillingContactFields: applePay.requiredBillingContactFields,
-            requiredShippingContactFields: applePay.requiredShippingContactFields)
+            requiredShippingContactFields: applePay.requiredShippingContactFields
+        )
 
         do {
             return try PreApplePayComponent(configuration: configuration)

diff --git a/AdyenDropIn/Views/PreApplePayView.swift b/AdyenDropIn/Views/PreApplePayView.swift
@@ -4,12 +4,12 @@
 // This file is open source and available under the MIT license. See the LICENSE file for more info.
 //
 
-import UIKit
 import Adyen
 import PassKit
+import UIKit
 
 /// :nodoc
-internal protocol PreApplePayViewDelegate: class {
+internal protocol PreApplePayViewDelegate: AnyObject {
 
     func pay()
 

diff --git a/AdyenEncryption/CardEncryptor.swift b/AdyenEncryption/CardEncryptor.swift
@@ -59,7 +59,7 @@ public enum CardEncryptor {
     /// - Throws:  `CardEncryptor.Error.invalidEncryptionArguments` when trying to encrypt a card with  card number, securityCode,
     /// expiryMonth, and expiryYear, all of them are nil.
     public static func encrypt(number: String, with publicKey: String) throws -> String {
-        guard !number.isEmpty, number.allSatisfy({ $0.isNumber }) else {
+        guard !number.isEmpty, number.allSatisfy(\.isNumber) else {
             throw Error.invalidNumber
         }
         let payload = CardPayload().add(number: number)
@@ -77,7 +77,7 @@ public enum CardEncryptor {
     /// - Throws:  `CardEncryptor.Error.invalidEncryptionArguments` when trying to encrypt a card with  card number, securityCode,
     /// expiryMonth, and expiryYear, all of them are nil.
     public static func encrypt(securityCode: String, with publicKey: String) throws -> String {
-        guard !securityCode.isEmpty, securityCode.allSatisfy({ $0.isNumber }) else {
+        guard !securityCode.isEmpty, securityCode.allSatisfy(\.isNumber) else {
             throw Error.invalidSecureCode
         }
         let payload = CardPayload().add(securityCode: securityCode)
@@ -95,7 +95,7 @@ public enum CardEncryptor {
     /// - Throws:  `CardEncryptor.Error.invalidEncryptionArguments` when trying to encrypt a card with  card number, securityCode,
     /// expiryMonth, and expiryYear, all of them are nil.
     public static func encrypt(expirationMonth: String, with publicKey: String) throws -> String {
-        guard !expirationMonth.isEmpty, expirationMonth.allSatisfy({ $0.isNumber }) else {
+        guard !expirationMonth.isEmpty, expirationMonth.allSatisfy(\.isNumber) else {
             throw Error.invalidExpiryMonth
         }
         let payload = CardPayload().add(expiryMonth: expirationMonth)
@@ -113,7 +113,7 @@ public enum CardEncryptor {
     /// - Throws:  `CardEncryptor.Error.invalidEncryptionArguments` when trying to encrypt a card with  card number, securityCode,
     /// expiryMonth, and expiryYear, all of them are nil.
     public static func encrypt(expirationYear: String, with publicKey: String) throws -> String {
-        guard !expirationYear.isEmpty, expirationYear.allSatisfy({ $0.isNumber }) else {
+        guard !expirationYear.isEmpty, expirationYear.allSatisfy(\.isNumber) else {
             throw Error.invalidExpiryYear
         }
         let payload = CardPayload().add(expiryYear: expirationYear)
@@ -130,7 +130,7 @@ public enum CardEncryptor {
     /// - Throws:  `CardEncryptor.Error.invalidEncryptionArguments` when trying to encrypt a card with  card number, securityCode,
     /// expiryMonth, and expiryYear, all of them are nil.
     public static func encrypt(bin: String, with publicKey: String) throws -> String {
-        guard !bin.isEmpty, bin.allSatisfy({ $0.isNumber }) else {
+        guard !bin.isEmpty, bin.allSatisfy(\.isNumber) else {
             throw Error.invalidBin
         }
         let payload = BinPayload().add(bin: bin)

diff --git a/Demo/Common/Models/ComponentsItem.swift b/Demo/Common/Models/ComponentsItem.swift
@@ -12,7 +12,7 @@ internal struct ComponentsItem: Hashable {
 
     internal var isApplePay: Bool { title == "Apple Pay" }
 
-    internal let selectionHandler: (() -> Void)
+    internal let selectionHandler: () -> Void
 
     internal init(title: String, selectionHandler: @escaping (() -> Void)) {
         self.title = title

diff --git a/Demo/UIKit/ComponentsView.swift b/Demo/UIKit/ComponentsView.swift
@@ -4,8 +4,8 @@
 // This file is open source and available under the MIT license. See the LICENSE file for more info.
 //
 
-import UIKit
 import PassKit
+import UIKit
 
 internal final class ComponentsView: UIView {