Merge branch '1.5.1' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDeb...

wjc

2024-12-30 13b98b03b11f3865aaafc9daa3ce5b205fa1a228

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

@@ -128,7 +128,7 @@
                            android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/power_kwp_unit"
                            android:id="@+id/power_kw_unit"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_marginStart="3dp"
@@ -186,12 +186,12 @@


                        <TextView
                            android:id="@+id/day_kwp_unit"
                            android:id="@+id/day_kwh_unit"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_marginStart="3dp"
                            android:gravity="bottom"
                            android:text="kW"
                            android:text="kWh"
                            android:textColor="@color/text_66FFFFFF"
                            android:textSize="@dimen/text_10" />
                    </LinearLayout>
@@ -242,12 +242,12 @@
                            android:textSize="@dimen/text_14" />

                        <TextView
                            android:id="@+id/month_kwp_unit"
                            android:id="@+id/month_kwh_unit"
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_marginStart="3dp"
                            android:gravity="bottom"
                            android:text="kW"
                            android:text="kWh"
                            android:textColor="@color/text_66FFFFFF"
                            android:textSize="@dimen/text_10" />
                    </LinearLayout>