From 4c6366c3ed403419be98a33d7565dd3add90113d Mon Sep 17 00:00:00 2001 From: alguilhot Date: Wed, 12 Oct 2022 15:42:56 +0200 Subject: [PATCH] ADD: Ajout de la botbar dans toutes les vues --- bob_party/src/components/BotBar.tsx | 6 +++--- bob_party/src/screens/Chat.tsx | 27 ++++++++------------------- bob_party/src/screens/Home.tsx | 1 + bob_party/src/screens/Profile.tsx | 27 ++++++++------------------- bob_party/src/screens/Store.tsx | 4 +--- 5 files changed, 21 insertions(+), 44 deletions(-) diff --git a/bob_party/src/components/BotBar.tsx b/bob_party/src/components/BotBar.tsx index a987169..09d9195 100644 --- a/bob_party/src/components/BotBar.tsx +++ b/bob_party/src/components/BotBar.tsx @@ -4,8 +4,8 @@ import React from "react" export const BotBar : -FC<{messages:ImageSourcePropType, games: ImageSourcePropType, shop: ImageSourcePropType, style: ImageStyle, nav: any, styleBar : any}> = -({messages, games, shop,style, nav,styleBar}) => +FC<{messages:ImageSourcePropType, games: ImageSourcePropType, shop: ImageSourcePropType, style: ImageStyle, styleStore: ImageStyle, nav: any, styleBar : any}> = +({messages, games, shop,style, styleStore, nav,styleBar}) => { return ( @@ -23,7 +23,7 @@ FC<{messages:ImageSourcePropType, games: ImageSourcePropType, shop: ImageSourceP nav.navigate('StoreTab')}> diff --git a/bob_party/src/screens/Chat.tsx b/bob_party/src/screens/Chat.tsx index a2b528e..b70abed 100644 --- a/bob_party/src/screens/Chat.tsx +++ b/bob_party/src/screens/Chat.tsx @@ -27,26 +27,15 @@ function Chat(props: { navigation: any; }) { couille - - - - - navigation.navigate('HomeTab')}> - - - navigation.navigate('StoreTab')}> - - - + styleStore={styles.iconStore} + nav={navigation} + styleBar={styles.footer} + /> ); } diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx index e80cb9f..20b8008 100644 --- a/bob_party/src/screens/Home.tsx +++ b/bob_party/src/screens/Home.tsx @@ -51,6 +51,7 @@ function Home(props: { navigation: any; }) { games={gamepad} shop={store} style={styles.iconFooter} + styleStore={styles.iconStore} nav={navigation} styleBar={styles.footer} /> diff --git a/bob_party/src/screens/Profile.tsx b/bob_party/src/screens/Profile.tsx index 6700018..88c582c 100644 --- a/bob_party/src/screens/Profile.tsx +++ b/bob_party/src/screens/Profile.tsx @@ -29,26 +29,15 @@ function Profile(props: { navigation: any; }) { couille - - navigation.navigate('ChatTab')}> - - - navigation.navigate('HomeTab')}> - - - navigation.navigate('StoreTab')}> - - - + styleStore={styles.iconStore} + nav={navigation} + styleBar={styles.footer} + /> ); } diff --git a/bob_party/src/screens/Store.tsx b/bob_party/src/screens/Store.tsx index adb60e9..9e4079f 100644 --- a/bob_party/src/screens/Store.tsx +++ b/bob_party/src/screens/Store.tsx @@ -30,14 +30,12 @@ function Store(props: { navigation: any; }) { couille - - couille -