From d4d8802a5dad97d453af5f3522d69687792af294 Mon Sep 17 00:00:00 2001
From: alguilhot <alban.guilhot@etu.uca.fr>
Date: Wed, 12 Oct 2022 14:25:27 +0200
Subject: [PATCH 1/6] =?UTF-8?q?FIX:=20r=C3=A9paration=20warn=20screen=20sa?=
 =?UTF-8?q?me=20name=20nested?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bob_party/src/navigation/AppNavigator.tsx | 8 ++++----
 bob_party/src/screens/Chat.tsx            | 6 +++---
 bob_party/src/screens/Home.tsx            | 8 ++++----
 bob_party/src/screens/Profile.tsx         | 6 +++---
 bob_party/src/screens/Store.tsx           | 6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/bob_party/src/navigation/AppNavigator.tsx b/bob_party/src/navigation/AppNavigator.tsx
index 1470d38..d5836c5 100644
--- a/bob_party/src/navigation/AppNavigator.tsx
+++ b/bob_party/src/navigation/AppNavigator.tsx
@@ -67,10 +67,10 @@ function MainTabNavigator() {
         backBehavior='none'
         screenOptions={{headerShown: false, tabBarStyle: { display: 'none' },}}
         >
-        <Tab.Screen name='Home' component={HomeStackScreen} />
-        <Tab.Screen name='Store' component={StoreStackScreen} />
-        <Tab.Screen name='Chat' component={ChatStackScreen} />
-        <Tab.Screen name='Profile' component={Profile} />
+        <Tab.Screen name='HomeTab' component={HomeStackScreen} />
+        <Tab.Screen name='StoreTab' component={StoreStackScreen} />
+        <Tab.Screen name='ChatTab' component={ChatStackScreen} />
+        <Tab.Screen name='ProfileTab' component={ProfileStackScreen} />
         <Tab.Screen name='Test' component={Test} />
       </Tab.Navigator>
     </NavigationContainer>
diff --git a/bob_party/src/screens/Chat.tsx b/bob_party/src/screens/Chat.tsx
index c0cec66..407c844 100644
--- a/bob_party/src/screens/Chat.tsx
+++ b/bob_party/src/screens/Chat.tsx
@@ -13,7 +13,7 @@ function Store(props: { navigation: any; }) {
     return (
     <View style={styles.container}>
       <View style={styles.header}>
-        <Pressable onPress={() => navigation.navigate('Profile')}>
+        <Pressable onPress={() => navigation.navigate('ProfileTab')}>
           <Image
           style={styles.avatar}
           source={avatar}
@@ -37,13 +37,13 @@ function Store(props: { navigation: any; }) {
           source={message}
           />
         </Pressable>
-        <Pressable onPress={() => navigation.navigate('Home')}>
+        <Pressable onPress={() => navigation.navigate('HomeTab')}>
           <Image
           style={styles.iconFooter}
           source={gamepad}
           />
         </Pressable>
-        <Pressable onPress={() => navigation.navigate('Store')}>
+        <Pressable onPress={() => navigation.navigate('StoreTab')}>
           <Image
           style={styles.iconStore}
           source={store}
diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx
index 557e71c..2d38c1e 100644
--- a/bob_party/src/screens/Home.tsx
+++ b/bob_party/src/screens/Home.tsx
@@ -18,8 +18,8 @@ function Home(props: { navigation: any; }) {
     return (
     <View style={styles.container}>
       <View style={styles.header}>
-        <Pressable onPress={() => navigation.navigate('Profile')}>
-          <SkinComponent skin={skinTest} children={styles.avatar} />
+        <Pressable onPress={() => navigation.navigate('ProfileTab')}>
+        <SkinComponent skin={skinTest} children={styles.avatar} />
         </Pressable>
         <Text style={styles.titre}>BOB PARTY</Text>
         <Pressable onPress={() => navigation.navigate('Settings')}>
@@ -40,7 +40,7 @@ function Home(props: { navigation: any; }) {
         />
       </View>
       <View style={styles.footer}>
-        <Pressable onPress={() => navigation.navigate('Chat')}>
+        <Pressable onPress={() => navigation.navigate('ChatTab')}>
           <Image
           style={styles.iconFooter}
           source={message}
@@ -52,7 +52,7 @@ function Home(props: { navigation: any; }) {
           source={gamepad}
           />
         </Pressable>
-        <Pressable onPress={() => navigation.navigate('Store')}>
+        <Pressable onPress={() => navigation.navigate('StoreTab')}>
           <Image
           style={styles.iconStore}
           source={store}
diff --git a/bob_party/src/screens/Profile.tsx b/bob_party/src/screens/Profile.tsx
index 08474c2..4cd0da9 100644
--- a/bob_party/src/screens/Profile.tsx
+++ b/bob_party/src/screens/Profile.tsx
@@ -31,19 +31,19 @@ function Store(props: { navigation: any; }) {
         <Text style={styles.text}>couille</Text>
       </View>
       <View style={styles.footer}>
-        <Pressable onPress={() => navigation.navigate('Chat')}>
+        <Pressable onPress={() => navigation.navigate('ChatTab')}>
           <Image
           style={styles.iconFooter}
           source={message}
           />
         </Pressable>
-        <Pressable onPress={() => navigation.navigate('Home')}>
+        <Pressable onPress={() => navigation.navigate('HomeTab')}>
           <Image
           style={styles.iconFooter}
           source={gamepad}
           />
         </Pressable>
-        <Pressable onPress={() => navigation.navigate('Store')}>
+        <Pressable onPress={() => navigation.navigate('StoreTab')}>
           <Image
           style={styles.iconStore}
           source={store}
diff --git a/bob_party/src/screens/Store.tsx b/bob_party/src/screens/Store.tsx
index 0437fc2..deaf7d7 100644
--- a/bob_party/src/screens/Store.tsx
+++ b/bob_party/src/screens/Store.tsx
@@ -13,7 +13,7 @@ function Store(props: { navigation: any; }) {
     return (
     <View style={styles.container}>
       <View style={styles.header}>
-        <Pressable onPress={() => navigation.navigate('Profile')}>
+        <Pressable onPress={() => navigation.navigate('ProfileTab')}>
           <Image
           style={styles.avatar}
           source={avatar}
@@ -31,13 +31,13 @@ function Store(props: { navigation: any; }) {
         <Text style={styles.text}>couille</Text>
       </View>
       <View style={styles.footer}>
-        <Pressable onPress={() => navigation.navigate('Chat')}>
+        <Pressable onPress={() => navigation.navigate('ChatTab')}>
           <Image
           style={styles.iconFooter}
           source={message}
           />
         </Pressable>
-        <Pressable onPress={() => navigation.navigate('Home')}>
+        <Pressable onPress={() => navigation.navigate('HomeTab')}>
           <Image
           style={styles.iconFooter}
           source={gamepad}

From dcc4479c173b9d7cbafc29f5892cbfae1c5468c5 Mon Sep 17 00:00:00 2001
From: alguilhot <alban.guilhot@etu.uca.fr>
Date: Wed, 12 Oct 2022 14:27:24 +0200
Subject: [PATCH 2/6] DEL: remove console.log inutile

---
 bob_party/src/components/skinAvatar.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bob_party/src/components/skinAvatar.tsx b/bob_party/src/components/skinAvatar.tsx
index f0afef3..fb6ce0d 100644
--- a/bob_party/src/components/skinAvatar.tsx
+++ b/bob_party/src/components/skinAvatar.tsx
@@ -5,7 +5,6 @@ import React from "react"
 
 export const SkinComponent : FC<{skin: Skin, children: ImageStyle}> = ({skin, children}) => {
 
-    console.log(skin.getSkinSource());
     return (
     <View>
         <Image source={ skin.getSkinSource()} style={children}/>

From d0c2e2dfe6b983b1f580af8a6c1ad7351915e7bb Mon Sep 17 00:00:00 2001
From: alguilhot <alban.guilhot@etu.uca.fr>
Date: Wed, 12 Oct 2022 15:04:36 +0200
Subject: [PATCH 3/6] =?UTF-8?q?ADD:=20Ajout=20de=20la=20TopBar=20=C3=A0=20?=
 =?UTF-8?q?la=20branche=20typescript?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bob_party/src/components/TopBar.tsx | 23 +++++++++++++++++++++++
 bob_party/src/screens/Home.tsx      | 24 +++++++++++-------------
 2 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 bob_party/src/components/TopBar.tsx

diff --git a/bob_party/src/components/TopBar.tsx b/bob_party/src/components/TopBar.tsx
new file mode 100644
index 0000000..869443f
--- /dev/null
+++ b/bob_party/src/components/TopBar.tsx
@@ -0,0 +1,23 @@
+import { FC, ReactNode } from "react"
+import { Pressable, Image, ImageStyle, Text, View, Alert, ImageSourcePropType, TextStyle } from "react-native"
+import { Skin } from "../core/Skin"
+import React from "react"
+import { SkinComponent } from "./skinAvatar"
+import MainTabNavigator from "../navigation/AppNavigator"
+import { BottomTabNavigationProp } from "@react-navigation/bottom-tabs"
+
+
+export const TopBar : FC<{skin: Skin, styleAvatar: ImageStyle, title: String, rightIcon: ImageSourcePropType, styleIcon: ImageStyle,nav: any, styleTitle: TextStyle, styleHeader : any}> = ({skin, styleAvatar, title, rightIcon,styleIcon, nav, styleTitle, styleHeader}) => 
+{
+    return (
+    <View style={styleHeader}>
+        <Pressable onPress={() => nav.navigate('ProfileTab')}>
+                <SkinComponent skin={skin} children={styleAvatar} />
+            </Pressable>
+            <Text style={styleTitle}>{title}</Text>
+            <Pressable onPress={() => nav.navigate('Settings')}>
+                <Image source={rightIcon} style={styleIcon}/>
+            </Pressable>
+    </View>
+    )
+}
\ No newline at end of file
diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx
index 2d38c1e..421e742 100644
--- a/bob_party/src/screens/Home.tsx
+++ b/bob_party/src/screens/Home.tsx
@@ -1,9 +1,11 @@
 import { StatusBar } from 'expo-status-bar'
 import { StyleSheet, View, Text, Alert, Pressable, Image} from 'react-native'
-import React from 'react';
+import React, { Children } from 'react';
 import { SkinComponent } from '../components/skinAvatar';
 import { User } from '../core/user';
 import { Skin } from '../core/skin';
+import { TopBar } from '../components/TopBar';
+
 
 
 const avatar = require('../../assets/Icons/BobClassic.png');
@@ -17,18 +19,14 @@ function Home(props: { navigation: any; }) {
     const { navigation } = props
     return (
     <View style={styles.container}>
-      <View style={styles.header}>
-        <Pressable onPress={() => navigation.navigate('ProfileTab')}>
-        <SkinComponent skin={skinTest} children={styles.avatar} />
-        </Pressable>
-        <Text style={styles.titre}>BOB PARTY</Text>
-        <Pressable onPress={() => navigation.navigate('Settings')}>
-          <Image
-          style={styles.engrenage}
-          source={engrenage}
-          />
-        </Pressable>
-      </View>
+        <TopBar
+          skin={skinTest} 
+          styleAvatar={styles.avatar} 
+          title="BOB PARTY" 
+          rightIcon={engrenage} 
+          styleIcon={styles.engrenage} 
+          nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
+        />
       <View style={styles.body}>
         <Button 
         title='Jouer Seul'

From 232f97460ab0ead3c5c83535b1d25ac1a7a4657f Mon Sep 17 00:00:00 2001
From: alguilhot <alban.guilhot@etu.uca.fr>
Date: Wed, 12 Oct 2022 15:22:08 +0200
Subject: [PATCH 4/6] ADD: Ajout du composent  topbar sur toutes les pages

---
 bob_party/src/components/skinAvatar.tsx |  1 -
 bob_party/src/screens/Chat.tsx          | 30 +++++++++------------
 bob_party/src/screens/Profile.tsx       | 36 ++++++++++++-------------
 bob_party/src/screens/Store.tsx         | 32 +++++++++++-----------
 4 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/bob_party/src/components/skinAvatar.tsx b/bob_party/src/components/skinAvatar.tsx
index fb6ce0d..2e1eb8a 100644
--- a/bob_party/src/components/skinAvatar.tsx
+++ b/bob_party/src/components/skinAvatar.tsx
@@ -4,7 +4,6 @@ import { Skin } from "../core/Skin"
 import React from "react"
 
 export const SkinComponent : FC<{skin: Skin, children: ImageStyle}> = ({skin, children}) => {
-
     return (
     <View>
         <Image source={ skin.getSkinSource()} style={children}/>
diff --git a/bob_party/src/screens/Chat.tsx b/bob_party/src/screens/Chat.tsx
index 407c844..9263cdc 100644
--- a/bob_party/src/screens/Chat.tsx
+++ b/bob_party/src/screens/Chat.tsx
@@ -1,32 +1,28 @@
 import { StatusBar } from 'expo-status-bar'
 import { StyleSheet, View, Text, Alert, Pressable, Image} from 'react-native'
 import React from 'react';
+import { Skin } from '../core/skin';
+import { TopBar } from '../components/TopBar';
 
 const avatar = require('../../assets/Icons/BobClassic.png');
+const skinTest= new Skin("Bob",require('../../assets/Icons/BobClassic.png'));
 const engrenage = require('../../assets/Icons/UnSelected/Cogs.png');
 const gamepad = require('../../assets/Icons/UnSelected/Gamepad.png');
 const message = require('../../assets/Icons/Selected/SChat.png');
 const store = require('../../assets/Icons/UnSelected/Store.png');
 
-function Store(props: { navigation: any; }) {
+function Chat(props: { navigation: any; }) {
     const { navigation } = props
     return (
     <View style={styles.container}>
-      <View style={styles.header}>
-        <Pressable onPress={() => navigation.navigate('ProfileTab')}>
-          <Image
-          style={styles.avatar}
-          source={avatar}
-          />
-        </Pressable>
-        <Text style={styles.titre}>BOB PARTY</Text>
-        <Pressable onPress={() => navigation.navigate('Settings')}>
-          <Image
-          style={styles.engrenage}
-          source={engrenage}
-          />
-        </Pressable>
-      </View>
+      <TopBar
+          skin={skinTest} 
+          styleAvatar={styles.avatar} 
+          title="BOB PARTY" 
+          rightIcon={engrenage} 
+          styleIcon={styles.engrenage} 
+          nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
+        />
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>
@@ -153,4 +149,4 @@ const styles = StyleSheet.create({
 
 });
 
-export default Store
\ No newline at end of file
+export default Chat
\ No newline at end of file
diff --git a/bob_party/src/screens/Profile.tsx b/bob_party/src/screens/Profile.tsx
index 4cd0da9..28e8a00 100644
--- a/bob_party/src/screens/Profile.tsx
+++ b/bob_party/src/screens/Profile.tsx
@@ -1,32 +1,32 @@
 import { StatusBar } from 'expo-status-bar'
 import { StyleSheet, View, Text, Alert, Pressable, Image} from 'react-native'
-import React from 'react';
+import React, { Children } from 'react';
+import { SkinComponent } from '../components/skinAvatar';
+import { User } from '../core/user';
+import { Skin } from '../core/skin';
+import { TopBar } from '../components/TopBar';
+
+
 
 const avatar = require('../../assets/Icons/BobClassic.png');
+const skinTest= new Skin("Bob",require('../../assets/Icons/BobClassic.png'));
 const engrenage = require('../../assets/Icons/UnSelected/Cogs.png');
 const gamepad = require('../../assets/Icons/UnSelected/Gamepad.png');
 const message = require('../../assets/Icons/UnSelected/Chat.png');
 const store = require('../../assets/Icons/UnSelected/Store.png');
 
-function Store(props: { navigation: any; }) {
+function Profile(props: { navigation: any; }) {
     const { navigation } = props
     return (
     <View style={styles.container}>
-      <View style={styles.header}>
-        <Pressable>
-          <Image
-          style={styles.avatar}
-          source={avatar}
-          />
-        </Pressable>
-        <Text style={styles.titre}>BOB PARTY</Text>
-        <Pressable onPress={() => navigation.navigate('Settings')}>
-          <Image
-          style={styles.engrenage}
-          source={engrenage}
-          />
-        </Pressable>
-      </View>
+        <TopBar
+          skin={skinTest} 
+          styleAvatar={styles.avatar} 
+          title="BOB PARTY" 
+          rightIcon={engrenage} 
+          styleIcon={styles.engrenage} 
+          nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
+        />
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>
@@ -153,4 +153,4 @@ const styles = StyleSheet.create({
 
 });
 
-export default Store
\ No newline at end of file
+export default Profile
\ No newline at end of file
diff --git a/bob_party/src/screens/Store.tsx b/bob_party/src/screens/Store.tsx
index deaf7d7..83859ee 100644
--- a/bob_party/src/screens/Store.tsx
+++ b/bob_party/src/screens/Store.tsx
@@ -1,32 +1,32 @@
 import { StatusBar } from 'expo-status-bar'
 import { StyleSheet, View, Text, Alert, Pressable, Image} from 'react-native'
-import React from 'react';
+import React, { Children } from 'react';
+import { SkinComponent } from '../components/skinAvatar';
+import { User } from '../core/user';
+import { Skin } from '../core/skin';
+import { TopBar } from '../components/TopBar';
+
 
 const avatar = require('../../assets/Icons/BobClassic.png');
+const skinTest= new Skin("Bob",require('../../assets/Icons/BobClassic.png'));
 const engrenage = require('../../assets/Icons/UnSelected/Cogs.png');
 const gamepad = require('../../assets/Icons/UnSelected/Gamepad.png');
 const message = require('../../assets/Icons/UnSelected/Chat.png');
 const store = require('../../assets/Icons/Selected/SStore.png');
 
+
 function Store(props: { navigation: any; }) {
     const { navigation } = props
     return (
     <View style={styles.container}>
-      <View style={styles.header}>
-        <Pressable onPress={() => navigation.navigate('ProfileTab')}>
-          <Image
-          style={styles.avatar}
-          source={avatar}
-          />
-        </Pressable>
-        <Text style={styles.titre}>BOB PARTY</Text>
-        <Pressable onPress={() => navigation.navigate('Settings')}>
-          <Image
-          style={styles.engrenage}
-          source={engrenage}
-          />
-        </Pressable>
-      </View>
+        <TopBar
+          skin={skinTest} 
+          styleAvatar={styles.avatar} 
+          title="BOB PARTY" 
+          rightIcon={engrenage} 
+          styleIcon={styles.engrenage} 
+          nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
+        />
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>

From 6bf01b030e1a2c6b4b0b4dff873214d0b5514658 Mon Sep 17 00:00:00 2001
From: Thomas Chazot <tchazot63@gmail.com>
Date: Wed, 12 Oct 2022 15:26:04 +0200
Subject: [PATCH 5/6] ADD: Ajout des classes conversations, messages

---
 bob_party/src/core/conversation.ts | 24 ++++++++++++++++++
 bob_party/src/core/message.ts      | 40 ++++++++++++++++++++++++++++++
 bob_party/src/core/skin.ts         |  2 --
 bob_party/src/core/user.ts         |  4 +--
 bob_party/src/screens/Home.tsx     |  6 +++++
 5 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 bob_party/src/core/conversation.ts
 create mode 100644 bob_party/src/core/message.ts

diff --git a/bob_party/src/core/conversation.ts b/bob_party/src/core/conversation.ts
new file mode 100644
index 0000000..5101847
--- /dev/null
+++ b/bob_party/src/core/conversation.ts
@@ -0,0 +1,24 @@
+import { Message } from "./message"
+import { User } from "./user";
+
+
+export class conversation{
+    private TabUser?: User[];
+    private TabMessage?: Message[];
+    
+    constructor(tabUser: User[], tabMessage:Message[]){
+        this.TabUser=[...tabUser];
+        this.TabMessage=[...tabMessage];
+    }
+
+    getTabMessage(){
+        return this.TabMessage;
+    }
+
+    getTabUser(){
+        return this.TabUser;
+    }
+
+
+}
+
diff --git a/bob_party/src/core/message.ts b/bob_party/src/core/message.ts
new file mode 100644
index 0000000..0327d5c
--- /dev/null
+++ b/bob_party/src/core/message.ts
@@ -0,0 +1,40 @@
+import { User } from './user'
+
+
+export class Message{
+    private Content: string;
+    private Sender: User;
+    private DateEnvoie: Date;
+
+    constructor(content: string, sender:User, dateEnvoie:Date){
+        this.Content=content;
+        this.Sender=sender;
+        this.DateEnvoie=dateEnvoie;
+    }
+    
+    setMessageContent(content: string){
+        this.Content=content;
+    }
+
+    setSMessageSender(sender: User){
+        this.Sender=sender;
+    }
+
+    setSMessageDate(dateEnvoie: Date){
+        this.DateEnvoie=dateEnvoie;
+    }
+
+    getMessageContent(){
+        return this.Content;
+    }
+
+    getMessageSender(){
+        return this.Sender;
+    }
+
+    getMessageDate(){
+        return this.DateEnvoie;
+    }
+
+
+}
\ No newline at end of file
diff --git a/bob_party/src/core/skin.ts b/bob_party/src/core/skin.ts
index c41f2d9..6f6bfde 100644
--- a/bob_party/src/core/skin.ts
+++ b/bob_party/src/core/skin.ts
@@ -1,5 +1,3 @@
-import { ImageURISource } from "react-native";
-
 export class Skin{
     private Name: string;
     private Source: any;
diff --git a/bob_party/src/core/user.ts b/bob_party/src/core/user.ts
index dcf268a..9c645de 100644
--- a/bob_party/src/core/user.ts
+++ b/bob_party/src/core/user.ts
@@ -21,7 +21,7 @@ export class User{
                     this.CurrentCoins=currentCoins;
                     this.TotalCoins=totalCoins;
                     this.CurrentSkin=currentSkin;
-                    this.TabSkin=tabSkin;
+                    this.TabSkin=[...tabSkin];
                 }
 
     getUsername(){
@@ -93,6 +93,6 @@ export class User{
     }
     
     setTabSkin(tabSkin: Skin[]){
-        this.TabSkin=tabSkin;
+        this.TabSkin=[...tabSkin];
     }
 }
\ No newline at end of file
diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx
index 421e742..4ee0b94 100644
--- a/bob_party/src/screens/Home.tsx
+++ b/bob_party/src/screens/Home.tsx
@@ -9,12 +9,18 @@ import { TopBar } from '../components/TopBar';
 
 
 const avatar = require('../../assets/Icons/BobClassic.png');
+let tabSkin:Skin[];
 const skinTest= new Skin("Bob",require('../../assets/Icons/BobClassic.png'));
+const skinTest2= new Skin("wesh",require('../../assets/BobsSkins/BobBlue.png'));
+tabSkin=[skinTest];
+tabSkin.push(skinTest2);
+const UserActu=new User("14", "leBg", "ouioui", "grand", "la", 12222, 123324, skinTest, tabSkin);
 const engrenage = require('../../assets/Icons/UnSelected/Cogs.png');
 const gamepad = require('../../assets/Icons/Selected/SGamepad.png');
 const message = require('../../assets/Icons/UnSelected/Chat.png');
 const store = require('../../assets/Icons/UnSelected/Store.png');
 
+
 function Home(props: { navigation: any; }) {
     const { navigation } = props
     return (

From 704e20305153b5998aa9446f79d9b1ce0d91e565 Mon Sep 17 00:00:00 2001
From: alguilhot <alban.guilhot@etu.uca.fr>
Date: Wed, 12 Oct 2022 15:30:46 +0200
Subject: [PATCH 6/6] ADD: Ajout de la BotBar sur les pages Home & Store

---
 bob_party/src/components/BotBar.tsx | 32 +++++++++++++++++++++++++++++
 bob_party/src/screens/Chat.tsx      |  3 ++-
 bob_party/src/screens/Home.tsx      | 31 ++++++++++------------------
 bob_party/src/screens/Profile.tsx   |  5 ++---
 bob_party/src/screens/Store.tsx     | 31 ++++++++++------------------
 5 files changed, 58 insertions(+), 44 deletions(-)
 create mode 100644 bob_party/src/components/BotBar.tsx

diff --git a/bob_party/src/components/BotBar.tsx b/bob_party/src/components/BotBar.tsx
new file mode 100644
index 0000000..a987169
--- /dev/null
+++ b/bob_party/src/components/BotBar.tsx
@@ -0,0 +1,32 @@
+import { FC, ReactNode } from "react"
+import { Pressable, Image, ImageStyle, Text, View, Alert, ImageSourcePropType, TextStyle } from "react-native"
+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}) => 
+{
+    return (
+    <View style={styleBar}>
+            <Pressable onPress={() => nav.navigate('ChatTab')}>
+                <Image
+                    style={style}
+                    source={messages}
+                />
+            </Pressable>
+            <Pressable onPress={()=> nav.navigate('HomeTab')}>
+                <Image
+                    style={style}
+                    source={games}
+                />
+            </Pressable>
+            <Pressable onPress={() => nav.navigate('StoreTab')}>
+                <Image
+                    style={style}
+                    source={shop}
+                />
+            </Pressable>
+    </View>
+    )
+}
\ No newline at end of file
diff --git a/bob_party/src/screens/Chat.tsx b/bob_party/src/screens/Chat.tsx
index 9263cdc..a2b528e 100644
--- a/bob_party/src/screens/Chat.tsx
+++ b/bob_party/src/screens/Chat.tsx
@@ -3,6 +3,7 @@ import { StyleSheet, View, Text, Alert, Pressable, Image} from 'react-native'
 import React from 'react';
 import { Skin } from '../core/skin';
 import { TopBar } from '../components/TopBar';
+import { BotBar } from '../components/BotBar';
 
 const avatar = require('../../assets/Icons/BobClassic.png');
 const skinTest= new Skin("Bob",require('../../assets/Icons/BobClassic.png'));
@@ -22,7 +23,7 @@ function Chat(props: { navigation: any; }) {
           rightIcon={engrenage} 
           styleIcon={styles.engrenage} 
           nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
-        />
+          />
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>
diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx
index 421e742..6f96cca 100644
--- a/bob_party/src/screens/Home.tsx
+++ b/bob_party/src/screens/Home.tsx
@@ -5,6 +5,7 @@ import { SkinComponent } from '../components/skinAvatar';
 import { User } from '../core/user';
 import { Skin } from '../core/skin';
 import { TopBar } from '../components/TopBar';
+import { BotBar } from '../components/BotBar';
 
 
 
@@ -25,7 +26,9 @@ function Home(props: { navigation: any; }) {
           title="BOB PARTY" 
           rightIcon={engrenage} 
           styleIcon={styles.engrenage} 
-          nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
+          nav={navigation} 
+          styleTitle={styles.titre} 
+          styleHeader={styles.header}
         />
       <View style={styles.body}>
         <Button 
@@ -37,26 +40,14 @@ function Home(props: { navigation: any; }) {
         onPress={() => Alert.alert('On Joue avec les potos')}
         />
       </View>
-      <View style={styles.footer}>
-        <Pressable onPress={() => navigation.navigate('ChatTab')}>
-          <Image
+      <BotBar 
+          messages={message}
+          games={gamepad}
+          shop={store}
           style={styles.iconFooter}
-          source={message}
-          />
-        </Pressable>
-        <Pressable >
-          <Image
-          style={styles.iconFooter}
-          source={gamepad}
-          />
-        </Pressable>
-        <Pressable onPress={() => navigation.navigate('StoreTab')}>
-          <Image
-          style={styles.iconStore}
-          source={store}
-          />
-        </Pressable>
-      </View>
+          nav={navigation}
+          styleBar={styles.footer}
+      />
     </View>
   );
 }
diff --git a/bob_party/src/screens/Profile.tsx b/bob_party/src/screens/Profile.tsx
index 28e8a00..6700018 100644
--- a/bob_party/src/screens/Profile.tsx
+++ b/bob_party/src/screens/Profile.tsx
@@ -5,8 +5,7 @@ import { SkinComponent } from '../components/skinAvatar';
 import { User } from '../core/user';
 import { Skin } from '../core/skin';
 import { TopBar } from '../components/TopBar';
-
-
+import { BotBar } from '../components/BotBar';
 
 const avatar = require('../../assets/Icons/BobClassic.png');
 const skinTest= new Skin("Bob",require('../../assets/Icons/BobClassic.png'));
@@ -26,7 +25,7 @@ function Profile(props: { navigation: any; }) {
           rightIcon={engrenage} 
           styleIcon={styles.engrenage} 
           nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
-        />
+          />
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>
diff --git a/bob_party/src/screens/Store.tsx b/bob_party/src/screens/Store.tsx
index 83859ee..adb60e9 100644
--- a/bob_party/src/screens/Store.tsx
+++ b/bob_party/src/screens/Store.tsx
@@ -5,6 +5,7 @@ import { SkinComponent } from '../components/skinAvatar';
 import { User } from '../core/user';
 import { Skin } from '../core/skin';
 import { TopBar } from '../components/TopBar';
+import { BotBar } from '../components/BotBar';
 
 
 const avatar = require('../../assets/Icons/BobClassic.png');
@@ -14,7 +15,6 @@ const gamepad = require('../../assets/Icons/UnSelected/Gamepad.png');
 const message = require('../../assets/Icons/UnSelected/Chat.png');
 const store = require('../../assets/Icons/Selected/SStore.png');
 
-
 function Store(props: { navigation: any; }) {
     const { navigation } = props
     return (
@@ -30,26 +30,17 @@ function Store(props: { navigation: any; }) {
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>
-      <View style={styles.footer}>
-        <Pressable onPress={() => navigation.navigate('ChatTab')}>
-          <Image
-          style={styles.iconFooter}
-          source={message}
-          />
-        </Pressable>
-        <Pressable onPress={() => navigation.navigate('HomeTab')}>
-          <Image
-          style={styles.iconFooter}
-          source={gamepad}
-          />
-        </Pressable>
-        <Pressable >
-          <Image
-          style={styles.iconStore}
-          source={store}
-          />
-        </Pressable>
+      <View style={styles.body}>
+        <Text style={styles.text}>couille</Text>
       </View>
+      <BotBar 
+          messages={message}
+          games={gamepad}
+          shop={store}
+          style={styles.iconFooter}
+          nav={navigation}
+          styleBar={styles.footer}
+      />
     </View>
   );
 }