refactor: profile tab to my

crossplatformkorea · Aug 12, 2024 · eb2b137 · eb2b137
1 parent 8d2f56d
commit eb2b137
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 9 deletions.
diff --git a/app/(app)/(tabs)/_layout.tsx b/app/(app)/(tabs)/_layout.tsx
@@ -9,6 +9,8 @@ import {useEffect, useRef} from 'react';
 import * as Notifications from 'expo-notifications';
 import {RectButton} from 'react-native-gesture-handler';
 import {css} from '@emotion/native';
+import {Image} from 'expo-image';
+import {IC_ICON} from '../../../src/icons';
 
 function SettingsMenu(): JSX.Element {
   const {theme} = useDooboo();
@@ -25,11 +27,7 @@ function SettingsMenu(): JSX.Element {
         margin-right: 4px;
       `}
     >
-      <Icon
-        color={theme.text.basic}
-        name="List"
-        size={22}
-      />
+      <Icon color={theme.text.basic} name="List" size={22} />
     </RectButton>
   );
 }
@@ -82,10 +80,29 @@ export default function TabLayout(): JSX.Element {
         }}
       />
       <Tabs.Screen
-        name="profile"
+        name="my"
         options={{
-          title: t('common.profile'),
-          tabBarIcon: ({color}) => <Icon color={color} name="User" size={24} />,
+          title: t('common.my'),
+          tabBarIcon: ({focused}) => (
+            <View
+              style={css`
+                width: 24px;
+                height: 24px;
+                border-radius: 12px;
+                background-color: ${theme.bg.paper};
+                overflow: hidden;
+              `}
+            >
+              <Image
+                source={user?.avatar_url ? {uri: user.avatar_url} : IC_ICON}
+                style={css`
+                  width: 24px;
+                  height: 24px;
+                  opacity: ${focused ? '1' : '0.5'};
+                `}
+              />
+            </View>
+          ),
           headerRight: () => <View>{SettingsMenu()}</View>,
         }}
       />

diff --git a/app/(app)/(tabs)/profile.tsx → app/(app)/(tabs)/my.tsx b/app/(app)/(tabs)/profile.tsx → app/(app)/(tabs)/my.tsx
@@ -108,7 +108,7 @@ export default function Profile(): JSX.Element {
 
   return (
     <ErrorBoundary FallbackComponent={FallbackComponent}>
-      <Stack.Screen options={{title: t('profile.title')}} />
+      <Stack.Screen options={{title: t('common.my')}} />
       <Container>
         <CustomScrollView bounces={false}>
           <ProfileHeader>

diff --git a/app/[...unmatched].tsx b/app/[...unmatched].tsx
@@ -0,0 +1,61 @@
+import {useEffect, useState} from 'react';
+import {css} from '@emotion/native';
+import {Button} from 'dooboo-ui';
+import {usePathname, useRouter} from 'expo-router';
+
+import {t} from '../src/STRINGS';
+import {showAlert} from '../src/utils/alert';
+import CustomLoadingIndicator from '../src/components/uis/CustomLoadingIndicator';
+
+/* 
+  For android redirect. This looks like expo router bug.
+  issue: https://github.com/expo/router/issues/157
+*/
+export default function Unmatched(): JSX.Element {
+  const [showReload] = useState(false);
+  const {replace, canGoBack, back} = useRouter();
+  const pathname = usePathname();
+
+  useEffect(() => {
+    // ios 신규 설치 버그 수정
+    // https://github.com/dooboolab/dooboo-task/issues/101
+    if (pathname === '/google/link') {
+      if (canGoBack()) {
+        back();
+        return;
+      }
+
+      replace('/');
+
+      return;
+    }
+  }, [back, canGoBack, pathname, replace]);
+
+  return (
+    <CustomLoadingIndicator>
+      {showReload ? (
+        <Button
+          borderRadius={28}
+          color="light"
+          onPress={() => replace('/')}
+          style={css`
+            margin-top: 14px;
+          `}
+          styles={{
+            text: css`
+              font-size: 14px;
+              font-family: Pretendard-Bold;
+            `,
+          }}
+          text={t('common.retry')}
+          touchableHighlightProps={{
+            onLongPress: () => {
+              showAlert(pathname);
+            },
+          }}
+          type="outlined"
+        />
+      ) : null}
+    </CustomLoadingIndicator>
+  );
+}
diff --git a/assets/langs/en.json b/assets/langs/en.json
@@ -34,6 +34,7 @@
     "invalidUrl": "Invalid URL",
     "latest": "Latest",
     "leaveComment": "Leave a comment",
+    "my": "My",
     "newReplyOnTitle": "New reply on {{title}}",
     "noComment": "No comments",
     "notFound": "Not found",

diff --git a/assets/langs/ko.json b/assets/langs/ko.json
@@ -34,6 +34,7 @@
     "invalidUrl": "유효하지 않은 URL",
     "latest": "최신순",
     "leaveComment": "댓글 남기기",
+    "my": "나",
     "newReplyOnTitle": "\"{{title}}\"에 새로운 댓글이 달렸습니다",
     "noComment": "댓글이 없습니다",
     "notFound": "찾을 수 없습니다",