WidgetsSDK Release 2.2.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+**Jira issue:**
+https://glia.atlassian.net/browse/MOB-xxx
+
+**What was solved?**
+
+**Release notes:**
+
+ - [ ] Feature
+ - [ ] Ignore
+ - [ ] Release notes (Is it clear from the description here?)
+ - [ ] Migration guide (If changes are needed for integrator already using the SDK - what needs to be communicated? Add underneath please)
+
+**Additional info:**
+
+ - [ ] Tests fixed, added? Unit, acceptance, snapshots?
+ - [ ] Logging necessary for future troubleshooting of customer issues added?
+
+**Screenshots:**

GliaWidgets.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = 'GliaWidgets'
-  s.version               = '2.1.0'
+  s.version               = '2.2.0'
   s.summary               = 'The Glia iOS Widgets library'
   s.description           = 'The Glia Widgets library allows to integrate easily a UI/UX for Glia\'s Digital Customer Service platform'
   s.homepage              = 'https://github.com/salemove/ios-sdk-widgets'
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   }
   s.exclude_files         = ['GliaWidgets/Window/**']
 
-  s.dependency 'GliaCoreSDK', '1.1.2'
+  s.dependency 'GliaCoreSDK', '1.1.5'
 end

GliaWidgets/Color.swift

@@ -8,7 +8,5 @@ enum Color {
     static let baseNormal = UIColor(hex: 0x6C7683) // grey
     static let baseShade = UIColor(hex: 0x6C7683, alpha: 0.5)
     static let baseDark = UIColor(hex: 0x2C0735) // purple
-    static let lightGrey = UIColor(hex: 0xF3F3F3) // light gray
-    static let grey = UIColor(hex: 0x999999) // gray
-    static let background: UIColor = .white
+    static let baseNeutral = UIColor(hex: 0xF3F3F3) // light gray
 }

GliaWidgets/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

GliaWidgets/Localization+StringProviding.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+extension Localization {
+    static func tr(
+        _ table: String,
+        _ key: String,
+        _ args: CVarArg...,
+        fallback value: String,
+        stringProviding: StringProviding? = Glia.sharedInstance.stringProviding,
+        bundleManaging: BundleManaging = .live
+    ) -> String {
+        guard
+            let stringProviding,
+            let remoteString = stringProviding.getRemoteString(key)
+        else {
+            let format = bundleManaging.current().localizedString(forKey: key, value: value, table: table)
+            return String(format: format, locale: Locale.current, arguments: args)
+        }
+
+        return remoteString
+    }
+}

GliaWidgets/Localization+Templates.swift

@@ -0,0 +1,14 @@
+import Foundation
+
+extension Localization {
+    enum Templates {
+        static let percentValue = "{uploadPercentValue}%"
+        static let fileNameWithProgressValue = "{uploadedFileName}, {uploadPercentValue}%"
+        static let operatorName = "{operatorName}"
+        static let callDuration = "{callDuration}"
+        static let titleAndBadgeValue = "{buttonTitle}, {badgeValue}"
+        static let errorMessage = "{message}"
+        static let downloadWithFileState = "{downloadedFileName}, {downloadedFileState}"
+        static let downloadWithFileStateAndPercentValue = "{downloadedFileName}, {downloadedFileState} {downloadPercentValue}%"
+    }
+}

GliaWidgets/Public/Configuration/Configuration+Mock.swift

@@ -7,12 +7,14 @@ extension Configuration {
     static func mock(
         authMethod: AuthorizationMethod = .siteApiKey(id: "site-api-key-id", secret: "site-api-key-secret"),
         environment: Environment = .beta,
-        site: String = "site-id"
+        site: String = "site-id",
+        companyName: String = ""
     ) -> Self {
         Configuration(
             authorizationMethod: authMethod,
             environment: environment,
-            site: site
+            site: site,
+            companyName: companyName
         )
     }
 }

GliaWidgets/Public/Configuration/Configuration.swift

