FIX: changement fonctionnement nav et image TopBar

bob_party/src/components/TopBar.tsx

@@ -1,23 +1,41 @@
 import { FC, ReactNode } from "react"
-import { Pressable, Image, ImageStyle, Text, View, Alert, ImageSourcePropType, TextStyle } from "react-native"
+import { Pressable, Image, ImageStyle, Text, View, Alert, ImageSourcePropType, TextStyle, Settings } from "react-native"
 import { Skin } from "../core/Skin"
 import React from "react"
 import { SkinComponent } from "./skinAvatar"
-import MainTabNavigator from "../navigation/AppNavigator"
+import styles from './style/TopBar.style';
-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}) => 
+const engrenage = require('../../assets/Icons/UnSelected/Cogs.png');
+const cross = require('../../assets/Icons/UnSelected/Cross.png');
+const msc = require('../../assets/Icons/FondGris.png');
+
+export const TopBar : FC<{skin?: Skin, nav: any, state?: string}> = ({skin, nav, state}) => 
 {
+    switch (state) {
+        case 'settings':
             return (
-    <View style={styleHeader}>
+                <View style={styles.header}>
+                    <Pressable>
+                        <Image source={msc} style={styles.icon}/>
+                    </Pressable>
+                    <Text style={styles.titre}>BOB PARTY</Text>
+                    <Pressable onPress={() => nav.goBack()}>
+                        <Image source={cross} style={styles.icon}/>
+                    </Pressable>
+                </View>
+            )
+        default:
+            return (
+                <View style={styles.header}>
                     <Pressable onPress={() => nav.navigate('ProfileTab')}>
-                <SkinComponent skin={skin} children={styleAvatar} />
+                            <SkinComponent skin={skin} children={styles.avatar} />
                         </Pressable>
-            <Text style={styleTitle}>{title}</Text>
+                        <Text style={styles.titre}>BOB PARTY</Text>
                         <Pressable onPress={() => nav.navigate('Settings')}>
-                <Image source={rightIcon} style={styleIcon}/>
+                            <Image source={engrenage} style={styles.icon}/>
                         </Pressable>
                 </View>
             )
     }
+}

bob_party/src/components/style/TopBar.style.js

@@ -0,0 +1,31 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+    header: {
+        flex: 0.15,
+        flexDirection: 'row',
+        backgroundColor: '#2D2C33',
+        width: '100%',
+        justifyContent: 'space-evenly',
+        alignItems: 'center',
+    },
+    avatar: {
+        borderRadius: 50,
+        width: 50,
+        height: 50,
+    },
+    icon: {
+        width: 50,
+        height: 50,
+    },
+    titre: {
+      flex: 0.7,
+      flexDirection: 'column',
+      textAlign: 'center',
+      fontSize: 30,
+      fontFamily: 'Helvetica',
+      fontWeight: 'bold',
+      letterSpacing: 0.25,
+      color: 'white',
+    },
+});