diff --git a/bob_party/components/skinAvatar.tsx b/bob_party/components/skinAvatar.tsx index 98d353c..b708e2f 100644 --- a/bob_party/components/skinAvatar.tsx +++ b/bob_party/components/skinAvatar.tsx @@ -3,12 +3,13 @@ import { Button, Image, ImageStyle, Text, View } from "react-native" import { Skin } from "../core/Skin" import React from "react" -export const SkinComponent : FC<{skin: Skin, children: ImageStyle}> = ({skin, children}) => { +export const SkinComponent : FC<{skin: Skin, children: ImageStyle, childrenTest: ReactNode}> = ({skin, children, childrenTest}) => { return ( + {childrenTest} ) } \ No newline at end of file diff --git a/bob_party/core/skin.ts b/bob_party/core/skin.ts index 4f13313..a8c61d1 100644 --- a/bob_party/core/skin.ts +++ b/bob_party/core/skin.ts @@ -4,7 +4,7 @@ export class Skin{ constructor(name: string, source:string){ this.Name=name; - this.Source=require(source); + this.Source=source; } setSkinName(name: string){ diff --git a/bob_party/src/screens/Home.tsx b/bob_party/src/screens/Home.tsx index fabd8a9..ea853b0 100644 --- a/bob_party/src/screens/Home.tsx +++ b/bob_party/src/screens/Home.tsx @@ -2,10 +2,14 @@ import { StatusBar } from 'expo-status-bar' import { StyleSheet, View, Text, Alert, Pressable, Image} from 'react-native' import React from 'react'; import { SkinComponent } from '../../components/skinAvatar'; +import { User } from '../../core/user'; +import { Skin } from '../../core/skin'; + const avatar = require('../../assets/Icons/BobClassic.png'); +const skinTest= new Skin("Bob", '../../assets/Icons/BobClassic.png'); const engrenage = require('../../assets/Icons/UnSelected/Cogs.png'); -const gamepad = require('../../assets/Icons/Selected/SGamepad.png'); +const gamepad = require('../../assets/Icons/Selected/Gamepad.png'); const message = require('../../assets/Icons/UnSelected/Chat.png'); const store = require('../../assets/Icons/UnSelected/Store.png'); @@ -15,10 +19,7 @@ function Home(props: { navigation: any; }) { Alert.alert('Profil Joueur')}> - + Bite} /> BOB PARTY navigation.navigate('Settings')}> diff --git a/bob_party/src/screens/Store.tsx b/bob_party/src/screens/Store.tsx index ed1e514..8e2a129 100644 --- a/bob_party/src/screens/Store.tsx +++ b/bob_party/src/screens/Store.tsx @@ -6,7 +6,7 @@ const avatar = require('../../assets/Icons/BobClassic.png'); const engrenage = require('../../assets/Icons/UnSelected/Cogs.png'); const gamepad = require('../../assets/Icons/UnSelected/Gamepad.png'); const message = require('../../assets/Icons/UnSelected/Chat.png'); -const store = require('../../assets/Icons/Selected/SStore.png'); +const store = require('../../assets/Icons/Selected/Store.png'); function Store(props: { navigation: any; }) { const { navigation } = props