From 784427cfba6bff1bb9f0eeca9b6eaae13b4c7605 Mon Sep 17 00:00:00 2001
From: AllenTom <qweasdzxczse2@gmail.com>
Date: Sun, 1 Dec 2024 15:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=86=E7=A0=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/aiosman/ravenow/ui/login/emailsignup.kt    | 14 +++++++-------
 app/src/main/res/values-zh/strings.xml             |  2 +-
 app/src/main/res/values/strings.xml                |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt b/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt
index 07a4a2d..9009ba3 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.aiosman.ravenow.AppState
 import com.aiosman.ravenow.AppStore
+import com.aiosman.ravenow.LocalAppTheme
 import com.aiosman.ravenow.data.api.ErrorCode
 import com.aiosman.ravenow.LocalNavController
 import com.aiosman.ravenow.R
@@ -43,6 +44,7 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun EmailSignupScreen() {
+    var appColor = LocalAppTheme.current
     var email by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
     var confirmPassword by remember { mutableStateOf("") }
@@ -71,14 +73,12 @@ fun EmailSignupScreen() {
         passwordError = when {
             // 非空
             password.isEmpty() -> context.getString(R.string.text_error_password_required)
-            // 包含大写字母
-            !password.matches(Regex(".*[A-Z].*")) -> context.getString(R.string.text_error_password_format)
-            // 至少8位
-            password.length < 8 -> context.getString(R.string.text_error_password_format)
+            // 至少6位
+            password.length < 6 -> context.getString(R.string.text_error_password_format)
             // 至少一个数字
             !password.matches(Regex(".*\\d.*")) -> context.getString(R.string.text_error_password_format)
-            // 包含小写字母
-            !password.matches(Regex(".*[a-z].*")) -> context.getString(R.string.text_error_password_format)
+            // 包含字母
+            !password.matches(Regex(".*[a-zA-Z].*")) -> context.getString(R.string.text_error_password_format)
             else -> null
         }
         confirmPasswordError = when {
@@ -170,7 +170,7 @@ fun EmailSignupScreen() {
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = Modifier
             .fillMaxSize()
-            .background(Color.White)
+            .background(appColor.background)
     ) {
         StatusBarSpacer()
         Box(
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index b60bf62..e8ee5a3 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -39,7 +39,7 @@
     <string name="agree_terms_of_service">我已阅读用户协议</string>
     <string name="agree_promotion">我同意 Rave Now 推送消息</string>
     <string name="text_error_email_format">邮箱格式错误</string>
-    <string name="text_error_password_format">密码至少为 8 位，包含大写字母、小写字母、数字</string>
+    <string name="text_error_password_format">至少6位，包含字母、数字</string>
     <string name="text_error_confirm_password_mismatch">密码和确认密码必须相同</string>
     <string name="text_error_confirm_password_required">请输入确认密码</string>
     <string name="error_10001_user_exist">用户已存在</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 81c4640..19e8356 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -38,7 +38,7 @@
     <string name="agree_terms_of_service">Yes, I have read and agree to RaveNow’s Privacy Policy.</string>
     <string name="agree_promotion">Yes, I want to be added to the Rave Now mailing list.</string>
     <string name="text_error_email_format">Invalid email</string>
-    <string name="text_error_password_format">The password must be at least 8 characters long and contain a combination of uppercase letters, lowercase letters, and numbers.</string>
+    <string name="text_error_password_format">At least 6 characters and contain letters, and numbers.</string>
     <string name="text_error_confirm_password_mismatch">Please ensure that the passwords entered twice are consistent.</string>
     <string name="text_error_confirm_password_required">Confirm password is required</string>
     <string name="error_10001_user_exist">User existed</string>