Improve on formatting issue #752

OpenHABCore/Sources/OpenHABCore/Model/NumberState.swift

@@ -20,6 +20,14 @@ public struct NumberState: CustomStringConvertible, Equatable {
     private(set) var unit: String? = ""
     private(set) var format: String? = ""
 
+    public var intValue: Int {
+        Int(value)
+    }
+
+    public var stringValue: String {
+        String(value)
+    }
+
     // Access to default memberwise initializer not permitted outside of package
     public init(value: Double, unit: String? = "", format: String? = "") {
         self.value = value
@@ -28,28 +36,31 @@ public struct NumberState: CustomStringConvertible, Equatable {
     }
 
     public func toString(locale: Locale?) -> String {
-        if let format, format.isEmpty == false {
-            let actualFormat = format.replacingOccurrences(of: "%unit%", with: unit ?? "")
-            if format.contains("%d") == true {
-                return String(format: actualFormat, locale: locale, Int(value))
+        if let format, !format.isEmpty {
+            let actualFormat = format
+                .replacingOccurrences(of: "%unit%", with: unit ?? "")
+                // %s in Java is for Strings, but does not work in Swift, see
+                // https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html)
+                .replacingOccurrences(of: "%s", with: "%@")
+            let formatValue: CVarArg = if format.contains("%d") {
+                intValue
+            } else if format.contains("%s") {
+                stringValue
             } else {
-                return String(format: actualFormat, locale: locale, value)
+                value
             }
+            return String(format: actualFormat, locale: locale, formatValue)
         }
-        if let unit, unit.isEmpty == false {
-            return "\(formatValue()) \(unit)"
+        if let unit, !unit.isEmpty {
+            return "\(stringValue) \(unit)"
         } else {
-            return formatValue()
+            return stringValue
         }
     }
 
-    public func formatValue() -> String {
-        String(value)
-    }
-
     private func getActualValue() -> NSNumber {
         if format?.contains("%d") == true {
-            NSNumber(value: Int(value))
+            NSNumber(value: intValue)
         } else {
             NSNumber(value: value)
         }

OpenHABCore/Sources/OpenHABCore/Model/OpenHABWidget.swift

@@ -155,7 +155,7 @@ public class OpenHABWidget: NSObject, MKAnnotation, Identifiable {
             sendCommand(state.toString(locale: Locale(identifier: "US")))
         } else {
             // For all other items, send the plain value
-            sendCommand(state.formatValue())
+            sendCommand(state.stringValue)
         }
     }
 

openHAB/SetpointUITableViewCell.swift

@@ -41,21 +41,22 @@ class SetpointUITableViewCell: GenericUITableViewCell {
     private func handleUpDown(down: Bool) {
         var numberState = widget?.stateValueAsNumberState
         let stateValue = numberState?.value ?? widget.minValue
-        let newValue: Double = switch down {
-        case true:
-            stateValue - widget.step
-        case false:
-            stateValue + widget.step
+        let newValue: Double = down ? stateValue - widget.step : stateValue + widget.step
+
+        let limitedNewValue = newValue.clamped(to: widget.minValue ... widget.maxValue)
+
+        guard limitedNewValue != stateValue else {
+            // nothing to update, skip sending value
+            return
         }
-        if newValue >= widget.minValue, newValue <= widget.maxValue {
-            if numberState != nil {
-                numberState?.value = newValue
-            } else {
-                numberState = NumberState(value: newValue)
-            }
 
-            widget.sendItemUpdate(state: numberState)
+        if numberState != nil {
+            numberState?.value = newValue
+        } else {
+            numberState = NumberState(value: newValue)
         }
+
+        widget.sendItemUpdate(state: numberState)
     }
 
     @objc

openHABWatch Extension/openHABWatch Extension/Model/ObservableOpenHABWidget.swift

@@ -180,7 +180,7 @@ class ObservableOpenHABWidget: NSObject, MKAnnotation, Identifiable, ObservableO
             sendCommand(state.toString(locale: Locale(identifier: "US")))
         } else {
             // For all other items, send the plain value
-            sendCommand(state.formatValue())
+            sendCommand(state.stringValue)
         }
     }