@@ -32,7 +32,7 @@ public struct Configuration {
         visitorContext: VisitorContext? = nil,
         pushNotifications: PushNotifications = .disabled,
         isWhiteLabelApp: Bool = false,
-        companyName: String = L10n.Chat.Connect.Queue.firstText
+        companyName: String = ""
     ) {
         self.authorizationMethod = authorizationMethod
         self.environment = environment

GliaWidgets/Public/Glia/Glia+StartEngagement.swift

@@ -46,6 +46,16 @@ extension Glia {
             interactor.queueIds = queueIds
         }
 
+        theme.chat.connect.queue.firstText = companyName(
+            using: interactor,
+            themeCompanyName: theme.chat.connect.queue.firstText
+        )
+
+        theme.call.connect.queue.firstText = companyName(
+            using: interactor,
+            themeCompanyName: theme.call.connect.queue.firstText
+        )
+
         let viewFactory = ViewFactory(
             with: theme,
             messageRenderer: messageRenderer,
@@ -69,6 +79,36 @@ extension Glia {
         )
     }
 
+    func companyName(
+        using interactor: Interactor,
+        themeCompanyName: String?
+    ) -> String {
+        let companyNameStringKey = "general.company_name"
+
+        // Company name has been set on the custom locale and is not empty.
+        if let remoteCompanyName = stringProviding?.getRemoteString(companyNameStringKey),
+            !remoteCompanyName.isEmpty {
+            return remoteCompanyName
+        }
+        // As the default value in the theme is not empty, it means that
+        // the integrator has set a value on the theme itself. Return that
+        // same value.
+        else if let themeCompanyName, !themeCompanyName.isEmpty {
+            return themeCompanyName
+        }
+        // Integrator has not set a company name in the custom locale,
+        // but has set it on the configuration.
+        else if !interactor.configuration.companyName.isEmpty {
+            return interactor.configuration.companyName
+        }
+        // Integrator has not set a company name anywhere, use the default.
+        else {
+            // This will return the fallback value every time, because we have
+            // already determined that the remote string is empty.
+            return Localization.General.companyNameLocalFallbackOnly
+        }
+    }
+
     func startRootCoordinator(
         with interactor: Interactor,
         viewFactory: ViewFactory,
@@ -124,7 +164,8 @@ extension Glia {
                 startSocketObservation: environment.coreSdk.startSocketObservation,
                 stopSocketObservation: environment.coreSdk.stopSocketObservation,
                 pushNotifications: environment.coreSdk.pushNotifications,
-                createSendMessagePayload: environment.coreSdk.createSendMessagePayload
+                createSendMessagePayload: environment.coreSdk.createSendMessagePayload,
+                orientationManager: environment.orientationManager
             )
         )
         rootCoordinator?.delegate = { [weak self] event in

GliaWidgets/Public/Glia/Glia.Deprecated.swift

@@ -114,12 +114,15 @@ extension Glia {
         interactor = createdInteractor
 
         if let callback = completion {
-            createdInteractor.withConfiguration { [weak createdInteractor] in
-                guard let interactor = createdInteractor else { return }
-                    interactor.state = GliaCore.sharedInstance
-                        .getCurrentEngagement()?.engagedOperator
-                        .map(InteractorState.engaged) ?? interactor.state
-                    callback()
+            createdInteractor.withConfiguration { [weak createdInteractor, weak self] in
+                guard let createdInteractor, let self else { return }
+
+                self.stringProviding = .init(getRemoteString: self.environment.coreSdk.localeProvider.getRemoteString)
+
+                createdInteractor.state = self.environment.coreSdk
+                    .getCurrentEngagement()?.engagedOperator
+                    .map(InteractorState.engaged) ?? createdInteractor.state
+                callback()
             }
         }
 

GliaWidgets/Public/Glia/Glia.swift

@@ -57,6 +57,8 @@ public class Glia {
     /// Used to monitor engagement state changes.
     public var onEvent: ((GliaEvent) -> Void)?
 
+    var stringProviding: StringProviding?
+
     public lazy var callVisualizer = CallVisualizer(
         environment: .init(
             data: environment.data,
@@ -81,7 +83,8 @@ public class Glia {
             uiConfig: { [weak self] in self?.uiConfig },
             assetsBuilder: { [weak self] in self?.assetsBuilder ?? .standard },
             getCurrentEngagement: environment.coreSdk.getCurrentEngagement,
-            eventHandler: onEvent
+            eventHandler: onEvent,
+            orientationManager: environment.orientationManager
         )
     )
     var rootCoordinator: EngagementCoordinator?
@@ -124,12 +127,16 @@ public class Glia {
         interactor = createdInteractor
 
         if let callback = completion {
-            createdInteractor.withConfiguration { [weak createdInteractor] in
-                guard let interactor = createdInteractor else { return }
-                    interactor.state = GliaCore.sharedInstance
-                        .getCurrentEngagement()?.engagedOperator
-                        .map(InteractorState.engaged) ?? interactor.state
-                    callback()
+            createdInteractor.withConfiguration { [weak createdInteractor, weak self] in
+                guard let createdInteractor, let self else { return }
+
+                self.stringProviding = .init(getRemoteString: self.environment.coreSdk.localeProvider.getRemoteString)
+
+                createdInteractor.state = self.environment.coreSdk
+                    .getCurrentEngagement()?.engagedOperator
+                    .map(InteractorState.engaged) ?? createdInteractor.state
+
+                callback()
             }
         }
 
@@ -143,7 +150,7 @@ public class Glia {
         rootCoordinator?.minimize()
     }
 
-    /// Maximizes engagement view if ongoing engagment exists.
+    /// Maximizes engagement view if ongoing engagement exists.
     /// Throws error if ongoing engagement not exist.
     /// Use this function for resuming engagement view If bubble is hidden programmatically and you need to
     /// present engagement view.