[CM-1260] Add trait for better accessibility. (#11)

* [UPDATE] removed localisation and extra string methods

[OTHER] updated test cases

* Remove unusued localization

* Lower Swift tools version for backwards compatibility with more versions of Xcode

* [UPDATE] added new test cases

* [UPDATE] test maximum

[UPDATE] test case update

---------

Co-authored-by: Mark Pospesel <[email protected]>

Author: SahilSainiYML

Package.swift

@@ -1,11 +1,10 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.5
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "YStepper",
-    defaultLocalization: "en",
     platforms: [
         .iOS(.v14)
     ],

Sources/YStepper/Assets/Strings/en.lproj/Localizable.strings

@@ -112,6 +112,11 @@ extension Stepper: View {
             getShape()
                 .background(getShapeWithoutStroke().foregroundColor(Color(appearance.backgroundColor)))
         )
+        .accessibilityElement(children: .combine)
+        .accessibilityValue(getValueText())
+        .accessibilityAdjustableAction { direction in
+            accessibilityAction(direction: direction)
+        }
     }
 
     @ViewBuilder
@@ -122,7 +127,7 @@ extension Stepper: View {
                      Color(appearance.textStyle.textColor).opacity(isIncrementDisabled ? 0.5 : 1)
                 )
         }
-        .accessibilityLabel(StepperControl.Strings.incrementA11yButton.localized)
+        .accessibilityHidden(true)
         .disabled(isIncrementDisabled)
     }
 
@@ -134,7 +139,7 @@ extension Stepper: View {
                      Color(appearance.textStyle.textColor).opacity(isDecrementDisabled ? 0.5 : 1)
                 )
         }
-        .accessibilityLabel(getAccessibilityText())
+        .accessibilityHidden(true)
         .disabled(isDecrementDisabled)
     }
 
@@ -148,7 +153,7 @@ extension Stepper: View {
             label.textColor = appearance.textStyle.textColor
         }
         .frame(width: getStringSize(sizeCategory).width)
-        .accessibilityLabel(getAccessibilityLabelText())
+        .accessibilityHidden(true)
     }
 
     @ViewBuilder
@@ -218,13 +223,6 @@ extension Stepper {
         String(format: "%.\(decimalPlaces)f", value)
     }
 
-    func getAccessibilityText() -> String {
-        if shouldShowDelete {
-            return StepperControl.Strings.deleteA11yButton.localized
-        }
-        return StepperControl.Strings.decrementA11yButton.localized
-    }
-
     func updateCurrentValue(newValue: Double) {
         if newValue < valueObserver.minimumValue {
             valueObserver.value = valueObserver.minimumValue
@@ -257,8 +255,15 @@ extension Stepper {
         )
     }
 
-    func getAccessibilityLabelText() -> String {
-        StepperControl.Strings.valueA11yLabel.localized + getValueText()
+    func accessibilityAction(direction: AccessibilityAdjustmentDirection) {
+        switch direction {
+        case .increment:
+            buttonAction(buttonType: .increment)
+        case .decrement:
+            buttonAction(buttonType: .decrement)
+        @unknown default:
+            break
+        }
     }
 }
 

Sources/YStepper/SwiftUI/Views/Stepper.swift

@@ -88,16 +88,6 @@ extension StepperControl {
         case decrement = "minus"
         case delete = "trash"
     }
-    
-    /// Collection of Strings
-    enum Strings: String, Localizable, CaseIterable {
-        case incrementA11yButton = "Increment_Button_A11y_label"
-        case decrementA11yButton = "Decrement_Button_A11y_label"
-        case deleteA11yButton = "Delete_Button_A11y_label"
-        case valueA11yLabel = "Value_A11y_label"
-
-        static var bundle: Bundle { .module }
-    }
 }
 
 extension StepperControl: StepperDelegate {

Sources/YStepper/UIKit/StepperControl.swift

@@ -231,12 +231,28 @@ final class StepperTests: XCTestCase {
         XCTAssertNotNil(Stepper_Previews.previews)
     }
 
-    func testGetAccessibilityText() {
-        var sut = makeSUT()
-        XCTAssertEqual(sut.getAccessibilityText(), StepperControl.Strings.deleteA11yButton.localized)
+    func test_accessibilityIncrement_IncrementsValue() {
+        let sut = makeSUT(maxValue: 2)
+        sut.accessibilityAction(direction: .increment)
+        sut.accessibilityAction(direction: .increment)
+        XCTAssertEqual(sut.value, sut.minimumValue + 2 * sut.stepValue)
+        XCTAssertEqual(sut.value, sut.maximumValue)
+        sut.accessibilityAction(direction: .increment)
+        // It should still just be the maximum value
+        XCTAssertEqual(sut.value, sut.maximumValue)
+    }
+
+    func test_accessibilityDecrement_decrementsValue() {
+        let sut = makeSUT()
+        sut.accessibilityAction(direction: .increment)
+        XCTAssertEqual(sut.value, sut.minimumValue + sut.stepValue)
 
-        sut.appearance.showDeleteImage = false
-        XCTAssertEqual(sut.getAccessibilityText(), StepperControl.Strings.decrementA11yButton.localized)
+        sut.accessibilityAction(direction: .decrement)
+        XCTAssertEqual(sut.value, sut.minimumValue)
+
+        sut.accessibilityAction(direction: .decrement)
+        // It should still just be the minimum value
+        XCTAssertEqual(sut.value, sut.minimumValue)
     }
 }