feat: navbar

app/(tabs)/login.tsx

@@ -75,8 +75,8 @@ const LoginScreen = () => {
                 bounces={false}
             >
                 <ThemedView className="flex-1 bg-bgPrimary justify-end">
-                    <View style={{ width: "100%", alignItems: "center", marginTop: insets.top + 8 }}>
-                        <ThemedText style={{ fontSize: 20, fontWeight: 'bold', color: "#fff" }}>Awake your Memo</ThemedText>
+                    <View style={{ width: "100%", alignItems: "center", marginTop: insets.top + 8, opacity: keyboardOffset === 0 ? 1 : 0 }}>
+                        <ThemedText style={{ fontSize: 20, fontWeight: 'bold', color: "#fff" }}>{t('login:auth.login.titleText')}</ThemedText>
                     </View>
                     <View className="flex-1">
                         <View

components/layout/ask.tsx

@@ -116,18 +116,18 @@ const AskNavbar = ({ wsStatus }: AskNavbarProps) => {
             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 (
         <View style={styles.container}>
-            <Image source={require('@/assets/images/png/owner/ask.png')} style={{ width: width * 1.18, height: 100, resizeMode: 'cover', marginLeft: -width * 0.07 }} />
+            <Image source={require('@/assets/images/png/owner/ask.png')} style={{ width: width }} />
             <View style={styles.navContainer}>
                 <TouchableOpacity
                     onPress={() => navigateTo('/memo-list')}

components/login/login.tsx

@@ -137,6 +137,16 @@ const Login = ({ updateUrlParam, setError, setShowPassword, showPassword }: Logi
                     </ThemedText>
                 )}
             </TouchableOpacity>
+            <View style={styles.signupContainer}>
+                <ThemedText style={styles.signupText}>
+                    {t('auth.login.signUpMessage', { ns: 'login' })}
+                </ThemedText>
+                <TouchableOpacity onPress={handleSignUp}>
+                    <ThemedText style={styles.signupLink}>
+                        {t('auth.login.signUp', { ns: 'login' })}
+                    </ThemedText>
+                </TouchableOpacity>
+            </View>
 
             <View style={{ width: "100%", alignItems: "center", opacity: 0 }}>
                 <View style={styles.loginTypeContainer}>
@@ -150,17 +160,6 @@ const Login = ({ updateUrlParam, setError, setShowPassword, showPassword }: Logi
                     </View>
                 </View>
             </View>
-
-            <View style={styles.signupContainer}>
-                <ThemedText style={styles.signupText}>
-                    {t('auth.login.signUpMessage', { ns: 'login' })}
-                </ThemedText>
-                <TouchableOpacity onPress={handleSignUp}>
-                    <ThemedText style={styles.signupLink}>
-                        {t('auth.login.signUp', { ns: 'login' })}
-                    </ThemedText>
-                </TouchableOpacity>
-            </View>
         </View>
     );
 };

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",

i18n/locales/zh/login.json

@@ -67,7 +67,8 @@
       "accountPlaceholder": "请输入您的账号或邮箱",
       "signUpMessage": "还没有账号？",
       "signUp": "注册",
-      "phoneLogin": "手机号登录"
+      "phoneLogin": "手机号登录",
+      "titleText": "Awake your Memo"
     },
     "agree": {
       "logintext": "登录即表示您同意我们的",