Gestion dynamique de l'affichage du défi

This commit is contained in:
Emmy D'Anello 2024-12-12 19:33:44 +01:00
parent 291e7ff8a7
commit ac20baad23
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
4 changed files with 56 additions and 26 deletions

View File

@ -1,9 +1,26 @@
import ChallengeCard from '@/components/ChallengeCard'
import PenaltyBanner from '@/components/PenalyBanner' import PenaltyBanner from '@/components/PenalyBanner'
import { FontAwesome6 } from '@expo/vector-icons' import { useChallengeActions } from '@/hooks/useChallengeActions'
import { View } from 'react-native' import { useChallenges } from '@/hooks/useChallenges'
import { Appbar, Button, Surface, Text } from 'react-native-paper' import { useGame } from '@/hooks/useGame'
import { useMemo } from 'react'
import { Appbar, Surface } from 'react-native-paper'
export default function ChallengesScreen() { export default function ChallengesScreen() {
const game = useGame()
const challengeActions = useChallengeActions()
const challenges = useChallenges()
const currentChallengeAction = useMemo(() => {
if (!game.currentChallengeId)
return null
return challengeActions.challengeActions.find((action) => action.id === game.currentChallengeId)
}, [game, challengeActions])
const currentChallenge = useMemo(() => {
if (!currentChallengeAction)
return null
return challenges.challenges.find((challenge) => challenge.id === currentChallengeAction.challengeId)
}, [currentChallengeAction, challenges])
return ( return (
<Surface style={{ flex: 1 }}> <Surface style={{ flex: 1 }}>
<Appbar.Header> <Appbar.Header>
@ -11,27 +28,7 @@ export default function ChallengesScreen() {
<Appbar.Action icon='format-list-bulleted' /> <Appbar.Action icon='format-list-bulleted' />
</Appbar.Header> </Appbar.Header>
<PenaltyBanner /> <PenaltyBanner />
<Surface elevation={2} style={{ flex: 1, margin: 20, borderRadius: 20 }}> {currentChallenge && <ChallengeCard challenge={currentChallenge} />}
<View style={{ padding: 10 }}>
<Text variant='headlineMedium' style={{ textAlign: 'center' }}>Titre</Text>
</View>
<View style={{ flexGrow: 1 }}>
<Surface elevation={5} mode='flat' style={{ flexGrow: 1, padding: 15 }}>
<Text variant='bodyLarge' style={{ flexGrow: 1 }}>Description</Text>
<Text variant='titleMedium'>
Récompense : 500 <FontAwesome6 name='coins' />
</Text>
</Surface>
</View>
<View style={{ flexWrap: 'wrap', flexDirection: 'row', justifyContent: 'space-around', padding: 15 }}>
<Button mode='outlined' icon='cancel'>
Passer
</Button>
<Button mode='contained' icon='check'>
Terminer
</Button>
</View>
</Surface>
</Surface> </Surface>
) )
} }

View File

@ -0,0 +1,30 @@
import { Challenge } from "@/utils/features/challenges/challengesSlice"
import { FontAwesome6 } from "@expo/vector-icons"
import { View } from "react-native"
import { Button, Surface, Text } from "react-native-paper"
export default function ChallengeCard({ challenge }: { challenge: Challenge }) {
return (
<Surface elevation={2} style={{ flex: 1, margin: 20, borderRadius: 20 }}>
<View style={{ padding: 10 }}>
<Text variant='headlineMedium' style={{ textAlign: 'center' }}>{challenge.title}</Text>
</View>
<View style={{ flexGrow: 1 }}>
<Surface elevation={5} mode='flat' style={{ flexGrow: 1, padding: 15 }}>
<Text variant='bodyLarge' style={{ flexGrow: 1 }}>{challenge.description}</Text>
<Text variant='titleMedium'>
Récompense : {challenge.reward} <FontAwesome6 name='coins' />
</Text>
</Surface>
</View>
<View style={{ flexWrap: 'wrap', flexDirection: 'row', justifyContent: 'space-around', padding: 15 }}>
<Button mode='outlined' icon='cancel'>
Passer
</Button>
<Button mode='contained' icon='check'>
Terminer
</Button>
</View>
</Surface>
)
}

View File

@ -1,3 +1,3 @@
import { useAppSelector } from "./useStore" import { useAppSelector } from "./useStore"
export const useTrain = () => useAppSelector((state) => state.challenges) export const useChallenges = () => useAppSelector((state) => state.challenges)

View File

@ -1,4 +1,5 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit' import { createSlice, PayloadAction } from '@reduxjs/toolkit'
import { ChallengeAction } from '../challengeActions/challengeActionsSlice'
export interface RunPayload { export interface RunPayload {
id: number id: number
@ -20,6 +21,7 @@ export interface GameState {
gameStarted: boolean gameStarted: boolean
money: number money: number
currentRunner: boolean currentRunner: boolean
currentChallengeId: number | null
chaseFreeTime: number | null // date chaseFreeTime: number | null // date
penaltyStart: number | null // date penaltyStart: number | null // date
penaltyEnd: number | null //date penaltyEnd: number | null //date
@ -30,6 +32,7 @@ const initialState: GameState = {
gameStarted: false, gameStarted: false,
money: 0, money: 0,
currentRunner: false, currentRunner: false,
currentChallengeId: null,
chaseFreeTime: null, chaseFreeTime: null,
penaltyStart: null, penaltyStart: null,
penaltyEnd: null, penaltyEnd: null,