Merge branch 'mbruce/bugfixes' into 'develop'

ensure any buttonBase in ButtonGroup is 1 line only

See merge request BPHV_MIPS/vds_ios!130

VDS.xcodeproj/project.pbxproj

@@ -1233,7 +1233,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1270,7 +1270,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 49;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;

VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift

@@ -149,7 +149,15 @@ open class ButtonGroup: View {
             case .percentage(let value): percentage = value
             }
         }
-        buttons.forEach { if let width { ($0 as? Button)?.width = .value(width) } }
+        buttons.forEach { buttonBase in
+            //only allow 1 line for any button
+            buttonBase.titleLabel?.numberOfLines = 1
+            buttonBase.titleLabel?.lineBreakMode = .byTruncatingTail
+        
+            if let width {
+                (buttonBase as? Button)?.width = .value(width)
+            }
+        }
         positionLayout.buttonPercentage = percentage
         
         collectionView.reloadData()

VDS/Components/Loader/Loader.swift

@@ -35,6 +35,7 @@ open class Loader: View {
     private var icon = Icon().with { $0.name = .loader }
     private var opacity: CGFloat = 0.8
     private var iconColorConfiguration = SurfaceColorConfiguration(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark)
+    private var loadingTimer: Timer?
     
     //--------------------------------------------------
     // MARK: - Public Properties
@@ -60,7 +61,8 @@ open class Loader: View {
     open override func setup() {
         super.setup()
         addSubview(icon)  
-        
+        isAccessibilityElement = true
+        icon.isAccessibilityElement = false
         icon
             .pinTopGreaterThanOrEqualTo()
             .pinLeadingGreaterThanOrEqualTo()
@@ -85,22 +87,37 @@ open class Loader: View {
         }
     }
         
+    open override func updateAccessibility() {
+    }
+    
     //--------------------------------------------------
     // MARK: - Private Methods
     //--------------------------------------------------
     private let rotationLayerName = "rotationAnimation"
     private func startAnimating() {
+        accessibilityLabel = "Loading"
+
         icon.layer.remove(layerName: rotationLayerName)
         let rotation : CABasicAnimation = CABasicAnimation(keyPath: "transform.rotation.z")
-        rotation.toValue = NSNumber(value: Double.pi * 2)
+        rotation.fromValue = 0
-        rotation.duration = 0.5 // the speed of the rotation
+        rotation.toValue = Double.pi * 2
-        rotation.isCumulative = true
+        rotation.duration = 0.5
-        rotation.repeatCount = Float.greatestFiniteMagnitude
+        rotation.repeatCount = .infinity
         icon.layer.add(rotation, forKey: rotationLayerName)
+                
+        // Focus VoiceOver on this view
+        UIAccessibility.post(notification: .layoutChanged, argument: self)
+        
+        loadingTimer = Timer.scheduledTimer(withTimeInterval: 60, repeats: true) { [weak self] _ in
+            self?.accessibilityLabel = "Still Loading"
+            UIAccessibility.post(notification: .announcement, argument: "Still Loading")
+        }
     }
 
     private func stopAnimating() {
         icon.layer.removeAnimation(forKey: rotationLayerName)
+        loadingTimer?.invalidate()
+        loadingTimer = nil
     }
 }
 

VDS/SupportingFiles/ReleaseNotes.txt

@@ -1,3 +1,7 @@
+1.0.49
+----------------
+- ONEAPP-6239 - Loader Voice Over Fixes
+
 1.0.48
 ----------------
 - ONEAPP-4683 - Accessibility - Tabs (Voice Over)