Respect state description pattern when formatting number input

Fixes #4000

Signed-off-by: Danny Baumann <dannybaumann@web.de>

Author: maniac103

mobile/src/main/java/org/openhab/habdroid/model/ParsedState.kt

@@ -173,26 +173,30 @@ data class ParsedState internal constructor(
         val unit: String? = null,
         val format: String? = null
     ) : Parcelable {
-        override fun toString() = toString(Locale.getDefault())
+        override fun toString() = toString(Locale.getDefault(), false)
 
         /**
          * Like [toString][.toString], but using a specific locale for formatting.
          */
-        fun toString(locale: Locale): String {
+        fun toString(locale: Locale, stripUnit: Boolean): String {
             if (!format.isNullOrEmpty()) {
-                val actualFormat = format
-                    .replace("%unit%", unit.orEmpty())
-                    // In case of 'one' unit, the unit is part of the format pattern, but not part of the value
-                    // sent by the server. Avoid ending the value with a space in that case.
-                    .trim()
+                val actualFormat = if (stripUnit) {
+                    format.split(" ").first()
+                } else {
+                    format
+                        .replace("%unit%", unit.orEmpty())
+                        // In case of 'one' unit, the unit is part of the format pattern, but not part of the value
+                        // sent by the server. Avoid ending the value with a space in that case.
+                        .trim()
+                }
                 try {
                     return String.format(locale, actualFormat, getActualValue())
                 } catch (e: IllegalFormatException) {
                     // State format pattern doesn't match the actual data type
                     // -> ignore and fall back to our own formatting
                 }
             }
-            return if (unit == null) formatValue() else "${formatValue()} $unit"
+            return if (unit == null || stripUnit) formatValue() else "${formatValue()} $unit"
         }
 
         fun formatValue(): String = getActualValue().toString()

mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt

@@ -777,8 +777,12 @@ class WidgetAdapter(
 
             val dataState = when {
                 widget.state == null -> ""
-                widget.inputHint == Widget.InputTypeHint.Number -> widget.state.asNumber?.formatValue()
+
+                widget.inputHint == Widget.InputTypeHint.Number ->
+                    widget.state.asNumber?.toString(Locale.getDefault(), true)
+
                 displayState.isNotEmpty() -> displayState
+
                 else -> widget.state.asString
             }
             binding.inputvalue.apply {
@@ -2153,7 +2157,7 @@ fun ParsedState.NumberState?.toItemCommand(item: Item?): String? {
     }
     return if (item.isOfTypeOrGroupType(Item.Type.NumberWithDimension)) {
         // For number items, include unit (if present) in command
-        toString(Locale.US)
+        toString(Locale.US, false)
     } else {
         // For all other items, send the plain value
         formatValue()