From bde413d383e3db95d2a255f6334fbbac7b9f373a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:13:14 +0800
Subject: [PATCH] Merge branch 'wjc_new' into feature/hxb
---
app/src/main/res/layout/activity_house_search.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/activity_house_search.xml b/app/src/main/res/layout/activity_house_search.xml
index f404390..c17c4a5 100644
--- a/app/src/main/res/layout/activity_house_search.xml
+++ b/app/src/main/res/layout/activity_house_search.xml
@@ -61,9 +61,9 @@
android:layout_toEndOf="@+id/power_station_search_iv"
android:background="@null"
android:gravity="start|center_vertical"
- android:hint="Search the power station"
- android:textColor="@color/text_90000000"
- android:textColorHint="@color/text_40000000"
+ android:hint="@string/search_station"
+ android:textColor="@color/text_E6000000"
+ android:textColorHint="@color/text_66000000"
android:textSize="@dimen/text_14" />
<ImageView
@@ -85,7 +85,7 @@
android:layout_marginEnd="@dimen/dp_21"
android:gravity="center"
android:text="@string/search"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16" />
@@ -108,7 +108,7 @@
android:layout_marginTop="@dimen/dp_23"
android:layout_marginEnd="@dimen/dp_21"
android:text="@string/history_search"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
--
Gitblit v1.8.0