[FEAT] added disable functionality to increment and decrement

[UPDATE] change opacity for disable button, updated images, updated test cases

Author: SahilSainiYML

Sources/YStepper/SwiftUI/Views/Stepper.swift

@@ -17,6 +17,13 @@ public struct Stepper {
     @ObservedObject private var appearanceObserver = Stepper.AppearanceObserver()
     @ObservedObject private var valueObserver = Stepper.ValueObserver()
 
+    var isIncrementDisabled: Bool {
+        value >= maximumValue
+    }
+    var isDecrmentDisabled: Bool {
+        value <= minimumValue
+    }
+    
     /// Receive value change notification
     public weak var delegate: StepperDelegate?
 
@@ -106,16 +113,26 @@ extension Stepper: View {
     func getIncrementButton() -> some View {
         Button { buttonAction(buttonType: .increment) } label: {
             getIncrementImage().renderingMode(.template)
+                .foregroundColor(
+                    isIncrementDisabled ?
+                    Color(appearance.textStyle.textColor).opacity(0.5) : Color(appearance.textStyle.textColor)
+                )
         }
         .accessibilityLabel(StepperControl.Strings.incrementA11yButton.localized)
+        .disabled(isIncrementDisabled)
     }
 
     @ViewBuilder
     func getDecrementButton() -> some View {
         Button { buttonAction(buttonType: .decrement) } label: {
             getImageForDecrementButton()?.renderingMode(.template)
+                .foregroundColor(
+                    isDecrmentDisabled ?
+                    Color(appearance.textStyle.textColor).opacity(0.5) : Color(appearance.textStyle.textColor)
+                )
         }
         .accessibilityLabel(getAccessibilityText())
+        .disabled(isDecrmentDisabled)
     }
 
     func getTextView() -> some View {
@@ -130,7 +147,7 @@ extension Stepper: View {
         .frame(width: getStringSize(sizeCategory).width)
         .accessibilityLabel(getAccessibilityLabelText())
     }
-
+    
     @ViewBuilder
     func getShape() -> some View {
         switch appearance.layout.shape {
@@ -199,7 +216,7 @@ extension Stepper {
     }
 
     func getAccessibilityText() -> String {
-        if appearance.hasDeleteButton
+        if appearance.showDeleteImage
             && value <= stepValue
             && minimumValue == 0 {
             return StepperControl.Strings.deleteA11yButton.localized
@@ -245,11 +262,8 @@ extension Stepper {
 }
 
 extension Stepper {
-    func getDeleteImage() -> Image? {
-        if let image = appearance.deleteImage {
-            return Image(uiImage: image)
-        }
-        return nil
+    func getDeleteImage() -> Image {
+            Image(uiImage: appearance.deleteImage)
     }
 
     @ViewBuilder
@@ -263,7 +277,7 @@ extension Stepper {
     }
 
     func getImageForDecrementButton() -> Image? {
-        if appearance.hasDeleteButton
+        if appearance.showDeleteImage
             && value <= stepValue
             && minimumValue == 0 {
             return getDeleteImage()

Sources/YStepper/UIKit/StepperControl+Appearance.swift

@@ -20,16 +20,16 @@ extension StepperControl {
         public var borderColor: UIColor
         /// Border width for stepper view
         public var borderWidth: CGFloat
-        /// Delete button image. Nil means no delete button
-        public var deleteImage: UIImage?
+        /// Delete button image
+        public var deleteImage: UIImage
         /// Increment button image
         public var incrementImage: UIImage
         /// Decrement button image
         public var decrementImage: UIImage
         /// Stepper's layout properties such as spacing between views. Default is `.default`
         public var layout: Layout
-        /// Whether to show delete button or not
-        var hasDeleteButton: Bool { deleteImage != nil }
+        /// Whether to show delete image or not
+        var showDeleteImage: Bool
 
         /// Initializer for appearance
         /// - Parameters:
@@ -39,30 +39,36 @@ extension StepperControl {
         ///   - backgroundColor: Background color for stepper view. Default is `.systemBackground`
         ///   - borderColor: Border color for stepper view. Default is `UIColor.label`
         ///   - borderWidth: Border width for day view. Default is `1.0`
-        ///   - deleteImage: Delete button image. Default is `Appearance.defaultDeleteImage`
-        ///   - incrementImage: Increment button image. Default is `Appearance.defaultIncrementImage`
-        ///   - decrementImage: Decrement button image. Default is `Appearance.defaultDecrementImage`
+        ///   - deleteImage: Delete button image. Default is `nil`.
+        ///   Nil means using `Appearance.defaultDeleteImage`
+        ///   - incrementImage: Increment button image. Default is `nil`
+        ///   Nil means using `Appearance.defaultIncrementImage`
+        ///   - decrementImage: Decrement button image. Default is `nil`
+        ///   Nil means using `Appearance.defaultDecrementImage`
         ///   - layout: Stepper's layout properties like spacing between views
-        
+        ///   - showDeleteImage: Whether to show delete button or not. Default is`true`
+
         public init(
             textStyle: (textColor: UIColor, typography: Typography) = (.label, .systemLabel),
             foregroundColor: UIColor = .label,
             backgroundColor: UIColor = .systemBackground,
             borderColor: UIColor = .label,
             borderWidth: CGFloat = 1.0,
-            deleteImage: UIImage? = Appearance.defaultDeleteImage,
-            incrementImage: UIImage = Appearance.defaultIncrementImage,
-            decrementImage: UIImage = Appearance.defaultDecrementImage,
-            layout: Layout = .default
+            deleteImage: UIImage? = nil,
+            incrementImage: UIImage? = nil,
+            decrementImage: UIImage? = nil,
+            layout: Layout = .default,
+            showDeleteImage: Bool = true
         ) {
             self.textStyle = textStyle
             self.backgroundColor = backgroundColor
             self.borderColor = borderColor
             self.borderWidth = borderWidth
-            self.deleteImage = deleteImage
-            self.incrementImage = incrementImage
-            self.decrementImage = decrementImage
+            self.deleteImage = deleteImage ?? Appearance.defaultDeleteImage
+            self.incrementImage = incrementImage ?? Appearance.defaultIncrementImage
+            self.decrementImage = decrementImage ?? Appearance.defaultDecrementImage
             self.layout = layout
+            self.showDeleteImage = showDeleteImage
         }
     }
 }

Tests/YStepperTests/Views/StepperTests.swift

@@ -95,21 +95,20 @@ final class StepperTests: XCTestCase {
 
     func testImagesShouldNotBeNil() {
         let sut = makeSUT(appearance: StepperControl.Appearance(
-            deleteImage: StepperControl.Appearance.defaultDeleteImage
+            deleteImage: nil,
+            incrementImage: nil,
+            decrementImage: nil
         ))
 
         XCTAssertNotNil(sut.getIncrementImage())
         XCTAssertNotNil(sut.getDecrementImage())
         XCTAssertNotNil(sut.getDeleteImage())
     }
 
-    func testDeleteImageShouldBeNil() {
-        let sut = makeSUT(appearance: StepperControl.Appearance(deleteImage: nil))
-        XCTAssertNil(sut.getDeleteImage())
-
-        let decrementImage = sut.getDecrementImage()
-
-        XCTAssertEqual(decrementImage, sut.getImageForDecrementButton())
+    func testDecrementImageshouldNotReturnDeleteImage() {
+        let sut = makeSUT(appearance: StepperControl.Appearance(showDeleteImage: false))
+        let decrementImage = sut.getDeleteImage()
+        XCTAssertNotEqual(decrementImage, sut.getImageForDecrementButton())
     }
 
     func testValueGreaterThanMaxValue() {
@@ -131,9 +130,6 @@ final class StepperTests: XCTestCase {
 
         sut.value = sut.stepValue
         XCTAssertEqual(sut.getImageForDecrementButton(), deleteImage)
-
-        sut.appearance.deleteImage = nil
-        XCTAssertEqual(sut.getImageForDecrementButton(), decrementImage)
     }
 
     func testButtonAction() {
@@ -145,13 +141,6 @@ final class StepperTests: XCTestCase {
         XCTAssertEqual(sut.value, sut.minimumValue)
     }
 
-    func testBackgroundNotNil() {
-        let sut = makeSUT()
-        let button = sut.getDecrementButton()
-
-        XCTAssertNotNil(button)
-    }
-
     func testShapesNotNil() {
         var expectedAppearance = StepperControl.Appearance(layout: StepperControl.Appearance.Layout(shape: .rectangle))
         var sut = makeSUT(appearance: expectedAppearance)
@@ -242,7 +231,7 @@ final class StepperTests: XCTestCase {
         var sut = makeSUT()
         XCTAssertEqual(sut.getAccessibilityText(), StepperControl.Strings.deleteA11yButton.localized)
 
-        sut.appearance.deleteImage = nil
+        sut.appearance.showDeleteImage = false
         XCTAssertEqual(sut.getAccessibilityText(), StepperControl.Strings.decrementA11yButton.localized)
     }
 }