From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/activity_register_account.xml | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/src/main/res/layout/activity_register_account.xml b/app/src/main/res/layout/activity_register_account.xml
index 46b70a3..b3047a7 100644
--- a/app/src/main/res/layout/activity_register_account.xml
+++ b/app/src/main/res/layout/activity_register_account.xml
@@ -23,9 +23,9 @@
android:layout_height="@dimen/dp_39"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_42"
- android:text="@string/home_login_娉ㄥ唽"
+ android:text="@string/home_login_register"
android:textAlignment="center"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_28"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -67,18 +67,18 @@
android:layout_marginStart="@dimen/dp_20"
android:src="@drawable/region" />
+
<TextView
android:id="@+id/region_tv"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="@dimen/dp_10"
+ android:layout_marginStart="9dp"
android:layout_marginEnd="@dimen/dp_20"
android:layout_toEndOf="@+id/region_iv"
android:gravity="center_vertical"
android:text="HDL China"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16" />
-
<ImageView
android:id="@+id/region_next_iv"
@@ -114,8 +114,8 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_150"
android:gravity="center_vertical"
- android:text="涓浗澶ч檰"
- android:textColor="@color/text_90000000"
+ android:text="@string/home_chinese_mainland"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16" />
<TextView
@@ -166,7 +166,7 @@
android:layout_marginStart="@dimen/dp_20"
android:layout_marginEnd="@dimen/dp_60"
android:background="@null"
- android:hint="@string/home_login_璇疯緭鍏ユ墜鏈哄彿"
+ android:hint="@string/home_login_input_phone"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -286,7 +286,7 @@
android:layout_marginEnd="@dimen/dp_20"
android:gravity="center"
android:padding="@dimen/dp_16"
- android:text="@string/home_login_楠岃瘉鐮�"
+ android:text="@string/home_login_verification_code"
android:textColor="@color/text_245EC3"
android:textSize="@dimen/text_14" />
@@ -306,7 +306,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_20"
android:background="@null"
- android:hint="@string/home_login_input_楠岃瘉鐮�"
+ android:hint="@string/home_login_input_verification_code"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -366,7 +366,7 @@
android:layout_alignParentStart="true"
android:layout_marginStart="@dimen/dp_20"
android:background="@null"
- android:hint="@string/home_login_input_楠岃瘉鐮�"
+ android:hint="@string/home_login_input_verification_code"
android:inputType="text"
android:lines="1"
android:maxLines="1"
@@ -408,7 +408,7 @@
android:background="@drawable/yesandnocheck"
android:enabled="false"
android:gravity="center"
- android:text="@string/home_login_娉ㄥ唽"
+ android:text="@string/home_login_register"
android:textColor="@color/text_FFFFFFFF"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
--
Gitblit v1.8.0