Merge pull request #320 from salemove/dev

Glia Widgets SDK Release 0.9.0

.gitignore

@@ -82,3 +82,11 @@ fastlane/test_output
 # https://github.com/johnno1962/injectionforxcode
 
 iOSInjectionProject/
+
+# SnapshotTesting
+#
+# Image based snapshots are to be retrieved separately from deidcated repo with Git LFS.
+# The reason Git LFS is not used for current repo is because Swift Package Manager fails to work properly
+# with it.
+SnapshotTests/__Snapshots__/
+.vscode

GliaWidgets.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name                  = 'GliaWidgets'
-    s.version               = '0.8.1'
+    s.version               = '0.9.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,7 +19,7 @@ Pod::Spec.new do |s|
     }
     s.exclude_files         = ['GliaWidgets/Window/**']
 
-    s.dependency 'SalemoveSDK', '0.33.3'
+    s.dependency 'SalemoveSDK', '0.33.4'
     s.dependency 'PureLayout', '~>3.1'
     s.dependency 'lottie-ios', '3.2.3'
   end

GliaWidgets/Component/AttachmentList/Item/AttachmentSourceItemStyle.Accessibility.swift

@@ -0,0 +1,16 @@
+extension AttachmentSourceItemStyle {
+    /// Accessibility properties for AttachmentSourceItemStyle.
+    public struct Accessibility: Equatable {
+        /// Flag that provides font dynamic type by setting `adjustsFontForContentSizeCategory` for component that supports it.
+        public var isFontScalingEnabled: Bool
+
+        ///
+        /// - Parameter isFontScalingEnabled: Flag that provides font dynamic type by setting `adjustsFontForContentSizeCategory` for component that supports it.
+        public init(isFontScalingEnabled: Bool) {
+            self.isFontScalingEnabled = isFontScalingEnabled
+        }
+
+        /// Accessibility is not supported intentionally.
+        public static let unsupported = Self(isFontScalingEnabled: false)
+    }
+}

GliaWidgets/Component/AttachmentList/Item/AttachmentSourceItemStyle.swift

