Cleanup WidgetSDK from most warnings

WidgetSDK had a lot of warnings that made further development not pleasent. This PR removes most of them. MOB-2846
yurii-glia · Jan 17, 2024 · 0226960 · 0226960
1 parent 678b1fd
commit 0226960
Show file tree

Hide file tree

Showing 22 changed files with 75 additions and 157 deletions.
diff --git a/GliaWidgets.xcodeproj/project.pbxproj b/GliaWidgets.xcodeproj/project.pbxproj
@@ -5320,7 +5320,7 @@
 			baseConfigurationReference = F42209821D041DD8881645AA /* Pods-TestingApp.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = TestingApp/TestingApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -5348,7 +5348,7 @@
 			baseConfigurationReference = 2F4C9EF1991B7981DC24CA98 /* Pods-TestingApp.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = "";
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = TestingApp/TestingApp.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";

diff --git a/GliaWidgets/Asset.swift b/GliaWidgets/Asset.swift
@@ -138,7 +138,6 @@ public enum Asset {
 // swiftlint:enable identifier_name line_length nesting type_body_length type_name
 
 public extension Image {
-  @available(iOS 1.0, tvOS 1.0, watchOS 1.0, *)
   @available(OSX, unavailable,
     message: "This initializer is unsafe on macOS, please use the ImageAsset.image property")
   convenience init!(asset: ImageAsset) {

diff --git a/GliaWidgets/Public/Glia/Glia.Deprecated.swift b/GliaWidgets/Public/Glia/Glia.Deprecated.swift
@@ -1,76 +1,6 @@
 import GliaCoreSDK
 
 extension Glia {
-    /// Deprecated.
-    @available(*, unavailable, message: "Use configure(with:uiConfig:assetsBuilder:completion:) instead.")
-    public func configure(
-        with configuration: Configuration,
-        queueId: String,
-        visitorContext: VisitorContext?,
-        completion: (() -> Void)? = nil
-    ) throws {
-        try self.configure(
-            with: configuration,
-            queueId: queueId,
-            uiConfig: nil,
-            completion: completion
-        )
-    }
-
-    /// Deprecated.
-    @available(
-        *,
-         unavailable,
-         message: "Use start(_:configuration:queueID:visitorContext:theme:features:sceneProvider:) with Optional<VisitorContext> instead."
-    )
-    public func start(
-        _ engagementKind: EngagementKind,
-        configuration: Configuration,
-        queueID: String,
-        visitorContext: VisitorContext,
-        theme: Theme = Theme(),
-        features: Features = .all,
-        sceneProvider: SceneProvider? = nil
-    ) throws {
-        try self.start(
-            engagementKind,
-            configuration: configuration,
-            queueID: queueID,
-            visitorContext: Optional(visitorContext),
-            theme: theme,
-            features: features,
-            sceneProvider: sceneProvider
-        )
-    }
-
-    /// Deprecated.
-    @available(
-        *,
-         deprecated,
-         message: "Use start(_:configuration:queueID:theme:features:sceneProvider:) instead."
-    )
-    public func start(
-        _ engagementKind: EngagementKind,
-        configuration: Configuration,
-        queueID: String,
-        visitorContext: VisitorContext?,
-        theme: Theme = Theme(),
-        features: Features = .all,
-        sceneProvider: SceneProvider? = nil
-    ) throws {
-        if visitorContext != nil {
-            print("⚠️ visitorContext has been deprecated, please pass visitor context using `Configuration`.")
-        }
-        try start(
-            engagementKind,
-            configuration: configuration,
-            queueID: queueID,
-            theme: theme,
-            features: features,
-            sceneProvider: sceneProvider
-        )
-    }
-
     /// Deprecated, use `clearVisitorSession(_:)` instead.
     @available(
         *,

diff --git a/GliaWidgets/SecureConversations/ChatTranscript/SecureConversations.TranscriptModel.swift b/GliaWidgets/SecureConversations/ChatTranscript/SecureConversations.TranscriptModel.swift
@@ -417,7 +417,7 @@ extension SecureConversations.TranscriptModel {
 // MARK: Handling of file-picker
 extension SecureConversations.TranscriptModel {
     private func presentMediaPicker() {
-        let itemSelected = { [weak self] (kind: AttachmentSourceItemKind) -> Void in
+        let itemSelected = { [weak self] (kind: AttachmentSourceItemKind) in
             let media = ObservableValue<MediaPickerEvent>(with: .none)
             guard let self = self else { return }
             media.addObserver(self) { [weak self] event, _ in

diff --git a/GliaWidgets/SecureConversations/Welcome/SecureConversations.WelcomeViewModel.swift b/GliaWidgets/SecureConversations/Welcome/SecureConversations.WelcomeViewModel.swift
@@ -431,7 +431,7 @@ extension SecureConversations.WelcomeViewModel {
         from originView: UIView,
         alertConfiguration: AlertConfiguration
     ) {
-        let itemSelected = { (kind: AttachmentSourceItemKind) -> Void in
+        let itemSelected = { (kind: AttachmentSourceItemKind) in
             let media = Command<MediaPickerEvent> { [weak self] event in
                 guard let self = self else { return }
                 switch event {

diff --git a/GliaWidgets/Sources/CallVisualizer/VideoCall/ViewModel/VideoCallViewModel.swift b/GliaWidgets/Sources/CallVisualizer/VideoCall/ViewModel/VideoCallViewModel.swift
@@ -82,14 +82,10 @@ extension CallVisualizer {
                 )
             )
 
-            if #available(iOS 13.0, *) {
-                let windows = environment.uiApplication.windows()
-                interfaceOrientation = windows.first(where: {
-                    $0.isKeyWindow
-                })?.windowScene?.interfaceOrientation ?? .portrait
-            } else {
-                interfaceOrientation = environment.uiApplication.statusBarOrientation()
-            }
+            let windows = environment.uiApplication.windows()
+            interfaceOrientation = windows.first(where: {
+                $0.isKeyWindow
+            })?.windowScene?.interfaceOrientation ?? .portrait
 
             connectOperatorSize = .init(size: .normal, animated: true)
             operatorImageVisible = false
@@ -323,14 +319,10 @@ private extension CallVisualizer.VideoCallViewModel {
     }
 
     func handleOrientationChange() {
-        if #available(iOS 13.0, *) {
-            let windows = environment.uiApplication.windows()
-            interfaceOrientation = windows.first(where: {
-                $0.isKeyWindow
-            })?.windowScene?.interfaceOrientation ?? .portrait
-        } else {
-            interfaceOrientation = environment.uiApplication.statusBarOrientation()
-        }
+        let windows = environment.uiApplication.windows()
+        interfaceOrientation = windows.first(where: {
+            $0.isKeyWindow
+        })?.windowScene?.interfaceOrientation ?? .portrait
     }
 
     func toggleVideo() {

diff --git a/GliaWidgets/Sources/Coordinators/Chat/ChatCoordinator.swift b/GliaWidgets/Sources/Coordinators/Chat/ChatCoordinator.swift
@@ -149,7 +149,7 @@ extension ChatCoordinator {
             isCustomCardSupported: viewFactory.messageRenderer != nil,
             isWindowVisible: isWindowVisible,
             startAction: startAction,
-            deliveredStatusText: viewFactory.theme.chat.visitorMessage.delivered,
+            deliveredStatusText: viewFactory.theme.chat.visitorMessageStyle.delivered,
             chatType: chatType,
             environment: Self.enviromentForChatModel(environment: environment, viewFactory: viewFactory)
         )

diff --git a/GliaWidgets/Sources/Extensions/UIColor+Extensions.swift b/GliaWidgets/Sources/Extensions/UIColor+Extensions.swift
@@ -29,8 +29,8 @@ extension UIColor {
         let hex: String = hex.trimmingCharacters(in: Self.trimmingCharacters)
         let scanner = Scanner(string: hex)
 
-        var color: UInt32 = 0
-        scanner.scanHexInt32(&color)
+        var color: UInt64 = 0
+        scanner.scanHexInt64(&color)
 
         let mask = 0x000000FF
         let r = CGFloat(Int(color >> 16) & mask) / 255.0

diff --git a/GliaWidgets/Sources/Theme/Chat/Theme.ChoiceCardStyle.swift b/GliaWidgets/Sources/Theme/Chat/Theme.ChoiceCardStyle.swift
@@ -152,7 +152,7 @@ extension Theme.ChoiceCardStyle {
                     textFont: choiceOption.normal.title.font,
                     textColor: UIColor(hex: choiceOption.normal.title.color),
                     textStyle: choiceOption.normal.title.textStyle,
-                    backgroundColor: choiceOption.normal.background.color ?? .clear,
+                    backgroundColor: choiceOption.normal.background.color,
                     borderColor: UIColor(hex: choiceOption.normal.borderColor ?? ""),
                     borderWidth: choiceOption.normal.borderWidth,
                     accessibility: .init(
@@ -164,7 +164,7 @@ extension Theme.ChoiceCardStyle {
                     textFont: choiceOption.selected.title.font,
                     textColor: UIColor(hex: choiceOption.selected.title.color),
                     textStyle: choiceOption.selected.title.textStyle,
-                    backgroundColor: choiceOption.selected.background.color ?? .clear,
+                    backgroundColor: choiceOption.selected.background.color,
                     borderColor: UIColor(hex: choiceOption.selected.borderColor ?? ""),
                     borderWidth: choiceOption.selected.borderWidth,
                     accessibility: .init(
@@ -176,7 +176,7 @@ extension Theme.ChoiceCardStyle {
                     textFont: choiceOption.disabled.title.font,
                     textColor: UIColor(hex: choiceOption.disabled.title.color),
                     textStyle: choiceOption.disabled.title.textStyle,
-                    backgroundColor: choiceOption.disabled.background.color ?? .clear,
+                    backgroundColor: choiceOption.disabled.background.color,
                     borderColor: UIColor(hex: choiceOption.disabled.borderColor ?? ""),
                     borderWidth: choiceOption.disabled.borderWidth,
                     accessibility: .init(

diff --git a/GliaWidgets/Sources/UIKitBased/UIKitBased.Interface.swift b/GliaWidgets/Sources/UIKitBased/UIKitBased.Interface.swift
@@ -11,7 +11,6 @@ enum UIKitBased {
         var preferredContentSizeCategory: () -> UIContentSizeCategory
         var isIdleTimerDisabled: (Bool) -> Void
         var windows: () -> [UIKit.UIWindow]
-        var statusBarOrientation: () -> UIInterfaceOrientation
     }
 
     struct UIDevice {

diff --git a/GliaWidgets/Sources/UIKitBased/UIKitBased.Live.swift b/GliaWidgets/Sources/UIKitBased/UIKitBased.Live.swift
@@ -10,8 +10,7 @@ extension UIKitBased.UIApplication {
         canOpenURL: UIApplication.shared.canOpenURL,
         preferredContentSizeCategory: { UIApplication.shared.preferredContentSizeCategory },
         isIdleTimerDisabled: { UIApplication.shared.isIdleTimerDisabled = $0 },
-        windows: { UIApplication.shared.windows },
-        statusBarOrientation: { UIApplication.shared.statusBarOrientation }
+        windows: { UIApplication.shared.windows }
     )
 }
 

diff --git a/GliaWidgets/Sources/UIKitBased/UIKitBased.Mock.swift b/GliaWidgets/Sources/UIKitBased/UIKitBased.Mock.swift
@@ -13,8 +13,7 @@ extension UIKitBased.UIApplication {
         canOpenURL: { _ in false },
         preferredContentSizeCategory: { .unspecified },
         isIdleTimerDisabled: { _ in },
-        windows: { .init() },
-        statusBarOrientation: { .portrait }
+        windows: { .init() }
     )
 }
 

diff --git a/GliaWidgets/Sources/View/BaseView/BaseView.swift b/GliaWidgets/Sources/View/BaseView/BaseView.swift
@@ -3,14 +3,11 @@ import UIKit
 class BaseView: UIView {
 
     var currentOrientation: UIInterfaceOrientation {
-        guard
-            #available(iOS 13.0, *),
-            let orientation = UIApplication.shared.windows.first?.windowScene?.interfaceOrientation
-        else {
-            return UIApplication.shared.statusBarOrientation
+        guard let windowScene = UIApplication.shared.windows.first?.windowScene else {
+            return .portrait
         }
 
-        return orientation
+        return windowScene.interfaceOrientation
     }
 
     required init() {

diff --git a/GliaWidgets/Sources/View/Chat/Message/ChatMessageView.swift b/GliaWidgets/Sources/View/Chat/Message/ChatMessageView.swift
@@ -64,7 +64,7 @@ class ChatMessageView: BaseView {
                 accessibilityProperties: accProperties
             )
             appendContentViews(contentViews, animated: animated)
-        case let .attributedText(text, accProperties):
+        case let .attributedText(text, _):
             let contentView = ChatTextContentView(
                 with: style,
                 contentAlignment: contentAlignment

diff --git a/GliaWidgets/Sources/ViewModel/Chat/ChatViewModel.swift b/GliaWidgets/Sources/ViewModel/Chat/ChatViewModel.swift
@@ -749,7 +749,7 @@ extension ChatViewModel {
 
 extension ChatViewModel {
     private func presentMediaPicker() {
-        let itemSelected = { (kind: AttachmentSourceItemKind) -> Void in
+        let itemSelected = { (kind: AttachmentSourceItemKind) in
             let media = ObservableValue<MediaPickerEvent>(with: .none)
             media.addObserver(self) { [weak self] event, _ in
                 guard let self = self else { return }

diff --git a/GliaWidgetsTests/Sources/Glia/GliaTests+StartEngagement.swift b/GliaWidgetsTests/Sources/Glia/GliaTests+StartEngagement.swift
@@ -15,7 +15,7 @@ extension GliaTests {
         }
         let sdk = Glia(environment: sdkEnv)
         sdk.rootCoordinator = .mock(engagementKind: .chat, screenShareHandler: .mock)
-        try sdk.configure(with: .mock())
+        try sdk.configure(with: .mock(), theme: .mock()) { _ in }
 
         XCTAssertThrowsError(
             try sdk.startEngagement(
@@ -32,7 +32,7 @@ extension GliaTests {
         sdk.environment.coreSDKConfigurator.configureWithConfiguration = { _, completion in
             completion(.success(()))
         }
-        try sdk.configure(with: .mock()) {}
+        try sdk.configure(with: .mock(), theme: .mock()) { _ in }
         sdk.environment.coreSdk.getCurrentEngagement = { .mock(source: .callVisualizer) }
 
         XCTAssertThrowsError(
@@ -75,7 +75,7 @@ extension GliaTests {
         }
         let sdk = Glia(environment: environment)
 
-        try sdk.start(.chat, configuration: .mock(), queueID: "queueId", visitorContext: nil)
+        try sdk.start(.chat, configuration: .mock(), queueID: "queueId", theme: .mock())
 
         XCTAssertTrue(sdk.isConfigured)
         XCTAssertEqual(calls, [.configureWithConfiguration, .configureWithInteractor])
@@ -155,9 +155,9 @@ extension GliaTests {
         theme.call.connect.queue.firstText = "Glia 1"
         theme.chat.connect.queue.firstText = "Glia 2"
 
-        try sdk.configure(with: .mock()) {
+        try sdk.configure(with: .mock(), theme: .mock()) { _ in
             do {
-                try sdk.startEngagement(engagementKind: .chat, in: ["queueId"], theme: theme)
+                try sdk.startEngagement(engagementKind: .chat, in: ["queueId"])
             } catch {
                 XCTFail("startEngagement unexpectedly failed with error \(error), but should succeed instead.")
             }
@@ -193,7 +193,7 @@ extension GliaTests {
 
         let sdk = Glia(environment: environment)
 
-        try sdk.configure(with: .mock(companyName: "Glia")) {
+        try sdk.configure(with: .mock(companyName: "Glia"), theme: .mock()) { _ in
             do {
                 try sdk.startEngagement(engagementKind: .chat, in: ["queueId"])
             } catch {
@@ -231,7 +231,7 @@ extension GliaTests {
 
         let sdk = Glia(environment: environment)
 
-        try sdk.configure(with: .mock()) {
+        try sdk.configure(with: .mock(), theme: .mock()) { _ in
             do {
                 try sdk.startEngagement(engagementKind: .chat, in: ["queueId"])
             } catch {
@@ -318,7 +318,7 @@ extension GliaTests {
         environment.coreSdk.getCurrentEngagement = { nil }
 
         let sdk = Glia(environment: environment)
-        try sdk.configure(with: .mock(), completion: {})
+        try sdk.configure(with: .mock(), theme: .mock()) { _ in }
         try sdk.startEngagement(engagementKind: .chat, in: ["queueId"])
 
         let configuredSdkTheme = resultingViewFactory?.theme