From 850a64571cac5050bc39842731986a93fd8d19bb Mon Sep 17 00:00:00 2001 From: keplyx Date: Sun, 8 Mar 2020 14:22:03 +0100 Subject: [PATCH] Improved files path coherence --- navigation/DrawerNavigator.js | 2 +- navigation/MainTabNavigator.js | 4 ++-- screens/{ => About}/DebugScreen.js | 8 ++++---- screens/{ => Planning}/PlanningDisplayScreen.js | 4 ++-- screens/{ => Planning}/PlanningScreen.js | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) rename screens/{ => About}/DebugScreen.js (95%) rename screens/{ => Planning}/PlanningDisplayScreen.js (94%) rename screens/{ => Planning}/PlanningScreen.js (97%) diff --git a/navigation/DrawerNavigator.js b/navigation/DrawerNavigator.js index 3b7a56b..71235ee 100644 --- a/navigation/DrawerNavigator.js +++ b/navigation/DrawerNavigator.js @@ -9,7 +9,7 @@ import AboutDependenciesScreen from '../screens/About/AboutDependenciesScreen'; import SelfMenuScreen from '../screens/SelfMenuScreen'; import AvailableRoomScreen from "../screens/Websites/AvailableRoomScreen"; import BibScreen from "../screens/Websites/BibScreen"; -import DebugScreen from '../screens/DebugScreen'; +import DebugScreen from '../screens/About/DebugScreen'; import Sidebar from "../components/Sidebar"; import {createStackNavigator, TransitionPresets} from "@react-navigation/stack"; import HeaderButton from "../components/HeaderButton"; diff --git a/navigation/MainTabNavigator.js b/navigation/MainTabNavigator.js index 89bdc16..3392976 100644 --- a/navigation/MainTabNavigator.js +++ b/navigation/MainTabNavigator.js @@ -3,8 +3,8 @@ import {createStackNavigator, TransitionPresets} from '@react-navigation/stack'; import {createMaterialBottomTabNavigator} from "@react-navigation/material-bottom-tabs"; import HomeScreen from '../screens/HomeScreen'; -import PlanningScreen from '../screens/PlanningScreen'; -import PlanningDisplayScreen from '../screens/PlanningDisplayScreen'; +import PlanningScreen from '../screens/Planning/PlanningScreen'; +import PlanningDisplayScreen from '../screens/Planning/PlanningDisplayScreen'; import ProxiwashScreen from '../screens/Proxiwash/ProxiwashScreen'; import ProxiwashAboutScreen from '../screens/Proxiwash/ProxiwashAboutScreen'; import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen'; diff --git a/screens/DebugScreen.js b/screens/About/DebugScreen.js similarity index 95% rename from screens/DebugScreen.js rename to screens/About/DebugScreen.js index a2b258d..98e1565 100644 --- a/screens/DebugScreen.js +++ b/screens/About/DebugScreen.js @@ -1,11 +1,11 @@ // @flow import * as React from 'react'; -import ThemeManager from '../utils/ThemeManager'; +import ThemeManager from '../../utils/ThemeManager'; import {Alert, Clipboard, ScrollView, View} from "react-native"; -import AsyncStorageManager from "../utils/AsyncStorageManager"; -import NotificationsManager from "../utils/NotificationsManager"; -import CustomModal from "../components/CustomModal"; +import AsyncStorageManager from "../../utils/AsyncStorageManager"; +import NotificationsManager from "../../utils/NotificationsManager"; +import CustomModal from "../../components/CustomModal"; import {Button, Card, List, Subheading, TextInput, Title} from 'react-native-paper'; type Props = { diff --git a/screens/PlanningDisplayScreen.js b/screens/Planning/PlanningDisplayScreen.js similarity index 94% rename from screens/PlanningDisplayScreen.js rename to screens/Planning/PlanningDisplayScreen.js index ffb96e5..9caf9a8 100644 --- a/screens/PlanningDisplayScreen.js +++ b/screens/Planning/PlanningDisplayScreen.js @@ -2,10 +2,10 @@ import * as React from 'react'; import {Image, ScrollView, View} from 'react-native'; -import ThemeManager from "../utils/ThemeManager"; +import ThemeManager from "../../utils/ThemeManager"; import HTML from "react-native-render-html"; import {Linking} from "expo"; -import PlanningEventManager from '../utils/PlanningEventManager'; +import PlanningEventManager from '../../utils/PlanningEventManager'; import {Card} from 'react-native-paper'; type Props = { diff --git a/screens/PlanningScreen.js b/screens/Planning/PlanningScreen.js similarity index 97% rename from screens/PlanningScreen.js rename to screens/Planning/PlanningScreen.js index 9efb51e..565b253 100644 --- a/screens/PlanningScreen.js +++ b/screens/Planning/PlanningScreen.js @@ -4,11 +4,11 @@ import * as React from 'react'; import {BackHandler, View} from 'react-native'; import i18n from "i18n-js"; import {LocaleConfig} from 'react-native-calendars'; -import WebDataManager from "../utils/WebDataManager"; -import PlanningEventManager from '../utils/PlanningEventManager'; +import WebDataManager from "../../utils/WebDataManager"; +import PlanningEventManager from '../../utils/PlanningEventManager'; import {Avatar, Divider, List} from 'react-native-paper'; -import CustomAgenda from "../components/CustomAgenda"; -import AprilFoolsManager from "../utils/AprilFoolsManager"; +import CustomAgenda from "../../components/CustomAgenda"; +import AprilFoolsManager from "../../utils/AprilFoolsManager"; LocaleConfig.locales['fr'] = { monthNames: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],