Changed prowiwash source to use updating json, edited readme

This commit is contained in:
keplyx 2019-08-08 16:24:55 +02:00
parent 83ae37420f
commit c6e27c5d47
5 changed files with 11 additions and 7 deletions

View file

@ -1,3 +1,7 @@
# application-amicale # Application pour l'Amicale
Application Android et IOS pour l'Amicale de l'INSA Toulouse 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
-

View file

@ -10,7 +10,7 @@
"android", "android",
"web" "web"
], ],
"version": "0.0.6", "version": "0.0.7",
"orientation": "portrait", "orientation": "portrait",
"primaryColor": "#be1522", "primaryColor": "#be1522",
"icon": "./assets/android.icon.png", "icon": "./assets/android.icon.png",

View file

@ -25,7 +25,7 @@ type State = {
export default class BaseContainer extends React.Component<Props, State> { export default class BaseContainer extends React.Component<Props, State> {
static defaultProps = { static defaultProps = {
headerRightMenu: <Right/> headerRightButton: <View/>
}; };

View file

@ -11,7 +11,7 @@ import ThemeManager from "../utils/ThemeManager";
const ICON_AMICALE = require('../assets/amicale.png'); const ICON_AMICALE = require('../assets/amicale.png');
const NAME_AMICALE = 'Amicale INSA Toulouse'; 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";
/** /**

View file

@ -12,7 +12,7 @@ import PlatformTouchable from "react-native-platform-touchable";
import AsyncStorageManager from "../utils/AsyncStorageManager"; import AsyncStorageManager from "../utils/AsyncStorageManager";
import * as Expo from "expo"; 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; let reminderNotifTime = 5;
@ -42,7 +42,7 @@ export default class ProxiwashScreen extends FetchedDataSectionList {
* Creates machine state parameters using current theme and translations * Creates machine state parameters using current theme and translations
*/ */
constructor() { constructor() {
super(DATA_URL, 1000 * 30); // Refresh every half minute super(DATA_URL, 1000 * 60); // Refresh every minute
let colors = ThemeManager.getCurrentThemeVariables(); let colors = ThemeManager.getCurrentThemeVariables();
stateColors[MACHINE_STATES.TERMINE] = colors.proxiwashFinishedColor; stateColors[MACHINE_STATES.TERMINE] = colors.proxiwashFinishedColor;
stateColors[MACHINE_STATES.DISPONIBLE] = colors.proxiwashReadyColor; stateColors[MACHINE_STATES.DISPONIBLE] = colors.proxiwashReadyColor;