Merge branch 'develop' into FixFor734-unarchiveTopLevelObjectWithData

Signed-off-by: Tim Bert <5411131+timbms@users.noreply.github.com>

OpenHABCore/Sources/OpenHABCore/Util/Comparable.swift

@@ -0,0 +1,19 @@
+// Copyright (c) 2010-2023 Contributors to the openHAB project
+//
+// See the NOTICE file(s) distributed with this work for additional
+// information.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0
+//
+// SPDX-License-Identifier: EPL-2.0
+
+import Foundation
+
+// Idea taken from https://twitter.com/alexiscreuzot/status/1635489793294454784?s=61&t=8ECwUy6QFS5UxjAFZzZ-hw
+public extension Comparable {
+    func clamped(to limits: ClosedRange<Self>) -> Self {
+        min(max(self, limits.lowerBound), limits.upperBound)
+    }
+}

openHAB/SliderUITableViewCell.swift

@@ -66,7 +66,7 @@ class SliderUITableViewCell: GenericUITableViewCell {
     private func adj(_ raw: Double) -> Double {
         var valueAdjustedToStep = Double(floor(Float(((raw - widget.minValue))) / step) * step)
         valueAdjustedToStep += widget.minValue
-        return min(max(valueAdjustedToStep, widget.minValue), widget.maxValue)
+        return valueAdjustedToStep.clamped(to: widget.minValue ... widget.maxValue)
     }
 
     private func adjustedValue() -> Double {

openHABWatch Extension/Views/Utils/ColorSelection.swift

@@ -70,7 +70,7 @@ struct ColorSelection: View {
 
     /// Prevent the draggable element from going over its limit
     func limitDisplacement(_ value: Double, _ limit: CGFloat, _ state: CGFloat) -> CGFloat {
-        max(0, min(limit, CGFloat(value) * limit + state))
+        (CGFloat(value) * limit + state).clamped(to: 0 ... limit)
     }
 
     /// Prevent the draggable element from going beyond the circle

openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift

@@ -205,7 +205,7 @@ class ObservableOpenHABWidget: NSObject, MKAnnotation, Identifiable, ObservableO
     private func adj(_ raw: Double) -> Double {
         var valueAdjustedToStep = floor((raw - minValue) / step) * step
         valueAdjustedToStep += minValue
-        return min(max(valueAdjustedToStep, minValue), maxValue)
+        return valueAdjustedToStep.clamped(to: minValue ... maxValue)
     }
 }