From ec69e86a5ee2f66818ba34e89d1f0b70384d55d0 Mon Sep 17 00:00:00 2001
From: Thomas Chazot <tchazot63@gmail.com>
Date: Tue, 22 Nov 2022 16:58:16 +0100
Subject: [PATCH] Modif: Utilisation du store au lieu du currentUser

---
 bob_party/src/screens/Profile.tsx  |  9 +++++----
 bob_party/src/screens/Settings.tsx | 12 +++++-------
 bob_party/src/screens/Store.tsx    |  3 ++-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bob_party/src/screens/Profile.tsx b/bob_party/src/screens/Profile.tsx
index 6372fed..334d443 100644
--- a/bob_party/src/screens/Profile.tsx
+++ b/bob_party/src/screens/Profile.tsx
@@ -9,6 +9,7 @@ import { SkinComponent } from '../components/Skin';
 import { ButtonGreySmall } from '../components/ButtonGreySmall';
 import { ScreenIndicator } from '../components/ScreenIndicator';
 import { MANAGER_USER } from '../../App';
+import { useUserStore } from '../../userContext';
 
 const coin = require('../../assets/Icons/Coin.png')
 
@@ -24,22 +25,22 @@ function Profile(props: { navigation: any; }) {
           />
       <View style={stylesScreen.bodyStart}>
         <ScreenIndicator title='Profil'/>
-        <Text style={styles.pseudoText}>{MANAGER_USER.getCurrentUser().getUsername()}</Text>
+        <Text style={styles.pseudoText}>{useUserStore().user?.getUsername()}</Text>
         <View style={styles.coinSkinView}>
             <View style={styles.coinView}>
                 <Image 
                     style={styles.coin}
                     source={coin}
                 />
-                <Text style={styles.coinText}>{MANAGER_USER.getCurrentUser().getCurrentCoins()}</Text>
+                <Text style={styles.coinText}>{useUserStore().user?.getCurrentCoins()}</Text>
             </View>
             <View style={styles.skinView}>
-                <SkinComponent skin={MANAGER_USER.getCurrentUser().getCurrentSkin()} state='profile' />
+                <SkinComponent skin={useUserStore().user?.getCurrentSkin()} state='profile' />
                 <ButtonGreySmall onPress={() => navigation.navigate('SkinList')} title='Changer de skin' state='Profile'/>
             </View>
         </View>
         <View style={styles.infoView}>
-            <Text style={styles.infoText}>Total de BobCoin gagnés: {MANAGER_USER.getCurrentUser().getTotalCoins()}</Text>
+            <Text style={styles.infoText}>Total de BobCoin gagnés: {useUserStore().user?.getTotalCoins()}</Text>
             <Text style={styles.infoText}>Total de BobCoin gagnés: </Text>
         </View>
       </View>
diff --git a/bob_party/src/screens/Settings.tsx b/bob_party/src/screens/Settings.tsx
index d30374b..3724b3d 100644
--- a/bob_party/src/screens/Settings.tsx
+++ b/bob_party/src/screens/Settings.tsx
@@ -29,14 +29,12 @@ function Settings(props: { navigation: any; }) {
 
     function changeUsername(username:string){
       MANAGER_USER.getCurrentUser()?.setUsername(username);
-      console.log(MANAGER_USER.getCurrentUser()?.getUsername());
       setUser(MANAGER_USER.getCurrentUser());
       MANAGER_USER.getsaverUser().updateUser(MANAGER_USER.getCurrentUser());
     }
 
     function changePassword(password:string){
       MANAGER_USER.getCurrentUser()?.setPassword(password);
-      console.log(MANAGER_USER.getCurrentUser()?.getPassword());
       setUser(MANAGER_USER.getCurrentUser());
       MANAGER_USER.getsaverUser().updateUser(MANAGER_USER.getCurrentUser());
     }
@@ -55,24 +53,24 @@ function Settings(props: { navigation: any; }) {
           <View style={{flexDirection: 'row', justifyContent: 'space-between',}}>
             <View>
               <View>
-                <Text style={styles.text}>Pseudo: {MANAGER_USER.getCurrentUser().getUsername()}</Text>
+                <Text style={styles.text}>Pseudo: {useUserStore().user?.getUsername()}</Text>
                 <ButtonGreySmall onPress={() => {console.log(dialogPseudoVisible);
                 ;setDialogPseudoVisible(true)}} title='Changer le pseudo'/>
               </View>
               <View>
-                <Text style={styles.text}>Mot de passe: {MANAGER_USER.getCurrentUser().getPassword()}</Text>
+                <Text style={styles.text}>Mot de passe: {useUserStore().user?.getPassword()}</Text>
                 <ButtonGreySmall onPress={() => setDialogPasswordVisible(true) } title='Changer le mot de passe'/>
               </View>
               <View>
-                <Text style={styles.text}>Nationalité: {MANAGER_USER.getCurrentUser().getNationality()}</Text>
+                <Text style={styles.text}>Nationalité: {useUserStore().user?.getNationality()}</Text>
                 <PickerGreySmall title='Changer la nationalité' valueChange={(value:string) => setSelectedNationality(value)} donePress={() => dispatch(updateNationality(selectedNationality))} values={["Francais", "Anglais"]} />
               </View>
               <View>
-                <Text style={styles.text}>Sexe: {MANAGER_USER.getCurrentUser().getSexe()}</Text>
+                <Text style={styles.text}>Sexe: {useUserStore().user?.getSexe()}</Text>
                 <PickerGreySmall title='Changer le sexe' valueChange={(value:string) => setSelectedSex(value)} donePress={() => dispatch(updateSex(selectedSex))} values={["Homme", "Femme", "Autre"]} />
               </View>
             </View>
-            <Text style={styles.textID}>ID: {MANAGER_USER.getCurrentUser().getId()}</Text>
+            <Text style={styles.textID}>ID: {useUserStore().user?.getId()}</Text>
           </View>
         </View>
       </View>
diff --git a/bob_party/src/screens/Store.tsx b/bob_party/src/screens/Store.tsx
index 8f0ab85..6599321 100644
--- a/bob_party/src/screens/Store.tsx
+++ b/bob_party/src/screens/Store.tsx
@@ -8,6 +8,7 @@ import { FlatList } from 'react-native-gesture-handler';
 import { SkinComponent } from '../components/Skin';
 import { ScreenIndicator } from '../components/ScreenIndicator';
 import { MANAGER_USER } from '../../App';
+import { useUserStore } from '../../userContext';
 
 function Store(props: { navigation: any; }) {
   const { navigation } = props
@@ -21,7 +22,7 @@ function Store(props: { navigation: any; }) {
       <View style={stylesScreen.bodyStart}>
         <ScreenIndicator title='Store'/>
         <FlatList 
-          data={MANAGER_USER.getCurrentUser().getTabSkin()}
+          data={useUserStore().user?.getTabSkin()}
           numColumns={2}
           columnWrapperStyle={{ flex: 1, justifyContent: "space-around"}}
           keyExtractor={item =>item.getSkinName()}