Browse Source

Improved project structure

Arnaud Vergnet 1 year ago
parent
commit
bdeae6933a
48 changed files with 81 additions and 81 deletions
  1. 1
    1
      App.js
  2. 2
    2
      src/components/Amicale/AuthenticatedScreen.js
  3. 1
    1
      src/components/Amicale/LogoutDialog.js
  4. 2
    2
      src/components/Amicale/Vote/VoteSelect.js
  5. 0
    0
      src/components/Animations/AnimatedBottomBar.js
  6. 0
    0
      src/components/Animations/AnimatedFAB.js
  7. 0
    0
      src/components/Animations/AnimatedFocusView.js
  8. 0
    0
      src/components/Dialogs/AlertDialog.js
  9. 0
    0
      src/components/Dialogs/ErrorDialog.js
  10. 0
    0
      src/components/Dialogs/LoadingConfirmDialog.js
  11. 1
    1
      src/components/Home/PreviewEventDashboardItem.js
  12. 0
    0
      src/components/Lists/Clubs/ClubListHeader.js
  13. 0
    0
      src/components/Lists/Clubs/ClubListItem.js
  14. 1
    1
      src/components/Lists/PlanexGroups/GroupListAccordion.js
  15. 0
    0
      src/components/Lists/PlanexGroups/GroupListItem.js
  16. 0
    0
      src/components/Lists/Proximo/ProximoListItem.js
  17. 2
    2
      src/components/Lists/Proxiwash/ProxiwashListItem.js
  18. 0
    0
      src/components/Lists/Proxiwash/ProxiwashSectionHeader.js
  19. 0
    0
      src/components/Overrides/CustomAgenda.js
  20. 0
    0
      src/components/Overrides/CustomHTML.js
  21. 0
    0
      src/components/Overrides/CustomHeaderButton.js
  22. 0
    0
      src/components/Overrides/CustomIntroSlider.js
  23. 0
    0
      src/components/Overrides/CustomModal.js
  24. 0
    0
      src/components/Screens/BasicLoadingScreen.js
  25. 0
    0
      src/components/Screens/ErrorView.js
  26. 2
    2
      src/components/Screens/WebSectionList.js
  27. 3
    3
      src/components/Screens/WebViewScreen.js
  28. 3
    3
      src/navigation/DrawerNavigator.js
  29. 6
    6
      src/navigation/MainTabNavigator.js
  30. 1
    1
      src/screens/About/AboutScreen.js
  31. 1
    1
      src/screens/About/DebugScreen.js
  32. 1
    1
      src/screens/Amicale/Clubs/ClubDisplayScreen.js
  33. 3
    3
      src/screens/Amicale/Clubs/ClubListScreen.js
  34. 1
    1
      src/screens/Amicale/LoginScreen.js
  35. 1
    1
      src/screens/Amicale/ProfileScreen.js
  36. 3
    3
      src/screens/Home/FeedItemScreen.js
  37. 11
    11
      src/screens/Home/HomeScreen.js
  38. 3
    3
      src/screens/Home/ScannerScreen.js
  39. 3
    3
      src/screens/Other/SelfMenuScreen.js
  40. 3
    3
      src/screens/Other/SettingsScreen.js
  41. 4
    4
      src/screens/Planex/GroupSelectionScreen.js
  42. 4
    4
      src/screens/Planex/PlanexScreen.js
  43. 3
    3
      src/screens/Planning/PlanningDisplayScreen.js
  44. 2
    2
      src/screens/Planning/PlanningScreen.js
  45. 3
    3
      src/screens/Proximo/ProximoListScreen.js
  46. 3
    3
      src/screens/Proximo/ProximoMainScreen.js
  47. 6
    6
      src/screens/Proxiwash/ProxiwashScreen.js
  48. 1
    1
      src/screens/Tetris/TetrisScreen.js

+ 1
- 1
App.js View File

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

+ 2
- 2
src/components/Amicale/AuthenticatedScreen.js View File

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

+ 1
- 1
src/components/Amicale/LogoutDialog.js View File

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

+ 2
- 2
src/components/Amicale/Vote/VoteSelect.js View File

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

src/components/Custom/AnimatedBottomBar.js → src/components/Animations/AnimatedBottomBar.js View File


src/components/Custom/AnimatedFAB.js → src/components/Animations/AnimatedFAB.js View File


