From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/res/layout/item_plant_details.xml | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/app/src/main/res/layout/item_plant_details.xml b/app/src/main/res/layout/item_plant_details.xml
index d73ee09..1b7cf5e 100644
--- a/app/src/main/res/layout/item_plant_details.xml
+++ b/app/src/main/res/layout/item_plant_details.xml
@@ -54,7 +54,7 @@
android:layout_alignStart="@+id/device_details_name_tv"
android:layout_marginTop="@dimen/dp_3"
android:gravity="center_vertical"
- android:text="@string/installed_capacity"
+ android:text="@string/string_capacity"
android:textColor="@color/text_66000000"
android:textSize="@dimen/text_12" />
@@ -79,10 +79,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
+ android:text="0"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_15" />
<TextView
android:id="@+id/power_type_tv"
@@ -108,10 +107,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
+ android:text="0"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_15" />
<TextView
android:id="@+id/day_type_tv"
@@ -137,10 +135,9 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_18"
android:gravity="center"
- android:text="99"
+ android:text="0"
android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_15"
- android:textStyle="bold" />
+ android:textSize="@dimen/text_15" />
<TextView
android:id="@+id/month_type_tv"
--
Gitblit v1.8.0