Merge branch '1.5.1' into dev

wjc

2025-02-07 a1c880c476327032fe174af8c80d6f78a590dae9

 app/src/main/res/layout/item_device_details.xml

@@ -25,7 +25,7 @@
            android:layout_marginStart="@dimen/dp_16"
            android:layout_marginTop="@dimen/dp_10"
            android:layout_marginEnd="@dimen/dp_16"
            android:background="@drawable/bj_ff333738">
            android:background="@drawable/bj_ff1c1c1e">

            <ImageView
                android:id="@+id/device_details_image_iv"
@@ -162,7 +162,7 @@
                            android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/day_kwp_unit"
                            android:id="@+id/device_label_power_unit"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_marginStart="3dp"
@@ -217,7 +217,7 @@
                            android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/month_kwp_unit"
                            android:id="@+id/device_label_day_unit"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_marginStart="3dp"