lpitault/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

Fixed duplicate list child key warning

Browse source
This commit is contained in:
Arnaud Vergnet 2020-07-21 22:35:38 +02:00
parent ae3d9310d6
commit ccf196abaa
4 changed files with 56 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/screens/Game/components/CellComponent.js
View file

@ -26,7 +26,6 @@ class CellComponent extends React.PureComponent<Props> {
borderWidth: 1,
aspectRatio: 1,
}}
key={item.key}
/>
);
}

2
src/screens/Game/components/GridComponent.js
View file

@ -31,7 +31,7 @@ class GridComponent extends React.Component<Props> {
}
getCellRender = (item: Cell) => {
return <CellComponent cell={item}/>;
return <CellComponent cell={item} key={item.key}/>;
};
getGrid() {

1
src/screens/Game/logic/GameLogic.js
View file

@ -109,6 +109,7 @@ export default class GameLogic {
onClock(callback: Function) {
this.#gameTime++;
console.log(this.#gameTime);
callback(this.#gameTime);
}

116
src/screens/Game/screens/GameStartScreen.js
View file

@ -110,7 +110,7 @@ class GameStartScreen extends React.Component<Props, State> {
animation={"fadeInDownBig"}
delay={animDelay}
duration={animDuration}
key={index.toString()}
key={"piece" + index.toString()}
style={{
width: size + "%",
position: "absolute",
@ -118,21 +118,14 @@ class GameStartScreen extends React.Component<Props, State> {
left: left + "%",
}}
>
<View style={{
transform: [{rotateZ: rot + "deg"}],
}}>
<GridComponent
width={4}
height={4}
grid={item}
style={{
marginRight: 5,
marginLeft: 5,
marginBottom: 5,
}}
/>
</View>
<GridComponent
width={4}
height={4}
grid={item}
style={{
transform: [{rotateZ: rot + "deg"}],
}}
/>
</Animatable.View>
);
})}
@ -379,34 +372,33 @@ class GameStartScreen extends React.Component<Props, State> {
getMainContent() {
return (
<View style={{flex: 1}}>
{
this.gameStats != null
? this.getPostGameContent(this.gameStats)
: this.getWelcomeText()
}
<Button
icon={"play"}
mode={"contained"}
onPress={() => this.props.navigation.replace(
"game-main",
{
highScore: this.scores.length > 0
? this.scores[0]
: null
}
)}
style={{
marginLeft: "auto",
marginRight: "auto",
marginTop: 10,
}}
>
{i18n.t("screens.game.play")}
</Button>
{this.getTopScoresRender()}
</View>
<View style={{flex: 1}}>
{
this.gameStats != null
? this.getPostGameContent(this.gameStats)
: this.getWelcomeText()
}
<Button
icon={"play"}
mode={"contained"}
onPress={() => this.props.navigation.replace(
"game-main",
{
highScore: this.scores.length > 0
? this.scores[0]
: null
}
)}
style={{
marginLeft: "auto",
marginRight: "auto",
marginTop: 10,
}}
>
{i18n.t("screens.game.play")}
</Button>
{this.getTopScoresRender()}
</View>
)
}
@ -425,24 +417,24 @@ class GameStartScreen extends React.Component<Props, State> {
start={{x: 0, y: 0}}
end={{x: 0, y: 1}}
>
<ScrollView>
{this.getMainContent()}
<MascotPopup
visible={this.state.mascotDialogVisible}
title={i18n.t("screens.game.mascotDialog.title")}
message={i18n.t("screens.game.mascotDialog.message")}
icon={"gamepad-variant"}
buttons={{
action: null,
cancel: {
message: i18n.t("screens.game.mascotDialog.button"),
icon: "check",
onPress: this.hideMascotDialog,
}
}}
emotion={MASCOT_STYLE.COOL}
/>
</ScrollView>
<ScrollView>
{this.getMainContent()}
<MascotPopup
visible={this.state.mascotDialogVisible}
title={i18n.t("screens.game.mascotDialog.title")}
message={i18n.t("screens.game.mascotDialog.message")}
icon={"gamepad-variant"}
buttons={{
action: null,
cancel: {
message: i18n.t("screens.game.mascotDialog.button"),
icon: "check",
onPress: this.hideMascotDialog,
}
}}
emotion={MASCOT_STYLE.COOL}
/>
</ScrollView>
</LinearGradient>
</View>