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; }) {
/>
- {MANAGER_USER.getCurrentUser().getUsername()}
+ {useUserStore().user?.getUsername()}
- {MANAGER_USER.getCurrentUser().getCurrentCoins()}
+ {useUserStore().user?.getCurrentCoins()}
-
+
navigation.navigate('SkinList')} title='Changer de skin' state='Profile'/>
- Total de BobCoin gagnés: {MANAGER_USER.getCurrentUser().getTotalCoins()}
+ Total de BobCoin gagnés: {useUserStore().user?.getTotalCoins()}
Total de BobCoin gagnés:
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; }) {
- Pseudo: {MANAGER_USER.getCurrentUser().getUsername()}
+ Pseudo: {useUserStore().user?.getUsername()}
{console.log(dialogPseudoVisible);
;setDialogPseudoVisible(true)}} title='Changer le pseudo'/>
- Mot de passe: {MANAGER_USER.getCurrentUser().getPassword()}
+ Mot de passe: {useUserStore().user?.getPassword()}
setDialogPasswordVisible(true) } title='Changer le mot de passe'/>
- Nationalité: {MANAGER_USER.getCurrentUser().getNationality()}
+ Nationalité: {useUserStore().user?.getNationality()}
setSelectedNationality(value)} donePress={() => dispatch(updateNationality(selectedNationality))} values={["Francais", "Anglais"]} />
- Sexe: {MANAGER_USER.getCurrentUser().getSexe()}
+ Sexe: {useUserStore().user?.getSexe()}
setSelectedSex(value)} donePress={() => dispatch(updateSex(selectedSex))} values={["Homme", "Femme", "Autre"]} />
- ID: {MANAGER_USER.getCurrentUser().getId()}
+ ID: {useUserStore().user?.getId()}
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; }) {
item.getSkinName()}