From fbb56780aded378d87803d3d586ad008c3254667 Mon Sep 17 00:00:00 2001
From: mueller-ma <mueller-ma@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:17:59 +0200
Subject: [PATCH] Show label and icon for all Widgets

Closes #3421
---
 .idea/kotlinc.xml                             |  2 +-
 .../org/openhab/habdroid/ui/WidgetAdapter.kt  |  6 ++--
 .../main/res/layout/widgetlist_chartitem.xml  | 29 +++++++++++++------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 217e5c51fbf..fdf8d994a65 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.21" />
+    <option name="version" value="1.9.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt
index 9591a724ddd..f119a9c427a 100644
--- a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt
+++ b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt
@@ -453,16 +453,14 @@ class WidgetAdapter(
         initData: ViewHolderInitData,
         @LayoutRes layoutResId: Int,
         @LayoutRes compactModeLayoutResId: Int = layoutResId
-    ) : ViewHolder(initData, layoutResId, compactModeLayoutResId) {
-        protected var boundWidget: Widget? = null
-            private set
+    ) : LabeledItemBaseViewHolder(initData, layoutResId, compactModeLayoutResId) {
         protected val widgetContentView: View = itemView.findViewById(R.id.widget_content)
         private val dataSaverView: View = itemView.findViewById(R.id.data_saver)
         private val dataSaverButton: Button = itemView.findViewById(R.id.data_saver_button)
         private val dataSaverHint: TextView = itemView.findViewById(R.id.data_saver_hint)
 
         override fun bind(widget: Widget) {
-            boundWidget = widget
+            super.bind(widget)
             if (!showDataSaverPlaceholderIfNeeded(widget, canBindWithoutDataTransfer(widget))) {
                 bindAfterDataSaverCheck(widget)
             }
diff --git a/mobile/src/main/res/layout/widgetlist_chartitem.xml b/mobile/src/main/res/layout/widgetlist_chartitem.xml
index 2d96714f465..5cdc8d7d672 100644
--- a/mobile/src/main/res/layout/widgetlist_chartitem.xml
+++ b/mobile/src/main/res/layout/widgetlist_chartitem.xml
@@ -1,20 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     style="@style/WidgetListItemContainer">
 
-    <org.openhab.habdroid.ui.widget.WidgetImageView
-        android:id="@+id/widget_content"
+    <include layout="@layout/widgetlist_icontext" />
+
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:imageScalingType="scaleToFitWithViewAdjustment"
-        app:emptyHeightToWidthRatio="50%"
-        app:progressIndicator="@drawable/ic_image_loading_themed"
-        app:addRandomnessToUrl="true" />
+        android:descendantFocusability="blocksDescendants">
+
+        <org.openhab.habdroid.ui.widget.WidgetImageView
+            android:id="@+id/widget_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:imageScalingType="scaleToFitWithViewAdjustment"
+            app:emptyHeightToWidthRatio="50%"
+            app:progressIndicator="@drawable/ic_image_loading_themed"
+            app:addRandomnessToUrl="true" />
+
+        <include layout="@layout/widgetlist_data_saver" />
+    </FrameLayout>
+
 
-    <include layout="@layout/widgetlist_data_saver" />
 
-</FrameLayout>
+</LinearLayout>