From ac9440bfe28c6a606669039b26af6506fd4fd718 Mon Sep 17 00:00:00 2001 From: aguilhot Date: Tue, 6 Dec 2022 15:32:52 +0100 Subject: [PATCH] ADD: Navigation jeu --- bob_party/src/components/GameComponent.tsx | 2 +- bob_party/src/navigation/AppNavigator.tsx | 23 +++++++++++++++++----- bob_party/src/screens/LobbySolo.tsx | 11 ++++++----- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/bob_party/src/components/GameComponent.tsx b/bob_party/src/components/GameComponent.tsx index 1cb3990..8b5579b 100644 --- a/bob_party/src/components/GameComponent.tsx +++ b/bob_party/src/components/GameComponent.tsx @@ -33,7 +33,7 @@ FC<{game: Game, nav: any}> = let match=await m.createMatch(tmp, game); MANAGER_MATCH.setCurrentMatch(match); setMatch(match); - nav.navigate("LobbySolo"); + nav.navigate("GameSolo"); } } diff --git a/bob_party/src/navigation/AppNavigator.tsx b/bob_party/src/navigation/AppNavigator.tsx index 1debeaa..142751d 100644 --- a/bob_party/src/navigation/AppNavigator.tsx +++ b/bob_party/src/navigation/AppNavigator.tsx @@ -13,7 +13,7 @@ import GameChoice from '../screens/GameChoice' import SignIn from '../screens/SignIn' import SignUp from '../screens/SignUp' import LobbySolo from '../screens/LobbySolo' - +import CookieClicker from '../Games/CookieClicker/cookieClicker' const HomeStack = createStackNavigator(); @@ -78,13 +78,26 @@ const GameChoiceStack = createStackNavigator(); */ function GameChoiceStackScreen() { return ( - - - - + + + + ); } +const GameSoloStack = createStackNavigator(); + +/* + Stack of screens for the profile and the changement of informations +*/ +function GameSoloStackScreen() { + return ( + + + + + ); +} const Tab = createBottomTabNavigator() /* diff --git a/bob_party/src/screens/LobbySolo.tsx b/bob_party/src/screens/LobbySolo.tsx index 24e32f6..7609175 100644 --- a/bob_party/src/screens/LobbySolo.tsx +++ b/bob_party/src/screens/LobbySolo.tsx @@ -23,15 +23,16 @@ function LobbySolo(props: { navigation: any; }) { state='matchmacking' /> - navigation.navigate('GameChoice')} - /> + navigation.navigate(match?.getGame().getName().replace(/\s/g, ''))} + /> + /> ); }