Entry widget and secure conversations v2

GliaWidgets.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.source                = { :git => 'https://github.com/salemove/ios-sdk-widgets.git', :tag => s.version.to_s }
 
   s.module_name           = 'GliaWidgets'
-  s.ios.deployment_target = '13.0'
+  s.ios.deployment_target = '14.0'
   s.source_files          = 'GliaWidgets/**/*.swift'
   s.swift_version         = '5.3'
 
@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   }
   s.exclude_files         = ['GliaWidgets/Window/**']
 
-  s.dependency 'GliaCoreSDK', '1.5.9'
+  s.dependency 'GliaCoreSDK', '2.0.7'
 end

GliaWidgets/Asset.swift

@@ -15,8 +15,6 @@ private let bundleManaging: BundleManaging = .live
 // swiftlint:disable superfluous_disable_command
 // swiftlint:disable file_length
 
-@available(*, deprecated, renamed: "ImageAsset")
-public typealias AssetType = ImageAsset
 
 public struct ImageAsset {
   public fileprivate(set) var name: String
@@ -65,11 +63,13 @@ public enum Asset {
       public static let uploadRemove = ImageAsset(name: "uploadRemove")
     public static let chatPickMedia = ImageAsset(name: "chatPickMedia")
     public static let chatSend = ImageAsset(name: "chatSend")
+    public static let sendMessageUnavailableInfo = ImageAsset(name: "send-message-unavailable-info")
     public static let unreadMessageIndicator = ImageAsset(name: "unreadMessageIndicator")
     public static let back = ImageAsset(name: "back")
     public static let close = ImageAsset(name: "close")
     public static let browseIcon = ImageAsset(name: "browseIcon")
     public static let cameraIcon = ImageAsset(name: "cameraIcon")
+    public static let chevronDownIcon = ImageAsset(name: "chevronDownIcon")
     public static let photoLibraryIcon = ImageAsset(name: "photoLibraryIcon")
     public static let gliaLogo = ImageAsset(name: "gliaLogo")
     public static let startScreenShare = ImageAsset(name: "startScreenShare")
@@ -109,11 +109,13 @@ public enum Asset {
       uploadRemove,
       chatPickMedia,
       chatSend,
+      sendMessageUnavailableInfo,
       unreadMessageIndicator,
       back,
       close,
       browseIcon,
       cameraIcon,
+      chevronDownIcon,
       photoLibraryIcon,
       gliaLogo,
       startScreenShare,
@@ -134,27 +136,9 @@ public enum Asset {
       spinner,
     ]
     // swiftlint:enable trailing_comma
-    @available(*, deprecated, renamed: "allImages")
-    public static let allValues: [AssetType] = allImages
 }
 // 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, deprecated,
-    message: "This initializer is unsafe on macOS, please use the ImageAsset.image property")
-  convenience init!(asset: ImageAsset) {
-    #if os(iOS) || os(tvOS)
-    let bundle = bundleManaging.current()
-    self.init(named: asset.name, in: bundle, compatibleWith: nil)
-    #elseif os(OSX)
-    self.init(named: NSImage.Name(asset.name))
-    #elseif os(watchOS)
-    self.init(named: asset.name)
-    #endif
-  }
-}
-
 public extension AssetColorTypeAlias {
   @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
   convenience init!(asset: ColorAsset) {
@@ -168,4 +152,3 @@ public extension AssetColorTypeAlias {
     #endif
   }
 }
-

GliaWidgets/Color.swift

@@ -2,11 +2,11 @@ import UIKit
 
 enum Color {
     static let primary = UIColor(hex: 0x0F6BFF) // blue
-    static let secondary = UIColor(hex: 0x00B233) // green
+    static let secondary = UIColor(hex: 0x18901C) // green
     static let baseLight = UIColor(hex: 0xFFFFFF) // white
-    static let systemNegative = UIColor(hex: 0xD11149) // red
-    static let baseNormal = UIColor(hex: 0x6C7683) // grey
-    static let baseShade = UIColor(hex: 0x6C7683, alpha: 0.5)
+    static let systemNegative = UIColor(hex: 0xBC0F42) // red
+    static let baseNormal = UIColor(hex: 0x616A75) // gray
+    static let baseShade = UIColor(hex: 0xB6BBC1) // mid-gray
     static let baseDark = UIColor(hex: 0x2C0735) // purple
-    static let baseNeutral = UIColor(hex: 0xF3F3F3) // light gray
+    static let baseNeutral = UIColor(hex: 0xF7F7F7) // light gray
 }

GliaWidgets/Localization.swift

@@ -432,14 +432,106 @@ internal enum Localization {
       internal static var message: String { Localization.tr("Localizable", "engagement.queue_wait.message", fallback: "You can continue browsing and we will connect you automatically.") }
     }
     internal enum SecureMessaging {
-      /// Messaging
-      internal static var title: String { Localization.tr("Localizable", "engagement.secure_messaging.title", fallback: "Messaging") }
+      /// Secure Messaging
+      internal static var title: String { Localization.tr("Localizable", "engagement.secure_messaging.title", fallback: "Secure Messaging") }
     }
     internal enum Video {
       /// Video
       internal static var title: String { Localization.tr("Localizable", "engagement.video.title", fallback: "Video") }
     }
   }
