From c048032781e5ab3e9d3465966d7c8ec80ea0227b Mon Sep 17 00:00:00 2001 From: keplyx Date: Thu, 30 Jan 2020 15:53:20 +0100 Subject: [PATCH 01/10] Fixed webview crash on refresh after screen rotation --- components/WebViewScreen.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/WebViewScreen.js b/components/WebViewScreen.js index 5ca209a..eb4ac9b 100644 --- a/components/WebViewScreen.js +++ b/components/WebViewScreen.js @@ -62,19 +62,22 @@ export default class WebViewScreen extends React.Component { refreshWebview() { for (let view of this.webviewArray) { - view.reload(); + if (view !== null) + view.reload(); } } goBackWebview() { for (let view of this.webviewArray) { - view.goBack(); + if (view !== null) + view.goBack(); } } goForwardWebview() { for (let view of this.webviewArray) { - view.goForward(); + if (view !== null) + view.goForward(); } } @@ -132,6 +135,7 @@ export default class WebViewScreen extends React.Component { render() { const nav = this.props.navigation; + this.webviewArray = []; return ( Date: Thu, 30 Jan 2020 17:42:11 +0100 Subject: [PATCH 02/10] Added bluemind screen, reworked sidemenu and changed planex default zoom --- components/CustomHeader.js | 8 -- components/Sidebar.js | 110 ++++++++++++------ native-base-theme/variables/platform.js | 2 +- native-base-theme/variables/platformDark.js | 2 +- navigation/AppNavigator.js | 12 +- navigation/MainDrawerNavigator.js | 2 +- navigation/MainTabNavigator.js | 2 +- screens/About/AboutScreen.js | 2 +- screens/{ => Websites}/AmicaleScreen.js | 4 +- screens/{ => Websites}/AvailableRoomScreen.js | 2 +- screens/Websites/BlueMindScreen.js | 53 +++++++++ screens/{ => Websites}/ElusEtudScreen.js | 4 +- screens/{ => Websites}/PlanexScreen.js | 6 +- screens/{ => Websites}/TutorInsaScreen.js | 4 +- screens/{ => Websites}/WiketudScreen.js | 4 +- translations/en.json | 5 + translations/fr.json | 5 + 17 files changed, 160 insertions(+), 67 deletions(-) rename screens/{ => Websites}/AmicaleScreen.js (87%) rename screens/{ => Websites}/AvailableRoomScreen.js (98%) create mode 100644 screens/Websites/BlueMindScreen.js rename screens/{ => Websites}/ElusEtudScreen.js (88%) rename screens/{ => Websites}/PlanexScreen.js (96%) rename screens/{ => Websites}/TutorInsaScreen.js (88%) rename screens/{ => Websites}/WiketudScreen.js (87%) diff --git a/components/CustomHeader.js b/components/CustomHeader.js index 7bf9669..ea10dcf 100644 --- a/components/CustomHeader.js +++ b/components/CustomHeader.js @@ -98,14 +98,6 @@ export default class CustomHeader extends React.Component { {this.props.rightButton} - {this.props.hasBackButton ? : - this.props.navigation.navigate('SettingsScreen')}> - - } ); } diff --git a/components/Sidebar.js b/components/Sidebar.js index 42eb3f0..cb744fa 100644 --- a/components/Sidebar.js +++ b/components/Sidebar.js @@ -41,6 +41,10 @@ export default class SideBar extends React.Component { // Dataset used to render the drawer // If the link field is defined, clicking on the item will open the link this.dataSet = [ + { + name: i18n.t('sidenav.divider1'), + route: "Divider1" + }, { name: "Amicale", route: "AmicaleScreen", @@ -61,6 +65,15 @@ export default class SideBar extends React.Component { route: "TutorInsaScreen", icon: "school", }, + { + name: "Mails BlueMind", + route: "BlueMindScreen", + icon: "email", + }, + { + name: i18n.t('sidenav.divider2'), + route: "Divider2" + }, { name: i18n.t('screens.availableRooms'), route: "AvailableRoomScreen", @@ -71,9 +84,68 @@ export default class SideBar extends React.Component { route: "SelfMenuScreen", icon: "silverware-fork-knife", }, + { + name: i18n.t('sidenav.divider3'), + route: "Divider3" + }, + { + name: i18n.t('screens.settings'), + route: "SettingsScreen", + icon: "settings", + }, ]; } + getRenderItem(item: Object) { + if (item.icon !== undefined) { + return ( + { + if (item.link !== undefined) + Linking.openURL(item.link).catch((err) => console.error('Error opening link', err)); + else + this.navigateToScreen(item.route); + }} + > + + + + {item.name} + + + {item.types && + + + {`${item.types} Types`} + + } + + ); + } else { + return ( + + {item.name} + + ); + } + + } + /** * Navigate to the selected route * @param route {string} The route name to navigate to @@ -92,43 +164,7 @@ export default class SideBar extends React.Component { data={this.dataSet} extraData={this.state} keyExtractor={(item) => item.route} - renderItem={({item}) => - { - if (item.link !== undefined) - Linking.openURL(item.link).catch((err) => console.error('Error opening link', err)); - else - this.navigateToScreen(item.route); - }} - > - - - - {item.name} - - - {item.types && - - - {`${item.types} Types`} - - } - } + renderItem={({item}) => this.getRenderItem(item)} /> ); diff --git a/native-base-theme/variables/platform.js b/native-base-theme/variables/platform.js index b458413..159a4b1 100644 --- a/native-base-theme/variables/platform.js +++ b/native-base-theme/variables/platform.js @@ -250,7 +250,7 @@ export default { // List listBg: 'transparent', listBorderColor: '#c9c9c9', - listDividerBg: '#f4f4f4', + listDividerBg: '#e2e2e2', listBtnUnderlayColor: '#DDD', listItemPadding: platform === PLATFORM.IOS ? 10 : 12, listNoteColor: '#808080', diff --git a/native-base-theme/variables/platformDark.js b/native-base-theme/variables/platformDark.js index cce16c1..5d640ee 100644 --- a/native-base-theme/variables/platformDark.js +++ b/native-base-theme/variables/platformDark.js @@ -250,7 +250,7 @@ export default { // List listBg: 'transparent', listBorderColor: '#3e3e3e', - listDividerBg: '#f4f4f4', + listDividerBg: '#222222', listBtnUnderlayColor: '#3a3a3a', listItemPadding: platform === PLATFORM.IOS ? 10 : 12, listNoteColor: '#acacac', diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js index 3327e4a..fb54342 100644 --- a/navigation/AppNavigator.js +++ b/navigation/AppNavigator.js @@ -9,11 +9,12 @@ import AboutDependenciesScreen from '../screens/About/AboutDependenciesScreen'; import ProxiwashAboutScreen from '../screens/Proxiwash/ProxiwashAboutScreen'; import ProximoAboutScreen from '../screens/Proximo/ProximoAboutScreen'; import SelfMenuScreen from '../screens/SelfMenuScreen'; -import TutorInsaScreen from "../screens/TutorInsaScreen"; -import AmicaleScreen from "../screens/AmicaleScreen"; -import WiketudScreen from "../screens/WiketudScreen"; -import ElusEtudScreen from "../screens/ElusEtudScreen"; -import AvailableRoomScreen from "../screens/AvailableRoomScreen"; +import TutorInsaScreen from "../screens/Websites/TutorInsaScreen"; +import AmicaleScreen from "../screens/Websites/AmicaleScreen"; +import WiketudScreen from "../screens/Websites/WiketudScreen"; +import ElusEtudScreen from "../screens/Websites/ElusEtudScreen"; +import BlueMindScreen from "../screens/Websites/BlueMindScreen"; +import AvailableRoomScreen from "../screens/Websites/AvailableRoomScreen"; import DebugScreen from '../screens/DebugScreen'; import {fromRight} from "react-navigation-transitions"; @@ -35,6 +36,7 @@ function createAppContainerWithInitialRoute(initialRoute: string) { AmicaleScreen: {screen: AmicaleScreen}, WiketudScreen: {screen: WiketudScreen}, ElusEtudScreen: {screen: ElusEtudScreen}, + BlueMindScreen: {screen: BlueMindScreen}, AvailableRoomScreen: {screen: AvailableRoomScreen}, ProxiwashAboutScreen: {screen: ProxiwashAboutScreen}, ProximoAboutScreen: {screen: ProximoAboutScreen}, diff --git a/navigation/MainDrawerNavigator.js b/navigation/MainDrawerNavigator.js index 9449c8a..a2f291a 100644 --- a/navigation/MainDrawerNavigator.js +++ b/navigation/MainDrawerNavigator.js @@ -7,7 +7,7 @@ import HomeScreen from '../screens/HomeScreen'; import PlanningScreen from '../screens/PlanningScreen'; import ProxiwashScreen from '../screens/Proxiwash/ProxiwashScreen'; import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen'; -import PlanexScreen from '../screens/PlanexScreen'; +import PlanexScreen from '../screens/Websites/PlanexScreen'; import SettingsScreen from '../screens/SettingsScreen'; import AboutScreen from '../screens/About/AboutScreen'; import Sidebar from "../components/Sidebar"; diff --git a/navigation/MainTabNavigator.js b/navigation/MainTabNavigator.js index 33ec229..5bfa445 100644 --- a/navigation/MainTabNavigator.js +++ b/navigation/MainTabNavigator.js @@ -5,7 +5,7 @@ import HomeScreen from '../screens/HomeScreen'; import PlanningScreen from '../screens/PlanningScreen'; import ProxiwashScreen from '../screens/Proxiwash/ProxiwashScreen'; import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen'; -import PlanexScreen from '../screens/PlanexScreen'; +import PlanexScreen from '../screens/Websites/PlanexScreen'; import CustomMaterialIcon from "../components/CustomMaterialIcon"; import ThemeManager from "../utils/ThemeManager"; import AsyncStorageManager from "../utils/AsyncStorageManager"; diff --git a/screens/About/AboutScreen.js b/screens/About/AboutScreen.js index 0c361ca..ee5457b 100644 --- a/screens/About/AboutScreen.js +++ b/screens/About/AboutScreen.js @@ -39,7 +39,7 @@ const links = { "Application Amicale INSA Toulouse" + "&body=" + "Coucou !\n\n", - yohanLinkedin: 'https://www.linkedin.com/in/yohan-simard', // TODO set real link + yohanLinkedin: 'https://www.linkedin.com/in/yohan-simard', react: 'https://facebook.github.io/react-native/', }; diff --git a/screens/AmicaleScreen.js b/screens/Websites/AmicaleScreen.js similarity index 87% rename from screens/AmicaleScreen.js rename to screens/Websites/AmicaleScreen.js index 8abfafb..38b5bfc 100644 --- a/screens/AmicaleScreen.js +++ b/screens/Websites/AmicaleScreen.js @@ -1,8 +1,8 @@ // @flow import * as React from 'react'; -import ThemeManager from "../utils/ThemeManager"; -import WebViewScreen from "../components/WebViewScreen"; +import ThemeManager from "../../utils/ThemeManager"; +import WebViewScreen from "../../components/WebViewScreen"; type Props = { navigation: Object, diff --git a/screens/AvailableRoomScreen.js b/screens/Websites/AvailableRoomScreen.js similarity index 98% rename from screens/AvailableRoomScreen.js rename to screens/Websites/AvailableRoomScreen.js index a3448e1..04294c2 100644 --- a/screens/AvailableRoomScreen.js +++ b/screens/Websites/AvailableRoomScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import WebViewScreen from "../components/WebViewScreen"; +import WebViewScreen from "../../components/WebViewScreen"; import i18n from "i18n-js"; type Props = { diff --git a/screens/Websites/BlueMindScreen.js b/screens/Websites/BlueMindScreen.js new file mode 100644 index 0000000..8031463 --- /dev/null +++ b/screens/Websites/BlueMindScreen.js @@ -0,0 +1,53 @@ +// @flow + +import * as React from 'react'; +import ThemeManager from "../../utils/ThemeManager"; +import WebViewScreen from "../../components/WebViewScreen"; +import i18n from "i18n-js"; + +type Props = { + navigation: Object, +} + + +const URL = 'https://etud-mel.insa-toulouse.fr/webmail/'; + +const CUSTOM_CSS_GENERAL = ''; + + +/** + * Class defining the app's planex screen. + * This screen uses a webview to render the planex page + */ +export default class AmicaleScreen extends React.Component { + + customInjectedJS: string; + + constructor() { + super(); + this.customInjectedJS = + '$(document).ready(function() {' + + '$("head").append(\'\');' + + '$("head").append(\'\');true;'; + } + + render() { + const nav = this.props.navigation; + return ( + + ); + } +} + diff --git a/screens/ElusEtudScreen.js b/screens/Websites/ElusEtudScreen.js similarity index 88% rename from screens/ElusEtudScreen.js rename to screens/Websites/ElusEtudScreen.js index 2843f6d..1151851 100644 --- a/screens/ElusEtudScreen.js +++ b/screens/Websites/ElusEtudScreen.js @@ -1,8 +1,8 @@ // @flow import * as React from 'react'; -import ThemeManager from "../utils/ThemeManager"; -import WebViewScreen from "../components/WebViewScreen"; +import ThemeManager from "../../utils/ThemeManager"; +import WebViewScreen from "../../components/WebViewScreen"; type Props = { navigation: Object, diff --git a/screens/PlanexScreen.js b/screens/Websites/PlanexScreen.js similarity index 96% rename from screens/PlanexScreen.js rename to screens/Websites/PlanexScreen.js index e7cf8d3..e47f6ad 100644 --- a/screens/PlanexScreen.js +++ b/screens/Websites/PlanexScreen.js @@ -1,8 +1,8 @@ // @flow import * as React from 'react'; -import ThemeManager from "../utils/ThemeManager"; -import WebViewScreen from "../components/WebViewScreen"; +import ThemeManager from "../../utils/ThemeManager"; +import WebViewScreen from "../../components/WebViewScreen"; import i18n from "i18n-js"; type Props = { @@ -73,7 +73,7 @@ export default class PlanexScreen extends React.Component { this.customInjectedJS = '$(document).ready(function() {' + OBSERVE_MUTATIONS_INJECTED + - '$("head").append(\'\');' + + '$("head").append(\'\');' + '$("head").append(\'\');'; if (ThemeManager.getNightMode()) diff --git a/screens/TutorInsaScreen.js b/screens/Websites/TutorInsaScreen.js similarity index 88% rename from screens/TutorInsaScreen.js rename to screens/Websites/TutorInsaScreen.js index 94965e8..53c2101 100644 --- a/screens/TutorInsaScreen.js +++ b/screens/Websites/TutorInsaScreen.js @@ -1,8 +1,8 @@ // @flow import * as React from 'react'; -import ThemeManager from "../utils/ThemeManager"; -import WebViewScreen from "../components/WebViewScreen"; +import ThemeManager from "../../utils/ThemeManager"; +import WebViewScreen from "../../components/WebViewScreen"; type Props = { navigation: Object, diff --git a/screens/WiketudScreen.js b/screens/Websites/WiketudScreen.js similarity index 87% rename from screens/WiketudScreen.js rename to screens/Websites/WiketudScreen.js index c817cdb..98353b0 100644 --- a/screens/WiketudScreen.js +++ b/screens/Websites/WiketudScreen.js @@ -1,8 +1,8 @@ // @flow import * as React from 'react'; -import ThemeManager from "../utils/ThemeManager"; -import WebViewScreen from "../components/WebViewScreen"; +import ThemeManager from "../../utils/ThemeManager"; +import WebViewScreen from "../../components/WebViewScreen"; type Props = { navigation: Object, diff --git a/translations/en.json b/translations/en.json index 406b29a..e9413df 100644 --- a/translations/en.json +++ b/translations/en.json @@ -10,6 +10,11 @@ "about": "About", "debug": "Debug" }, + "sidenav": { + "divider1": "Nice websites", + "divider2": "Useful services", + "divider3": "Personalisation" + }, "intro": { "slide1": { "title": "Welcome to CAMPUS", diff --git a/translations/fr.json b/translations/fr.json index 44a5868..ca0c0ea 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -10,6 +10,11 @@ "about": "À Propos", "debug": "Debug" }, + "sidenav": { + "divider1": "Sites bien", + "divider2": "Services utiles", + "divider3": "Personnalisation" + }, "intro": { "slide1": { "title": "Bienvenue sur CAMPUS", From d654a5d7a854b00e21f6339ffc2b5196b37ac70c Mon Sep 17 00:00:00 2001 From: keplyx Date: Thu, 30 Jan 2020 18:27:51 +0100 Subject: [PATCH 03/10] Improved Planex display and webview fullscreen --- components/BaseContainer.js | 5 +++-- components/WebViewScreen.js | 3 ++- screens/Websites/PlanexScreen.js | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/components/BaseContainer.js b/components/BaseContainer.js index e0935c9..38ba60a 100644 --- a/components/BaseContainer.js +++ b/components/BaseContainer.js @@ -5,7 +5,7 @@ import {Container} from "native-base"; import CustomHeader from "./CustomHeader"; import CustomSideMenu from "./CustomSideMenu"; import CustomMaterialIcon from "./CustomMaterialIcon"; -import {Platform, View} from "react-native"; +import {Platform, View, StatusBar} from "react-native"; import ThemeManager from "../utils/ThemeManager"; import Touchable from "react-native-platform-touchable"; import {ScreenOrientation} from "expo"; @@ -80,6 +80,7 @@ export default class BaseContainer extends React.Component { key: this.props.navigation.state.key, }); this.props.navigation.dispatch(setParamsAction); + StatusBar.setHidden(isLandscape); } }); } @@ -122,7 +123,7 @@ export default class BaseContainer extends React.Component { rightButton={this.props.headerRightButton} hasTabs={this.props.hasTabs} hasBackButton={this.props.hasBackButton}/> - : } + : } {this.props.children} ); diff --git a/components/WebViewScreen.js b/components/WebViewScreen.js index eb4ac9b..e68561f 100644 --- a/components/WebViewScreen.js +++ b/components/WebViewScreen.js @@ -144,7 +144,8 @@ export default class WebViewScreen extends React.Component { hasBackButton={this.props.hasHeaderBackButton} hasSideMenu={this.props.hasSideMenu} enableRotation={true} - hideHeaderOnLandscape={true}> + hideHeaderOnLandscape={true} + hasTabs={this.props.data.length > 1}> {this.props.data.length === 1 ? this.getWebview(this.props.data[0]) : { this.customInjectedJS = '$(document).ready(function() {' + OBSERVE_MUTATIONS_INJECTED + - '$("head").append(\'\');' + + '$("head").append(\'\');' + '$("head").append(\'\');'; if (ThemeManager.getNightMode()) From e72196812e07c321f6453927dd70a33fba2bd3d3 Mon Sep 17 00:00:00 2001 From: keplyx Date: Thu, 30 Jan 2020 18:58:23 +0100 Subject: [PATCH 04/10] Moved about screen in sidemenu, fixed warnings --- components/Sidebar.js | 15 +- screens/About/AboutDependenciesScreen.js | 34 ++-- screens/About/AboutScreen.js | 196 ++++++++++++++--------- screens/SettingsScreen.js | 15 +- translations/en.json | 5 +- translations/fr.json | 5 +- 6 files changed, 155 insertions(+), 115 deletions(-) diff --git a/components/Sidebar.js b/components/Sidebar.js index cb744fa..f4acf73 100644 --- a/components/Sidebar.js +++ b/components/Sidebar.js @@ -65,15 +65,15 @@ export default class SideBar extends React.Component { route: "TutorInsaScreen", icon: "school", }, - { - name: "Mails BlueMind", - route: "BlueMindScreen", - icon: "email", - }, { name: i18n.t('sidenav.divider2'), route: "Divider2" }, + { + name: i18n.t('screens.bluemind'), + route: "BlueMindScreen", + icon: "email", + }, { name: i18n.t('screens.availableRooms'), route: "AvailableRoomScreen", @@ -93,6 +93,11 @@ export default class SideBar extends React.Component { route: "SettingsScreen", icon: "settings", }, + { + name: i18n.t('screens.about'), + route: "AboutScreen", + icon: "information", + }, ]; } diff --git a/screens/About/AboutDependenciesScreen.js b/screens/About/AboutDependenciesScreen.js index 1178152..93f5435 100644 --- a/screens/About/AboutDependenciesScreen.js +++ b/screens/About/AboutDependenciesScreen.js @@ -31,24 +31,22 @@ export default class AboutDependenciesScreen extends React.Component { return ( - - item.name} - style={{minHeight: 300, width: '100%'}} - renderItem={({item}) => - - - - {item.name} - - - {item.version.replace('^', '')} - - - } - /> - + item.name} + style={{minHeight: 300, width: '100%'}} + renderItem={({item}) => + + + + {item.name} + + + {item.version.replace('^', '')} + + + } + /> ); } diff --git a/screens/About/AboutScreen.js b/screens/About/AboutScreen.js index ee5457b..6ffafb8 100644 --- a/screens/About/AboutScreen.js +++ b/screens/About/AboutScreen.js @@ -185,6 +185,107 @@ export default class AboutScreen extends React.Component { }, ]; + dataOrder: Array = [ + { + id: 'app', + }, + { + id: 'team', + }, + { + id: 'techno', + }, + ]; + + getAppCard() { + return ( + + + + + +

{appJson.expo.name}

+ + v.{appJson.expo.version} + + + + + item.icon} + listKey={(item) => "app"} + renderItem={({item}) => + this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) + } + /> + + ); + } + + getTeamCard() { + return ( + + + + + +

{i18n.t('aboutScreen.team')}

+ + + + + {i18n.t('aboutScreen.author')} + + item.icon} + listKey={(item) => "team1"} + renderItem={({item}) => + this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) + } + /> + + {i18n.t('aboutScreen.additionalDev')} + + item.icon} + listKey={(item) => "team2"} + renderItem={({item}) => + this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) + } + /> + + ); + } + + getTechnoCard() { + return ( + + + {i18n.t('aboutScreen.technologies')} + + item.icon} + listKey={(item) => "techno"} + renderItem={({item}) => + this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) + } + /> + + ); + } + /** * Get a clickable card item to be rendered inside a card. * @@ -284,86 +385,33 @@ export default class AboutScreen extends React.Component { } } + getMainCard(item: Object) { + switch (item.id) { + case 'app': + return this.getAppCard(); + case 'team': + return this.getTeamCard(); + case 'techno': + return this.getTechnoCard(); + } + return ; + } + render() { const nav = this.props.navigation; return ( {this.getBugReportModal()} - - - - - - -

{appJson.expo.name}

- - v.{appJson.expo.version} - - - - - item.icon} - renderItem={({item}) => - this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) - } - /> - - - - - - - -

{i18n.t('aboutScreen.team')}

- - - - - {i18n.t('aboutScreen.author')} - - item.icon} - renderItem={({item}) => - this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) - } - /> - - {i18n.t('aboutScreen.additionalDev')} - - item.icon} - renderItem={({item}) => - this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) - } - /> - - - - - {i18n.t('aboutScreen.technologies')} - - item.icon} - renderItem={({item}) => - this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) - } - /> - - + item.id} + renderItem={({item}) => + this.getMainCard(item) + } + /> ); } diff --git a/screens/SettingsScreen.js b/screens/SettingsScreen.js index 89e9a12..c92d722 100644 --- a/screens/SettingsScreen.js +++ b/screens/SettingsScreen.js @@ -212,24 +212,11 @@ export default class SettingsScreen extends React.Component { ); } - getRightButton() { - return ( - this.props.navigation.navigate('AboutScreen')}> - - - ); - } - render() { const nav = this.props.navigation; return ( - + diff --git a/translations/en.json b/translations/en.json index e9413df..0f22092 100644 --- a/translations/en.json +++ b/translations/en.json @@ -7,12 +7,13 @@ "menuSelf": "RU Menu", "settings": "Settings", "availableRooms": "Available rooms", + "bluemind": "INSA Mails", "about": "About", "debug": "Debug" }, "sidenav": { - "divider1": "Nice websites", - "divider2": "Useful services", + "divider1": "Useful websites", + "divider2": "Services", "divider3": "Personalisation" }, "intro": { diff --git a/translations/fr.json b/translations/fr.json index ca0c0ea..21abadb 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -7,12 +7,13 @@ "menuSelf": "Menu du RU", "settings": "Paramètres", "availableRooms": "Salles dispo", + "bluemind": "Mails INSA", "about": "À Propos", "debug": "Debug" }, "sidenav": { - "divider1": "Sites bien", - "divider2": "Services utiles", + "divider1": "Sites utiles", + "divider2": "Services", "divider3": "Personnalisation" }, "intro": { From 628f36df246cdfadcc66fd1032a6c5b555c9c690 Mon Sep 17 00:00:00 2001 From: keplyx Date: Fri, 31 Jan 2020 12:14:38 +0100 Subject: [PATCH 05/10] Improved planex display --- screens/Websites/PlanexScreen.js | 46 +++++++++++++++++++------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/screens/Websites/PlanexScreen.js b/screens/Websites/PlanexScreen.js index e01cf8b..521977b 100644 --- a/screens/Websites/PlanexScreen.js +++ b/screens/Websites/PlanexScreen.js @@ -18,22 +18,27 @@ const CUSTOM_CSS_NIGHTMODE = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_ // // JS + JQuery functions used to remove alpha from events. Copy paste in browser console for quick testing // // Remove alpha from given Jquery node // function removeAlpha(node) { -// console.log(node); // let bg = node.css("background-color"); // if (bg.match("^rgba")) { // let a = bg.slice(5).split(','); -// let newBg ='rgb(' + a[0] + ',' + parseInt(a[1]) + ',' + parseInt(a[2]) + ')'; +// // Fix for tooltips with broken background +// if (parseInt(a[0]) === parseInt(a[1]) && parseInt(a[1]) === parseInt(a[2]) && parseInt(a[2]) === 0) { +// a[0] = a[1] = a[2] = '255'; +// } +// let newBg ='rgb(' + a[0] + ',' + a[1] + ',' + a[2] + ')'; // node.css("background-color", newBg); // } // } // // Observe for planning DOM changes // let observer = new MutationObserver(function(mutations) { // for (let i = 0; i < mutations.length; i++) { -// if (mutations[i]['addedNodes'].length > 0 && $(mutations[i]['addedNodes'][0]).hasClass("fc-event")) +// if (mutations[i]['addedNodes'].length > 0 && +// ($(mutations[i]['addedNodes'][0]).hasClass("fc-event") || $(mutations[i]['addedNodes'][0]).hasClass("tooltiptopicevent"))) // removeAlpha($(mutations[i]['addedNodes'][0])) // } // }); -// observer.observe(document.querySelector(".fc-body"), {attributes: false, childList: true, characterData: false, subtree:true}); +// // observer.observe(document.querySelector(".fc-body"), {attributes: false, childList: true, characterData: false, subtree:true}); +// observer.observe(document.querySelector("body"), {attributes: false, childList: true, characterData: false, subtree:true}); // // Run remove alpha a first time on whole planning. Useful when code injected after planning fully loaded. // $(".fc-event-container .fc-event").each(function(index) { // removeAlpha($(this)); @@ -42,21 +47,28 @@ const CUSTOM_CSS_NIGHTMODE = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_ // Watch for changes in the calendar and call the remove alpha function const OBSERVE_MUTATIONS_INJECTED = 'function removeAlpha(node) {\n' + - ' console.log(node);\n' + - ' let bg = node.css("background-color");\n' + - ' if (bg.match("^rgba")) {\n' + - ' let a = bg.slice(5).split(\',\');\n' + - ' let newBg =\'rgb(\' + a[0] + \',\' + parseInt(a[1]) + \',\' + parseInt(a[2]) + \')\';\n' + - ' node.css("background-color", newBg);\n' + - ' }\n' + - '}' + + ' let bg = node.css("background-color");\n' + + ' if (bg.match("^rgba")) {\n' + + ' let a = bg.slice(5).split(\',\');\n' + + ' // Fix for tooltips with broken background\n' + + ' if (parseInt(a[0]) === parseInt(a[1]) && parseInt(a[1]) === parseInt(a[2]) && parseInt(a[2]) === 0) {\n' + + ' a[0] = a[1] = a[2] = \'255\';\n' + + ' }\n' + + ' let newBg =\'rgb(\' + a[0] + \',\' + a[1] + \',\' + a[2] + \')\';\n' + + ' node.css("background-color", newBg);\n' + + ' }\n' + + '}\n' + + '// Observe for planning DOM changes\n' + 'let observer = new MutationObserver(function(mutations) {\n' + ' for (let i = 0; i < mutations.length; i++) {\n' + - ' if (mutations[i][\'addedNodes\'].length > 0 && $(mutations[i][\'addedNodes\'][0]).hasClass("fc-event"))\n' + + ' if (mutations[i][\'addedNodes\'].length > 0 &&\n' + + ' ($(mutations[i][\'addedNodes\'][0]).hasClass("fc-event") || $(mutations[i][\'addedNodes\'][0]).hasClass("tooltiptopicevent")))\n' + ' removeAlpha($(mutations[i][\'addedNodes\'][0]))\n' + ' }\n' + '});\n' + - 'observer.observe(document.querySelector(".fc-body"), {attributes: false, childList: true, characterData: false, subtree:true});\n' + + '// observer.observe(document.querySelector(".fc-body"), {attributes: false, childList: true, characterData: false, subtree:true});\n' + + 'observer.observe(document.querySelector("body"), {attributes: false, childList: true, characterData: false, subtree:true});\n' + + '// Run remove alpha a first time on whole planning. Useful when code injected after planning fully loaded.\n' + '$(".fc-event-container .fc-event").each(function(index) {\n' + ' removeAlpha($(this));\n' + '});'; @@ -73,17 +85,13 @@ export default class PlanexScreen extends React.Component { this.customInjectedJS = '$(document).ready(function() {' + OBSERVE_MUTATIONS_INJECTED + - '$("head").append(\'\');' + + '$("head").append(\'\');' + '$("head").append(\'\');'; if (ThemeManager.getNightMode()) this.customInjectedJS += '$("head").append(\'\');'; this.customInjectedJS += - '$(".fc-toolbar .fc-center").append(\'

' + - i18n.t("planexScreen.rotateToLandscape") + '

\');' + - '$(".fc-toolbar .fc-center").append(\'

' + - i18n.t("planexScreen.rotateToPortrait") + '

\');' + 'removeAlpha();' + '});true;'; // Prevent crash on ios From b62ad1fd4a85ea86ff73160264bd3d30d2655a1a Mon Sep 17 00:00:00 2001 From: keplyx Date: Fri, 31 Jan 2020 16:00:22 +0100 Subject: [PATCH 06/10] Improved bluemind display and added ent webview screen --- components/Sidebar.js | 7 ++- navigation/AppNavigator.js | 2 + screens/Websites/BlueMindScreen.js | 9 ++- screens/Websites/EntScreen.js | 91 ++++++++++++++++++++++++++++++ translations/en.json | 3 +- translations/fr.json | 3 +- 6 files changed, 107 insertions(+), 8 deletions(-) create mode 100644 screens/Websites/EntScreen.js diff --git a/components/Sidebar.js b/components/Sidebar.js index f4acf73..09216e5 100644 --- a/components/Sidebar.js +++ b/components/Sidebar.js @@ -48,7 +48,7 @@ export default class SideBar extends React.Component { { name: "Amicale", route: "AmicaleScreen", - icon: "web", + icon: "alpha-a-box", }, { name: "Élus Étudiants", @@ -74,6 +74,11 @@ export default class SideBar extends React.Component { route: "BlueMindScreen", icon: "email", }, + { + name: i18n.t('screens.ent'), + route: "EntScreen", + icon: "notebook", + }, { name: i18n.t('screens.availableRooms'), route: "AvailableRoomScreen", diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js index fb54342..6a89682 100644 --- a/navigation/AppNavigator.js +++ b/navigation/AppNavigator.js @@ -14,6 +14,7 @@ import AmicaleScreen from "../screens/Websites/AmicaleScreen"; import WiketudScreen from "../screens/Websites/WiketudScreen"; import ElusEtudScreen from "../screens/Websites/ElusEtudScreen"; import BlueMindScreen from "../screens/Websites/BlueMindScreen"; +import EntScreen from "../screens/Websites/EntScreen"; import AvailableRoomScreen from "../screens/Websites/AvailableRoomScreen"; import DebugScreen from '../screens/DebugScreen'; import {fromRight} from "react-navigation-transitions"; @@ -37,6 +38,7 @@ function createAppContainerWithInitialRoute(initialRoute: string) { WiketudScreen: {screen: WiketudScreen}, ElusEtudScreen: {screen: ElusEtudScreen}, BlueMindScreen: {screen: BlueMindScreen}, + EntScreen: {screen: EntScreen}, AvailableRoomScreen: {screen: AvailableRoomScreen}, ProxiwashAboutScreen: {screen: ProxiwashAboutScreen}, ProximoAboutScreen: {screen: ProximoAboutScreen}, diff --git a/screens/Websites/BlueMindScreen.js b/screens/Websites/BlueMindScreen.js index 8031463..afcabaa 100644 --- a/screens/Websites/BlueMindScreen.js +++ b/screens/Websites/BlueMindScreen.js @@ -12,21 +12,20 @@ type Props = { const URL = 'https://etud-mel.insa-toulouse.fr/webmail/'; -const CUSTOM_CSS_GENERAL = ''; +const CUSTOM_CSS_GENERAL = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/bluemind/customMobile.css'; /** * Class defining the app's planex screen. * This screen uses a webview to render the planex page */ -export default class AmicaleScreen extends React.Component { +export default class BlueMindScreen extends React.Component { customInjectedJS: string; constructor() { super(); this.customInjectedJS = - '$(document).ready(function() {' + '$("head").append(\'\');' + '$("head").append(\'\');true;'; } @@ -41,10 +40,10 @@ export default class AmicaleScreen extends React.Component { url: URL, icon: '', name: '', - customJS: '' + customJS: this.customInjectedJS }, ]} - headerTitle={'Mails BlueMind'} + headerTitle={i18n.t('screens.bluemind')} hasHeaderBackButton={true} hasSideMenu={false}/> ); diff --git a/screens/Websites/EntScreen.js b/screens/Websites/EntScreen.js new file mode 100644 index 0000000..8df8e49 --- /dev/null +++ b/screens/Websites/EntScreen.js @@ -0,0 +1,91 @@ +// @flow + +import * as React from 'react'; +import ThemeManager from "../../utils/ThemeManager"; +import WebViewScreen from "../../components/WebViewScreen"; +import i18n from "i18n-js"; + +type Props = { + navigation: Object, +} + + +const URL = 'https://ent.insa-toulouse.fr/'; + +const CUSTOM_CSS_GENERAL = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/ent/customMobile.css'; + +// let stylesheet = document.createElement('link'); +// stylesheet.type = 'text/css'; +// stylesheet.rel = 'stylesheet'; +// stylesheet.href = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/ent/customMobile.css'; +// let mobileSpec = document.createElement('meta'); +// mobileSpec.name = 'viewport'; +// mobileSpec.content = 'width=device-width, initial-scale=1.0'; +// document.getElementsByTagName('head')[0].appendChild(mobileSpec); +// // document.getElementsByTagName('head')[0].appendChild(stylesheet); +// document.getElementsByClassName('preference-items')[0].style.display = 'none'; +// document.getElementsByClassName('logoInsa')[0].style.display = 'none'; +// document.getElementsByClassName('logoPress')[0].style.display = 'none'; +// document.getElementsByClassName('ent')[0].style.display = 'none'; +// document.getElementById('portal-page-header').style.margin = 0; +// document.querySelectorAll('.uportal-navigation-category').forEach(element => { +// element.style.cssText = "width: 100%; display: flex; height: 50px;"; +// if (element.children.length > 0) +// element.children[0].style.margin = 'auto'; +// }); +// true; + + +/** + * Class defining the app's ent screen. + * This screen uses a webview to render the ent page + */ +export default class EntScreen extends React.Component { + + customInjectedJS: string; + + constructor() { + super(); + this.customInjectedJS = + 'let stylesheet = document.createElement(\'link\');\n' + + 'stylesheet.type = \'text/css\';\n' + + 'stylesheet.rel = \'stylesheet\';\n' + + 'stylesheet.href = \'' + CUSTOM_CSS_GENERAL +'\';\n' + + 'let mobileSpec = document.createElement(\'meta\');\n' + + 'mobileSpec.name = \'viewport\';\n' + + 'mobileSpec.content = \'width=device-width, initial-scale=1.0\';\n' + + 'document.getElementsByTagName(\'head\')[0].appendChild(mobileSpec);\n' + + 'document.getElementsByTagName(\'head\')[0].appendChild(stylesheet);\n' + + 'document.getElementsByClassName(\'preference-items\')[0].style.display = \'none\';\n' + + 'document.getElementsByClassName(\'logoInsa\')[0].style.display = \'none\';\n' + + 'document.getElementsByClassName(\'logoPress\')[0].style.display = \'none\';\n' + + 'document.getElementsByClassName(\'ent\')[0].style.display = \'none\';\n' + + 'document.getElementById(\'portal-page-header\').style.margin = 0;\n' + + 'document.querySelectorAll(\'.uportal-navigation-category\').forEach(element => {\n' + + ' element.style.cssText = "width: 100%; display: flex; height: 50px;";\n' + + ' if (element.children.length > 0)\n' + + ' element.children[0].style.margin = \'auto\';\n' + + '});' + + 'true;'; + } + + render() { + const nav = this.props.navigation; + return ( + + ); + } +} + diff --git a/translations/en.json b/translations/en.json index 0f22092..4e6f0cf 100644 --- a/translations/en.json +++ b/translations/en.json @@ -8,11 +8,12 @@ "settings": "Settings", "availableRooms": "Available rooms", "bluemind": "INSA Mails", + "ent": "INSA ENT", "about": "About", "debug": "Debug" }, "sidenav": { - "divider1": "Useful websites", + "divider1": "Student websites", "divider2": "Services", "divider3": "Personalisation" }, diff --git a/translations/fr.json b/translations/fr.json index 21abadb..72ec3c3 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -8,11 +8,12 @@ "settings": "Paramètres", "availableRooms": "Salles dispo", "bluemind": "Mails INSA", + "ent": "ENT INSA", "about": "À Propos", "debug": "Debug" }, "sidenav": { - "divider1": "Sites utiles", + "divider1": "Sites étudiants", "divider2": "Services", "divider3": "Personnalisation" }, From c478a117b54c3360fde384614c7bb063460ee202 Mon Sep 17 00:00:00 2001 From: keplyx Date: Fri, 31 Jan 2020 16:51:43 +0100 Subject: [PATCH 07/10] Optimised imported and cleaned code --- components/BaseContainer.js | 13 ++- components/CustomHeader.js | 2 +- components/FetchedDataSectionList.js | 19 ++-- components/Sidebar.js | 3 +- components/WebViewScreen.js | 5 +- navigation/AppNavigator.js | 1 + navigation/MainDrawerNavigator.js | 34 ------- navigation/MainTabNavigator.js | 1 - package.json | 4 +- screens/About/AboutDependenciesScreen.js | 2 +- screens/About/AboutScreen.js | 17 ++-- screens/DebugScreen.js | 59 ++++++------- screens/HomeScreen.js | 103 ++++++++++------------ screens/PlanningScreen.js | 24 +++-- screens/Proximo/ProximoAboutScreen.js | 10 +-- screens/Proximo/ProximoListScreen.js | 22 ++--- screens/Proximo/ProximoMainScreen.js | 10 +-- screens/Proxiwash/ProxiwashAboutScreen.js | 10 +-- screens/Proxiwash/ProxiwashScreen.js | 2 +- screens/SelfMenuScreen.js | 7 +- screens/SettingsScreen.js | 68 +++++++------- screens/Websites/AmicaleScreen.js | 1 - screens/Websites/BlueMindScreen.js | 1 - screens/Websites/ElusEtudScreen.js | 1 - screens/Websites/EntScreen.js | 3 +- screens/Websites/PlanexScreen.js | 1 - screens/Websites/TutorInsaScreen.js | 1 - screens/Websites/WiketudScreen.js | 1 - 28 files changed, 169 insertions(+), 256 deletions(-) delete mode 100644 navigation/MainDrawerNavigator.js diff --git a/components/BaseContainer.js b/components/BaseContainer.js index 38ba60a..7c97a98 100644 --- a/components/BaseContainer.js +++ b/components/BaseContainer.js @@ -5,7 +5,7 @@ import {Container} from "native-base"; import CustomHeader from "./CustomHeader"; import CustomSideMenu from "./CustomSideMenu"; import CustomMaterialIcon from "./CustomMaterialIcon"; -import {Platform, View, StatusBar} from "react-native"; +import {Platform, StatusBar, View} from "react-native"; import ThemeManager from "../utils/ThemeManager"; import Touchable from "react-native-platform-touchable"; import {ScreenOrientation} from "expo"; @@ -32,9 +32,6 @@ type State = { export default class BaseContainer extends React.Component { - willBlurSubscription: function; - willFocusSubscription: function; - static defaultProps = { headerRightButton: , hasTabs: false, @@ -43,8 +40,8 @@ export default class BaseContainer extends React.Component { enableRotation: false, hideHeaderOnLandscape: false, }; - - + willBlurSubscription: function; + willFocusSubscription: function; state = { isOpen: false, isHeaderVisible: true, @@ -66,7 +63,7 @@ export default class BaseContainer extends React.Component { componentDidMount() { this.willFocusSubscription = this.props.navigation.addListener( 'willFocus', - payload => { + () => { if (this.props.enableRotation) { ScreenOrientation.unlockAsync(); ScreenOrientation.addOrientationChangeListener((OrientationChangeEvent) => { @@ -87,7 +84,7 @@ export default class BaseContainer extends React.Component { }); this.willBlurSubscription = this.props.navigation.addListener( 'willBlur', - payload => { + () => { if (this.props.enableRotation) ScreenOrientation.lockAsync(ScreenOrientation.Orientation.PORTRAIT); this.setState({isOpen: false}); diff --git a/components/CustomHeader.js b/components/CustomHeader.js index ea10dcf..71bd2ef 100644 --- a/components/CustomHeader.js +++ b/components/CustomHeader.js @@ -1,7 +1,7 @@ // @flow import * as React from "react"; -import {Body, Header, Input, Item, Left, Right, Title, Form} from "native-base"; +import {Body, Header, Input, Item, Left, Right, Title} from "native-base"; import {Platform, StyleSheet, View} from "react-native"; import {getStatusBarHeight} from "react-native-status-bar-height"; import Touchable from 'react-native-platform-touchable'; diff --git a/components/FetchedDataSectionList.js b/components/FetchedDataSectionList.js index abb74ed..65f6e7a 100644 --- a/components/FetchedDataSectionList.js +++ b/components/FetchedDataSectionList.js @@ -35,13 +35,6 @@ export default class FetchedDataSectionList extends React.Component { + () => { this.onScreenFocus(); } ); this.willBlurSubscription = this.props.navigation.addListener( 'willBlur', - payload => { + () => { this.onScreenBlur(); } ); @@ -136,7 +135,7 @@ export default class FetchedDataSectionList extends React.Component { + .catch(() => { this.setState({ fetchedData: {}, refreshing: false, diff --git a/components/Sidebar.js b/components/Sidebar.js index 09216e5..2edcc0c 100644 --- a/components/Sidebar.js +++ b/components/Sidebar.js @@ -2,12 +2,11 @@ import * as React from 'react'; import {Dimensions, FlatList, Image, Linking, Platform, StyleSheet} from 'react-native'; -import {Badge, Container, Content, Left, ListItem, Right, Text} from "native-base"; +import {Badge, Container, Left, ListItem, Right, Text} from "native-base"; import i18n from "i18n-js"; import CustomMaterialIcon from '../components/CustomMaterialIcon'; import ThemeManager from "../utils/ThemeManager"; -const deviceHeight = Dimensions.get("window").height; const deviceWidth = Dimensions.get("window").width; const drawerCover = require("../assets/drawer-cover.png"); diff --git a/components/WebViewScreen.js b/components/WebViewScreen.js index e68561f..480c425 100644 --- a/components/WebViewScreen.js +++ b/components/WebViewScreen.js @@ -2,13 +2,12 @@ import * as React from 'react'; import {Linking, Platform, View} from 'react-native'; -import {Spinner, Footer, Right, Left, Body, Tab, TabHeading, Text, Tabs} from 'native-base'; +import {Body, Footer, Left, Right, Spinner, Tab, TabHeading, Tabs, Text} from 'native-base'; import WebView from "react-native-webview"; import Touchable from "react-native-platform-touchable"; import CustomMaterialIcon from "../components/CustomMaterialIcon"; import ThemeManager from "../utils/ThemeManager"; import BaseContainer from "../components/BaseContainer"; -import {NavigationActions} from 'react-navigation'; type Props = { navigation: Object, @@ -153,7 +152,7 @@ export default class WebViewScreen extends React.Component { elevation: 0, // Fix for android shadow }} locked={true} - style = {{ + style={{ backgroundColor: Platform.OS === 'ios' ? ThemeManager.getCurrentThemeVariables().tabDefaultBg : ThemeManager.getCurrentThemeVariables().brandPrimary diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js index 6a89682..c3d2426 100644 --- a/navigation/AppNavigator.js +++ b/navigation/AppNavigator.js @@ -52,4 +52,5 @@ function createAppContainerWithInitialRoute(initialRoute: string) { }) ); } + export {createAppContainerWithInitialRoute}; diff --git a/navigation/MainDrawerNavigator.js b/navigation/MainDrawerNavigator.js deleted file mode 100644 index a2f291a..0000000 --- a/navigation/MainDrawerNavigator.js +++ /dev/null @@ -1,34 +0,0 @@ -// @flow - -import * as React from 'react'; -import {createDrawerNavigator} from 'react-navigation'; - -import HomeScreen from '../screens/HomeScreen'; -import PlanningScreen from '../screens/PlanningScreen'; -import ProxiwashScreen from '../screens/Proxiwash/ProxiwashScreen'; -import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen'; -import PlanexScreen from '../screens/Websites/PlanexScreen'; -import SettingsScreen from '../screens/SettingsScreen'; -import AboutScreen from '../screens/About/AboutScreen'; -import Sidebar from "../components/Sidebar"; - -/** - * Creates the drawer navigation stack - */ -export default createDrawerNavigator({ - Home: {screen: HomeScreen}, - Planning: {screen: PlanningScreen,}, - Proxiwash: {screen: ProxiwashScreen,}, - Proximo: {screen: ProximoMainScreen,}, - Planex: {screen: PlanexScreen}, - Settings: {screen: SettingsScreen,}, - About: {screen: AboutScreen,}, - }, { - contentComponent: Sidebar, - initialRouteName: 'Home', - backBehavior: 'initialRoute', - drawerType: 'front', - useNativeAnimations: true, - } -); - diff --git a/navigation/MainTabNavigator.js b/navigation/MainTabNavigator.js index 5bfa445..cb0348c 100644 --- a/navigation/MainTabNavigator.js +++ b/navigation/MainTabNavigator.js @@ -8,7 +8,6 @@ import ProximoMainScreen from '../screens/Proximo/ProximoMainScreen'; import PlanexScreen from '../screens/Websites/PlanexScreen'; import CustomMaterialIcon from "../components/CustomMaterialIcon"; import ThemeManager from "../utils/ThemeManager"; -import AsyncStorageManager from "../utils/AsyncStorageManager"; const TAB_ICONS = { Home: 'triangle', diff --git a/package.json b/package.json index e9e01c3..ddfdff3 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,6 @@ "eject": "expo eject" }, "dependencies": { - "@expo/vector-icons": "^10.0.0", - "@react-native-community/status-bar": "^1.0.3", "expo": "^36.0.0", "expo-font": "~8.0.0", "expo-linear-gradient": "~8.0.0", @@ -27,8 +25,10 @@ "react-native-gesture-handler": "~1.5.0", "react-native-material-menu": "^0.6.7", "react-native-modalize": "^1.3.6", + "react-native-paper": "^3.5.1", "react-native-platform-touchable": "^1.1.1", "react-native-render-html": "^4.1.2", + "react-native-screens": "2.0.0-alpha.12", "react-native-side-menu": "^1.1.3", "react-native-status-bar-height": "^2.3.1", "react-native-webview": "7.4.3", diff --git a/screens/About/AboutDependenciesScreen.js b/screens/About/AboutDependenciesScreen.js index 93f5435..7a28866 100644 --- a/screens/About/AboutDependenciesScreen.js +++ b/screens/About/AboutDependenciesScreen.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import {Body, Container, Content, ListItem, Text} from 'native-base'; +import {Body, Container, ListItem, Text} from 'native-base'; import CustomHeader from "../../components/CustomHeader"; import {FlatList} from "react-native"; import i18n from "i18n-js"; diff --git a/screens/About/AboutScreen.js b/screens/About/AboutScreen.js index 6ffafb8..5cecf0e 100644 --- a/screens/About/AboutScreen.js +++ b/screens/About/AboutScreen.js @@ -2,7 +2,7 @@ import * as React from 'react'; import {FlatList, Linking, Platform, View} from 'react-native'; -import {Body, Card, CardItem, Container, Content, H1, Left, Right, Text, Thumbnail, Button} from 'native-base'; +import {Body, Button, Card, CardItem, Container, H1, Left, Right, Text, Thumbnail} from 'native-base'; import CustomHeader from "../../components/CustomHeader"; import i18n from "i18n-js"; import appJson from '../../app'; @@ -70,12 +70,6 @@ export default class AboutScreen extends React.Component { state = { isDebugUnlocked: AsyncStorageManager.getInstance().preferences.debugUnlocked.current === '1' }; - - constructor(props: any) { - super(props); - this.modalRef = React.createRef(); - } - /** * Data to be displayed in the app card */ @@ -118,7 +112,6 @@ export default class AboutScreen extends React.Component { showOnlyDebug: true }, ]; - /** * Data to be displayed in the author card */ @@ -142,7 +135,6 @@ export default class AboutScreen extends React.Component { showChevron: true }, ]; - /** * Data to be displayed in the additional developer card */ @@ -166,7 +158,6 @@ export default class AboutScreen extends React.Component { showChevron: true }, ]; - /** * Data to be displayed in the technologies card */ @@ -184,7 +175,6 @@ export default class AboutScreen extends React.Component { showChevron: true }, ]; - dataOrder: Array = [ { id: 'app', @@ -197,6 +187,11 @@ export default class AboutScreen extends React.Component { }, ]; + constructor(props: any) { + super(props); + this.modalRef = React.createRef(); + } + getAppCard() { return ( diff --git a/screens/DebugScreen.js b/screens/DebugScreen.js index f5c1347..fd7c391 100644 --- a/screens/DebugScreen.js +++ b/screens/DebugScreen.js @@ -3,29 +3,28 @@ import * as React from 'react'; import { Body, + Button, Card, CardItem, Container, Content, + Form, H1, H3, + Input, + Item, + Label, Left, List, ListItem, Right, - Text, - Form, - Item, - Label, - Input, - Button + Text } from "native-base"; import CustomHeader from "../components/CustomHeader"; import ThemeManager from '../utils/ThemeManager'; import i18n from "i18n-js"; import CustomMaterialIcon from "../components/CustomMaterialIcon"; -import Touchable from "react-native-platform-touchable"; -import {Alert, View, Clipboard, Image} from "react-native"; +import {Alert, Clipboard, View} from "react-native"; import AsyncStorageManager from "../utils/AsyncStorageManager"; import NotificationsManager from "../utils/NotificationsManager"; import {Modalize} from "react-native-modalize"; @@ -46,36 +45,16 @@ export default class DebugScreen extends React.Component { modalRef: { current: null | Modalize }; modalInputValue = ''; - - constructor(props: any) { - super(props); - this.modalRef = React.createRef(); - } - state = { modalCurrentDisplayItem: {}, currentPreferences: JSON.parse(JSON.stringify(AsyncStorageManager.getInstance().preferences)) }; - alertCurrentExpoToken() { - let token = AsyncStorageManager.getInstance().preferences.expoToken.current; - console.log(token); - Alert.alert( - 'Expo Token', - token, - [ - {text: 'Copy', onPress: () => Clipboard.setString(token)}, - {text: 'OK'} - ] - ); + constructor(props: any) { + super(props); + this.modalRef = React.createRef(); } - async forceExpoTokenUpdate() { - await NotificationsManager.forceExpoTokenUpdate(); - this.alertCurrentExpoToken(); - } - - static getGeneralItem(onPressCallback: Function, icon: ?string, title: string, subtitle: string) { return ( { ); } + alertCurrentExpoToken() { + let token = AsyncStorageManager.getInstance().preferences.expoToken.current; + console.log(token); + Alert.alert( + 'Expo Token', + token, + [ + {text: 'Copy', onPress: () => Clipboard.setString(token)}, + {text: 'OK'} + ] + ); + } + + async forceExpoTokenUpdate() { + await NotificationsManager.forceExpoTokenUpdate(); + this.alertCurrentExpoToken(); + } + showEditModal(item: Object) { this.setState({ modalCurrentDisplayItem: item diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js index 14a1eef..5fead20 100644 --- a/screens/HomeScreen.js +++ b/screens/HomeScreen.js @@ -2,7 +2,7 @@ import * as React from 'react'; import {Image, Linking, TouchableOpacity, View} from 'react-native'; -import {Body, Button, Card, CardItem, Left, Text, Thumbnail, H1, H3} from 'native-base'; +import {Body, Button, Card, CardItem, H1, Left, Text, Thumbnail} from 'native-base'; import i18n from "i18n-js"; import CustomMaterialIcon from '../components/CustomMaterialIcon'; import FetchedDataSectionList from "../components/FetchedDataSectionList"; @@ -42,6 +42,16 @@ export default class HomeScreen extends FetchedDataSectionList { super(DATA_URL, REFRESH_TIME); } + /** + * Converts a dateString using Unix Timestamp to a formatted date + * @param dateString {string} The Unix Timestamp representation of a date + * @return {string} The formatted output date + */ + static getFormattedDate(dateString: string) { + let date = new Date(Number.parseInt(dateString) * 1000); + return date.toLocaleString(); + } + getHeaderTranslation() { return i18n.t("screens.home"); } @@ -119,17 +129,6 @@ export default class HomeScreen extends FetchedDataSectionList { return dataset } - - /** - * Converts a dateString using Unix Timestamp to a formatted date - * @param dateString {string} The Unix Timestamp representation of a date - * @return {string} The formatted output date - */ - static getFormattedDate(dateString: string) { - let date = new Date(Number.parseInt(dateString) * 1000); - return date.toLocaleString(); - } - getRenderSectionHeader(title: string) { if (title === '') { return ; @@ -294,7 +293,7 @@ export default class HomeScreen extends FetchedDataSectionList { let icon = 'calendar-range'; let color = ThemeManager.getCurrentThemeVariables().planningColor; let title = i18n.t('homeScreen.dashboard.todayEventsTitle'); - let subtitle = ''; + let subtitle; let futureEvents = this.getFutureEvents(content); let isAvailable = futureEvents.length > 0; if (isAvailable) { @@ -336,7 +335,7 @@ export default class HomeScreen extends FetchedDataSectionList { let proximoColor = ThemeManager.getCurrentThemeVariables().proximoColor; let proximoTitle = i18n.t('homeScreen.dashboard.proximoTitle'); let isProximoAvailable = parseInt(proximoData) > 0; - let proximoSubtitle = ''; + let proximoSubtitle; if (isProximoAvailable) { proximoSubtitle = @@ -358,7 +357,7 @@ export default class HomeScreen extends FetchedDataSectionList { let menuColor = ThemeManager.getCurrentThemeVariables().menuColor; let menuTitle = i18n.t('homeScreen.dashboard.menuTitle'); let isMenuAvailable = menuData.length > 0; - let menuSubtitle = ''; + let menuSubtitle; if (isMenuAvailable) { menuSubtitle = i18n.t('homeScreen.dashboard.menuSubtitle'); } else @@ -410,39 +409,39 @@ export default class HomeScreen extends FetchedDataSectionList { let availableWashers = proxiwashData['washers']; if (proxiwashIsAvailable) { proxiwashSubtitle = + + 0 ? + 'bold' : + 'normal', + color: dryerColor + }}> + {availableDryers} + - 0 ? - 'bold' : - 'normal', - color: dryerColor - }}> - {availableDryers} - - - { - availableDryers > 1 ? - i18n.t('homeScreen.dashboard.proxiwashSubtitle1Plural') : - i18n.t('homeScreen.dashboard.proxiwashSubtitle1') - } - - {"\n"} - 0 ? - 'bold' : - 'normal', - color: washerColor - }}> - {availableWashers} - - - { - availableWashers > 1 ? - i18n.t('homeScreen.dashboard.proxiwashSubtitle2Plural') : - i18n.t('homeScreen.dashboard.proxiwashSubtitle2') - } - - ; + { + availableDryers > 1 ? + i18n.t('homeScreen.dashboard.proxiwashSubtitle1Plural') : + i18n.t('homeScreen.dashboard.proxiwashSubtitle1') + } + + {"\n"} + 0 ? + 'bold' : + 'normal', + color: washerColor + }}> + {availableWashers} + + + { + availableWashers > 1 ? + i18n.t('homeScreen.dashboard.proxiwashSubtitle2Plural') : + i18n.t('homeScreen.dashboard.proxiwashSubtitle2') + } + + ; } else proxiwashSubtitle = i18n.t('homeScreen.dashboard.proxiwashSubtitleNA'); let proxiwashClickAction = () => this.props.navigation.navigate('Proxiwash'); @@ -497,10 +496,8 @@ export default class HomeScreen extends FetchedDataSectionList { getRenderItem(item: Object, section: Object, data: Object) { - if (section['id'] === SECTIONS_ID[0]) { - return this.getDashboardItem(item); - } else { - return ( + return ( + section['id'] === SECTIONS_ID[0] ? this.getDashboardItem(item) : - ); - } + ); } - } diff --git a/screens/PlanningScreen.js b/screens/PlanningScreen.js index 3d936f5..1fe69ac 100644 --- a/screens/PlanningScreen.js +++ b/screens/PlanningScreen.js @@ -1,10 +1,9 @@ // @flow import * as React from 'react'; -import {BackHandler} from 'react-native'; -import {Content, H1, H3, Text, Button} from 'native-base'; +import {BackHandler, Image, View} from 'react-native'; +import {Button, Content, H1, H3, Text} from 'native-base'; import i18n from "i18n-js"; -import {View, Image} from "react-native"; import ThemeManager from "../utils/ThemeManager"; import {Linking} from "expo"; import BaseContainer from "../components/BaseContainer"; @@ -61,6 +60,12 @@ export default class PlanningScreen extends React.Component { didFocusSubscription: Function; willBlurSubscription: Function; + state = { + modalCurrentDisplayItem: {}, + refreshing: false, + agendaItems: {}, + calendarShowing: false, + }; constructor(props: any) { super(props); @@ -68,7 +73,7 @@ export default class PlanningScreen extends React.Component { this.webDataManager = new WebDataManager(FETCH_URL); this.didFocusSubscription = props.navigation.addListener( 'didFocus', - payload => + () => BackHandler.addEventListener( 'hardwareBackPress', this.onBackButtonPressAndroid @@ -83,7 +88,7 @@ export default class PlanningScreen extends React.Component { this._onRefresh(); this.willBlurSubscription = this.props.navigation.addListener( 'willBlur', - payload => + () => BackHandler.removeEventListener( 'hardwareBackPress', this.onBackButtonPressAndroid @@ -105,13 +110,6 @@ export default class PlanningScreen extends React.Component { this.willBlurSubscription && this.willBlurSubscription.remove(); } - state = { - modalCurrentDisplayItem: {}, - refreshing: false, - agendaItems: {}, - calendarShowing: false, - }; - getCurrentDate() { let today = new Date(); return this.getFormattedDate(today); @@ -351,7 +349,7 @@ export default class PlanningScreen extends React.Component { getFormattedTime(event: Object) { if (this.getEventEndTime(event) !== "") - return this.getEventStartTime(event) + " - " + this.getEventEndTime(event) + return this.getEventStartTime(event) + " - " + this.getEventEndTime(event); else return this.getEventStartTime(event); } diff --git a/screens/Proximo/ProximoAboutScreen.js b/screens/Proximo/ProximoAboutScreen.js index 93e87f5..269a5f6 100644 --- a/screens/Proximo/ProximoAboutScreen.js +++ b/screens/Proximo/ProximoAboutScreen.js @@ -2,7 +2,7 @@ import * as React from 'react'; import {Image, Linking, View} from 'react-native'; -import {Body, Card, CardItem, Container, Content, H2, Left, Text} from 'native-base'; +import {Card, CardItem, Container, Content, H2, Left, Text} from 'native-base'; import CustomHeader from "../../components/CustomHeader"; import i18n from "i18n-js"; import CustomMaterialIcon from "../../components/CustomMaterialIcon"; @@ -11,14 +11,6 @@ type Props = { navigation: Object, }; -/** - * Opens a link in the device's browser - * @param link The link to open - */ -function openWebLink(link) { - Linking.openURL(link).catch((err) => console.error('Error opening link', err)); -} - /** * Class defining an about screen. This screen shows the user information about the app and it's author. */ diff --git a/screens/Proximo/ProximoListScreen.js b/screens/Proximo/ProximoListScreen.js index e505c76..446e17b 100644 --- a/screens/Proximo/ProximoListScreen.js +++ b/screens/Proximo/ProximoListScreen.js @@ -1,9 +1,9 @@ // @flow import * as React from 'react'; -import {Body, Container, Content, Left, ListItem, Right, Text, Thumbnail, H1, H3} from 'native-base'; +import {Body, Container, Content, H1, H3, Left, ListItem, Right, Text, Thumbnail} from 'native-base'; import CustomHeader from "../../components/CustomHeader"; -import {FlatList, Platform, View, Image} from "react-native"; +import {FlatList, Image, Platform, View} from "react-native"; import Touchable from 'react-native-platform-touchable'; import Menu, {MenuItem} from 'react-native-material-menu'; import i18n from "i18n-js"; @@ -62,13 +62,6 @@ export default class ProximoListScreen extends React.Component { originalData: Array; navData = this.props.navigation.getParam('data', []); shouldFocusSearchBar = this.props.navigation.getParam('shouldFocusSearchBar', false); - - constructor(props: any) { - super(props); - this.modalRef = React.createRef(); - this.originalData = this.navData['data']; - } - state = { currentlyDisplayedData: this.navData['data'].sort(sortPrice), currentSortMode: sortMode.price, @@ -77,9 +70,14 @@ export default class ProximoListScreen extends React.Component { sortNameIcon: '', modalCurrentDisplayItem: {}, }; - _menu: Menu; + constructor(props: any) { + super(props); + this.modalRef = React.createRef(); + this.originalData = this.navData['data']; + } + /** * Saves the reference to the sort menu for later use * @@ -132,9 +130,6 @@ export default class ProximoListScreen extends React.Component { } break; } - this.setState({ - navData: data, - }); this.setupSortIcons(mode, isReverse); this._menu.hide(); } @@ -297,7 +292,6 @@ export default class ProximoListScreen extends React.Component { render() { const nav = this.props.navigation; - const navType = nav.getParam('type', '{name: "Error"}'); return ( console.error('Error opening link', err)); -} - /** * Class defining an about screen. This screen shows the user information about the app and it's author. */ diff --git a/screens/Proxiwash/ProxiwashScreen.js b/screens/Proxiwash/ProxiwashScreen.js index 310ed70..fece8ab 100644 --- a/screens/Proxiwash/ProxiwashScreen.js +++ b/screens/Proxiwash/ProxiwashScreen.js @@ -89,7 +89,7 @@ export default class ProxiwashScreen extends FetchedDataSectionList { this.setState({machinesWatched: fetchedList}) }); // Get updated watchlist after received notification - Expo.Notifications.addListener((notification) => { + Expo.Notifications.addListener(() => { NotificationsManager.getMachineNotificationWatchlist((fetchedList) => { this.setState({machinesWatched: fetchedList}) }); diff --git a/screens/SelfMenuScreen.js b/screens/SelfMenuScreen.js index 76bb27b..3221b3b 100644 --- a/screens/SelfMenuScreen.js +++ b/screens/SelfMenuScreen.js @@ -2,11 +2,10 @@ import * as React from 'react'; import {View} from 'react-native'; -import {Text, H2, H3, Card, CardItem} from 'native-base'; +import {Card, CardItem, H2, H3, Text} from 'native-base'; import ThemeManager from "../utils/ThemeManager"; import i18n from "i18n-js"; import FetchedDataSectionList from "../components/FetchedDataSectionList"; -import LocaleManager from "../utils/LocaleManager"; const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/menu/menu_data.json"; @@ -64,7 +63,7 @@ export default class SelfMenuScreen extends FetchedDataSectionList { return true; } - hasSideMenu() : boolean { + hasSideMenu(): boolean { return false; } @@ -150,7 +149,7 @@ export default class SelfMenuScreen extends FetchedDataSectionList { flexDirection: 'column', paddingTop: 0, }}> - {item.dishes.map((object, i) => + {item.dishes.map((object) => {object.name !== "" ? { startScreenPickerSelected: AsyncStorageManager.getInstance().preferences.defaultStartScreen.current, }; + /** + * Get a list item using the specified control + * + * @param control The custom control to use + * @param icon The icon name to display on the list item + * @param title The text to display as this list item title + * @param subtitle The text to display as this list item subtitle + * @returns {React.Node} + */ + static getGeneralItem(control: React.Node, icon: string, title: string, subtitle: string) { + return ( + + + + + + + {title} + + + {subtitle} + + + + + {control} + + + ); + } + /** * Save the value for the proxiwash reminder notification time * @@ -179,39 +210,6 @@ export default class SettingsScreen extends React.Component { ); } - /** - * Get a list item using the specified control - * - * @param control The custom control to use - * @param icon The icon name to display on the list item - * @param title The text to display as this list item title - * @param subtitle The text to display as this list item subtitle - * @returns {React.Node} - */ - static getGeneralItem(control: React.Node, icon: string, title: string, subtitle: string) { - return ( - - - - - - - {title} - - - {subtitle} - - - - - {control} - - - ); - } - render() { const nav = this.props.navigation; return ( diff --git a/screens/Websites/AmicaleScreen.js b/screens/Websites/AmicaleScreen.js index 38b5bfc..57a863a 100644 --- a/screens/Websites/AmicaleScreen.js +++ b/screens/Websites/AmicaleScreen.js @@ -1,7 +1,6 @@ // @flow import * as React from 'react'; -import ThemeManager from "../../utils/ThemeManager"; import WebViewScreen from "../../components/WebViewScreen"; type Props = { diff --git a/screens/Websites/BlueMindScreen.js b/screens/Websites/BlueMindScreen.js index afcabaa..781e33f 100644 --- a/screens/Websites/BlueMindScreen.js +++ b/screens/Websites/BlueMindScreen.js @@ -1,7 +1,6 @@ // @flow import * as React from 'react'; -import ThemeManager from "../../utils/ThemeManager"; import WebViewScreen from "../../components/WebViewScreen"; import i18n from "i18n-js"; diff --git a/screens/Websites/ElusEtudScreen.js b/screens/Websites/ElusEtudScreen.js index 1151851..7da2dc9 100644 --- a/screens/Websites/ElusEtudScreen.js +++ b/screens/Websites/ElusEtudScreen.js @@ -1,7 +1,6 @@ // @flow import * as React from 'react'; -import ThemeManager from "../../utils/ThemeManager"; import WebViewScreen from "../../components/WebViewScreen"; type Props = { diff --git a/screens/Websites/EntScreen.js b/screens/Websites/EntScreen.js index 8df8e49..bb0f300 100644 --- a/screens/Websites/EntScreen.js +++ b/screens/Websites/EntScreen.js @@ -1,7 +1,6 @@ // @flow import * as React from 'react'; -import ThemeManager from "../../utils/ThemeManager"; import WebViewScreen from "../../components/WebViewScreen"; import i18n from "i18n-js"; @@ -50,7 +49,7 @@ export default class EntScreen extends React.Component { 'let stylesheet = document.createElement(\'link\');\n' + 'stylesheet.type = \'text/css\';\n' + 'stylesheet.rel = \'stylesheet\';\n' + - 'stylesheet.href = \'' + CUSTOM_CSS_GENERAL +'\';\n' + + 'stylesheet.href = \'' + CUSTOM_CSS_GENERAL + '\';\n' + 'let mobileSpec = document.createElement(\'meta\');\n' + 'mobileSpec.name = \'viewport\';\n' + 'mobileSpec.content = \'width=device-width, initial-scale=1.0\';\n' + diff --git a/screens/Websites/PlanexScreen.js b/screens/Websites/PlanexScreen.js index 521977b..ccdf9e0 100644 --- a/screens/Websites/PlanexScreen.js +++ b/screens/Websites/PlanexScreen.js @@ -3,7 +3,6 @@ import * as React from 'react'; import ThemeManager from "../../utils/ThemeManager"; import WebViewScreen from "../../components/WebViewScreen"; -import i18n from "i18n-js"; type Props = { navigation: Object, diff --git a/screens/Websites/TutorInsaScreen.js b/screens/Websites/TutorInsaScreen.js index 53c2101..c0bef99 100644 --- a/screens/Websites/TutorInsaScreen.js +++ b/screens/Websites/TutorInsaScreen.js @@ -1,7 +1,6 @@ // @flow import * as React from 'react'; -import ThemeManager from "../../utils/ThemeManager"; import WebViewScreen from "../../components/WebViewScreen"; type Props = { diff --git a/screens/Websites/WiketudScreen.js b/screens/Websites/WiketudScreen.js index 98353b0..8a8e23e 100644 --- a/screens/Websites/WiketudScreen.js +++ b/screens/Websites/WiketudScreen.js @@ -1,7 +1,6 @@ // @flow import * as React from 'react'; -import ThemeManager from "../../utils/ThemeManager"; import WebViewScreen from "../../components/WebViewScreen"; type Props = { From 0a6a4dc863de0a6e463ff6c9edf2d9ad0bac2228 Mon Sep 17 00:00:00 2001 From: keplyx Date: Sat, 1 Feb 2020 20:50:02 +0100 Subject: [PATCH 08/10] Fixed soome bugs, increased version number and added Changelog.md --- Changelog.md | 54 ++++++++++++++++++++- app.json | 4 +- components/CustomHeader.js | 3 +- components/DashboardItem.js | 6 ++- native-base-theme/variables/platform.js | 1 + native-base-theme/variables/platformDark.js | 1 + screens/Websites/BlueMindScreen.js | 7 +-- 7 files changed, 68 insertions(+), 8 deletions(-) diff --git a/Changelog.md b/Changelog.md index f48c24c..6e15d2c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,55 @@ # Changelog -Pas de version officielle. +Pensez à garder l'appli à jour pour profiter des dernières fonctionnalités ! + + - **v1.4.0** - _01/02/2020_ + - Correction d'un crash lors du rafraichissement de planex + - Correction de bugs divers + - Ajout d'un accès rapide à BlueMind et l'ENT + - Amélioration de l'apparence du menu gauche + - Amélioration de l'affichage de Planex + + - **v1.3.3** - _29/01/2020_ + - Ajout d'une barre de recherche dans Proximo + - Amélioration de l'interface Proximo + - Ajout d'un accès rapide au site des Élus Étudiants + - Amélioration du mode plein écran de Planex + - Correction d'un problème de Planex mettant des cours sans couleur de fond + - _Notes de développement :_ + - Yohan SIMARD rejoint le projet + - Passage de Expo SDK 33 à SDK 36 + - Passage de React Native 59 à 61 + - Mise à jour d'autres librairies + + + - **v1.3.0** - _08/11/2019_ + - Ajout du support du mode paysage dans l'écran Planex pour une vue de la semaine entière + - Ajout d'une page pour visualiser les salles en libre accès et réserver une Bib'Box + - Ajout de Tutor'INSA sur la dashboard pour un accès rapide + - Ouverture des sites web dans l'appli a la place d'utiliser le navigateur externe + - Correction de quelques bugs + + - **v1.2.0** - _01/11/2019_ + - Ajout d'une dashboard sur la page d'accueil pour un accès rapide aux informations les plus importantes. + - Corrections de bugs + + - **v1.1.1** - _28/09/2019_ + - Amélioration de la page Menu du RU + - Suppression de l'affichage des articles en rupture de stock dans la page Proximo + - Ajout de fonctionnalités de debug + + - **v1.1.0** - _17/09/2019_ + - Améliorations diverses de l'interface + - Ajout de l'écran planning des événements + + - **v1.0.3** - _13/09/2019_ + - Correction d'un crash sur l'écran du Proximo si l'utilisateur refuse les notifications + - Ajout de la possibilité de choisir un écran de démarrage + + - **v1.0.2** - _12/09/2019_ + - Amélioration de l'interface du Proximo + - Ajout de la possibilité de cliquer sur un article du Proximo pour afficher plus de détails + + - **v1.0.0** - _27/08/2019_ + - Première version officielle créée par Arnaud VERGNET + diff --git a/app.json b/app.json index 778d785..24144dd 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ "android", "web" ], - "version": "1.3.3", + "version": "1.4.0", "orientation": "portrait", "primaryColor": "#be1522", "icon": "./assets/android.icon.png", @@ -36,7 +36,7 @@ }, "android": { "package": "fr.amicaleinsat.application", - "versionCode": 11, + "versionCode": 12, "icon": "./assets/android.icon.png", "adaptiveIcon": { "foregroundImage": "./assets/android.adaptive-icon.png", diff --git a/components/CustomHeader.js b/components/CustomHeader.js index 71bd2ef..091f6f3 100644 --- a/components/CustomHeader.js +++ b/components/CustomHeader.js @@ -93,7 +93,8 @@ export default class CustomHeader extends React.Component { {this.props.hasSearchField ? this.getSearchBar() : {this.props.title}} diff --git a/components/DashboardItem.js b/components/DashboardItem.js index daa7dfb..716fb33 100644 --- a/components/DashboardItem.js +++ b/components/DashboardItem.js @@ -101,7 +101,11 @@ export default class DashboardItem extends React.Component { div: {color: ThemeManager.getCurrentThemeVariables().textColor}, }}/> { constructor() { super(); - this.customInjectedJS = - '$("head").append(\'\');' + - '$("head").append(\'\');true;'; + // Breaks website on ios + this.customInjectedJS = ''; + // '$("head").append(\'\');' + + // '$("head").append(\'\');true;'; } render() { From 2691931d73e9999f4dad4da95b0662c9b90ec094 Mon Sep 17 00:00:00 2001 From: keplyx Date: Sat, 1 Feb 2020 20:58:13 +0100 Subject: [PATCH 09/10] Added update text --- App.js | 4 ++-- components/CustomIntroSlider.js | 2 +- translations/en.json | 2 +- translations/fr.json | 2 +- utils/AsyncStorageManager.js | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/App.js b/App.js index 9644f2d..42fcfe4 100644 --- a/App.js +++ b/App.js @@ -69,7 +69,7 @@ export default class App extends React.Component { showUpdate: false, }); AsyncStorageManager.getInstance().savePref(AsyncStorageManager.getInstance().preferences.showIntro.key, '0'); - AsyncStorageManager.getInstance().savePref(AsyncStorageManager.getInstance().preferences.showUpdate4.key, '0'); + AsyncStorageManager.getInstance().savePref(AsyncStorageManager.getInstance().preferences.showUpdate5.key, '0'); } async loadAssetsAsync() { @@ -93,7 +93,7 @@ export default class App extends React.Component { isLoading: false, currentTheme: ThemeManager.getCurrentTheme(), showIntro: AsyncStorageManager.getInstance().preferences.showIntro.current === '1', - showUpdate: AsyncStorageManager.getInstance().preferences.showUpdate4.current === '1' + showUpdate: AsyncStorageManager.getInstance().preferences.showUpdate5.current === '1' // showIntro: true }); // Status bar goes dark if set too fast diff --git a/components/CustomIntroSlider.js b/components/CustomIntroSlider.js index 96a3c52..6e430e3 100644 --- a/components/CustomIntroSlider.js +++ b/components/CustomIntroSlider.js @@ -105,7 +105,7 @@ export default class CustomIntroSlider extends React.Component { key: '1', title: i18n.t('intro.updateSlide.title'), text: i18n.t('intro.updateSlide.text'), - icon: 'school', + icon: 'email', colors: ['#e01928', '#be1522'], }, ] diff --git a/translations/en.json b/translations/en.json index 4e6f0cf..8010f51 100644 --- a/translations/en.json +++ b/translations/en.json @@ -48,7 +48,7 @@ }, "updateSlide": { "title": "New in this update!", - "text": "Get ready for your exams with Tutor'INSA! Book a Bib'Box or find an empty room to study, available in the side menu." + "text": "Never miss an email anymore! Acces your INSA webmail from the app using the left menu. Planex has also seen some improvements!" }, "buttons": { "next": "Next", diff --git a/translations/fr.json b/translations/fr.json index 72ec3c3..5facbb1 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -48,7 +48,7 @@ }, "updateSlide": { "title": "Nouveau dans cette mise à jour !", - "text": "Préparez vos exams avec Tutor'INSA! Réservez une Bib'Box ou trouvez une salle libre pour travailler, disponible dans le menu à gauche. " + "text": "Ne ratez plus jamais un email ! Accédez à vos mails insa depuis le menu à gauche. Planex a aussi été un peu amélioré !" }, "buttons": { "next": "Suivant", diff --git a/utils/AsyncStorageManager.js b/utils/AsyncStorageManager.js index 6d6e597..8a009dc 100644 --- a/utils/AsyncStorageManager.js +++ b/utils/AsyncStorageManager.js @@ -29,8 +29,8 @@ export default class AsyncStorageManager { default: '1', current: '', }, - showUpdate4: { - key: 'showUpdate4', + showUpdate5: { + key: 'showUpdate5', default: '1', current: '', }, From 99eff7ebf5a33c7cbcb1400323f199b1bcda8eb3 Mon Sep 17 00:00:00 2001 From: keplyx Date: Sat, 1 Feb 2020 21:12:35 +0100 Subject: [PATCH 10/10] Improved translations --- translations/en.json | 2 +- translations/fr.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/en.json b/translations/en.json index 8010f51..3cd8800 100644 --- a/translations/en.json +++ b/translations/en.json @@ -48,7 +48,7 @@ }, "updateSlide": { "title": "New in this update!", - "text": "Never miss an email anymore! Acces your INSA webmail from the app using the left menu. Planex has also seen some improvements!" + "text": "Never miss an email anymore! Acces your INSA webmail from the app using the left menu.\nPlanex has also seen some improvements!\n\nSome of your remarks where taken into account for this update, more to come.\nThanks for your feedback on the survey! " }, "buttons": { "next": "Next", diff --git a/translations/fr.json b/translations/fr.json index 5facbb1..d2c78a1 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -48,7 +48,7 @@ }, "updateSlide": { "title": "Nouveau dans cette mise à jour !", - "text": "Ne ratez plus jamais un email ! Accédez à vos mails insa depuis le menu à gauche. Planex a aussi été un peu amélioré !" + "text": "Ne ratez plus jamais un email ! Accédez à vos mails INSA depuis le menu à gauche.\nPlanex a aussi été un peu amélioré !\n\nUne partie de vos remarques ont été prises en compte pour cette mise à jour, d'autres sont à venir.\nMerci pour votre retour lors du sondage !" }, "buttons": { "next": "Suivant",