From 76aeac773d4482659a38dcee7d3142355a474f7e Mon Sep 17 00:00:00 2001
From: alguilhot <alban.guilhot@etu.uca.fr>
Date: Sat, 15 Oct 2022 01:09:59 +0200
Subject: [PATCH] FIX: Clean BotBar & TopBar

---
 bob_party/src/components/BotBar.tsx |  2 --
 bob_party/src/screens/Chat.tsx      | 16 ++-------
 bob_party/src/screens/Home.tsx      | 51 ++++-------------------------
 bob_party/src/screens/Profile.tsx   | 15 ++-------
 bob_party/src/screens/Settings.tsx  | 18 +++-------
 bob_party/src/screens/Store.tsx     | 20 +++--------
 6 files changed, 20 insertions(+), 102 deletions(-)

diff --git a/bob_party/src/components/BotBar.tsx b/bob_party/src/components/BotBar.tsx
index 79fbe3b..41a12a5 100644
--- a/bob_party/src/components/BotBar.tsx
+++ b/bob_party/src/components/BotBar.tsx
@@ -19,8 +19,6 @@ FC<{nav: any, state?: String }> =
 {
     var imgLeft=message, imgMid=gamepad, imgRight=store
    
-    console.log(state)
-    
     switch (state) {
         case 'Home':
                 imgMid = sgamepad
diff --git a/bob_party/src/screens/Chat.tsx b/bob_party/src/screens/Chat.tsx
index b70abed..46ee5c2 100644
--- a/bob_party/src/screens/Chat.tsx
+++ b/bob_party/src/screens/Chat.tsx
@@ -5,7 +5,6 @@ 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'));
 const engrenage = require('../../assets/Icons/UnSelected/Cogs.png');
 const gamepad = require('../../assets/Icons/UnSelected/Gamepad.png');
@@ -17,24 +16,15 @@ function Chat(props: { navigation: any; }) {
     return (
     <View style={styles.container}>
       <TopBar
-          skin={skinTest} 
-          styleAvatar={styles.avatar} 
-          title="BOB PARTY" 
-          rightIcon={engrenage} 
-          styleIcon={styles.engrenage} 
-          nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
+          skin={skinTest}
+          nav={navigation}
           />
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>
       <BotBar 
-          messages={message}
-          games={gamepad}
-          shop={store}
-          style={styles.iconFooter}
-          styleStore={styles.iconStore}
           nav={navigation}
-          styleBar={styles.footer}
+          state='Chat'
       />
     </View>
   );
diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx
index e8dadba..c568cef 100644
--- a/bob_party/src/screens/Home.tsx
+++ b/bob_party/src/screens/Home.tsx
@@ -10,7 +10,6 @@ import { Conversation } from '../core/conversation';
 
 
 
-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'));
@@ -18,26 +17,15 @@ tabSkin=[skinTest];
 tabSkin.push(skinTest2);
 let tabConv:Conversation[]=[];
 const UserActu=new User("14", "leBg", "ouioui", "grand", "la", 12222, 123324, skinTest, tabSkin, tabConv);
-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 (
     <View style={styles.container}>
-        <TopBar
-          skin={skinTest} 
-          styleAvatar={styles.avatar} 
-          title="BOB PARTY" 
-          rightIcon={engrenage} 
-          styleIcon={styles.engrenage} 
-          nav={navigation} 
-          styleTitle={styles.titre} 
-          styleHeader={styles.header}
-        />
+      <TopBar
+        skin={skinTest} 
+        nav={navigation}
+      />
       <View style={styles.body}>
         <Button 
         title='Jouer Seul'
@@ -49,13 +37,8 @@ function Home(props: { navigation: any; }) {
         />
       </View>
       <BotBar 
-          messages={message}
-          games={gamepad}
-          shop={store}
-          style={styles.iconFooter}
-          styleStore={styles.iconStore}
-          nav={navigation}
-          styleBar={styles.footer}
+        nav={navigation}
+        state='Home'
       />
     </View>
   );
@@ -99,14 +82,6 @@ const styles = StyleSheet.create({
     letterSpacing: 0.25,
     color: 'white',
   },
-  header: {
-    flex : 0.15,
-    width: '100%',
-    flexDirection: 'row',
-    backgroundColor: '#2D2C33',
-    alignItems: 'center',
-    justifyContent: 'space-around',
-  },
   titre: {
     flex: 0.7,
     flexDirection: 'column',
@@ -141,20 +116,6 @@ const styles = StyleSheet.create({
     width: '100%',
     justifyContent: 'space-evenly',
   },
-  iconFooter: {
-    marginBot: 25,
-    marginTop: 10,
-    width: 65,
-    height: 50,
-  },
-  iconStore: {
-    marginBot: 25,
-    marginTop: 10,
-    marginLeft: 7,
-    marginRight: 8,
-    width: 50,
-    height: 50,
-  },
 
 });
 
diff --git a/bob_party/src/screens/Profile.tsx b/bob_party/src/screens/Profile.tsx
index 88c582c..1d3f64e 100644
--- a/bob_party/src/screens/Profile.tsx
+++ b/bob_party/src/screens/Profile.tsx
@@ -7,7 +7,6 @@ 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'));
 const engrenage = require('../../assets/Icons/UnSelected/Cogs.png');
 const gamepad = require('../../assets/Icons/UnSelected/Gamepad.png');
@@ -20,23 +19,13 @@ function Profile(props: { navigation: any; }) {
     <View style={styles.container}>
         <TopBar
           skin={skinTest} 
-          styleAvatar={styles.avatar} 
-          title="BOB PARTY" 
-          rightIcon={engrenage} 
-          styleIcon={styles.engrenage} 
-          nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
+          nav={navigation}
           />
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>
-      <BotBar 
-          messages={message}
-          games={gamepad}
-          shop={store}
-          style={styles.iconFooter}
-          styleStore={styles.iconStore}
+      <BotBar
           nav={navigation}
-          styleBar={styles.footer}
       />
     </View>
   );
diff --git a/bob_party/src/screens/Settings.tsx b/bob_party/src/screens/Settings.tsx
index a436426..40926b8 100644
--- a/bob_party/src/screens/Settings.tsx
+++ b/bob_party/src/screens/Settings.tsx
@@ -1,27 +1,17 @@
 import { StatusBar } from 'expo-status-bar'
 import { StyleSheet, View, Text, Alert, Pressable, Image} from 'react-native'
 import React from 'react';
+import { TopBar } from '../components/TopBar';
 
-const msc = require('../../assets/Icons/FondGris.png');
-const engrenage = require('../../assets/Icons/UnSelected/Cross.png');
 
 function Store(props: { navigation: any; }) {
     const { navigation } = props
     return (
     <View style={styles.container}>
-      <View style={styles.header}>
-        <Image
-          style={styles.engrenage}
-          source={msc}
+      <TopBar
+          nav={navigation}
+          state='settings'
         />
-        <Text style={styles.titre}>Paramètres</Text>
-        <Pressable onPress={() => props.navigation.goBack()}>
-          <Image
-          style={styles.engrenage}
-          source={engrenage}
-          />
-        </Pressable>
-      </View>
       <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 9e4079f..a06efc4 100644
--- a/bob_party/src/screens/Store.tsx
+++ b/bob_party/src/screens/Store.tsx
@@ -8,7 +8,6 @@ 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'));
 const engrenage = require('../../assets/Icons/UnSelected/Cogs.png');
 const gamepad = require('../../assets/Icons/UnSelected/Gamepad.png');
@@ -19,25 +18,16 @@ function Store(props: { navigation: any; }) {
     const { navigation } = props
     return (
     <View style={styles.container}>
-        <TopBar
-          skin={skinTest} 
-          styleAvatar={styles.avatar} 
-          title="BOB PARTY" 
-          rightIcon={engrenage} 
-          styleIcon={styles.engrenage} 
-          nav={navigation} styleTitle={styles.titre} styleHeader={styles.header}
-        />
+      <TopBar
+        skin={skinTest}
+        nav={navigation}
+      />
       <View style={styles.body}>
         <Text style={styles.text}>couille</Text>
       </View>
       <BotBar 
-          messages={message}
-          games={gamepad}
-          shop={store}
-          style={styles.iconFooter}
-          styleStore={styles.iconStore}
           nav={navigation}
-          styleBar={styles.footer}
+          state='Store'
       />
     </View>
   );