From cc6fd184c5aa77a7a4cfc64aafac84c96ad43248 Mon Sep 17 00:00:00 2001 From: keplyx Date: Sat, 28 Sep 2019 12:01:19 +0200 Subject: [PATCH] Grouped proxiwash screens files --- navigation/AppNavigator.js | 2 +- navigation/MainDrawerNavigator.js | 2 +- navigation/MainTabNavigator.js | 2 +- screens/{ => Proxiwash}/ProxiwashAboutScreen.js | 8 ++++---- screens/{ => Proxiwash}/ProxiwashScreen.js | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) rename screens/{ => Proxiwash}/ProxiwashAboutScreen.js (96%) rename screens/{ => Proxiwash}/ProxiwashScreen.js (97%) diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js index 24e971a..1b47029 100644 --- a/navigation/AppNavigator.js +++ b/navigation/AppNavigator.js @@ -6,7 +6,7 @@ import SettingsScreen from '../screens/SettingsScreen'; import AboutScreen from '../screens/About/AboutScreen'; import ProximoListScreen from '../screens/Proximo/ProximoListScreen'; import AboutDependenciesScreen from '../screens/About/AboutDependenciesScreen'; -import ProxiwashAboutScreen from '../screens/ProxiwashAboutScreen'; +import ProxiwashAboutScreen from '../screens/Proxiwash/ProxiwashAboutScreen'; import ProximoAboutScreen from '../screens/Proximo/ProximoAboutScreen'; import SelfMenuScreen from '../screens/SelfMenuScreen'; import DebugScreen from '../screens/DebugScreen'; diff --git a/navigation/MainDrawerNavigator.js b/navigation/MainDrawerNavigator.js index 4d7894f..9449c8a 100644 --- a/navigation/MainDrawerNavigator.js +++ b/navigation/MainDrawerNavigator.js @@ -5,7 +5,7 @@ import {createDrawerNavigator} from 'react-navigation'; import HomeScreen from '../screens/HomeScreen'; import PlanningScreen from '../screens/PlanningScreen'; -import ProxiwashScreen from '../screens/ProxiwashScreen'; +import ProxiwashScreen from '../screens/Proxiwash/ProxiwashScreen'; import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen'; import PlanexScreen from '../screens/PlanexScreen'; import SettingsScreen from '../screens/SettingsScreen'; diff --git a/navigation/MainTabNavigator.js b/navigation/MainTabNavigator.js index b448010..2151431 100644 --- a/navigation/MainTabNavigator.js +++ b/navigation/MainTabNavigator.js @@ -3,7 +3,7 @@ import {createMaterialBottomTabNavigator} from "react-navigation-material-bottom import HomeScreen from '../screens/HomeScreen'; import PlanningScreen from '../screens/PlanningScreen'; -import ProxiwashScreen from '../screens/ProxiwashScreen'; +import ProxiwashScreen from '../screens/Proxiwash/ProxiwashScreen'; import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen'; import PlanexScreen from '../screens/PlanexScreen'; import CustomMaterialIcon from "../components/CustomMaterialIcon"; diff --git a/screens/ProxiwashAboutScreen.js b/screens/Proxiwash/ProxiwashAboutScreen.js similarity index 96% rename from screens/ProxiwashAboutScreen.js rename to screens/Proxiwash/ProxiwashAboutScreen.js index f1c6cf3..b685b64 100644 --- a/screens/ProxiwashAboutScreen.js +++ b/screens/Proxiwash/ProxiwashAboutScreen.js @@ -3,10 +3,10 @@ import * as React from 'react'; import {Image, Linking, View} from 'react-native'; import {Body, Card, CardItem, Container, Content, H2, H3, Left, Tab, TabHeading, Tabs, Text} from 'native-base'; -import CustomHeader from "../components/CustomHeader"; +import CustomHeader from "../../components/CustomHeader"; import i18n from "i18n-js"; -import CustomMaterialIcon from "../components/CustomMaterialIcon"; -import ThemeManager from "../utils/ThemeManager"; +import CustomMaterialIcon from "../../components/CustomMaterialIcon"; +import ThemeManager from "../../utils/ThemeManager"; type Props = { navigation: Object, @@ -60,7 +60,7 @@ export default class ProxiwashAboutScreen extends React.Component { alignItems: 'center' }}> diff --git a/screens/ProxiwashScreen.js b/screens/Proxiwash/ProxiwashScreen.js similarity index 97% rename from screens/ProxiwashScreen.js rename to screens/Proxiwash/ProxiwashScreen.js index 24ef7bc..4162118 100644 --- a/screens/ProxiwashScreen.js +++ b/screens/Proxiwash/ProxiwashScreen.js @@ -3,14 +3,14 @@ import * as React from 'react'; import {Alert, Platform, View} from 'react-native'; import {Body, Card, CardItem, Left, Right, Text} from 'native-base'; -import ThemeManager from '../utils/ThemeManager'; +import ThemeManager from '../../utils/ThemeManager'; import i18n from "i18n-js"; -import CustomMaterialIcon from "../components/CustomMaterialIcon"; -import FetchedDataSectionList from "../components/FetchedDataSectionList"; -import NotificationsManager from "../utils/NotificationsManager"; +import CustomMaterialIcon from "../../components/CustomMaterialIcon"; +import FetchedDataSectionList from "../../components/FetchedDataSectionList"; +import NotificationsManager from "../../utils/NotificationsManager"; import PlatformTouchable from "react-native-platform-touchable"; import Touchable from "react-native-platform-touchable"; -import AsyncStorageManager from "../utils/AsyncStorageManager"; +import AsyncStorageManager from "../../utils/AsyncStorageManager"; import * as Expo from "expo"; const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/washinsa/washinsa.json";