@@ -20,6 +20,9 @@ public class AttachmentSourceItemStyle {
     /// Color of the icon.
     public var iconColor: UIColor?
 
+    /// Accessibility related properties.
+    public var accessibility: Accessibility
+
     ///
     /// - Parameters:
     ///   - kind: Kind of an item shown in the attachment source list view (e.g. Photo Library, Take Photo or Browse).
@@ -28,20 +31,23 @@ public class AttachmentSourceItemStyle {
     ///   - titleColor: Color of the title.
     ///   - icon: Icon of the item. Default is one of three icons (Take Photo, Photo Library or Browse) corresponding to the kind of attachment.
     ///   - iconColor: Color of the icon.
+    ///   - accessibility: Accessibility related properties.
     ///
     public init(
         kind: AtttachmentSourceItemKind,
         title: String,
         titleFont: UIFont,
         titleColor: UIColor,
         icon: UIImage?,
-        iconColor: UIColor?
+        iconColor: UIColor?,
+        accessibility: Accessibility = .unsupported
     ) {
         self.kind = kind
         self.title = title
         self.titleFont = titleFont
         self.titleColor = titleColor
         self.icon = icon
         self.iconColor = iconColor
+        self.accessibility = accessibility
     }
 }

GliaWidgets/Component/AttachmentList/Item/AttachmentSourceItemView.swift

@@ -26,6 +26,15 @@ class AttachmentSourceItemView: UIView {
         titleLabel.font = style.titleFont
         titleLabel.textColor = style.titleColor
 
+        accessibilityTraits = .button
+        accessibilityLabel = style.title
+        isAccessibilityElement = true
+
+        setFontScalingEnabled(
+            style.accessibility.isFontScalingEnabled,
+            for: titleLabel
+        )
+
         stackView.axis = .horizontal
         stackView.spacing = 10
         stackView.addArrangedSubview(titleLabel)

GliaWidgets/Component/Bubble/BubbleStyle.Accessibility.swift

@@ -0,0 +1,24 @@
+extension BubbleStyle {
+    /// Accessibility properties for BubbleStyle.
+    public struct Accessibility: Equatable {
+        /// Accessibility label for BubbleView.
+        public var label: String
+        /// Accessibility hint for BubbleView.
+        public var hint: String
+
+        ///
+        /// - Parameters:
+        ///   - label: Accessibility label for BubbleView.
+        ///   - hint: Accessibility hint for BubbleView.
+        public init(label: String, hint: String) {
+            self.label = label
+            self.hint = hint
+        }
+
+        /// Accessibility is not supported intentionally.
+        public static let unsupported = Self(
+            label: "",
+            hint: ""
+        )
+    }
+}

GliaWidgets/Component/Bubble/BubbleStyle.swift

@@ -8,19 +8,26 @@ public class BubbleStyle {
 
     /// Style of a visitor's on hold state overlay.
     public var onHoldOverlay: OnHoldOverlayStyle
+
+	/// Accessibility related properties.
+    public var accessibility: Accessibility
+
     ///
     /// - Parameters:
     ///   - userImage: Style of a user's image shown in the bubble.
     ///   - badge: Style of a badge shown on the bubble.
     ///   - onHoldOverlay: Style of a visitor's on hold state overlay.
+    ///   - accessibility: Accessibility related properties.
     ///
     public init(
         userImage: UserImageStyle,
         badge: BadgeStyle? = nil,
-        onHoldOverlay: OnHoldOverlayStyle = .bubble
+        onHoldOverlay: OnHoldOverlayStyle = .bubble,
+        accessibility: Accessibility = .unsupported
     ) {
         self.userImage = userImage
         self.badge = badge
         self.onHoldOverlay = onHoldOverlay
+        self.accessibility = accessibility
     }
 }

GliaWidgets/Component/Bubble/BubbleView.swift

@@ -105,8 +105,8 @@ class BubbleView: UIView {
         addGestureRecognizer(panRecognizer)
         isAccessibilityElement = true
         accessibilityTraits = [.button]
-        accessibilityLabel = "Operator Avatar"
-        accessibilityHint = "Deactivates minimize."
+        accessibilityLabel = style.accessibility.label
+        accessibilityHint = style.accessibility.hint
 
         update(kind)
     }

GliaWidgets/Component/Button/Action/ActionButton.swift

@@ -5,7 +5,10 @@ class ActionButton: UIButton {
 
     var title: String? {
         get { return title(for: .normal) }
-        set { setTitle(newValue, for: .normal) }
+        set {
+            setTitle(newValue, for: .normal)
+            accessibilityLabel = newValue
+        }
     }
 
     private let style: ActionButtonStyle
@@ -60,10 +63,14 @@ class ActionButton: UIButton {
         setTitleColor(style.titleColor, for: .normal)
         titleLabel?.textAlignment = .center
         setTitle(style.title, for: .normal)
+        titleLabel?.adjustsFontSizeToFitWidth = true
 
         addTarget(self, action: #selector(tapped), for: .touchUpInside)
 
-        accessibilityLabel = style.title
+        setFontScalingEnabled(
+            style.accessibility.isFontScalingEnabled,
+            for: self
+        )
     }
 
     private func layout() {

GliaWidgets/Component/Button/Action/ActionButtonStyle.Accessibility.swift

@@ -0,0 +1,28 @@
+extension ActionButtonStyle {
+    /// Accessibility properties of ActionButtonStyle.
+    public struct Accessibility: Equatable {
+        /// Accessibility label.
+        public var label: String
+
+        /// Flag that provides font dynamic type by setting `adjustsFontForContentSizeCategory` for component that supports it.
+        public var isFontScalingEnabled: Bool
+
+        ///
+        /// - Parameters:
+        ///   - label: Accessibility label.
+        ///   - isFontScalingEnabled: Flag that provides font dynamic type by setting `adjustsFontForContentSizeCategory` for component that supports it.
+        public init(
+            label: String,
+            isFontScalingEnabled: Bool
+        ) {
+            self.label = label
+            self.isFontScalingEnabled = isFontScalingEnabled
+        }
+
+        /// Accessibility is not supported intentionally.
+        public static let unsupported = Self(
+            label: "",
+            isFontScalingEnabled: false
+        )
+    }
+}

GliaWidgets/Component/Button/Action/ActionButtonStyle.swift

@@ -35,6 +35,9 @@ public struct ActionButtonStyle {
     /// Border color of the button.
     public var borderColor: UIColor?
 
+    /// Accessibility related properties.
+    public var accessibility: Accessibility
+
     ///
     /// - Parameters:
     ///   - title: Title of the button.
@@ -48,6 +51,7 @@ public struct ActionButtonStyle {
     ///   - shadowOpacity: Shadow opacity of the button.
     ///   - borderWidth: Border width of the button.
     ///   - borderColor: Border color of the button.
+    ///   - accessibility: Accessibility related properties.
     ///
     public init(
         title: String,
@@ -60,7 +64,8 @@ public struct ActionButtonStyle {
         shadowRadius: CGFloat? = 2.0,
         shadowOpacity: Float? = nil,
         borderWidth: CGFloat? = nil,
-        borderColor: UIColor? = nil
+        borderColor: UIColor? = nil,
+        accessibility: Accessibility = .unsupported
     ) {
         self.title = title
         self.titleFont = titleFont
@@ -73,5 +78,6 @@ public struct ActionButtonStyle {
         self.shadowOpacity = shadowOpacity
         self.borderWidth = borderWidth
         self.borderColor = borderColor
+        self.accessibility = accessibility
     }
 }

GliaWidgets/Component/Button/Header/HeaderButton.swift

@@ -31,6 +31,8 @@ class HeaderButton: UIButton {
         setImage(style.image, for: .normal)
         setImage(style.image, for: .highlighted)
         addTarget(self, action: #selector(tapped), for: .touchUpInside)
+        accessibilityLabel = style.accessibility.label
+        accessibilityHint = style.accessibility.hint
     }
 
     private func layout() {

GliaWidgets/Component/Button/Header/HeaderButtonStyle.Accessibility.swift

@@ -0,0 +1,27 @@
+extension HeaderButtonStyle {
+    /// Accessibility properties of HeaderButtonStyle.
+    public struct Accessibility: Equatable {
+        /// Accessiblity label.
+        public var label: String
+        /// Accessibility hint.
+        public var hint: String
+
+        ///
+        /// - Parameters:
+        ///   - label: Accessiblity label.
+        ///   - hint: Accessibility hint.
+        public init(
+            label: String,
+            hint: String
+        ) {
+            self.label = label
+            self.hint = hint
+        }
+
+        /// Accessibility is not supported intentionally.
+        public static let unsupported = Self(
+            label: "",
+            hint: ""
+        )
+    }
+}

GliaWidgets/Component/Button/Header/HeaderButtonStyle.swift

@@ -8,13 +8,21 @@ public struct HeaderButtonStyle {
     /// Color of the button's image.
     public var color: UIColor
 
+    /// Accessibility related properties.
+    public var accessibility: Accessibility
+
     ///
     /// - Parameters:
     ///   - image: Image of the button.
     ///   - color: Color of the button's image.
-    ///
-    public init(image: UIImage, color: UIColor) {
+    ///   - accessibility: Accessibility related properties.
+    public init(
+        image: UIImage,
+        color: UIColor,
+        accessibility: Accessibility = .unsupported
+    ) {
         self.image = image
         self.color = color
+        self.accessibility = accessibility
     }
 }

GliaWidgets/Component/Button/Message/MessageButtonStyle.Accessibility.swift

@@ -0,0 +1,16 @@
+extension MessageButtonStyle {
+    /// Accessibility properties of MessageButtonStyle.
+    public struct Accessibility: Equatable {
+        /// Accessibility label of the button.
+        public var accessibilityLabel: String
+
+        ///
+        /// - Parameter accessibilityLabel: Accessibility label of the button.
+        public init(accessibilityLabel: String) {
+            self.accessibilityLabel = accessibilityLabel
+        }
+
+        /// Accessibility is not supported intentionally.
+        public static let unsupported = Self(accessibilityLabel: "")
+    }
+}

GliaWidgets/Component/Button/Message/MessageButtonStyle.swift

@@ -8,13 +8,21 @@ public struct MessageButtonStyle {
     /// Color of the button's image.
     public var color: UIColor
 
+    /// Accessibility related properties.
+    public var accessibility: Accessibility
+
     ///
     /// - Parameters:
     ///   - image: Image of the button.
     ///   - color: Color of the button's image.
-    ///
-    public init(image: UIImage, color: UIColor) {
+    ///   - accessibility: Accessibility related properties.
+    public init(
+        image: UIImage,
+        color: UIColor,
+        accessibility: Accessibility = .unsupported
+    ) {
         self.image = image
         self.color = color
+        self.accessibility = accessibility
     }
 }