Navigation handled

Biblotrh · Jul 7, 2024 · cf7319c · cf7319c
1 parent de373f7
commit cf7319c
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 9 deletions.
diff --git a/app/navigation/OwnBottomTabs.tsx b/app/navigation/OwnBottomTabs.tsx
@@ -26,11 +26,25 @@ const OwnBottomTabs: React.FC<OwnBottomTabsProps> = ({navigation}) => {
   return (
     <View style={styles.container}>
       <View style={styles.content}>
-        {selectedTab === 'home' && <HomeScreen navigation={navigation} />}
-        {selectedTab === 'wishlist' && <WishlistScreen />}
+        {selectedTab === 'home' && (
+          <HomeScreen navigation={navigation} setSelectedTab={setSelectedTab} />
+        )}
+        {selectedTab === 'wishlist' && (
+          <WishlistScreen
+            navigation={navigation}
+            setSelectedTab={setSelectedTab}
+          />
+        )}
         {selectedTab === 'scan' && <Text>Scan Screen</Text>}
-        {selectedTab === 'cart' && <CartScreen />}
-        {selectedTab === 'profile' && <ProfileScreen />}
+        {selectedTab === 'cart' && (
+          <CartScreen navigation={navigation} setSelectedTab={setSelectedTab} />
+        )}
+        {selectedTab === 'profile' && (
+          <ProfileScreen
+            navigation={navigation}
+            setSelectedTab={setSelectedTab}
+          />
+        )}
       </View>
 
       {/* Bottom Tab Bar */}

diff --git a/app/screens/CartScreen.tsx b/app/screens/CartScreen.tsx
@@ -15,7 +15,15 @@ import {
 import fonts from '../assets/fonts';
 import colors from '../styles/colors';
 
-const CartScreen: React.FC = () => {
+interface CartScreenProps {
+  navigation: any;
+  setSelectedTab: (tab: string) => void;
+}
+
+const CartScreen: React.FC<CartScreenProps> = ({
+  navigation,
+  setSelectedTab,
+}) => {
   const dispatch = useDispatch();
   const cartItems = useSelector((state: RootState) => state.cart.items);
 
@@ -90,7 +98,9 @@ const CartScreen: React.FC = () => {
             <Text style={styles.noDataSubText}>
               Looks like you haven't added anything to your cart yet.
             </Text>
-            <TouchableOpacity style={styles.shopButton}>
+            <TouchableOpacity
+              onPress={() => setSelectedTab('home')}
+              style={styles.shopButton}>
               <Text style={styles.shopButtonText}>Start Shopping</Text>
             </TouchableOpacity>
           </View>

diff --git a/app/screens/HomeScreen.tsx b/app/screens/HomeScreen.tsx
@@ -16,9 +16,13 @@ import {fetchProducts} from '../store/actions/productActions';
 
 interface HomeScreenProps {
   navigation: any;
+  setSelectedTab: (tab: string) => void;
 }
 
-const HomeScreen: React.FC<HomeScreenProps> = ({navigation}) => {
+const HomeScreen: React.FC<HomeScreenProps> = ({
+  navigation,
+  setSelectedTab,
+}) => {
   const dispatch: AppDispatch = useDispatch();
   const products = useSelector((state: RootState) => state.product.products);
 

diff --git a/app/screens/ProfileScreen.tsx b/app/screens/ProfileScreen.tsx
@@ -2,7 +2,15 @@ import React from 'react';
 import {StyleSheet} from 'react-native';
 import {Header, ScreenContainer} from '../components/common';
 
-const ProfileScreen = () => {
+interface ProfileScreenProps {
+  navigation: any;
+  setSelectedTab: (tab: string) => void;
+}
+
+const ProfileScreen: React.FC<ProfileScreenProps> = ({
+  navigation,
+  setSelectedTab,
+}) => {
   return (
     <ScreenContainer>
       <Header title="Profile" />

diff --git a/app/screens/WishlistScreen.tsx b/app/screens/WishlistScreen.tsx
@@ -2,7 +2,15 @@ import React from 'react';
 import {StyleSheet} from 'react-native';
 import {Header, ScreenContainer} from '../components/common';
 
-const WishlistScreen = () => {
+interface WishlistScreenProps {
+  navigation: any;
+  setSelectedTab: (tab: string) => void;
+}
+
+const WishlistScreen: React.FC<WishlistScreenProps> = ({
+  navigation,
+  setSelectedTab,
+}) => {
   return (
     <ScreenContainer>
       <Header title="Wishlist" />