fix when slider button is enabled on init value

netreconlab · Dec 10, 2024 · b9729c9 · b9729c9
1 parent 2f8d4b8
commit b9729c9
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 35 deletions.
diff --git a/Sources/CareKitEssentials/Cards/iOS/SliderLog/Slider.swift b/Sources/CareKitEssentials/Cards/iOS/SliderLog/Slider.swift
@@ -85,7 +85,7 @@ struct Slider: View {
                     .foregroundColor(.accentColor)
                     .fontWeight(.semibold)
                     .padding(.bottom, 10)
-                    .disabled(!viewModel.isActive)
+                    .disabled(viewModel.isButtonDisabled)
 
                 HStack(spacing: 0) {
                     minimumImage?
@@ -148,7 +148,7 @@ struct Slider: View {
                             })
                         )
                     addTicks(sliderWidth: sliderWidth)
-                        .if(!viewModel.isActive) {
+                        .if(viewModel.isButtonDisabled) {
                             $0.accentColor(Color.gray)
                         }
                 }
@@ -161,7 +161,7 @@ struct Slider: View {
             if gradientColors != nil {
                 Rectangle()
                     .foregroundColor(.clear)
-                    .background(viewModel.isActive ?
+                    .background(!viewModel.isButtonDisabled ?
                                     LinearGradient(gradient: Gradient(colors: gradientColors ?? []),
                                                    startPoint: .leading,
                                                    endPoint: .trailing) :
@@ -173,7 +173,7 @@ struct Slider: View {
 
             SwiftUI.Slider(value: $viewModel.valueAsDouble, in: range.0...range.1, step: viewModel.step)
                 .if(gradientColors == nil) {
-                    $0.accentColor(viewModel.isActive ? .accentColor : Color.gray)
+                    $0.accentColor(!viewModel.isButtonDisabled ? .accentColor : Color.gray)
                 }
                 .if(gradientColors != nil) { $0.accentColor(.clear) }
         }
@@ -185,35 +185,56 @@ struct Slider: View {
         let barRightSize = CGSize(width: CGFloat(offsetX), height: height)
         let barLeft = Rectangle()
             .if(gradientColors == nil) {
-                $0.foregroundColor(viewModel.isActive ? .accentColor : Color.gray)
+                $0.foregroundColor(
+                    !viewModel.isButtonDisabled ? .accentColor : Color.gray
+                )
             }
             .if(gradientColors != nil) {
                 $0
                     .foregroundColor(.clear)
-                    .background(viewModel.isActive ?
-                                    LinearGradient(gradient: Gradient(colors: gradientColors ?? []),
-                                                   startPoint: .leading,
-                                                   endPoint: .trailing) :
-                                LinearGradient(gradient: Gradient(colors: [Color.gray]),
-                                               startPoint: .leading,
-                                               endPoint: .trailing))
+                    .background(
+                        !viewModel.isButtonDisabled ?
+                        LinearGradient(
+                            gradient: Gradient(
+                                colors: gradientColors ?? []
+                            ),
+                            startPoint: .leading,
+                            endPoint: .trailing
+                        ) :
+                        LinearGradient(
+                            gradient: Gradient(
+                                colors: [Color.gray]
+                            ),
+                            startPoint: .leading,
+                            endPoint: .trailing
+                        )
+                    )
             }
         let barRight = Color.white
         return
             ZStack {
-                barLeft
-                    .modifier(SliderModifier(sliderWidth: width,
-                                             size: barLeftSize,
-                                             radius: cornerRadius!))
+                barLeft.modifier(
+                    SliderModifier(
+                        sliderWidth: width,
+                        size: barLeftSize,
+                        radius: cornerRadius!
+                    )
+                )
                 barRight
-                    .modifier(SliderModifier(sliderWidth: width,
-                                             size: barRightSize,
-                                             radius: cornerRadius!))
-                RoundedRectangle(cornerRadius: cornerRadius!)
-                    .stroke(
-                        Color.gray,
-                        lineWidth: borderWidth
+                    .modifier(
+                        SliderModifier(
+                            sliderWidth: width,
+                            size: barRightSize,
+                            radius: cornerRadius!
+                        )
                     )
+                RoundedRectangle(
+                    cornerRadius: cornerRadius!
+                )
+                .stroke(
+                    Color.gray,
+                    lineWidth: borderWidth
+                )
             }
     }
 
@@ -246,7 +267,6 @@ struct Slider: View {
         dragValue = dragValue.convert(fromRange: (xrange.min, xrange.max), toRange: (range.0, range.1))
         dragValue = round(dragValue / viewModel.step) * viewModel.step
         self.viewModel.valueAsDouble = dragValue
-        self.viewModel.isActive = true
     }
 
     private func getOffsetX(sliderWidth: CGFloat) -> CGFloat {

diff --git a/Sources/CareKitEssentials/Cards/iOS/SliderLog/SliderLogButton.swift b/Sources/CareKitEssentials/Cards/iOS/SliderLog/SliderLogButton.swift
@@ -57,8 +57,8 @@ struct SliderLogButton: CareKitEssentialView {
                 .font(Font.subheadline.weight(.medium))
                 .foregroundColor(.accentColor)
             }
-            .disabled(!viewModel.isActive)
-            .foregroundColor(viewModel.isActive ? .accentColor : Color.gray)
+            .disabled(viewModel.isButtonDisabled)
+            .foregroundColor(!viewModel.isButtonDisabled ? .accentColor : Color.gray)
             .padding(.bottom)
 
             Button(action: {}) {

diff --git a/Sources/CareKitEssentials/Cards/iOS/SliderLog/SliderLogTaskViewModel.swift b/Sources/CareKitEssentials/Cards/iOS/SliderLog/SliderLogTaskViewModel.swift
@@ -18,8 +18,14 @@ open class SliderLogTaskViewModel: CardViewModel {
     /// The binded array of previous outcome values.
     @Published public var previousValues = [Double]()
 
-    /// Specifies if the slider is allowed to be changed.
-    @Published open var isActive = true
+    /// Determines when the slider is disabled.
+    open var isButtonDisabled: Bool {
+        let currentDouble = valueAsDouble
+        guard let originalDouble = previousValues.first else {
+            return false
+        }
+        return Int(currentDouble) == Int(originalDouble)
+    }
 
     /// The range that includes all possible values.
     public private(set) var range: ClosedRange<Double>
@@ -63,12 +69,8 @@ open class SliderLogTaskViewModel: CardViewModel {
             currentInitialDoubleValue = initialValue
         }
         var currentInitialOutcome = OCKOutcomeValue(currentInitialDoubleValue)
-        if let latestOutcomeValue = outcomeValues?.first,
-           let initialOutcomeDouble = latestOutcomeValue.doubleValue {
-            if initialOutcomeDouble != currentInitialDoubleValue {
-                isActive = false
-                currentInitialOutcome = latestOutcomeValue
-            }
+        if let latestOutcomeValue = outcomeValues?.first {
+            currentInitialOutcome = latestOutcomeValue
         }
         super.init(
             event: event,
@@ -85,6 +87,5 @@ open class SliderLogTaskViewModel: CardViewModel {
         if let previousValues = Self.filterAndSortValuesByLatest(outcome.values, by: kind) {
             self.previousValues = previousValues.compactMap(\.doubleValue)
         }
-        self.isActive = false
     }
 }
diff --git a/Sources/CareKitEssentials/Cards/watchOS/DigitalCrown/DigitalCrownViewModel.swift b/Sources/CareKitEssentials/Cards/watchOS/DigitalCrown/DigitalCrownViewModel.swift
@@ -33,6 +33,7 @@ open class DigitalCrownViewModel: CardViewModel {
         return Color(red: red, green: green, blue: blue)
     }
 
+    /// Determines when the slider is disabled.
     open var isButtonDisabled: Bool {
         guard let currentDouble = value.doubleValue,
               let originalDouble = event.outcomeValueDouble else {