remove buttons from Widget, remove table children selectively

Signed-off-by: Jimmy Tanagra <[email protected]>
maniac103 · Jul 5, 2024 · b31f58f · b31f58f
1 parent b508509
commit b31f58f
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 136 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
@@ -55,8 +55,6 @@ data class Widget(
     private val rawMinValue: Float?,
     private val rawMaxValue: Float?,
     private val rawStep: Float?,
-    // buttons are sub-widgets of buttongrids
-    val buttons: MutableList<Widget>?,
     val row: Int?,
     val column: Int?,
     val command: String?,
@@ -187,12 +185,6 @@ data class Widget(
         return chartUrl.toString()
     }
 
-    fun updateButton(button: Widget) {
-        buttons?.indexOfFirst { it.id == button.id }?.takeIf { it >= 0 }?.let { index ->
-            buttons.set(index, button)
-        }
-    }
-
     companion object {
         @Throws(JSONException::class)
         fun updateFromEvent(source: Widget, eventPayload: JSONObject): Widget {
@@ -222,7 +214,6 @@ data class Widget(
                 rawMinValue = source.rawMinValue,
                 rawMaxValue = source.rawMaxValue,
                 rawStep = source.rawStep,
-                buttons = source.buttons,
                 row = source.row,
                 column = source.column,
                 command = source.command,
@@ -364,9 +355,8 @@ fun Node.collectWidgets(parent: Widget?): List<Widget> {
         rawMinValue = minValue,
         rawMaxValue = maxValue,
         rawStep = step,
-        // buttons, row, column, command, releaseCommand, stateless were added in openHAB 4.2
+        // row, column, command, releaseCommand, stateless were added in openHAB 4.2
         // so no support for openHAB 1 required.
-        buttons = null,
         row = null,
         column = null,
         command = null,
@@ -398,27 +388,13 @@ fun JSONObject.collectWidgets(parent: Widget?): List<Widget> {
         emptyList()
     }
 
-    val id = getString("widgetId")
     val item = optJSONObject("item")?.toItem()
     val type = getString("type").toWidgetType()
     val icon = optStringOrNull("icon")
     val staticIcon = optBoolean("staticIcon", false)
 
-    // Parse the sub-widgets of a Buttongrid into buttons
-    // but they also need to be included in the main list of widgets below
-    // so that they can be found when we receive update events
-    val buttons = if (type == Widget.Type.Buttongrid) {
-        val buttonWidgets = mappings.mapIndexed { index, mapping -> 
-            mapping.toWidget("$id-mappings-$index", item) 
-        }.toMutableList()
-        optJSONArray("widgets")?.forEach { obj -> buttonWidgets.addAll(obj.collectWidgets(null)) }
-        buttonWidgets.ifEmpty { null }
-    } else {
-        null
-    }
-
     val widget = Widget(
-        id = id,
+        id = getString("widgetId"),
         parentId = parent?.id,
         rawLabel = optString("label", ""),
         labelSource = optStringOrNull("labelSource").toLabelSource(),
@@ -437,7 +413,6 @@ fun JSONObject.collectWidgets(parent: Widget?): List<Widget> {
         rawMinValue = optFloatOrNull("minValue"),
         rawMaxValue = optFloatOrNull("maxValue"),
         rawStep = optFloatOrNull("step"),
-        buttons = buttons,
         row = optIntOrNull("row"),
         column = optIntOrNull("column"),
         command = optStringOrNull("command"),
@@ -460,43 +435,3 @@ fun JSONObject.collectWidgets(parent: Widget?): List<Widget> {
     childWidgetJson?.forEach { obj -> result.addAll(obj.collectWidgets(widget)) }
     return result
 }
-
-fun LabeledValue.toWidget(id: String, item: Item?): Widget {
-    return Widget(
-        id = id,
-        parentId = null,
-        rawLabel = label,
-        labelSource = Widget.LabelSource.SitemapDefinition,
-        icon = icon,
-        state = null,
-        type = Widget.Type.Button,
-        url = null,
-        item = item,
-        linkedPage = null,
-        mappings = emptyList(),
-        encoding = null,
-        iconColor = null,
-        labelColor = null,
-        valueColor = null,
-        refresh = 0,
-        rawMinValue = null,
-        rawMaxValue = null,
-        rawStep = null,
-        buttons = null,
-        row = row,
-        column = column,
-        command = value,
-        releaseCommand = null,
-        stateless = null,
-        period = "",
-        service = "",
-        legend = null,
-        forceAsItem = false,
-        yAxisDecimalPattern = null,
-        switchSupport = false,
-        releaseOnly = null,
-        height = 0,
-        visibility = true,
-        rawInputHint = null
-    )
-}
diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/ViewExtensions.kt b/mobile/src/main/java/org/openhab/habdroid/ui/ViewExtensions.kt
@@ -15,9 +15,9 @@ package org.openhab.habdroid.ui
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Build
 import android.graphics.BlendMode
 import android.graphics.BlendModeColorFilter
+import android.os.Build
 import android.util.Log
 import android.view.View
 import android.view.inputmethod.InputMethodManager
@@ -136,7 +136,7 @@ fun MaterialButton.setTextAndIcon(
         text = label
         mapper?.mapColor(labelColor)?.let { setTextColor(it) }
         return
-    } 
+    }
     val iconSize = context.resources.getDimensionPixelSize(R.dimen.section_switch_icon)
     CoroutineScope(Dispatchers.IO + Job()).launch {
         val drawable = try {
@@ -150,7 +150,7 @@ fun MaterialButton.setTextAndIcon(
         withContext(Dispatchers.Main) {
             if (drawable != null) {
                 mapper?.mapColor(iconColor)?.let {
-                    drawable.setColorFilter(BlendModeColorFilter(it, BlendMode.SRC_ATOP)) 
+                    drawable.setColorFilter(BlendModeColorFilter(it, BlendMode.SRC_ATOP))
                 }
                 text = null
             } else {