From bdeae6933a7c8bb2438e888e0521c08343c0c721 Mon Sep 17 00:00:00 2001 From: Arnaud Vergnet Date: Sat, 18 Apr 2020 20:00:51 +0200 Subject: [PATCH] Improved project structure --- App.js | 2 +- src/components/Amicale/AuthenticatedScreen.js | 4 ++-- src/components/Amicale/LogoutDialog.js | 2 +- src/components/Amicale/Vote/VoteSelect.js | 4 ++-- .../AnimatedBottomBar.js | 0 .../{Custom => Animations}/AnimatedFAB.js | 0 .../AnimatedFocusView.js | 0 .../{Dialog => Dialogs}/AlertDialog.js | 0 .../{Dialog => Dialogs}/ErrorDialog.js | 0 .../LoadingConfirmDialog.js | 0 .../Home/PreviewEventDashboardItem.js | 2 +- .../Lists/{ => Clubs}/ClubListHeader.js | 0 .../Lists/{ => Clubs}/ClubListItem.js | 0 .../{ => PlanexGroups}/GroupListAccordion.js | 2 +- .../Lists/{ => PlanexGroups}/GroupListItem.js | 0 .../Lists/{ => Proximo}/ProximoListItem.js | 0 .../{ => Proxiwash}/ProxiwashListItem.js | 4 ++-- .../{ => Proxiwash}/ProxiwashSectionHeader.js | 0 .../{Custom => Overrides}/CustomAgenda.js | 0 .../{Custom => Overrides}/CustomHTML.js | 0 .../CustomHeaderButton.js} | 0 .../CustomIntroSlider.js | 0 .../{Custom => Overrides}/CustomModal.js | 0 .../{Custom => Screens}/BasicLoadingScreen.js | 0 .../{Custom => Screens}/ErrorView.js | 0 .../{Lists => Screens}/WebSectionList.js | 4 ++-- src/components/Screens/WebViewScreen.js | 6 ++--- src/navigation/DrawerNavigator.js | 6 ++--- src/navigation/MainTabNavigator.js | 12 +++++----- src/screens/About/AboutScreen.js | 2 +- src/screens/About/DebugScreen.js | 2 +- .../Amicale/Clubs/ClubDisplayScreen.js | 2 +- src/screens/Amicale/Clubs/ClubListScreen.js | 6 ++--- src/screens/Amicale/LoginScreen.js | 2 +- src/screens/Amicale/ProfileScreen.js | 2 +- src/screens/{ => Home}/FeedItemScreen.js | 6 ++--- src/screens/{ => Home}/HomeScreen.js | 22 +++++++++---------- src/screens/{ => Home}/ScannerScreen.js | 6 ++--- src/screens/{ => Other}/SelfMenuScreen.js | 6 ++--- src/screens/{ => Other}/SettingsScreen.js | 6 ++--- .../{ => Planex}/GroupSelectionScreen.js | 8 +++---- .../{Websites => Planex}/PlanexScreen.js | 8 +++---- src/screens/Planning/PlanningDisplayScreen.js | 6 ++--- src/screens/Planning/PlanningScreen.js | 4 ++-- src/screens/Proximo/ProximoListScreen.js | 6 ++--- src/screens/Proximo/ProximoMainScreen.js | 6 ++--- src/screens/Proxiwash/ProxiwashScreen.js | 12 +++++----- src/screens/Tetris/TetrisScreen.js | 2 +- 48 files changed, 81 insertions(+), 81 deletions(-) rename src/components/{Custom => Animations}/AnimatedBottomBar.js (100%) rename src/components/{Custom => Animations}/AnimatedFAB.js (100%) rename src/components/{Custom => Animations}/AnimatedFocusView.js (100%) rename src/components/{Dialog => Dialogs}/AlertDialog.js (100%) rename src/components/{Dialog => Dialogs}/ErrorDialog.js (100%) rename src/components/{Dialog => Dialogs}/LoadingConfirmDialog.js (100%) rename src/components/Lists/{ => Clubs}/ClubListHeader.js (100%) rename src/components/Lists/{ => Clubs}/ClubListItem.js (100%) rename src/components/Lists/{ => PlanexGroups}/GroupListAccordion.js (97%) rename src/components/Lists/{ => PlanexGroups}/GroupListItem.js (100%) rename src/components/Lists/{ => Proximo}/ProximoListItem.js (100%) rename src/components/Lists/{ => Proxiwash}/ProxiwashListItem.js (98%) rename src/components/Lists/{ => Proxiwash}/ProxiwashSectionHeader.js (100%) rename src/components/{Custom => Overrides}/CustomAgenda.js (100%) rename src/components/{Custom => Overrides}/CustomHTML.js (100%) rename src/components/{Custom/HeaderButton.js => Overrides/CustomHeaderButton.js} (100%) rename src/components/{Custom => Overrides}/CustomIntroSlider.js (100%) rename src/components/{Custom => Overrides}/CustomModal.js (100%) rename src/components/{Custom => Screens}/BasicLoadingScreen.js (100%) rename src/components/{Custom => Screens}/ErrorView.js (100%) rename src/components/{Lists => Screens}/WebSectionList.js (98%) rename src/screens/{ => Home}/FeedItemScreen.js (93%) rename src/screens/{ => Home}/HomeScreen.js (95%) rename src/screens/{ => Home}/ScannerScreen.js (97%) rename src/screens/{ => Other}/SelfMenuScreen.js (96%) rename src/screens/{ => Other}/SettingsScreen.js (97%) rename src/screens/{ => Planex}/GroupSelectionScreen.js (95%) rename src/screens/{Websites => Planex}/PlanexScreen.js (97%) diff --git a/App.js b/App.js index 69872ab..090893c 100644 --- a/App.js +++ b/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'; diff --git a/src/components/Amicale/AuthenticatedScreen.js b/src/components/Amicale/AuthenticatedScreen.js index b2ca001..7aff22b 100644 --- a/src/components/Amicale/AuthenticatedScreen.js +++ b/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 BasicLoadingScreen from "../Custom/BasicLoadingScreen"; +import ErrorView from "../Screens/ErrorView"; +import BasicLoadingScreen from "../Screens/BasicLoadingScreen"; type Props = { navigation: Object, diff --git a/src/components/Amicale/LogoutDialog.js b/src/components/Amicale/LogoutDialog.js index 9d70d40..5c0f63f 100644 --- a/src/components/Amicale/LogoutDialog.js +++ b/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 = { diff --git a/src/components/Amicale/Vote/VoteSelect.js b/src/components/Amicale/Vote/VoteSelect.js index acceee9..48fb02f 100644 --- a/src/components/Amicale/Vote/VoteSelect.js +++ b/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 ErrorDialog from "../../Dialog/ErrorDialog"; +import LoadingConfirmDialog from "../../Dialogs/LoadingConfirmDialog"; +import ErrorDialog from "../../Dialogs/ErrorDialog"; import i18n from 'i18n-js'; type Props = { diff --git a/src/components/Custom/AnimatedBottomBar.js b/src/components/Animations/AnimatedBottomBar.js similarity index 100% rename from src/components/Custom/AnimatedBottomBar.js rename to src/components/Animations/AnimatedBottomBar.js diff --git a/src/components/Custom/AnimatedFAB.js b/src/components/Animations/AnimatedFAB.js similarity index 100% rename from src/components/Custom/AnimatedFAB.js rename to src/components/Animations/AnimatedFAB.js diff --git a/src/components/Custom/AnimatedFocusView.js b/src/components/Animations/AnimatedFocusView.js similarity index 100% rename from src/components/Custom/AnimatedFocusView.js rename to src/components/Animations/AnimatedFocusView.js diff --git a/src/components/Dialog/AlertDialog.js b/src/components/Dialogs/AlertDialog.js similarity index 100% rename from src/components/Dialog/AlertDialog.js rename to src/components/Dialogs/AlertDialog.js diff --git a/src/components/Dialog/ErrorDialog.js b/src/components/Dialogs/ErrorDialog.js similarity index 100% rename from src/components/Dialog/ErrorDialog.js rename to src/components/Dialogs/ErrorDialog.js diff --git a/src/components/Dialog/LoadingConfirmDialog.js b/src/components/Dialogs/LoadingConfirmDialog.js similarity index 100% rename from src/components/Dialog/LoadingConfirmDialog.js rename to src/components/Dialogs/LoadingConfirmDialog.js diff --git a/src/components/Home/PreviewEventDashboardItem.js b/src/components/Home/PreviewEventDashboardItem.js index d6dfb85..9bc1e58 100644 --- a/src/components/Home/PreviewEventDashboardItem.js +++ b/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, diff --git a/src/components/Lists/ClubListHeader.js b/src/components/Lists/Clubs/ClubListHeader.js similarity index 100% rename from src/components/Lists/ClubListHeader.js rename to src/components/Lists/Clubs/ClubListHeader.js diff --git a/src/components/Lists/ClubListItem.js b/src/components/Lists/Clubs/ClubListItem.js similarity index 100% rename from src/components/Lists/ClubListItem.js rename to src/components/Lists/Clubs/ClubListItem.js diff --git a/src/components/Lists/GroupListAccordion.js b/src/components/Lists/PlanexGroups/GroupListAccordion.js similarity index 97% rename from src/components/Lists/GroupListAccordion.js rename to src/components/Lists/PlanexGroups/GroupListAccordion.js index 3b2b4e5..ce660a5 100644 --- a/src/components/Lists/GroupListAccordion.js +++ b/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"; diff --git a/src/components/Lists/GroupListItem.js b/src/components/Lists/PlanexGroups/GroupListItem.js similarity index 100% rename from src/components/Lists/GroupListItem.js rename to src/components/Lists/PlanexGroups/GroupListItem.js diff --git a/src/components/Lists/ProximoListItem.js b/src/components/Lists/Proximo/ProximoListItem.js similarity index 100% rename from src/components/Lists/ProximoListItem.js rename to src/components/Lists/Proximo/ProximoListItem.js diff --git a/src/components/Lists/ProxiwashListItem.js b/src/components/Lists/Proxiwash/ProxiwashListItem.js similarity index 98% rename from src/components/Lists/ProxiwashListItem.js rename to src/components/Lists/Proxiwash/ProxiwashListItem.js index f003129..5135932 100644 --- a/src/components/Lists/ProxiwashListItem.js +++ b/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 = { diff --git a/src/components/Lists/ProxiwashSectionHeader.js b/src/components/Lists/Proxiwash/ProxiwashSectionHeader.js similarity index 100% rename from src/components/Lists/ProxiwashSectionHeader.js rename to src/components/Lists/Proxiwash/ProxiwashSectionHeader.js diff --git a/src/components/Custom/CustomAgenda.js b/src/components/Overrides/CustomAgenda.js similarity index 100% rename from src/components/Custom/CustomAgenda.js rename to src/components/Overrides/CustomAgenda.js diff --git a/src/components/Custom/CustomHTML.js b/src/components/Overrides/CustomHTML.js similarity index 100% rename from src/components/Custom/CustomHTML.js rename to src/components/Overrides/CustomHTML.js diff --git a/src/components/Custom/HeaderButton.js b/src/components/Overrides/CustomHeaderButton.js similarity index 100% rename from src/components/Custom/HeaderButton.js rename to src/components/Overrides/CustomHeaderButton.js diff --git a/src/components/Custom/CustomIntroSlider.js b/src/components/Overrides/CustomIntroSlider.js similarity index 100% rename from src/components/Custom/CustomIntroSlider.js rename to src/components/Overrides/CustomIntroSlider.js diff --git a/src/components/Custom/CustomModal.js b/src/components/Overrides/CustomModal.js similarity index 100% rename from src/components/Custom/CustomModal.js rename to src/components/Overrides/CustomModal.js diff --git a/src/components/Custom/BasicLoadingScreen.js b/src/components/Screens/BasicLoadingScreen.js similarity index 100% rename from src/components/Custom/BasicLoadingScreen.js rename to src/components/Screens/BasicLoadingScreen.js diff --git a/src/components/Custom/ErrorView.js b/src/components/Screens/ErrorView.js similarity index 100% rename from src/components/Custom/ErrorView.js rename to src/components/Screens/ErrorView.js diff --git a/src/components/Lists/WebSectionList.js b/src/components/Screens/WebSectionList.js similarity index 98% rename from src/components/Lists/WebSectionList.js rename to src/components/Screens/WebSectionList.js index fca5013..5b72c62 100644 --- a/src/components/Lists/WebSectionList.js +++ b/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 BasicLoadingScreen from "../Custom/BasicLoadingScreen"; +import ErrorView from "./ErrorView"; +import BasicLoadingScreen from "./BasicLoadingScreen"; import {withCollapsible} from "../../utils/withCollapsible"; import * as Animatable from 'react-native-animatable'; import CustomTabBar from "../Tabbar/CustomTabBar"; diff --git a/src/components/Screens/WebViewScreen.js b/src/components/Screens/WebViewScreen.js index 5245d57..fff5538 100644 --- a/src/components/Screens/WebViewScreen.js +++ b/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 ErrorView from "../Custom/ErrorView"; +import BasicLoadingScreen from "./BasicLoadingScreen"; +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'; diff --git a/src/navigation/DrawerNavigator.js b/src/navigation/DrawerNavigator.js index a85e949..c982cbc 100644 --- a/src/navigation/DrawerNavigator.js +++ b/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"; diff --git a/src/navigation/MainTabNavigator.js b/src/navigation/MainTabNavigator.js index 154c21f..2e60825 100644 --- a/src/navigation/MainTabNavigator.js +++ b/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 MaterialHeaderButtons, {Item} from "../components/Custom/HeaderButton"; -import FeedItemScreen from "../screens/FeedItemScreen"; +import ScannerScreen from "../screens/Home/ScannerScreen"; +import MaterialHeaderButtons, {Item} from "../components/Overrides/CustomHeaderButton"; +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 = { diff --git a/src/screens/About/AboutScreen.js b/src/screens/About/AboutScreen.js index e7d843c..04001b5 100644 --- a/src/screens/About/AboutScreen.js +++ b/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 = { diff --git a/src/screens/About/DebugScreen.js b/src/screens/About/DebugScreen.js index 931eb8d..e9f8e8d 100644 --- a/src/screens/About/DebugScreen.js +++ b/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 = { diff --git a/src/screens/Amicale/Clubs/ClubDisplayScreen.js b/src/screens/Amicale/Clubs/ClubDisplayScreen.js index b453655..f7a667f 100644 --- a/src/screens/Amicale/Clubs/ClubDisplayScreen.js +++ b/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 = { diff --git a/src/screens/Amicale/Clubs/ClubListScreen.js b/src/screens/Amicale/Clubs/ClubListScreen.js index 04a30fb..6255c1d 100644 --- a/src/screens/Amicale/Clubs/ClubListScreen.js +++ b/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 MaterialHeaderButtons, {Item} from "../../../components/Custom/HeaderButton"; +import ClubListHeader from "../../../components/Lists/Clubs/ClubListHeader"; +import MaterialHeaderButtons, {Item} from "../../../components/Overrides/CustomHeaderButton"; import {withCollapsible} from "../../../utils/withCollapsible"; type Props = { diff --git a/src/screens/Amicale/LoginScreen.js b/src/screens/Amicale/LoginScreen.js index 66e6eab..1712ad8 100644 --- a/src/screens/Amicale/LoginScreen.js +++ b/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 = { diff --git a/src/screens/Amicale/ProfileScreen.js b/src/screens/Amicale/ProfileScreen.js index f4dd389..960583e 100644 --- a/src/screens/Amicale/ProfileScreen.js +++ b/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, diff --git a/src/screens/FeedItemScreen.js b/src/screens/Home/FeedItemScreen.js similarity index 93% rename from src/screens/FeedItemScreen.js rename to src/screens/Home/FeedItemScreen.js index 63404c8..a3c46e9 100644 --- a/src/screens/FeedItemScreen.js +++ b/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. diff --git a/src/screens/HomeScreen.js b/src/screens/Home/HomeScreen.js similarity index 95% rename from src/screens/HomeScreen.js rename to src/screens/Home/HomeScreen.js index cfce94e..ba9324d 100644 --- a/src/screens/HomeScreen.js +++ b/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 WebSectionList from "../components/Lists/WebSectionList"; +import DashboardItem from "../../components/Home/EventDashboardItem"; +import WebSectionList from "../../components/Screens/WebSectionList"; import {withTheme} from 'react-native-paper'; -import FeedItem from "../components/Home/FeedItem"; -import SquareDashboardItem from "../components/Home/SmallDashboardItem"; -import PreviewEventDashboardItem from "../components/Home/PreviewEventDashboardItem"; -import {stringToDate} from "../utils/Planning"; -import ActionsDashBoardItem from "../components/Home/ActionsDashboardItem"; -import ConnectionManager from "../managers/ConnectionManager"; +import FeedItem from "../../components/Home/FeedItem"; +import SquareDashboardItem from "../../components/Home/SmallDashboardItem"; +import PreviewEventDashboardItem from "../../components/Home/PreviewEventDashboardItem"; +import {stringToDate} from "../../utils/Planning"; +import ActionsDashBoardItem from "../../components/Home/ActionsDashboardItem"; +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 AnimatedFocusView from "../components/Custom/AnimatedFocusView"; +import AnimatedFAB from "../../components/Animations/AnimatedFAB"; +import AnimatedFocusView from "../../components/Animations/AnimatedFocusView"; // import DATA from "../dashboard_data.json"; diff --git a/src/screens/ScannerScreen.js b/src/screens/Home/ScannerScreen.js similarity index 97% rename from src/screens/ScannerScreen.js rename to src/screens/Home/ScannerScreen.js index b326ed5..f75b864 100644 --- a/src/screens/ScannerScreen.js +++ b/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 = { diff --git a/src/screens/SelfMenuScreen.js b/src/screens/Other/SelfMenuScreen.js similarity index 96% rename from src/screens/SelfMenuScreen.js rename to src/screens/Other/SelfMenuScreen.js index 02a13df..2c958c2 100644 --- a/src/screens/SelfMenuScreen.js +++ b/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 WebSectionList from "../components/Lists/WebSectionList"; +import DateManager from "../../managers/DateManager"; +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"; diff --git a/src/screens/SettingsScreen.js b/src/screens/Other/SettingsScreen.js similarity index 97% rename from src/screens/SettingsScreen.js rename to src/screens/Other/SettingsScreen.js index 6930591..80f75e7 100644 --- a/src/screens/SettingsScreen.js +++ b/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 {setMachineReminderNotificationTime} from "../utils/Notifications"; +import AsyncStorageManager from "../../managers/AsyncStorageManager"; +import {setMachineReminderNotificationTime} from "../../utils/Notifications"; import {Card, List, Switch, ToggleButton} from 'react-native-paper'; import {Appearance} from "react-native-appearance"; diff --git a/src/screens/GroupSelectionScreen.js b/src/screens/Planex/GroupSelectionScreen.js similarity index 95% rename from src/screens/GroupSelectionScreen.js rename to src/screens/Planex/GroupSelectionScreen.js index 34c1833..b3dda9f 100644 --- a/src/screens/GroupSelectionScreen.js +++ b/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 WebSectionList from "../components/Lists/WebSectionList"; -import GroupListAccordion from "../components/Lists/GroupListAccordion"; -import AsyncStorageManager from "../managers/AsyncStorageManager"; +import {stringMatchQuery} from "../../utils/Search"; +import WebSectionList from "../../components/Screens/WebSectionList"; +import GroupListAccordion from "../../components/Lists/PlanexGroups/GroupListAccordion"; +import AsyncStorageManager from "../../managers/AsyncStorageManager"; const LIST_ITEM_HEIGHT = 70; diff --git a/src/screens/Websites/PlanexScreen.js b/src/screens/Planex/PlanexScreen.js similarity index 97% rename from src/screens/Websites/PlanexScreen.js rename to src/screens/Planex/PlanexScreen.js index 75e5e4a..a25de48 100644 --- a/src/screens/Websites/PlanexScreen.js +++ b/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 AnimatedFocusView from "../../components/Custom/AnimatedFocusView"; +import ErrorView from "../../components/Screens/ErrorView"; +import AnimatedFocusView from "../../components/Animations/AnimatedFocusView"; type Props = { navigation: Object, diff --git a/src/screens/Planning/PlanningDisplayScreen.js b/src/screens/Planning/PlanningDisplayScreen.js index 6a2e3f2..8892ab1 100644 --- a/src/screens/Planning/PlanningDisplayScreen.js +++ b/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 CustomHTML from "../../components/Custom/CustomHTML"; +import ErrorView from "../../components/Screens/ErrorView"; +import CustomHTML from "../../components/Overrides/CustomHTML"; import CustomTabBar from "../../components/Tabbar/CustomTabBar"; type Props = { diff --git a/src/screens/Planning/PlanningScreen.js b/src/screens/Planning/PlanningScreen.js index 2a1d0f1..16bcfe1 100644 --- a/src/screens/Planning/PlanningScreen.js +++ b/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 AnimatedFocusView from "../../components/Custom/AnimatedFocusView"; +import CustomAgenda from "../../components/Overrides/CustomAgenda"; +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'], diff --git a/src/screens/Proximo/ProximoListScreen.js b/src/screens/Proximo/ProximoListScreen.js index d53a653..3f30ba5 100644 --- a/src/screens/Proximo/ProximoListScreen.js +++ b/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 MaterialHeaderButtons, {Item} from "../../components/Custom/HeaderButton"; +import ProximoListItem from "../../components/Lists/Proximo/ProximoListItem"; +import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton"; import {withCollapsible} from "../../utils/withCollapsible"; import CustomTabBar from "../../components/Tabbar/CustomTabBar"; import AutoHideHandler from "../../utils/AutoHideHandler"; diff --git a/src/screens/Proximo/ProximoMainScreen.js b/src/screens/Proximo/ProximoMainScreen.js index fd31628..ba683d8 100644 --- a/src/screens/Proximo/ProximoMainScreen.js +++ b/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 AnimatedFocusView from "../../components/Custom/AnimatedFocusView"; +import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton"; +import AnimatedFocusView from "../../components/Animations/AnimatedFocusView"; const DATA_URL = "https://etud.insa-toulouse.fr/~proximo/data/stock-v2.json"; const LIST_ITEM_HEIGHT = 84; diff --git a/src/screens/Proxiwash/ProxiwashScreen.js b/src/screens/Proxiwash/ProxiwashScreen.js index 5118c62..65efb2c 100644 --- a/src/screens/Proxiwash/ProxiwashScreen.js +++ b/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 ProxiwashSectionHeader from "../../components/Lists/ProxiwashSectionHeader"; +import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton"; +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"; diff --git a/src/screens/Tetris/TetrisScreen.js b/src/screens/Tetris/TetrisScreen.js index b7beb29..3d064ae 100644 --- a/src/screens/Tetris/TetrisScreen.js +++ b/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,