From 3e3904224ff6b37c654f54cee56e9ca466f289de Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 五月 2024 19:31:55 +0800
Subject: [PATCH] Merge branch 'wjc_new' into lwj_new
---
app/src/main/res/layout/activity_house_search.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/activity_house_search.xml b/app/src/main/res/layout/activity_house_search.xml
index 977d256..a5c9f43 100644
--- a/app/src/main/res/layout/activity_house_search.xml
+++ b/app/src/main/res/layout/activity_house_search.xml
@@ -62,8 +62,8 @@
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:textColor="@color/text_E6000000"
+ android:textColorHint="@color/text_66000000"
android:textSize="@dimen/text_14" />
<ImageView
@@ -85,12 +85,12 @@
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" />
</RelativeLayout>
-
+ <!--鍘嗗彶璁板綍-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/history_list_parent"
android:layout_width="match_parent"
@@ -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"
@@ -135,7 +135,7 @@
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
-
+ <!--鎼滅储鏁版嵁-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/list_parent"
android:layout_width="match_parent"
--
Gitblit v1.8.0