Browse Source

Renamed game to a more general name

Arnaud Vergnet 1 year ago
parent
commit
494b319f19

+ 2
- 2
src/managers/ThemeManager.js View File

@@ -1,14 +1,14 @@
1 1
 // @flow
2 2
 
3 3
 import AsyncStorageManager from "./AsyncStorageManager";
4
-import {DarkTheme, DefaultTheme, Theme} from 'react-native-paper';
4
+import {DarkTheme, DefaultTheme} from 'react-native-paper';
5 5
 import AprilFoolsManager from "./AprilFoolsManager";
6 6
 import {Appearance} from 'react-native-appearance';
7 7
 
8 8
 const colorScheme = Appearance.getColorScheme();
9 9
 
10 10
 export type CustomTheme = {
11
-    ...Theme,
11
+    ...DefaultTheme,
12 12
     colors: {
13 13
         primary: string,
14 14
         accent: string,

+ 2
- 2
src/navigation/MainNavigator.js View File

@@ -8,7 +8,7 @@ import DebugScreen from '../screens/About/DebugScreen';
8 8
 import {createStackNavigator, TransitionPresets} from "@react-navigation/stack";
9 9
 import i18n from "i18n-js";
10 10
 import TabNavigator from "./TabNavigator";
11
-import TetrisScreen from "../screens/Tetris/TetrisScreen";
11
+import GameScreen from "../screens/Game/GameScreen";
12 12
 import VoteScreen from "../screens/Amicale/VoteScreen";
13 13
 import LoginScreen from "../screens/Amicale/LoginScreen";
14 14
 import {Platform} from "react-native";
@@ -93,7 +93,7 @@ function MainStackComponent(props: { createTabNavigator: () => React.Node }) {
93 93
             />
94 94
             <MainStack.Screen
95 95
                 name="tetris"
96
-                component={TetrisScreen}
96
+                component={GameScreen}
97 97
                 options={{
98 98
                     title: i18n.t("screens.game.title"),
99 99
                 }}

src/screens/Tetris/GameLogic.js → src/screens/Game/GameLogic.js View File


src/screens/Tetris/TetrisScreen.js → src/screens/Game/GameScreen.js View File

@@ -22,7 +22,7 @@ type State = {
22 22
     gameLevel: number,
23 23
 }
24 24
 
25
-class TetrisScreen extends React.Component<Props, State> {
25
+class GameScreen extends React.Component<Props, State> {
26 26
 
27 27
     colors: Object;
28 28
 
@@ -296,4 +296,4 @@ class TetrisScreen extends React.Component<Props, State> {
296 296
 
297 297
 }
298 298
 
299
-export default withTheme(TetrisScreen);
299
+export default withTheme(GameScreen);

src/screens/Tetris/GridManager.js → src/screens/Game/GridManager.js View File


src/screens/Tetris/Piece.js → src/screens/Game/Piece.js View File


src/screens/Tetris/ScoreManager.js → src/screens/Game/ScoreManager.js View File


src/screens/Tetris/Shapes/BaseShape.js → src/screens/Game/Shapes/BaseShape.js View File


src/screens/Tetris/Shapes/ShapeI.js → src/screens/Game/Shapes/ShapeI.js View File


src/screens/Tetris/Shapes/ShapeJ.js → src/screens/Game/Shapes/ShapeJ.js View File


src/screens/Tetris/Shapes/ShapeL.js → src/screens/Game/Shapes/ShapeL.js View File


src/screens/Tetris/Shapes/ShapeO.js → src/screens/Game/Shapes/ShapeO.js View File


src/screens/Tetris/Shapes/ShapeS.js → src/screens/Game/Shapes/ShapeS.js View File


src/screens/Tetris/Shapes/ShapeT.js → src/screens/Game/Shapes/ShapeT.js View File


src/screens/Tetris/Shapes/ShapeZ.js → src/screens/Game/Shapes/ShapeZ.js View File


src/screens/Tetris/__tests__/GridManager.test.js → src/screens/Game/__tests__/GridManager.test.js View File


src/screens/Tetris/__tests__/Piece.test.js → src/screens/Game/__tests__/Piece.test.js View File


src/screens/Tetris/__tests__/ScoreManager.test.js → src/screens/Game/__tests__/ScoreManager.test.js View File


src/screens/Tetris/__tests__/Shape.test.js → src/screens/Game/__tests__/Shape.test.js View File


src/screens/Tetris/components/Cell.js → src/screens/Game/components/Cell.js View File


src/screens/Tetris/components/Grid.js → src/screens/Game/components/Grid.js View File


src/screens/Tetris/components/Preview.js → src/screens/Game/components/Preview.js View File


Loading…
Cancel
Save