From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/res/layout/fragment_home_page.xml | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 9d227d0..2aa3fbf 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -116,7 +116,7 @@
<TextView
android:id="@+id/home_page_station_info_rl1_f_text2_tv"
- android:layout_width="9dp"
+ android:layout_width="wrap_content"
android:layout_height="14.5dp"
android:layout_alignBottom="@+id/info_rl1_f_text1_tv"
android:layout_marginStart="2.5dp"
@@ -142,7 +142,7 @@
android:id="@+id/info_rl1_text2_tv"
style="@style/Text14Style"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="@dimen/dp_18"
android:layout_below="@+id/info_rl1_text1_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:layout_marginTop="3dp"
@@ -162,7 +162,7 @@
android:id="@+id/info_rl1_text4_tv"
style="@style/Text14Style"
android:layout_width="wrap_content"
- android:layout_height="@dimen/dp_17"
+ android:layout_height="@dimen/dp_18"
android:layout_below="@+id/info_rl1_text3_tv"
android:layout_alignStart="@+id/info_rl1_text1_tv"
android:layout_marginTop="3dp"
@@ -189,9 +189,9 @@
<TextView
android:id="@+id/home_page_station_info_rl1_title_tv"
android:layout_width="wrap_content"
- android:layout_height="14.5dp"
+ android:layout_height="16dp"
android:layout_marginStart="@dimen/dp_47"
- android:layout_marginTop="17dp"
+ android:layout_marginTop="16dp"
android:text="@string/generation"
android:textColor="@color/text_191919"
android:textSize="@dimen/text_12" />
@@ -426,8 +426,8 @@
<TextView
android:id="@+id/unit_icon_tv"
- android:layout_width="@dimen/dp_11"
- android:layout_height="@dimen/dp_11"
+ android:layout_width="@dimen/dp_10"
+ android:layout_height="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_3"
android:layout_marginEnd="@dimen/dp_3"
android:layout_toStartOf="@+id/unit_text_tv"
@@ -504,7 +504,7 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_12"
android:text="13.14"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
@@ -518,7 +518,7 @@
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_1_tv"
android:text="@string/t"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_969696"
android:textSize="@dimen/text_12"
@@ -561,7 +561,7 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_12"
android:text="13.14"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
@@ -575,7 +575,7 @@
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_2_tv"
android:text="@string/t"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_969696"
android:textSize="@dimen/text_12"
/>
@@ -616,7 +616,7 @@
android:layout_height="22dp"
android:layout_alignParentTop="true"
android:layout_marginStart="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_16"
+ android:layout_marginTop="@dimen/dp_12"
android:text="13"
android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_18"
@@ -630,7 +630,7 @@
android:layout_marginStart="@dimen/dp_2"
android:layout_toEndOf="@+id/social_contribution_data_3_tv"
android:text="@string/number"
- android:textColor="@color/text_E6000000"
+ android:textColor="@color/text_969696"
android:textSize="@dimen/text_12" />
<TextView
--
Gitblit v1.8.0