From 0287b5d20f7d57f5352248175733b99d5a99959b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 28 八月 2025 17:42:27 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/res/layout/item_plant_details.xml | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index 90f7b2d..4487366 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -74,7 +74,7 @@
android:layout_height="@dimen/dp_18"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
- android:layout_marginTop="@dimen/dp_14"
+ android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">
<ImageView
@@ -88,8 +88,6 @@
android:layout_height="match_parent"
android:paddingStart="0dp"
android:paddingEnd="@dimen/dp_16"
- android:paddingTop="@dimen/dp_1"
- android:paddingBottom="@dimen/dp_1"
android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_12" />
</LinearLayout>
@@ -131,7 +129,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="37.5dp"
+ android:layout_height="39dp"
android:orientation="horizontal">
<LinearLayout
@@ -178,7 +176,7 @@
<TextView
android:id="@+id/pv_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/pv"
@@ -232,7 +230,7 @@
<TextView
android:id="@+id/generation_today_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/day_generation"
@@ -256,7 +254,7 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="37.5dp"
+ android:layout_height="39dp"
android:orientation="horizontal">
<LinearLayout
@@ -303,7 +301,7 @@
<TextView
android:id="@+id/output_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/output"
@@ -357,7 +355,7 @@
<TextView
android:id="@+id/battery_storage_type_tv"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_14"
+ android:layout_height="@dimen/dp_17"
android:layout_marginTop="3dp"
android:gravity="center_vertical|start"
android:text="@string/battery_capacity_indicator"
@@ -377,5 +375,4 @@
</RelativeLayout>
-</com.hdl.photovoltaic.widget.SwipeLayout>
-
+</com.hdl.photovoltaic.widget.SwipeLayout>
\ No newline at end of file
--
Gitblit v1.8.0