src/components/Custom/AnimatedFocusView.js → src/components/Animations/AnimatedFocusView.js View File


src/components/Dialog/AlertDialog.js → src/components/Dialogs/AlertDialog.js View File


src/components/Dialog/ErrorDialog.js → src/components/Dialogs/ErrorDialog.js View File


src/components/Dialog/LoadingConfirmDialog.js → src/components/Dialogs/LoadingConfirmDialog.js View File


+ 1
- 1
src/components/Home/PreviewEventDashboardItem.js View File

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

src/components/Lists/ClubListHeader.js → src/components/Lists/Clubs/ClubListHeader.js View File


src/components/Lists/ClubListItem.js → src/components/Lists/Clubs/ClubListItem.js View File


src/components/Lists/GroupListAccordion.js → src/components/Lists/PlanexGroups/GroupListAccordion.js View File

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

src/components/Lists/GroupListItem.js → src/components/Lists/PlanexGroups/GroupListItem.js View File


src/components/Lists/ProximoListItem.js → src/components/Lists/Proximo/ProximoListItem.js View File


src/components/Lists/ProxiwashListItem.js → src/components/Lists/Proxiwash/ProxiwashListItem.js View File

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

src/components/Lists/ProxiwashSectionHeader.js → src/components/Lists/Proxiwash/ProxiwashSectionHeader.js View File


src/components/Custom/CustomAgenda.js → src/components/Overrides/CustomAgenda.js View File


src/components/Custom/CustomHTML.js → src/components/Overrides/CustomHTML.js View File


src/components/Custom/HeaderButton.js → src/components/Overrides/CustomHeaderButton.js View File


src/components/Custom/CustomIntroSlider.js → src/components/Overrides/CustomIntroSlider.js View File


src/components/Custom/CustomModal.js → src/components/Overrides/CustomModal.js View File


src/components/Custom/BasicLoadingScreen.js → src/components/Screens/BasicLoadingScreen.js View File


src/components/Custom/ErrorView.js → src/components/Screens/ErrorView.js View File


src/components/Lists/WebSectionList.js → src/components/Screens/WebSectionList.js View File

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

+ 3
- 3
src/components/Screens/WebViewScreen.js View File

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

+ 3
- 3
src/navigation/DrawerNavigator.js View File

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

+ 6
- 6
src/navigation/MainTabNavigator.js View File

@@ -2,7 +2,7 @@ import * as React from 'react';
2 2
 import {createStackNavigator, TransitionPresets} from '@react-navigation/stack';
3 3
 import {createBottomTabNavigator} from "@react-navigation/bottom-tabs";
4 4
 
5
-import HomeScreen from '../screens/HomeScreen';
5
+import HomeScreen from '../screens/Home/HomeScreen';
6 6
 import PlanningScreen from '../screens/Planning/PlanningScreen';
7 7
 import PlanningDisplayScreen from '../screens/Planning/PlanningDisplayScreen';
8 8
 import ProxiwashScreen from '../screens/Proxiwash/ProxiwashScreen';
@@ -10,16 +10,16 @@ import ProxiwashAboutScreen from '../screens/Proxiwash/ProxiwashAboutScreen';
10 10
 import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen';
11 11
 import ProximoListScreen from "../screens/Proximo/ProximoListScreen";
12 12
 import ProximoAboutScreen from "../screens/Proximo/ProximoAboutScreen";
13
-import PlanexScreen from '../screens/Websites/PlanexScreen';
13
+import PlanexScreen from '../screens/Planex/PlanexScreen';
14 14
 import AsyncStorageManager from "../managers/AsyncStorageManager";
15 15
 import {useTheme, withTheme} from 'react-native-paper';
16 16
 import i18n from "i18n-js";
17 17
 import ClubDisplayScreen from "../screens/Amicale/Clubs/ClubDisplayScreen";
18
-import ScannerScreen from "../screens/ScannerScreen";
19
-import MaterialHeaderButtons, {Item} from "../components/Custom/HeaderButton";
20
-import FeedItemScreen from "../screens/FeedItemScreen";
18
+import ScannerScreen from "../screens/Home/ScannerScreen";
19
+import MaterialHeaderButtons, {Item} from "../components/Overrides/CustomHeaderButton";
20
+import FeedItemScreen from "../screens/Home/FeedItemScreen";
21 21
 import {createCollapsibleStack} from "react-navigation-collapsible";
