diff --git a/app/(tabs)/login.tsx b/app/(tabs)/login.tsx index e332311..ccc6d0d 100644 --- a/app/(tabs)/login.tsx +++ b/app/(tabs)/login.tsx @@ -75,8 +75,8 @@ const LoginScreen = () => { bounces={false} > - - Awake your Memo + + {t('login:auth.login.titleText')} { bottom: 0, left: 0, right: 0, - height: 80, // Set a fixed height for the navbar + height: 80, flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', paddingHorizontal: 32, - backgroundColor: 'transparent', // Make sure it's transparent + backgroundColor: 'transparent', }, centerButton: { position: 'absolute', left: width / 2, - top: -30, // Adjust this value to move the button up or down - marginLeft: -42.5, // Half of the button width (85/2) + top: -30, + marginLeft: -49, width: 85, height: 85, justifyContent: 'center', @@ -143,8 +143,8 @@ const AskNavbar = ({ wsStatus }: AskNavbarProps) => { }, statusIndicator: { position: 'absolute', - top: 15, - right: 15, + top: 3, + right: 20, width: 10, height: 10, borderRadius: 5, @@ -162,7 +162,7 @@ const AskNavbar = ({ wsStatus }: AskNavbarProps) => { return ( - + navigateTo('/memo-list')} diff --git a/components/login/login.tsx b/components/login/login.tsx index 32c27cb..63bab19 100644 --- a/components/login/login.tsx +++ b/components/login/login.tsx @@ -137,6 +137,16 @@ const Login = ({ updateUrlParam, setError, setShowPassword, showPassword }: Logi )} + + + {t('auth.login.signUpMessage', { ns: 'login' })} + + + + {t('auth.login.signUp', { ns: 'login' })} + + + @@ -150,17 +160,6 @@ const Login = ({ updateUrlParam, setError, setShowPassword, showPassword }: Logi - - - - {t('auth.login.signUpMessage', { ns: 'login' })} - - - - {t('auth.login.signUp', { ns: 'login' })} - - - ); }; diff --git a/i18n/locales/en/login.json b/i18n/locales/en/login.json index c4d15e4..016a55e 100644 --- a/i18n/locales/en/login.json +++ b/i18n/locales/en/login.json @@ -67,7 +67,8 @@ "accountPlaceholder": "Enter your account or email", "signUpMessage": "Don’t have an account?", "signUp": "Sign up", - "phoneLogin": "Phone Login" + "phoneLogin": "Phone Login", + "titleText": "Awake your Memo" }, "agree": { "logintext": "By logging in, you agree to our", diff --git a/i18n/locales/zh/login.json b/i18n/locales/zh/login.json index 1a5bf24..fbc9311 100644 --- a/i18n/locales/zh/login.json +++ b/i18n/locales/zh/login.json @@ -67,7 +67,8 @@ "accountPlaceholder": "请输入您的账号或邮箱", "signUpMessage": "还没有账号?", "signUp": "注册", - "phoneLogin": "手机号登录" + "phoneLogin": "手机号登录", + "titleText": "Awake your Memo" }, "agree": { "logintext": "登录即表示您同意我们的",