Disable controls for read-only items

Signed-off-by: mueller-ma <[email protected]>
openhab · Feb 7, 2025 · 00eaa95 · 00eaa95
1 parent b1b094d
commit 00eaa95
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/mobile/src/main/java/org/openhab/habdroid/model/Widget.kt b/mobile/src/main/java/org/openhab/habdroid/model/Widget.kt
@@ -100,6 +100,8 @@ data class Widget(
         return InputTypeHint.Text
     }
 
+    val readOnly get() = item?.readOnly == true
+
     private val configuredMinValue get() = when {
         rawMinValue != null -> rawMinValue
         item?.minimum != null && item.type != Item.Type.Dimmer -> item.minimum

diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt
@@ -664,11 +664,15 @@ class WidgetAdapter(
             } else {
                 null
             }
+            switch.isEnabled = !widget.readOnly
 
             isBinding = false
         }
 
         override fun handleRowClick() {
+            if (boundWidget?.readOnly == true) {
+                return
+            }
             switch.toggle()
         }
     }
@@ -730,6 +734,7 @@ class WidgetAdapter(
             }
             inputText.setText(dataState)
             inputText.text?.let { inputText.setSelection(it.length) }
+            inputText.isEnabled = !widget.readOnly
 
             inputTextLayout.placeholderText = if (widget.state != null) "" else displayState
             inputTextLayout.suffixText = when (widget.inputHint) {
@@ -800,6 +805,9 @@ class WidgetAdapter(
 
         override fun handleRowClick() {
             val widget = boundWidget ?: return
+            if (widget.readOnly) {
+                return
+            }
             val dt = widget.state?.asDateTime
             when (widget.inputHint) {
                 Widget.InputTypeHint.Date -> showDatePicker(widget, dt, false)
@@ -950,7 +958,8 @@ class WidgetAdapter(
                             iconRes = button.icon,
                             labelColor = button.labelColor,
                             iconColor = button.iconColor,
-                            mapper = colorMapper
+                            mapper = colorMapper,
+                            readOnly = widget.readOnly
                         )
                         if (button.stateless == false) {
                             // stateful button: make checkable and set checked state afterwards
@@ -1017,6 +1026,7 @@ class WidgetAdapter(
 
             val hasValidValues = widget.minValue < widget.maxValue
             slider.isVisible = hasValidValues
+            slider.isEnabled = !widget.readOnly
             if (hasValidValues) {
                 slider.bindToWidget(widget, widget.shouldUseSliderUpdatesDuringMove())
             } else {
@@ -1026,6 +1036,9 @@ class WidgetAdapter(
 
         override fun handleRowClick() {
             val widget = boundWidget ?: return
+            if (widget.readOnly) {
+                return
+            }
             if (widget.switchSupport) {
                 connection.httpClient.sendItemCommand(
                     widget.item,
@@ -1189,7 +1202,8 @@ class WidgetAdapter(
             mappings.slice(0 until buttonCount).forEachIndexed { index, mapping ->
                 with(group[index] as MaterialButton) {
                     tag = mapping
-                    setTextAndIcon(connection, mapping.label, mapping.icon)
+                    setTextAndIcon(connection, mapping.label, mapping.icon, widget.readOnly)
+                    isEnabled = !widget.readOnly
                 }
             }
 
@@ -1282,7 +1296,7 @@ class WidgetAdapter(
                 button.isGone = mapping == null
                 if (mapping != null) {
                     button.isChecked = widget.state?.asString == mapping.value
-                    button.setTextAndIcon(connection, mapping.label, mapping.icon)
+                    button.setTextAndIcon(connection, mapping.label, mapping.icon, widget.readOnly)
                     button.tag = mapping
                 }
             }
@@ -1424,6 +1438,9 @@ class WidgetAdapter(
 
         private fun openSelection() {
             val widget = boundWidget ?: return
+            if (widget.readOnly) {
+                return
+            }
             fragmentPresenter.showBottomSheet(SliderBottomSheet(), widget)
         }
 
@@ -1441,6 +1458,13 @@ class WidgetAdapter(
                 connection.httpClient.sendItemUpdate(widget.item, state.withValue(newValue))
             }
         }
+
+        override fun bind(widget: Widget) {
+            super.bind(widget)
+            itemView.findViewById<View>(R.id.select_button).isEnabled = !widget.readOnly
+            itemView.findViewById<View>(R.id.up_button).isEnabled = !widget.readOnly
+            itemView.findViewById<View>(R.id.down_button).isEnabled = !widget.readOnly
+        }
     }
 
     class ChartViewHolder internal constructor(private val initData: ViewHolderInitData) :
@@ -1684,6 +1708,9 @@ class WidgetAdapter(
             } else {
                 selectColorButton.setImageDrawable(color.toColoredRoundedRect(selectColorButton.context))
             }
+            selectColorButton.isEnabled = !widget.readOnly
+            upButton.isEnabled = !widget.readOnly
+            downButton.isEnabled = !widget.readOnly
         }
 
         override fun onClick(view: View) {
@@ -1712,6 +1739,9 @@ class WidgetAdapter(
 
         override fun handleRowClick() {
             val widget = boundWidget ?: return
+            if (widget.readOnly) {
+                return
+            }
             fragmentPresenter.showBottomSheet(ColorChooserBottomSheet(), widget)
         }
     }
@@ -1736,6 +1766,9 @@ class WidgetAdapter(
 
         override fun handleRowClick() {
             val widget = boundWidget ?: return
+            if (widget.readOnly) {
+                return
+            }
             fragmentPresenter.showBottomSheet(ColorTemperatureSliderBottomSheet(), widget)
         }
     }
@@ -1952,10 +1985,12 @@ fun MaterialButton.setTextAndIcon(
     connection: Connection,
     label: String,
     iconRes: IconResource?,
+    readOnly: Boolean,
     labelColor: String? = null,
     iconColor: String? = null,
     mapper: WidgetAdapter.ColorMapper? = null
 ) {
+    isEnabled = !readOnly
     contentDescription = label
     val iconUrl = iconRes?.toUrl(context, true)
     if (iconUrl == null) {

diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetDetailBottomSheets.kt b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetDetailBottomSheets.kt
@@ -162,6 +162,7 @@ class SelectionBottomSheet : AbstractWidgetBottomSheet() {
                 connection?.httpClient?.sendItemCommand(widget.item, mapping.value)
                 dismissAllowingStateLoss()
             }
+            radio.isEnabled = !widget.readOnly
             group.addView(radio)
         }