22
-import GroupSelectionScreen from "../screens/GroupSelectionScreen";
22
+import GroupSelectionScreen from "../screens/Planex/GroupSelectionScreen";
23 23
 import CustomTabBar from "../components/Tabbar/CustomTabBar";
24 24
 
25 25
 const TAB_ICONS = {

+ 1
- 1
src/screens/About/AboutScreen.js View File

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

+ 1
- 1
src/screens/About/DebugScreen.js View File

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

+ 1
- 1
src/screens/Amicale/Clubs/ClubDisplayScreen.js View File

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

+ 3
- 3
src/screens/Amicale/Clubs/ClubListScreen.js View File

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

+ 1
- 1
src/screens/Amicale/LoginScreen.js View File

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

+ 1
- 1
src/screens/Amicale/ProfileScreen.js View File

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

src/screens/FeedItemScreen.js → src/screens/Home/FeedItemScreen.js View File

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

src/screens/HomeScreen.js → src/screens/Home/HomeScreen.js View File

@@ -3,20 +3,20 @@
3 3
 import * as React from 'react';
4 4
 import {Animated, FlatList} from 'react-native';
5 5
 import i18n from "i18n-js";
6
-import DashboardItem from "../components/Home/EventDashboardItem";
7
-import WebSectionList from "../components/Lists/WebSectionList";
6
+import DashboardItem from "../../components/Home/EventDashboardItem";
7
+import WebSectionList from "../../components/Screens/WebSectionList";
8 8
 import {withTheme} from 'react-native-paper';
9
-import FeedItem from "../components/Home/FeedItem";
10
-import SquareDashboardItem from "../components/Home/SmallDashboardItem";
11
-import PreviewEventDashboardItem from "../components/Home/PreviewEventDashboardItem";
12
-import {stringToDate} from "../utils/Planning";
13
-import ActionsDashBoardItem from "../components/Home/ActionsDashboardItem";
14
-import ConnectionManager from "../managers/ConnectionManager";
9
+import FeedItem from "../../components/Home/FeedItem";
10
+import SquareDashboardItem from "../../components/Home/SmallDashboardItem";
11
+import PreviewEventDashboardItem from "../../components/Home/PreviewEventDashboardItem";
12
+import {stringToDate} from "../../utils/Planning";
13
+import ActionsDashBoardItem from "../../components/Home/ActionsDashboardItem";
14
+import ConnectionManager from "../../managers/ConnectionManager";
15 15
 import {CommonActions} from '@react-navigation/native';
16
-import MaterialHeaderButtons, {Item} from "../components/Custom/HeaderButton";
16
+import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
17 17
 import {AnimatedValue} from "react-native-reanimated";
18
-import AnimatedFAB from "../components/Custom/AnimatedFAB";
19
-import AnimatedFocusView from "../components/Custom/AnimatedFocusView";
18
+import AnimatedFAB from "../../components/Animations/AnimatedFAB";
19
+import AnimatedFocusView from "../../components/Animations/AnimatedFocusView";
20 20
 // import DATA from "../dashboard_data.json";
21 21
 
22 22
 

src/screens/ScannerScreen.js → src/screens/Home/ScannerScreen.js View File

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

src/screens/SelfMenuScreen.js → src/screens/Other/SelfMenuScreen.js View File

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

src/screens/SettingsScreen.js → src/screens/Other/SettingsScreen.js View File

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

src/screens/GroupSelectionScreen.js → src/screens/Planex/GroupSelectionScreen.js View File

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

src/screens/Websites/PlanexScreen.js → src/screens/Planex/PlanexScreen.js View File

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

+ 3
- 3
src/screens/Planning/PlanningDisplayScreen.js View File

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

+ 2
- 2
src/screens/Planning/PlanningScreen.js View File

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

+ 3
- 3
src/screens/Proximo/ProximoListScreen.js View File

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

+ 3
- 3
src/screens/Proximo/ProximoMainScreen.js View File

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

+ 6
- 6
src/screens/Proxiwash/ProxiwashScreen.js View File

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

+ 1
- 1
src/screens/Tetris/TetrisScreen.js View File

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

Loading…
Cancel
Save