diff --git a/bob_party/App.tsx b/bob_party/App.tsx index 20f9208..0006c10 100644 --- a/bob_party/App.tsx +++ b/bob_party/App.tsx @@ -5,7 +5,6 @@ import LoaderUserApi from './src/services/userServices/loaderUserApi' import ManagerUser from './src/services/userServices/managerUser' import FakeSaverUser from './src/services/userServices/fakeSaverUser' import React, { useCallback } from 'react'; -import { useUserStore } from './src/context/userContext'; import ManagerConversation from './src/services/conversationService/managerConversation' import { LoaderConversationApi } from './src/services/conversationService/loaderConversationApi' import { FakeSaverConversation } from './src/services/conversationService/fakeSaverConversation' @@ -14,22 +13,33 @@ import LoaderMatchApi from './src/services/matchServices/loaderMatchApi' import SaverMatchApi from './src/services/matchServices/saverMatchApi' import LoaderGameApi from './src/services/gameService/loaderGameApi' import ManagerGame from './src/services/gameService/managerGame' -import { Text } from 'react-native' +import { useFonts } from 'expo-font'; +import * as SplashScreen from 'expo-splash-screen'; +import { View } from 'react-native' -export const MANAGER_USER = new ManagerUser(new LoaderUserApi, new FakeSaverUser); +export const MANAGER_USER = new ManagerUser(new LoaderUserApi, new FakeSaverUser); export const MANAGER_CONVERSATION = new ManagerConversation(new LoaderConversationApi, new FakeSaverConversation); -export const MANAGER_MATCH = new ManagerMatch(new LoaderMatchApi, new SaverMatchApi); +export const MANAGER_MATCH = new ManagerMatch(new LoaderMatchApi, new SaverMatchApi); export const MANAGER_GAME = new ManagerGame(new LoaderGameApi); - export default function App() { +export default function App() { - return ( - - - - ); + const [fontsLoaded] = useFonts({ + 'Helvetica': require('./assets/fonts/Helvetica.ttf'), + }); + + if (!fontsLoaded) { + return null; } - - + + + return ( + + + + ); +} + + diff --git a/bob_party/assets/fonts/Helvetica.ttf b/bob_party/assets/fonts/Helvetica.ttf new file mode 100644 index 0000000..718f22d Binary files /dev/null and b/bob_party/assets/fonts/Helvetica.ttf differ diff --git a/bob_party/src/components/GameComponent.tsx b/bob_party/src/components/GameComponent.tsx index 6b7b5da..b79305c 100644 --- a/bob_party/src/components/GameComponent.tsx +++ b/bob_party/src/components/GameComponent.tsx @@ -2,7 +2,7 @@ import { FC, ReactNode, useCallback } from "react" import { Pressable, Image, ImageStyle, Text, View, Alert, ImageSourcePropType, TextStyle } from "react-native" import React from "react" import { trace } from "console" -import { Game } from "../core/game" +import { Game } from "../core/Game" /* Importing the correct stylesheet diff --git a/bob_party/src/components/Skin.tsx b/bob_party/src/components/Skin.tsx index 89a822e..bb5b1d8 100644 --- a/bob_party/src/components/Skin.tsx +++ b/bob_party/src/components/Skin.tsx @@ -8,12 +8,9 @@ import { Skin } from "../core/skin" */ import styles from "./style/Skin.style" import { useDispatch, useSelector } from "react-redux" -import { loginUser } from "../redux/features/currentUserSlice" -import { RootState } from "../redux/store" import { MANAGER_USER } from "../../App" import { useUserStore } from "../context/userContext" import { ManagerCoinsUser } from "../core/User/userCoinsModifier" -import ManagerUser from "../services/userServices/managerUser" import UserSkinModifier from "../core/User/userSkinModifier" import { useStoreStore } from "../context/storeContext" import tabSkinApp from "../constSkin" diff --git a/bob_party/src/context/gameContext.tsx b/bob_party/src/context/gameContext.tsx index 28a88f0..19490f2 100644 --- a/bob_party/src/context/gameContext.tsx +++ b/bob_party/src/context/gameContext.tsx @@ -2,7 +2,7 @@ import React from "react"; import create from "zustand"; import { MANAGER_USER } from "../../App"; import tabSkinApp from "../constSkin"; -import { Game } from "../core/game"; +import { Game } from "../core/Game"; import { Skin } from "../core/Skin"; import { User } from "../core/User/user"; diff --git a/bob_party/src/core/Match/match.ts b/bob_party/src/core/Match/match.ts index 3265e5c..3e36fd8 100644 --- a/bob_party/src/core/Match/match.ts +++ b/bob_party/src/core/Match/match.ts @@ -1,5 +1,5 @@ import { ImageSourcePropType } from 'react-native'; -import { Game } from '../game'; +import { Game } from '../Game'; import { User } from "../User/user"; diff --git a/bob_party/src/core/Match/matchCasino.ts b/bob_party/src/core/Match/matchCasino.ts index 6376812..97861a4 100644 --- a/bob_party/src/core/Match/matchCasino.ts +++ b/bob_party/src/core/Match/matchCasino.ts @@ -1,6 +1,6 @@ import { Match } from "./match"; import { User } from "../User/user"; -import { Game } from "../game"; +import { Game } from "../Game"; import { GameCasino } from "../gameCasino"; import { ManagerCoinsUser } from "../User/userCoinsModifier"; diff --git a/bob_party/src/core/Match/matchCreator.ts b/bob_party/src/core/Match/matchCreator.ts index 5803af0..ec58731 100644 --- a/bob_party/src/core/Match/matchCreator.ts +++ b/bob_party/src/core/Match/matchCreator.ts @@ -1,6 +1,6 @@ import { MANAGER_MATCH } from "../../../App"; import ManagerMatch from "../../services/matchServices/managerMatch"; -import { Game } from "../game"; +import { Game } from "../Game"; import { User } from "../User/user"; import { Match } from "./match"; diff --git a/bob_party/src/core/Match/matchMulti.ts b/bob_party/src/core/Match/matchMulti.ts index c72ba66..22cd254 100644 --- a/bob_party/src/core/Match/matchMulti.ts +++ b/bob_party/src/core/Match/matchMulti.ts @@ -1,6 +1,6 @@ import { Match } from "./match"; import { User } from "../User/user"; -import { Game } from "../game"; +import { Game } from "../Game"; import { GameMulti } from "../gameMulti"; import { ManagerCoinsUser } from "../User/userCoinsModifier"; diff --git a/bob_party/src/core/Match/matchSolo.ts b/bob_party/src/core/Match/matchSolo.ts index fef2170..45f7a75 100644 --- a/bob_party/src/core/Match/matchSolo.ts +++ b/bob_party/src/core/Match/matchSolo.ts @@ -1,7 +1,7 @@ import { Match } from "./match"; import { GameSolo } from "../gameSolo"; import { User } from "../User/user"; -import { Game } from "../game"; +import { Game } from "../Game"; import { ManagerCoinsUser } from "../User/userCoinsModifier"; export default class MatchSolo extends Match{ diff --git a/bob_party/src/core/gameCasino.ts b/bob_party/src/core/gameCasino.ts index 379166d..b5a0edc 100644 --- a/bob_party/src/core/gameCasino.ts +++ b/bob_party/src/core/gameCasino.ts @@ -1,4 +1,4 @@ -import { Game } from './game' +import { Game } from './Game' export class GameCasino extends Game{ diff --git a/bob_party/src/core/gameMulti.ts b/bob_party/src/core/gameMulti.ts index bbaad4f..9c92b79 100644 --- a/bob_party/src/core/gameMulti.ts +++ b/bob_party/src/core/gameMulti.ts @@ -1,4 +1,4 @@ -import { Game } from './game' +import { Game } from './Game' export class GameMulti extends Game{ readonly rankToCoins:Map diff --git a/bob_party/src/core/gameSolo.ts b/bob_party/src/core/gameSolo.ts index b0e1d71..86f6946 100644 --- a/bob_party/src/core/gameSolo.ts +++ b/bob_party/src/core/gameSolo.ts @@ -1,4 +1,4 @@ -import { Game } from './game' +import { Game } from './Game' export class GameSolo extends Game{ readonly ptsToCoins:Map diff --git a/bob_party/src/screens/GameChoice.tsx b/bob_party/src/screens/GameChoice.tsx index d87c690..3270e9b 100644 --- a/bob_party/src/screens/GameChoice.tsx +++ b/bob_party/src/screens/GameChoice.tsx @@ -1,7 +1,7 @@ import { StatusBar } from 'expo-status-bar' import { StyleSheet, View, Text, Alert, Pressable, Image, FlatList} from 'react-native' import React from 'react'; -import { Game } from '../core/game'; +import { Game } from '../core/Game'; import { Skin } from '../core/skin'; import { TopBar } from '../components/TopBar'; import { BotBar } from '../components/BotBar'; diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx index cd7d3da..697f9ca 100644 --- a/bob_party/src/screens/Home.tsx +++ b/bob_party/src/screens/Home.tsx @@ -9,7 +9,7 @@ import { ButtonGameTypeChoice } from '../components/ButtonGameTypeChoice'; import { MANAGER_GAME } from '../../App'; import { useGameStore } from '../context/gameContext'; import { GameSolo } from '../core/gameSolo'; -import { Game } from '../core/game'; +import { Game } from '../core/Game'; import game from '../testGameSolo'; diff --git a/bob_party/src/services/gameService/ILoaderGame.ts b/bob_party/src/services/gameService/ILoaderGame.ts index 17b826d..b8b22c5 100644 --- a/bob_party/src/services/gameService/ILoaderGame.ts +++ b/bob_party/src/services/gameService/ILoaderGame.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/game"; +import { Game } from "../../core/Game"; export default interface ILoaderGame{ diff --git a/bob_party/src/services/gameService/loaderGameApi.ts b/bob_party/src/services/gameService/loaderGameApi.ts index 2529784..4c811e5 100644 --- a/bob_party/src/services/gameService/loaderGameApi.ts +++ b/bob_party/src/services/gameService/loaderGameApi.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/game"; +import { Game } from "../../core/Game"; import { GameSolo } from "../../core/gameSolo"; import ILoaderGame from "./ILoaderGame"; diff --git a/bob_party/src/services/gameService/managerGame.ts b/bob_party/src/services/gameService/managerGame.ts index bb4bdbc..316122d 100644 --- a/bob_party/src/services/gameService/managerGame.ts +++ b/bob_party/src/services/gameService/managerGame.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/game"; +import { Game } from "../../core/Game"; import ILoaderGame from "./ILoaderGame"; export default class ManagerGame{ diff --git a/bob_party/src/services/matchServices/ISaverMatch.ts b/bob_party/src/services/matchServices/ISaverMatch.ts index 2786262..4423d74 100644 --- a/bob_party/src/services/matchServices/ISaverMatch.ts +++ b/bob_party/src/services/matchServices/ISaverMatch.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/game"; +import { Game } from "../../core/Game"; import { Match } from "../../core/Match/match"; import { User } from "../../core/User/user"; diff --git a/bob_party/src/services/matchServices/saverMatchApi.ts b/bob_party/src/services/matchServices/saverMatchApi.ts index 2b12e60..5c1ba29 100644 --- a/bob_party/src/services/matchServices/saverMatchApi.ts +++ b/bob_party/src/services/matchServices/saverMatchApi.ts @@ -1,4 +1,4 @@ -import { Game } from "../../core/game"; +import { Game } from "../../core/Game"; import { Match } from "../../core/Match/match"; import { User } from "../../core/User/user";