From 8f4a21c13de88f6c34705f0660ec54ec5e032aa4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 01 十二月 2025 08:24:33 +0800
Subject: [PATCH] Merge branch 'master' into 2.0
---
app/src/main/res/layout/activity_home_login.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/res/layout/activity_home_login.xml b/app/src/main/res/layout/activity_home_login.xml
index d8bb7a2..49d6fa3 100644
--- a/app/src/main/res/layout/activity_home_login.xml
+++ b/app/src/main/res/layout/activity_home_login.xml
@@ -86,7 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_39"
android:layout_marginTop="@dimen/dp_40"
- android:text="@string/app_name"
+ android:text="@string/app_name_title"
android:textColor="@color/text_FFACACAC"
android:textSize="@dimen/text_28"
app:layout_constraintStart_toStartOf="@+id/home_login_language_ll"
@@ -292,7 +292,7 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_16"
android:paddingEnd="@dimen/dp_16"
- android:text="OR"
+ android:text="@string/or"
android:textAlignment="center"
android:textColor="@color/text_FF5B5B5B"
android:textSize="@dimen/sp_14" />
--
Gitblit v1.8.0