diff --git a/README.md b/README.md index ce1ca36..9da966e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ -# application-amicale +# Application pour l'Amicale -Application Android et IOS pour l'Amicale de l'INSA Toulouse \ No newline at end of file +Créée pendant l'été 2019, cette application compatible Android et iOS permet aux étudiants d'avoir un accès facile aux informations du campus : + - News de l'amicale + - État des machines à laver + - Stock du Proximo + - diff --git a/app.json b/app.json index d3d6342..2bb8b3b 100644 --- a/app.json +++ b/app.json @@ -10,7 +10,7 @@ "android", "web" ], - "version": "0.0.6", + "version": "0.0.7", "orientation": "portrait", "primaryColor": "#be1522", "icon": "./assets/android.icon.png", diff --git a/components/BaseContainer.js b/components/BaseContainer.js index 2a7451e..10de752 100644 --- a/components/BaseContainer.js +++ b/components/BaseContainer.js @@ -25,7 +25,7 @@ type State = { export default class BaseContainer extends React.Component { static defaultProps = { - headerRightMenu: + headerRightButton: }; diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js index a2d95d4..4b11410 100644 --- a/screens/HomeScreen.js +++ b/screens/HomeScreen.js @@ -11,7 +11,7 @@ import ThemeManager from "../utils/ThemeManager"; const ICON_AMICALE = require('../assets/amicale.png'); const NAME_AMICALE = 'Amicale INSA Toulouse'; -const DATA_URL = "https://etud.insa-toulouse.fr/~vergnet/appli-amicale/facebook_data.json"; +const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~vergnet/appli-amicale/facebook_data.json"; /** diff --git a/screens/ProxiwashScreen.js b/screens/ProxiwashScreen.js index 71b6504..6018bcb 100644 --- a/screens/ProxiwashScreen.js +++ b/screens/ProxiwashScreen.js @@ -12,7 +12,7 @@ import PlatformTouchable from "react-native-platform-touchable"; import AsyncStorageManager from "../utils/AsyncStorageManager"; import * as Expo from "expo"; -const DATA_URL = "https://etud.insa-toulouse.fr/~vergnet/appli-amicale/dataProxiwash.json"; +const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~vergnet/appli-amicale/washinsa/washinsa.json"; let reminderNotifTime = 5; @@ -42,7 +42,7 @@ export default class ProxiwashScreen extends FetchedDataSectionList { * Creates machine state parameters using current theme and translations */ constructor() { - super(DATA_URL, 1000 * 30); // Refresh every half minute + super(DATA_URL, 1000 * 60); // Refresh every minute let colors = ThemeManager.getCurrentThemeVariables(); stateColors[MACHINE_STATES.TERMINE] = colors.proxiwashFinishedColor; stateColors[MACHINE_STATES.DISPONIBLE] = colors.proxiwashReadyColor;