+  internal enum EntryWidget {
+    internal enum Audio {
+      internal enum Button {
+        /// Speak through your device
+        internal static var description: String { Localization.tr("Localizable", "entry_widget.audio.button.description", fallback: "Speak through your device") }
+        /// Audio
+        internal static var label: String { Localization.tr("Localizable", "entry_widget.audio.button.label", fallback: "Audio") }
+        internal enum Accessibility {
+          /// Starts a call
+          internal static var hint: String { Localization.tr("Localizable", "entry_widget.audio.button.accessibility.hint", fallback: "Starts a call") }
+        }
+      }
+    }
+    internal enum CallVisualizer {
+      /// You are already in contact with the support team
+      internal static var description: String { Localization.tr("Localizable", "entry_widget.call_visualizer.description", fallback: "You are already in contact with the support team") }
+      internal enum Button {
+        /// Call Visualizer
+        internal static var label: String { Localization.tr("Localizable", "entry_widget.call_visualizer.button.label", fallback: "Call Visualizer") }
+      }
+    }
+    internal enum EmptyState {
+      /// We are here to assist you during our business hours.
+      internal static var description: String { Localization.tr("Localizable", "entry_widget.empty_state.description", fallback: "We are here to assist you during our business hours.") }
+      /// Support team is currently offline
+      internal static var title: String { Localization.tr("Localizable", "entry_widget.empty_state.title", fallback: "Support team is currently offline") }
+    }
+    internal enum ErrorState {
+      /// We could not load the contacts at this time. This may be due to a temporary syncing issue or network problem.
+      internal static var description: String { Localization.tr("Localizable", "entry_widget.error_state.description", fallback: "We could not load the contacts at this time. This may be due to a temporary syncing issue or network problem.") }
+      /// Could not load the contacts
+      internal static var title: String { Localization.tr("Localizable", "entry_widget.error_state.title", fallback: "Could not load the contacts") }
+      internal enum TryAgain {
+        internal enum Button {
+          /// Try again
+          internal static var label: String { Localization.tr("Localizable", "entry_widget.error_state.try_again.button.label", fallback: "Try again") }
+        }
+      }
+    }
+    internal enum LiveChat {
+      internal enum Button {
+        /// For the texter in all of us
+        internal static var description: String { Localization.tr("Localizable", "entry_widget.live_chat.button.description", fallback: "For the texter in all of us") }
+        /// Chat
+        internal static var label: String { Localization.tr("Localizable", "entry_widget.live_chat.button.label", fallback: "Chat") }
+        internal enum Accessibility {
+          /// Starts a chat
+          internal static var hint: String { Localization.tr("Localizable", "entry_widget.live_chat.button.accessibility.hint", fallback: "Starts a chat") }
+        }
+      }
+    }
+    internal enum Loading {
+      internal enum Accessibility {
+        /// Loading indicator. Waiting for available options.
+        internal static var label: String { Localization.tr("Localizable", "entry_widget.loading.accessibility.label", fallback: "Loading indicator. Waiting for available options.") }
+      }
+    }
+    internal enum OngoingEngagement {
+      /// Ongoing • Tap to return
+      internal static var description: String { Localization.tr("Localizable", "entry_widget.ongoing_engagement.description", fallback: "Ongoing • Tap to return") }
+      internal enum Button {
+        internal enum Accessibility {
+          /// Returns to ongoing engagement
+          internal static var hint: String { Localization.tr("Localizable", "entry_widget.ongoing_engagement.button.accessibility.hint", fallback: "Returns to ongoing engagement") }
+        }
+      }
+    }
+    internal enum SecureMessaging {
+      internal enum Button {
+        /// Start a conversation, we’ll get back to you
+        internal static var description: String { Localization.tr("Localizable", "entry_widget.secure_messaging.button.description", fallback: "Start a conversation, we’ll get back to you") }
+        /// Secure Messaging
+        internal static var label: String { Localization.tr("Localizable", "entry_widget.secure_messaging.button.label", fallback: "Secure Messaging") }
+        internal enum Accessibility {
+          /// Starts messaging with us
+          internal static var hint: String { Localization.tr("Localizable", "entry_widget.secure_messaging.button.accessibility.hint", fallback: "Starts messaging with us") }
+        }
+      }
+    }
+    internal enum Video {
+      internal enum Button {
+        /// Face-to-face, just like in person
+        internal static var description: String { Localization.tr("Localizable", "entry_widget.video.button.description", fallback: "Face-to-face, just like in person") }
+        /// Video
+        internal static var label: String { Localization.tr("Localizable", "entry_widget.video.button.label", fallback: "Video") }
+        internal enum Accessibility {
+          /// Starts a video call
+          internal static var hint: String { Localization.tr("Localizable", "entry_widget.video.button.accessibility.hint", fallback: "Starts a video call") }
+        }
+      }
+    }
+  }
   internal enum Error {
     /// Something went wrong.
     internal static var general: String { Localization.tr("Localizable", "error.general", fallback: "Something went wrong.") }
@@ -563,11 +655,11 @@ internal enum Localization {
     }
   }
   internal enum MessageCenter {
-    /// Messaging
-    internal static var header: String { Localization.tr("Localizable", "message_center.header", fallback: "Messaging") }
+    /// Secure Messaging
+    internal static var header: String { Localization.tr("Localizable", "message_center.header", fallback: "Secure Messaging") }
     internal enum Confirmation {
-      /// Your message has been sent. We will get back to you within 48 hours.
-      internal static var subtitle: String { Localization.tr("Localizable", "message_center.confirmation.subtitle", fallback: "Your message has been sent. We will get back to you within 48 hours.") }
+      /// Your message has been sent. We will get back to you within 1 business day.
+      internal static var subtitle: String { Localization.tr("Localizable", "message_center.confirmation.subtitle", fallback: "Your message has been sent. We will get back to you within 1 business day.") }
       internal enum CheckMessages {
         internal enum Accessibility {
           /// Navigates you to the chat transcript.
@@ -592,10 +684,10 @@ internal enum Localization {
       internal static var checkMessages: String { Localization.tr("Localizable", "message_center.welcome.check_messages", fallback: "Check messages") }
       /// Your message
       internal static var messageTitle: String { Localization.tr("Localizable", "message_center.welcome.message_title", fallback: "Your message") }
-      /// Send a message and we will get back to you within 48 hours.
-      internal static var subtitle: String { Localization.tr("Localizable", "message_center.welcome.subtitle", fallback: "Send a message and we will get back to you within 48 hours.") }
-      /// Welcome to Message Center
-      internal static var title: String { Localization.tr("Localizable", "message_center.welcome.title", fallback: "Welcome to Message Center") }
+      /// Send a message and we will get back to you within 1 business day.
+      internal static var subtitle: String { Localization.tr("Localizable", "message_center.welcome.subtitle", fallback: "Send a message and we will get back to you within 1 business day.") }
+      /// Welcome to Secure Messaging
+      internal static var title: String { Localization.tr("Localizable", "message_center.welcome.title", fallback: "Welcome to Secure Messaging") }
       internal enum CheckMessages {
         internal enum Accessibility {
           /// Navigates you to the chat transcript.
@@ -611,8 +703,8 @@ internal enum Localization {
         }
       }
       internal enum MessageInput {
-        /// Enter your message
-        internal static var placeholder: String { Localization.tr("Localizable", "message_center.welcome.message_input.placeholder", fallback: "Enter your message") }
+        /// Enter message
+        internal static var placeholder: String { Localization.tr("Localizable", "message_center.welcome.message_input.placeholder", fallback: "Enter message") }
       }
       internal enum MessageLength {
         /// The message cannot exceed 10,000 characters.
@@ -644,6 +736,32 @@ internal enum Localization {
       }
     }
   }
+  internal enum SecureMessaging {
+    internal enum Chat {
+      internal enum Banner {
+        /// Secure messaging has an expected response time of 1 business day.
+        internal static var bottom: String { Localization.tr("Localizable", "secure_messaging.chat.banner.bottom", fallback: "Secure messaging has an expected response time of 1 business day.") }
+        /// Need live support?
+        internal static var top: String { Localization.tr("Localizable", "secure_messaging.chat.banner.top", fallback: "Need live support?") }
+      }
+      internal enum LeaveCurrentConversation {
+        /// You have an ongoing conversation. Starting a new conversation before ongoing ones are resolved may lead to our agents overlooking your current query.
+        internal static var message: String { Localization.tr("Localizable", "secure_messaging.chat.leave_current_conversation.message", fallback: "You have an ongoing conversation. Starting a new conversation before ongoing ones are resolved may lead to our agents overlooking your current query.") }
+        /// Leave Current Conversation?
+        internal static var title: String { Localization.tr("Localizable", "secure_messaging.chat.leave_current_conversation.title", fallback: "Leave Current Conversation?") }
+        internal enum Button {
+          /// Leave
+          internal static var negative: String { Localization.tr("Localizable", "secure_messaging.chat.leave_current_conversation.button.negative", fallback: "Leave") }
+          /// Stay
+          internal static var positive: String { Localization.tr("Localizable", "secure_messaging.chat.leave_current_conversation.button.positive", fallback: "Stay") }
+        }
+      }
+      internal enum Unavailable {
+        /// Sending messages is currently not available.
+        internal static var message: String { Localization.tr("Localizable", "secure_messaging.chat.unavailable.message", fallback: "Sending messages is currently not available.") }
+      }
+    }
+  }
   internal enum Survey {
     internal enum Action {
       /// Please provide an answer.

GliaWidgets/Public/Glia/Glia+EngagementLauncher.swift

@@ -0,0 +1,55 @@
+import Foundation
+
+extension Glia {
+    /// Retrieves an instance of `EngagementLauncher`.
+    ///
+    /// - Parameters:
+    ///   - queueIds: A list of queue IDs to be used for the engagement launcher. When nil, the default queues will be used.
+    ///
+    /// - Returns:
+    ///   - `EngagementLauncher` instance.
+    public func getEngagementLauncher(queueIds: [String]) throws -> EngagementLauncher {
+        @discardableResult
+        func getConfiguration() throws -> Configuration {
+            guard let configuration else {
+                throw GliaError.sdkIsNotConfigured
+            }
+            return configuration
+        }
+
+        @discardableResult
+        func getInteractor() throws -> Interactor {
+            guard let interactor else {
+                loggerPhase.logger.prefixed(Self.self).warning("Interactor is missing")
+                throw GliaError.sdkIsNotConfigured
+            }
+            return interactor
+        }
+
+        // In order to align behaviour between platforms,
+        // `GliaError.engagementExists` is no longer thrown,
+        // instead engagement is getting restored.
+        try getConfiguration()
+        try getInteractor()
+
+        loggerPhase.logger.info("Returning an Engagement Launcher")
+
+        return EngagementLauncher { [weak self] engagementKind, sceneProvider in
+            guard let self else { return }
+            let parameters = try getEngagementParameters(
+                configuration: getConfiguration(),
+                interactor: getInteractor(),
+                queueIds: queueIds
+            )
+            self.resolveEngagementState(
+                engagementKind: engagementKind,
+                sceneProvider: sceneProvider,
+                configuration: parameters.configuration,
+                interactor: parameters.interactor,
+                features: parameters.features,
+                viewFactory: parameters.viewFactory,
+                ongoingEngagementMediaStreams: parameters.ongoingEngagementMediaStreams
+            )
+        }
+    }
+}