MOB-4878 remove warnings (#609)

* add explanation to imports in payment related files, remove unknown default warnings, inhibit pod warnings, suppress TODO warnings * update pods to recommended settings * remove or suppress line length and type name warnings * remove public access to loading image view, fix more warnings * remove warnings, adapt swiftlint exception for UITextView SwiftUI extension * remove more warnings * remove warning from client app delegate * remove location manager deprecated warnings * remove warning in ErrorBannerView * improve region code selection * remove LoyaltyViewDataModel
karhoo · Sep 5, 2023 · 73a3798 · 73a3798
1 parent 8738bea
commit 73a3798
Show file tree

Hide file tree

Showing 55 changed files with 165 additions and 143 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,6 +1,7 @@
 disabled_rules:
   - identifier_name
   - void_function_in_ternary
+  - todo
 trailing_whitespace:
   ignores_empty_lines: true
   ignores_comments: true

diff --git a/AdyenPSP/AdyenCardRegistrationFlow.swift b/AdyenPSP/AdyenCardRegistrationFlow.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import KarhooSDK
-import KarhooUISDK
+import KarhooUISDK // Even if the import may not be required in some configurations, it is needed for SPM linking. Do not remove unless you are sure a new solution allowes SPM-based project/app to be compiled.
 #if canImport(Adyen)
 import Adyen
 #endif

diff --git a/AdyenPSP/AdyenPaymentNonceProvider.swift b/AdyenPSP/AdyenPaymentNonceProvider.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import KarhooSDK
-import KarhooUISDK
+import KarhooUISDK // Even if the import may not be required in some configurations, it is needed for SPM linking. Do not remove unless you are sure a new solution allowes SPM-based project/app to be compiled.
 
 final class AdyenPaymentNonceProvider: PaymentNonceProvider {
 

diff --git a/AdyenPSP/AdyenResponseHandler.swift b/AdyenPSP/AdyenResponseHandler.swift
@@ -10,7 +10,7 @@
 
 import Foundation
 import KarhooSDK
-import KarhooUISDK
+import KarhooUISDK // Even if the import may not be required in some configurations, it is needed for SPM linking. Do not remove unless you are sure a new solution allowes SPM-based project/app to be compiled.
 #if canImport(Adyen)
 import Adyen
 #endif

diff --git a/AdyenPSP/AdyenThreeDSecureUtils.swift b/AdyenPSP/AdyenThreeDSecureUtils.swift
@@ -6,7 +6,7 @@
 //
 //
 import Foundation
-import KarhooUISDK
+import KarhooUISDK // Even if the import may not be required in some configurations, it is needed for SPM linking. Do not remove unless you are sure a new solution allowes SPM-based project/app to be compiled.
 
 public struct AdyenThreeDSecureUtils: ThreeDSecureUtils {
     public init() {}

diff --git a/BraintreePSP/BraintreeCardRegistrationFlow.swift b/BraintreePSP/BraintreeCardRegistrationFlow.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import KarhooSDK
-import KarhooUISDK
+import KarhooUISDK // Even if the import may not be required in some configurations, it is needed for SPM linking. Do not remove unless you are sure a new solution allowes SPM-based project/app to be compiled.
 
 public final class BraintreeCardRegistrationFlow: CardRegistrationFlow {
 

diff --git a/BraintreePSP/BraintreePaymentNonceProvider.swift b/BraintreePSP/BraintreePaymentNonceProvider.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import KarhooSDK
-import KarhooUISDK
+import KarhooUISDK // Even if the import may not be required in some configurations, it is needed for SPM linking. Do not remove unless you are sure a new solution allowes SPM-based project/app to be compiled.
 
 final class BraintreePaymentNonceProvider: PaymentNonceProvider {
 
@@ -59,6 +59,8 @@ final class BraintreePaymentNonceProvider: PaymentNonceProvider {
             case .failure:
                 self?.callbackResult?(.completed(value: .failedToInitialisePaymentService(error: result.getErrorValue())))
                 return
+            @unknown default:
+                print("Unknown enum value in BraintreePaymentNonceProvider.getPaymentNonce")
             }
         }
     }

diff --git a/BraintreePSP/BraintreePaymentScreensBuilder.swift b/BraintreePSP/BraintreePaymentScreensBuilder.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import KarhooSDK
-import KarhooUISDK
+import KarhooUISDK // Even if the import may not be required in some configurations, it is needed for SPM linking. Do not remove unless you are sure a new solution allowes SPM-based project/app to be compiled.
 #if canImport(BraintreeDropIn)
 import BraintreeDropIn
 #endif

diff --git a/BraintreePSP/BraintreeThreeDSecureProvider.swift b/BraintreePSP/BraintreeThreeDSecureProvider.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import KarhooSDK
-import KarhooUISDK
+import KarhooUISDK // Even if the import may not be required in some configurations, it is needed for SPM linking. Do not remove unless you are sure a new solution allowes SPM-based project/app to be compiled.
 #if canImport(Braintree)
 import Braintree
 #endif

diff --git a/Client/AppDelegate.swift b/Client/AppDelegate.swift
@@ -55,7 +55,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         willPresent notification: UNNotification,
         withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
             if notification.request.identifier.contains(KarhooAnalitycsServiceWithNotifications.karhooNotificationIdentifierPrefix){
-                completionHandler([.alert,.badge])
+                completionHandler([.banner,.badge])
             }
     }
 

diff --git a/Client/KarhooAnalyticsServiceWithNotifications.swift b/Client/KarhooAnalyticsServiceWithNotifications.swift
@@ -31,8 +31,8 @@ class KarhooAnalitycsServiceWithNotifications: AnalyticsService {
                 trigger: trigger
             )
             UNUserNotificationCenter.current().add(request) { (error) in
-                if error != nil {
-                   print(error)
+                if let error = error {
+                    print(error)
                 }
              }
         }

diff --git a/KarhooUISDK.xcodeproj/project.pbxproj b/KarhooUISDK.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -4291,6 +4291,7 @@
 		};
 		5C8316B92469FCB200BAA926 /* SwiftLint Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);

diff --git a/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/Client+KarhooUISDK.xcscheme b/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/Client+KarhooUISDK.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/Client.xcscheme b/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/Client.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/KarhooUISDK.xcscheme b/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/KarhooUISDK.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1430"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/KarhooUISDKTests.xcscheme b/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/KarhooUISDKTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/KarhooUISDKUITests.xcscheme b/KarhooUISDK.xcodeproj/xcshareddata/xcschemes/KarhooUISDKUITests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1400"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/KarhooUISDK/API/KarhooUISDKConfiguration.swift b/KarhooUISDK/API/KarhooUISDKConfiguration.swift
@@ -22,7 +22,9 @@ public protocol KarhooUISDKConfiguration: KarhooSDKConfiguration {
 
     var paymentManager: PaymentManager { get }
 
-    /// Return `true` if you want `Karhoo UISDK` to use `Add to calendar` feature, allowing users to add scheduled ride to the device main calendar. This feature required host app’s `info.plist` to have `Privacy - Calendars Usage Description` marked as used. If you do not want to modify your `info.plist`, or you don’t want user to see this feature, return `false`.
+    /// Return `true` if you want `Karhoo UISDK` to use `Add to calendar` feature, allowing users to add scheduled ride to the device main calendar.
+    /// This feature required host app’s `info.plist` to have `Privacy - Calendars Usage Description` marked as used.
+    /// If you do not want to modify your `info.plist`, or you don’t want user to see this feature, return `false`.
     var useAddToCalendarFeature: Bool { get }
 }
 

diff --git a/KarhooUISDK/CommonUI/BaseControls/BaseView.swift b/KarhooUISDK/CommonUI/BaseControls/BaseView.swift
@@ -21,8 +21,12 @@ public extension BaseView {
         configService.uiConfig(uiConfigRequest: UIConfigRequest(viewId: self.accessibilityIdentifier))
             .execute(callback: { [weak self] result in
             switch result {
-            case .success(let model, _): self?.set(configuration: model)
-            case .failure: print("no config for view: \(self?.accessibilityIdentifier ?? "nil" )")
+            case .success(let model, _):
+                self?.set(configuration: model)
+            case .failure:
+                print("no config for view: \(self?.accessibilityIdentifier ?? "nil" )")
+            @unknown default:
+                print("Unknown enum value in BaseView.configure")
             }
         })
     }

diff --git a/KarhooUISDK/CommonUI/BottomSheet/KarhooBottomSheet.swift b/KarhooUISDK/CommonUI/BottomSheet/KarhooBottomSheet.swift
@@ -56,10 +56,9 @@ struct KarhooBottomSheet<Content: View>: View {
                 maxHeight: UIScreen.main.bounds.height - getTopPadding()
             )
         }
-        .colorScheme(.light) // Delete this line after dark mode modifications
+        .colorScheme(.light) // TODO: Delete this line after dark mode modifications
 
     }
-
 
     private func getTopPadding() -> CGFloat {
         UIApplication.shared.windows.first?.safeAreaInsets.top ?? 0

diff --git a/KarhooUISDK/CommonUI/LoadingControls/LoadingImageView/LoadingImageView.swift b/KarhooUISDK/CommonUI/LoadingControls/LoadingImageView/LoadingImageView.swift
@@ -9,8 +9,7 @@
 import UIKit
 import SwiftUI
 
-@available(*, deprecated, message: "Public access to this class will be removed in next release")
-public final class LoadingImageView: UIView {
+final class LoadingImageView: UIView {
 
     private var imageView: UIImageView!
     private var activityIndicator: UIActivityIndicatorView!
@@ -51,7 +50,7 @@ public final class LoadingImageView: UIView {
         activityIndicator = UIActivityIndicatorView()
         activityIndicator.translatesAutoresizingMaskIntoConstraints = false
         activityIndicator.accessibilityIdentifier = "caching_activity_indicator"
-        activityIndicator.style = .gray
+        activityIndicator.style = .medium
         activityIndicator.hidesWhenStopped = true
 
         addSubview(activityIndicator)

diff --git a/KarhooUISDK/CommonUI/LoadingControls/LoadingView/LoadingView.swift b/KarhooUISDK/CommonUI/LoadingControls/LoadingView/LoadingView.swift
@@ -38,7 +38,7 @@ public final class LoadingView: UIView {
         accessibilityIdentifier = "loading_view"
         alpha = 0.0
 
-        activityIndicatorView = UIActivityIndicatorView(style: .whiteLarge)
+        activityIndicatorView = UIActivityIndicatorView(style: .large)
         activityIndicatorView.accessibilityIdentifier = "activity_indicator"
         activityIndicatorView.translatesAutoresizingMaskIntoConstraints = false
         activityIndicatorView.startAnimating()

diff --git a/KarhooUISDK/CommonUI/UIConstants.swift b/KarhooUISDK/CommonUI/UIConstants.swift
@@ -5,7 +5,7 @@
 //  Created by Diana Petrea on 05.01.2022.
 //  Copyright © 2022 Flit Technologies Ltd. All rights reserved.
 //
-// swiftlint:disable comment_spacing nesting
+// swiftlint:disable nesting
 
 import Foundation
 import UIKit
@@ -20,25 +20,25 @@ public struct UIConstants {
         public static let xxSmall: CGFloat = 2
 
         /// 4
-        public static let xSmall: CGFloat = 4 //3...5
+        public static let xSmall: CGFloat = 4 // 3...5
 
         /// 8
-        public static let small: CGFloat = 8 //6...10
+        public static let small: CGFloat = 8 // 6...10
 
         /// 12
-        public static let medium: CGFloat = 12 //11...14
+        public static let medium: CGFloat = 12 // 11...14
 
         /// 16
-        public static let standard: CGFloat = 16 //15...21
+        public static let standard: CGFloat = 16 // 15...21
 
         /// 24
-        public static let large: CGFloat = 24 //22...28
+        public static let large: CGFloat = 24 // 22...28
 
         /// 32
-        public static let xLarge: CGFloat = 32 //29...40
+        public static let xLarge: CGFloat = 32 // 29...40
 
         /// 44
-        public static let xxLarge: CGFloat = 44 //41...56
+        public static let xxLarge: CGFloat = 44 // 41...56
 
         /// 64
         public static let xxxLarge: CGFloat = 64 // 57+
@@ -73,22 +73,22 @@ public struct UIConstants {
 
         public struct Icon {
             /// 11
-            public static let small: CGFloat = 11 //8...14
+            public static let small: CGFloat = 11 // 8...14
 
             /// 16
-            public static let medium: CGFloat = 16 //15...17
+            public static let medium: CGFloat = 16 // 15...17
 
             /// 22
-            public static let standard: CGFloat = 22 //18...26
+            public static let standard: CGFloat = 22 // 18...26
 
             /// 32
-            public static let large: CGFloat = 32 //27...39
+            public static let large: CGFloat = 32 // 27...39
 
             /// 44
-            public static let xLarge: CGFloat = 44 //44...53
+            public static let xLarge: CGFloat = 44 // 44...53
 
             /// 64
-            public static let xxLarge: CGFloat = 64 //54+
+            public static let xxLarge: CGFloat = 64 // 54+
 
             /// 120
             public static let xxxLarge: CGFloat = 120
@@ -151,7 +151,7 @@ public struct UIConstants {
             public static let headerHeight: CGFloat = 90
 
             /// 50
-            public static let rowHeight: CGFloat = 50 //includes KarhooQuoteListViewController > prebookQuotesTitleLabel height
+            public static let rowHeight: CGFloat = 50 // includes KarhooQuoteListViewController > prebookQuotesTitleLabel height
 
             /// 60
             public static let largeRowHeight: CGFloat = 60 // includes the address search bar height
@@ -173,16 +173,16 @@ public struct UIConstants {
             public static let findTripSpinnerSize = CGSize(width: 212, height: 212)
 
             /// 150
-            public static let fleetAvailabilityHeight: CGFloat = 150 //KarhooBookingViewController > bottomNotificationViewBottomConstraint
+            public static let fleetAvailabilityHeight: CGFloat = 150 // KarhooBookingViewController > bottomNotificationViewBottomConstraint
 
             /// 230
-            public static let quoteListHeight: CGFloat = 230 //QuoteListPanelLayout
+            public static let quoteListHeight: CGFloat = 230 // QuoteListPanelLayout
 
             /// 140
-            public static let quoteListTopOffset: CGFloat = 140 //QuoteListPanelLayout
+            public static let quoteListTopOffset: CGFloat = 140 // QuoteListPanelLayout
 
             /// 162
-            public static let cancelTripProgressViewWidth: CGFloat = 162 //KarhooCancelButtonView
+            public static let cancelTripProgressViewWidth: CGFloat = 162 // KarhooCancelButtonView
 
             /// 180 x 180
             public static let driverDetailsViewSize = CGSize(width: 180, height: 180)
@@ -199,7 +199,7 @@ public struct UIConstants {
         public static let xSmall: CGFloat = 2
 
         /// 4
-        public static let small: CGFloat = 4 //3...5
+        public static let small: CGFloat = 4 // 3...5
 
         /// 8
         public static let medium: CGFloat = 8
@@ -222,7 +222,7 @@ public struct UIConstants {
         public static let border: CGFloat = 0.5
     }
 
-    //Animation duration
+    // Animation duration
     public struct Duration {
         /// 0.1
         public static let xShort: Double = 0.1
@@ -242,7 +242,7 @@ public struct UIConstants {
         /// 0.1
         public static let xxSmallDelay: Double = 0.1
 
-        ///0.25
+        /// 0.25
         public static let xSmallDelay: Double = 0.25
 
         /// 0.3
@@ -290,3 +290,5 @@ public struct UIConstants {
         static let shadowAlpha: CGFloat = 0.5
     }
 }
+
+// swiftlint:enable nesting
diff --git a/KarhooUISDK/CommonUI/UITexts.swift b/KarhooUISDK/CommonUI/UITexts.swift
@@ -537,7 +537,7 @@ public enum UITexts {
         public static let vehicleLogoHybrid = "kh_uisdk_accessibility_icon_hybrid".localized
         public static let vehicleLogoEconomy = "kh_uisdk_accessibility_icon_economy".localized
         public static let loyaltySwitchEnabled = "kh_uisdk_accessibility_loyalty_switch_enabled".localized
-        public static let loyaltySwitchDisabled = "kh_uisdk_accessibility_loyalty_switch_disabled".localized  
+        public static let loyaltySwitchDisabled = "kh_uisdk_accessibility_loyalty_switch_disabled".localized
         public static let pickUpAddress = "kh_uisdk_accessibility_label_pickup_address".localized
         public static let dropOffAddress = "kh_uisdk_accessibility_label_drop_off_address".localized
     }

diff --git a/KarhooUISDK/CommonUI/VehicleCapacityView/VehicleCapacityView.swift b/KarhooUISDK/CommonUI/VehicleCapacityView/VehicleCapacityView.swift
@@ -7,8 +7,6 @@ import Foundation
 import UIKit
 import KarhooSDK
 
-
-
 final class VehicleCapacityView: UIStackView {
 
     private var passengerCapacityView: IconPlusTextHorizontalView?