Improved project structure

App.js

@@ -4,7 +4,7 @@ import * as React from 'react';
 import {Platform, StatusBar, YellowBox} from 'react-native';
 import LocaleManager from './src/managers/LocaleManager';
 import AsyncStorageManager from "./src/managers/AsyncStorageManager";
-import CustomIntroSlider from "./src/components/Custom/CustomIntroSlider";
+import CustomIntroSlider from "./src/components/Overrides/CustomIntroSlider";
 import {SplashScreen} from 'expo';
 import ThemeManager from './src/managers/ThemeManager';
 import {NavigationContainer} from '@react-navigation/native';

src/components/Amicale/AuthenticatedScreen.js

@@ -3,8 +3,8 @@
 import * as React from 'react';
 import ConnectionManager from "../../managers/ConnectionManager";
 import {ERROR_TYPE} from "../../utils/WebData";
-import ErrorView from "../Custom/ErrorView";
+import ErrorView from "../Screens/ErrorView";
-import BasicLoadingScreen from "../Custom/BasicLoadingScreen";
+import BasicLoadingScreen from "../Screens/BasicLoadingScreen";
 
 type Props = {
     navigation: Object,

src/components/Amicale/LogoutDialog.js

@@ -2,7 +2,7 @@
 
 import * as React from 'react';
 import i18n from 'i18n-js';
-import LoadingConfirmDialog from "../Dialog/LoadingConfirmDialog";
+import LoadingConfirmDialog from "../Dialogs/LoadingConfirmDialog";
 import ConnectionManager from "../../managers/ConnectionManager";
 
 type Props = {

src/components/Amicale/Vote/VoteSelect.js

@@ -4,8 +4,8 @@ import * as React from 'react';
 import {Avatar, Button, Card, RadioButton} from "react-native-paper";
 import {FlatList, StyleSheet, View} from "react-native";
 import ConnectionManager from "../../../managers/ConnectionManager";
-import LoadingConfirmDialog from "../../Dialog/LoadingConfirmDialog";
+import LoadingConfirmDialog from "../../Dialogs/LoadingConfirmDialog";
-import ErrorDialog from "../../Dialog/ErrorDialog";
+import ErrorDialog from "../../Dialogs/ErrorDialog";
 import i18n from 'i18n-js';
 
 type Props = {

src/components/Home/PreviewEventDashboardItem.js

@@ -5,7 +5,7 @@ import {StyleSheet} from "react-native";
 import i18n from "i18n-js";
 import {Avatar, Button, Card} from 'react-native-paper';
 import {getFormattedEventTime, isDescriptionEmpty} from "../../utils/Planning";
-import CustomHTML from "../Custom/CustomHTML";
+import CustomHTML from "../Overrides/CustomHTML";
 
 type Props = {
     event: Object,

src/components/Lists/PlanexGroups/GroupListAccordion.js

@@ -3,7 +3,7 @@
 import * as React from 'react';
 import {List, withTheme} from 'react-native-paper';
 import {FlatList, View} from "react-native";
-import {stringMatchQuery} from "../../utils/Search";
+import {stringMatchQuery} from "../../../utils/Search";
 import Collapsible from "react-native-collapsible";
 import * as Animatable from "react-native-animatable";
 import GroupListItem from "./GroupListItem";

src/components/Lists/Proxiwash/ProxiwashListItem.js

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import {ActivityIndicator, Avatar, List, ProgressBar, Surface, Text, withTheme} from 'react-native-paper';
 import {StyleSheet, View} from "react-native";
-import ProxiwashConstants from "../../constants/ProxiwashConstants";
+import ProxiwashConstants from "../../../constants/ProxiwashConstants";
 import i18n from "i18n-js";
-import AprilFoolsManager from "../../managers/AprilFoolsManager";
+import AprilFoolsManager from "../../../managers/AprilFoolsManager";
 import * as Animatable from "react-native-animatable";
 
 type Props = {

src/components/Screens/WebSectionList.js

@@ -5,8 +5,8 @@ import {ERROR_TYPE, readData} from "../../utils/WebData";
 import i18n from "i18n-js";
 import {Snackbar} from 'react-native-paper';
 import {Animated, RefreshControl, View} from "react-native";
-import ErrorView from "../Custom/ErrorView";
+import ErrorView from "./ErrorView";
-import BasicLoadingScreen from "../Custom/BasicLoadingScreen";
+import BasicLoadingScreen from "./BasicLoadingScreen";
 import {withCollapsible} from "../../utils/withCollapsible";
 import * as Animatable from 'react-native-animatable';
 import CustomTabBar from "../Tabbar/CustomTabBar";

src/components/Screens/WebViewScreen.js

@@ -2,10 +2,10 @@
 
 import * as React from 'react';
 import WebView from "react-native-webview";
-import BasicLoadingScreen from "../Custom/BasicLoadingScreen";
+import BasicLoadingScreen from "./BasicLoadingScreen";
-import ErrorView from "../Custom/ErrorView";
+import ErrorView from "./ErrorView";
 import {ERROR_TYPE} from "../../utils/WebData";
-import MaterialHeaderButtons, {Item} from '../Custom/HeaderButton';
+import MaterialHeaderButtons, {Item} from '../Overrides/CustomHeaderButton';
 import {HiddenItem} from "react-navigation-header-buttons";
 import {Linking} from "expo";
 import i18n from 'i18n-js';

src/navigation/DrawerNavigator.js

@@ -3,10 +3,10 @@
 import * as React from 'react';
 import {createDrawerNavigator} from '@react-navigation/drawer';
 import TabNavigator from './MainTabNavigator';
-import SettingsScreen from '../screens/SettingsScreen';
+import SettingsScreen from '../screens/Other/SettingsScreen';
 import AboutScreen from '../screens/About/AboutScreen';
 import AboutDependenciesScreen from '../screens/About/AboutDependenciesScreen';
-import SelfMenuScreen from '../screens/SelfMenuScreen';
+import SelfMenuScreen from '../screens/Other/SelfMenuScreen';
 import AvailableRoomScreen from "../screens/Websites/AvailableRoomScreen";
 import BibScreen from "../screens/Websites/BibScreen";
 import TetrisScreen from "../screens/Tetris/TetrisScreen";
@@ -21,7 +21,7 @@ import ClubDisplayScreen from "../screens/Amicale/Clubs/ClubDisplayScreen";
 import ClubAboutScreen from "../screens/Amicale/Clubs/ClubAboutScreen";
 import VoteScreen from "../screens/Amicale/VoteScreen";
 import AmicaleContactScreen from "../screens/Amicale/AmicaleContactScreen";
-import MaterialHeaderButtons, {Item} from "../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../components/Overrides/CustomHeaderButton";
 import {AmicaleWebsiteScreen} from "../screens/Websites/AmicaleWebsiteScreen";
 import {TutorInsaWebsiteScreen} from "../screens/Websites/TutorInsaWebsiteScreen";
 import {WiketudWebsiteScreen} from "../screens/Websites/WiketudWebsiteScreen";

src/navigation/MainTabNavigator.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import {createStackNavigator, TransitionPresets} from '@react-navigation/stack';
 import {createBottomTabNavigator} from "@react-navigation/bottom-tabs";
 
-import HomeScreen from '../screens/HomeScreen';
+import HomeScreen from '../screens/Home/HomeScreen';
 import PlanningScreen from '../screens/Planning/PlanningScreen';
 import PlanningDisplayScreen from '../screens/Planning/PlanningDisplayScreen';
 import ProxiwashScreen from '../screens/Proxiwash/ProxiwashScreen';
@@ -10,16 +10,16 @@ import ProxiwashAboutScreen from '../screens/Proxiwash/ProxiwashAboutScreen';
 import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen';
 import ProximoListScreen from "../screens/Proximo/ProximoListScreen";
 import ProximoAboutScreen from "../screens/Proximo/ProximoAboutScreen";
-import PlanexScreen from '../screens/Websites/PlanexScreen';
+import PlanexScreen from '../screens/Planex/PlanexScreen';
 import AsyncStorageManager from "../managers/AsyncStorageManager";
 import {useTheme, withTheme} from 'react-native-paper';
 import i18n from "i18n-js";
 import ClubDisplayScreen from "../screens/Amicale/Clubs/ClubDisplayScreen";
-import ScannerScreen from "../screens/ScannerScreen";
+import ScannerScreen from "../screens/Home/ScannerScreen";
-import MaterialHeaderButtons, {Item} from "../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../components/Overrides/CustomHeaderButton";
-import FeedItemScreen from "../screens/FeedItemScreen";
+import FeedItemScreen from "../screens/Home/FeedItemScreen";
 import {createCollapsibleStack} from "react-navigation-collapsible";
-import GroupSelectionScreen from "../screens/GroupSelectionScreen";
+import GroupSelectionScreen from "../screens/Planex/GroupSelectionScreen";
 import CustomTabBar from "../components/Tabbar/CustomTabBar";
 
 const TAB_ICONS = {

src/screens/About/AboutScreen.js

@@ -5,7 +5,7 @@ import {FlatList, Linking, Platform, View} from 'react-native';
 import i18n from "i18n-js";
 import appJson from '../../../app';
 import AsyncStorageManager from "../../managers/AsyncStorageManager";
-import CustomModal from "../../components/Custom/CustomModal";
+import CustomModal from "../../components/Overrides/CustomModal";
 import {Avatar, Button, Card, List, Text, Title, withTheme} from 'react-native-paper';
 
 const links = {

src/screens/About/DebugScreen.js

@@ -3,7 +3,7 @@
 import * as React from 'react';
 import {FlatList, View} from "react-native";
 import AsyncStorageManager from "../../managers/AsyncStorageManager";
-import CustomModal from "../../components/Custom/CustomModal";
+import CustomModal from "../../components/Overrides/CustomModal";
 import {Button, List, Subheading, TextInput, Title, withTheme} from 'react-native-paper';
 
 type Props = {

src/screens/Amicale/Clubs/ClubDisplayScreen.js

@@ -6,7 +6,7 @@ import {Avatar, Card, Chip, Paragraph, withTheme} from 'react-native-paper';
 import ImageModal from 'react-native-image-modal';
 import i18n from "i18n-js";
 import AuthenticatedScreen from "../../../components/Amicale/AuthenticatedScreen";
-import CustomHTML from "../../../components/Custom/CustomHTML";
+import CustomHTML from "../../../components/Overrides/CustomHTML";
 import CustomTabBar from "../../../components/Tabbar/CustomTabBar";
 
 type Props = {

src/screens/Amicale/Clubs/ClubListScreen.js

@@ -5,10 +5,10 @@ import {Animated, Platform} from "react-native";
 import {Chip, Searchbar, withTheme} from 'react-native-paper';
 import AuthenticatedScreen from "../../../components/Amicale/AuthenticatedScreen";
 import i18n from "i18n-js";
-import ClubListItem from "../../../components/Lists/ClubListItem";
+import ClubListItem from "../../../components/Lists/Clubs/ClubListItem";
 import {isItemInCategoryFilter, stringMatchQuery} from "../../../utils/Search";
-import ClubListHeader from "../../../components/Lists/ClubListHeader";
+import ClubListHeader from "../../../components/Lists/Clubs/ClubListHeader";
-import MaterialHeaderButtons, {Item} from "../../../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../../../components/Overrides/CustomHeaderButton";
 import {withCollapsible} from "../../../utils/withCollapsible";
 
 type Props = {

src/screens/Amicale/LoginScreen.js

@@ -5,7 +5,7 @@ import {KeyboardAvoidingView, ScrollView, StyleSheet, View} from "react-native";
 import {Avatar, Button, Card, HelperText, Paragraph, TextInput, withTheme} from 'react-native-paper';
 import ConnectionManager from "../../managers/ConnectionManager";
 import i18n from 'i18n-js';
-import ErrorDialog from "../../components/Dialog/ErrorDialog";
+import ErrorDialog from "../../components/Dialogs/ErrorDialog";
 import {CommonActions} from "@react-navigation/native";
 
 type Props = {

src/screens/Amicale/ProfileScreen.js

@@ -6,7 +6,7 @@ import {Avatar, Button, Card, Divider, List, withTheme} from 'react-native-paper
 import AuthenticatedScreen from "../../components/Amicale/AuthenticatedScreen";
 import i18n from 'i18n-js';
 import LogoutDialog from "../../components/Amicale/LogoutDialog";
-import MaterialHeaderButtons, {Item} from "../../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
 
 type Props = {
     navigation: Object,

src/screens/Home/FeedItemScreen.js

@@ -5,16 +5,16 @@ import {ScrollView, View} from 'react-native';
 import {Avatar, Card, Text, withTheme} from 'react-native-paper';
 import ImageModal from 'react-native-image-modal';
 import Autolink from "react-native-autolink";
-import MaterialHeaderButtons, {Item} from "../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
 import {Linking} from "expo";
-import CustomTabBar from "../components/Tabbar/CustomTabBar";
+import CustomTabBar from "../../components/Tabbar/CustomTabBar";
 
 type Props = {
     navigation: Object,
     route: Object
 };
 
-const ICON_AMICALE = require('../../assets/amicale.png');
+const ICON_AMICALE = require('../../../assets/amicale.png');
 const NAME_AMICALE = 'Amicale INSA Toulouse';
 /**
  * Class defining a planning event information page.

src/screens/Home/HomeScreen.js

@@ -3,20 +3,20 @@
 import * as React from 'react';
 import {Animated, FlatList} from 'react-native';
 import i18n from "i18n-js";
-import DashboardItem from "../components/Home/EventDashboardItem";
+import DashboardItem from "../../components/Home/EventDashboardItem";
-import WebSectionList from "../components/Lists/WebSectionList";
+import WebSectionList from "../../components/Screens/WebSectionList";
 import {withTheme} from 'react-native-paper';
-import FeedItem from "../components/Home/FeedItem";
+import FeedItem from "../../components/Home/FeedItem";
-import SquareDashboardItem from "../components/Home/SmallDashboardItem";
+import SquareDashboardItem from "../../components/Home/SmallDashboardItem";
-import PreviewEventDashboardItem from "../components/Home/PreviewEventDashboardItem";
+import PreviewEventDashboardItem from "../../components/Home/PreviewEventDashboardItem";
-import {stringToDate} from "../utils/Planning";
+import {stringToDate} from "../../utils/Planning";
-import ActionsDashBoardItem from "../components/Home/ActionsDashboardItem";
+import ActionsDashBoardItem from "../../components/Home/ActionsDashboardItem";
-import ConnectionManager from "../managers/ConnectionManager";
+import ConnectionManager from "../../managers/ConnectionManager";
 import {CommonActions} from '@react-navigation/native';
-import MaterialHeaderButtons, {Item} from "../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
 import {AnimatedValue} from "react-native-reanimated";
-import AnimatedFAB from "../components/Custom/AnimatedFAB";
+import AnimatedFAB from "../../components/Animations/AnimatedFAB";
-import AnimatedFocusView from "../components/Custom/AnimatedFocusView";
+import AnimatedFocusView from "../../components/Animations/AnimatedFocusView";
 // import DATA from "../dashboard_data.json";
 
 

src/screens/Home/ScannerScreen.js

@@ -5,11 +5,11 @@ import {StyleSheet, View} from "react-native";
 import {Button, Text, withTheme} from 'react-native-paper';
 import {BarCodeScanner} from "expo-barcode-scanner";
 import {Camera} from 'expo-camera';
-import URLHandler from "../utils/URLHandler";
+import URLHandler from "../../utils/URLHandler";
 import {Linking} from "expo";
-import AlertDialog from "../components/Dialog/AlertDialog";
+import AlertDialog from "../../components/Dialogs/AlertDialog";
 import i18n from 'i18n-js';
-import CustomTabBar from "../components/Tabbar/CustomTabBar";
+import CustomTabBar from "../../components/Tabbar/CustomTabBar";
 
 type Props = {};
 type State = {

src/screens/Other/SelfMenuScreen.js

@@ -2,10 +2,10 @@
 
 import * as React from 'react';
 import {View} from 'react-native';
-import DateManager from "../managers/DateManager";
+import DateManager from "../../managers/DateManager";
-import WebSectionList from "../components/Lists/WebSectionList";
+import WebSectionList from "../../components/Screens/WebSectionList";
 import {Card, Text, withTheme} from 'react-native-paper';
-import AprilFoolsManager from "../managers/AprilFoolsManager";
+import AprilFoolsManager from "../../managers/AprilFoolsManager";
 
 const DATA_URL = "https://etud.insa-toulouse.fr/~amicale_app/menu/menu_data.json";
 

src/screens/Other/SettingsScreen.js

@@ -2,10 +2,10 @@
 
 import * as React from 'react';
 import {ScrollView} from "react-native";
-import ThemeManager from '../managers/ThemeManager';
+import ThemeManager from '../../managers/ThemeManager';
 import i18n from "i18n-js";
-import AsyncStorageManager from "../managers/AsyncStorageManager";
+import AsyncStorageManager from "../../managers/AsyncStorageManager";
-import {setMachineReminderNotificationTime} from "../utils/Notifications";
+import {setMachineReminderNotificationTime} from "../../utils/Notifications";
 import {Card, List, Switch, ToggleButton} from 'react-native-paper';
 import {Appearance} from "react-native-appearance";
 

src/screens/Planex/GroupSelectionScreen.js

@@ -4,10 +4,10 @@ import * as React from 'react';
 import {Platform} from "react-native";
 import i18n from "i18n-js";
 import {Searchbar, withTheme} from "react-native-paper";
-import {stringMatchQuery} from "../utils/Search";
+import {stringMatchQuery} from "../../utils/Search";
-import WebSectionList from "../components/Lists/WebSectionList";
+import WebSectionList from "../../components/Screens/WebSectionList";
-import GroupListAccordion from "../components/Lists/GroupListAccordion";
+import GroupListAccordion from "../../components/Lists/PlanexGroups/GroupListAccordion";
-import AsyncStorageManager from "../managers/AsyncStorageManager";
+import AsyncStorageManager from "../../managers/AsyncStorageManager";
 
 const LIST_ITEM_HEIGHT = 70;
 

src/screens/Planex/PlanexScreen.js

@@ -7,14 +7,14 @@ import {Avatar, Banner, withTheme} from "react-native-paper";
 import i18n from "i18n-js";
 import {View} from "react-native";
 import AsyncStorageManager from "../../managers/AsyncStorageManager";
-import AlertDialog from "../../components/Dialog/AlertDialog";
+import AlertDialog from "../../components/Dialogs/AlertDialog";
 import {withCollapsible} from "../../utils/withCollapsible";
 import {dateToString, getTimeOnlyString} from "../../utils/Planning";
 import DateManager from "../../managers/DateManager";
-import AnimatedBottomBar from "../../components/Custom/AnimatedBottomBar";
+import AnimatedBottomBar from "../../components/Animations/AnimatedBottomBar";
 import {CommonActions} from "@react-navigation/native";
-import ErrorView from "../../components/Custom/ErrorView";
+import ErrorView from "../../components/Screens/ErrorView";
-import AnimatedFocusView from "../../components/Custom/AnimatedFocusView";
+import AnimatedFocusView from "../../components/Animations/AnimatedFocusView";
 
 type Props = {
     navigation: Object,

src/screens/Planning/PlanningDisplayScreen.js

@@ -6,10 +6,10 @@ import {getDateOnlyString, getFormattedEventTime} from '../../utils/Planning';
 import {Card, withTheme} from 'react-native-paper';
 import DateManager from "../../managers/DateManager";
 import ImageModal from 'react-native-image-modal';
-import BasicLoadingScreen from "../../components/Custom/BasicLoadingScreen";
+import BasicLoadingScreen from "../../components/Screens/BasicLoadingScreen";
 import {apiRequest} from "../../utils/WebData";
-import ErrorView from "../../components/Custom/ErrorView";
+import ErrorView from "../../components/Screens/ErrorView";
-import CustomHTML from "../../components/Custom/CustomHTML";
+import CustomHTML from "../../components/Overrides/CustomHTML";
 import CustomTabBar from "../../components/Tabbar/CustomTabBar";
 
 type Props = {

src/screens/Planning/PlanningScreen.js

@@ -13,8 +13,8 @@ import {
     getFormattedEventTime,
 } from '../../utils/Planning';
 import {Avatar, Divider, List} from 'react-native-paper';
-import CustomAgenda from "../../components/Custom/CustomAgenda";
+import CustomAgenda from "../../components/Overrides/CustomAgenda";
-import AnimatedFocusView from "../../components/Custom/AnimatedFocusView";
+import AnimatedFocusView from "../../components/Animations/AnimatedFocusView";
 
 LocaleConfig.locales['fr'] = {
     monthNames: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],

src/screens/Proximo/ProximoListScreen.js

@@ -3,11 +3,11 @@
 import * as React from 'react';
 import {Animated, Image, Platform, ScrollView, View} from "react-native";
 import i18n from "i18n-js";
-import CustomModal from "../../components/Custom/CustomModal";
+import CustomModal from "../../components/Overrides/CustomModal";
 import {RadioButton, Searchbar, Subheading, Text, Title, withTheme} from "react-native-paper";
 import {stringMatchQuery} from "../../utils/Search";
-import ProximoListItem from "../../components/Lists/ProximoListItem";
+import ProximoListItem from "../../components/Lists/Proximo/ProximoListItem";
-import MaterialHeaderButtons, {Item} from "../../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
 import {withCollapsible} from "../../utils/withCollapsible";
 import CustomTabBar from "../../components/Tabbar/CustomTabBar";
 import AutoHideHandler from "../../utils/AutoHideHandler";

src/screens/Proximo/ProximoMainScreen.js

@@ -3,10 +3,10 @@
 import * as React from 'react';
 import {View} from 'react-native'
 import i18n from "i18n-js";
-import WebSectionList from "../../components/Lists/WebSectionList";
+import WebSectionList from "../../components/Screens/WebSectionList";
 import {List, withTheme} from 'react-native-paper';
-import MaterialHeaderButtons, {Item} from "../../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
-import AnimatedFocusView from "../../components/Custom/AnimatedFocusView";
+import AnimatedFocusView from "../../components/Animations/AnimatedFocusView";
 
 const DATA_URL = "https://etud.insa-toulouse.fr/~proximo/data/stock-v2.json";
 const LIST_ITEM_HEIGHT = 84;

src/screens/Proxiwash/ProxiwashScreen.js

@@ -3,19 +3,19 @@
 import * as React from 'react';
 import {Alert, Platform, View} from 'react-native';
 import i18n from "i18n-js";
-import WebSectionList from "../../components/Lists/WebSectionList";
+import WebSectionList from "../../components/Screens/WebSectionList";
 import * as Notifications from "../../utils/Notifications";
 import AsyncStorageManager from "../../managers/AsyncStorageManager";
 import * as Expo from "expo";
 import {Avatar, Banner, Button, Card, Text, withTheme} from 'react-native-paper';
-import ProxiwashListItem from "../../components/Lists/ProxiwashListItem";
+import ProxiwashListItem from "../../components/Lists/Proxiwash/ProxiwashListItem";
 import ProxiwashConstants from "../../constants/ProxiwashConstants";
-import CustomModal from "../../components/Custom/CustomModal";
+import CustomModal from "../../components/Overrides/CustomModal";
 import AprilFoolsManager from "../../managers/AprilFoolsManager";
-import MaterialHeaderButtons, {Item} from "../../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
-import ProxiwashSectionHeader from "../../components/Lists/ProxiwashSectionHeader";
+import ProxiwashSectionHeader from "../../components/Lists/Proxiwash/ProxiwashSectionHeader";
 import {withCollapsible} from "../../utils/withCollapsible";
-import AnimatedFocusView from "../../components/Custom/AnimatedFocusView";
+import AnimatedFocusView from "../../components/Animations/AnimatedFocusView";
 
 const DATA_URL = "https://etud.insa-toulouse.fr/~amicale_app/washinsa/washinsa.json";
 

src/screens/Tetris/TetrisScreen.js

@@ -8,7 +8,7 @@ import GameLogic from "./GameLogic";
 import Grid from "./components/Grid";
 import Preview from "./components/Preview";
 import i18n from "i18n-js";
-import MaterialHeaderButtons, {Item} from "../../components/Custom/HeaderButton";
+import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
 
 type Props = {
     navigation: Object,