diff --git a/native-base-theme/variables/platform.js b/native-base-theme/variables/platform.js
index 58a081a..5f78f2f 100644
--- a/native-base-theme/variables/platform.js
+++ b/native-base-theme/variables/platform.js
@@ -260,11 +260,11 @@ export default {
customMaterialIconColor: "#5d5d5d",
// PROXIWASH
- proxiwashFinishedColor: "rgba(54,165,22,0.4)",
+ proxiwashFinishedColor: "rgba(54,165,22,0.31)",
proxiwashReadyColor: "transparent",
- proxiwashRunningColor: "rgba(94,104,241,0.4)",
- proxiwashBrokenColor: "#a2a2a2",
- proxiwashErrorColor: "rgba(204,7,0,0.4)",
+ proxiwashRunningColor: "rgba(94,104,241,0.3)",
+ proxiwashBrokenColor: "rgba(162,162,162,0.31)",
+ proxiwashErrorColor: "rgba(204,7,0,0.31)",
// Other
borderRadiusBase: platform === "ios" ? 5 : 2,
diff --git a/screens/ProxiwashScreen.js b/screens/ProxiwashScreen.js
index 44c9a8e..66b8511 100644
--- a/screens/ProxiwashScreen.js
+++ b/screens/ProxiwashScreen.js
@@ -2,7 +2,7 @@
import * as React from 'react';
import {AsyncStorage, View} from 'react-native';
-import {Body, Button, H2, Icon, Left, ListItem, Right, Text} from 'native-base';
+import {Body, Card, CardItem, H2, Left, Right, Text} from 'native-base';
import ThemeManager from '../utils/ThemeManager';
import i18n from "i18n-js";
import CustomMaterialIcon from "../components/CustomMaterialIcon";
@@ -23,7 +23,7 @@ const MACHINE_STATES = {
};
let stateStrings = {};
-
+let stateIcons = {};
let stateColors = {};
@@ -37,7 +37,7 @@ export default class ProxiwashScreen extends FetchedDataSectionList {
refreshing: false,
firstLoading: true,
fetchedData: {},
- machinesWatched : [],
+ machinesWatched: [],
};
/**
@@ -57,6 +57,12 @@ export default class ProxiwashScreen extends FetchedDataSectionList {
stateStrings[MACHINE_STATES.FONCTIONNE] = i18n.t('proxiwashScreen.states.running');
stateStrings[MACHINE_STATES.HS] = i18n.t('proxiwashScreen.states.broken');
stateStrings[MACHINE_STATES.ERREUR] = i18n.t('proxiwashScreen.states.error');
+
+ stateIcons[MACHINE_STATES.TERMINE] = 'check-circle';
+ stateIcons[MACHINE_STATES.DISPONIBLE] = 'radiobox-blank';
+ stateIcons[MACHINE_STATES.FONCTIONNE] = 'progress-check';
+ stateIcons[MACHINE_STATES.HS] = 'alert-octagram-outline';
+ stateIcons[MACHINE_STATES.ERREUR] = 'alert';
}
getFetchUrl() {
@@ -208,60 +214,70 @@ export default class ProxiwashScreen extends FetchedDataSectionList {
*/
getRenderItem(item: Object, section: Object, data: Object) {
return (
-
-
-
-
-
-
-
-
- {section.title === data[0].title ? i18n.t('proxiwashScreen.dryer') : i18n.t('proxiwashScreen.washer')} n°{item.number}
-
-
- {item.startTime !== '' ? item.startTime + '/' + item.endTime : ''}
-
-
-
- {item.startTime !== '' ?
-
- : {stateStrings[MACHINE_STATES[item.state]]}
+
- }
-
- );
+
+
+
+
+
+
+ {section.title === data[0].title ? i18n.t('proxiwashScreen.dryer') : i18n.t('proxiwashScreen.washer')} n°{item.number}
+
+
+ {item.startTime !== '' ? item.startTime + '/' + item.endTime : ''}
+
+
+
+
+
+ {stateStrings[MACHINE_STATES[item.state]]}
+
+
+
+ {/*{item.startTime !== '' ?*/}
+ {/* {*/}
+ {/* this.setupNotifications(item.number, ProxiwashScreen.getRemainingTime(item.startTime, item.endTime, item.donePercent))*/}
+ {/* }}*/}
+ {/* >*/}
+ {/* */}
+ {/* {ProxiwashScreen.getRemainingTime(item.startTime, item.endTime, item.donePercent) + ' ' + i18n.t('proxiwashScreen.min')}*/}
+ {/* */}
+ {/* */}
+ {/* */}
+ {/* : (*/}
+ {/* )*/}
+ {/*}*/}
+
+
+ );
}
getRenderSectionHeader(title: String) {