Merge pull request #503 from bounswe/MOBILE-465

feat(mobile): Search Page
bounswe · Nov 19, 2024 · 3c0f72c · 3c0f72c
2 parents a1e119c + 892f674
commit 3c0f72c
Show file tree

Hide file tree

Showing 4 changed files with 393 additions and 15 deletions.
diff --git a/mobile/bulingo/app/(tabs)/_layout.tsx b/mobile/bulingo/app/(tabs)/_layout.tsx
@@ -1,12 +1,11 @@
 import FontAwesome from '@expo/vector-icons/FontAwesome';
 import { Tabs } from 'expo-router';
-import React, {useState} from 'react';
-import {TouchableOpacity} from 'react-native';
+import React from 'react';
 
 export default function TabLayout() {
   return (
     <>
-      <Tabs screenOptions={{ tabBarActiveTintColor: 'red', headerShown: false, tabBarStyle:{paddingBottom:5, paddingTop: 5}}}>
+      <Tabs screenOptions={{ tabBarActiveTintColor: 'red', headerShown: false}}>
         <Tabs.Screen
           name="index"
           options={{
@@ -25,6 +24,7 @@ export default function TabLayout() {
         <Tabs.Screen
           name="search"
           options={{
+            headerShown: true,
             title: 'Search',
             tabBarIcon: ({ color }) => <FontAwesome size={28} name="search" color={color} />,
           }}

diff --git a/mobile/bulingo/app/(tabs)/profile/userCard.tsx b/mobile/bulingo/app/(tabs)/profile/userCard.tsx
@@ -26,7 +26,11 @@ const UserCard = (props: UserCardProps) => {
     if (props.onCardPress){ 
       props.onCardPress();
     }
-    router.push(`/(tabs)/profile/users/${props.username}`)
+
+    router.navigate('/(tabs)/profile')
+    setTimeout(() => {
+      router.push(`/(tabs)/profile/users/${props.username}`);
+    }, 0);
   };
 
   let buttonStyleAddOn;