diff --git a/src/app/config/assets.js b/src/app/config/assets.js index ea6c91a..8101b69 100644 --- a/src/app/config/assets.js +++ b/src/app/config/assets.js @@ -6,6 +6,11 @@ import RiverFlood from "../assets/river-extravasado.svg"; import RiverLow from "../assets/river_low.svg"; import RiverHigh from "../assets/river_high.svg"; import RiverNormal from "../assets/river_normal.svg"; +import RainNot from "../assets/sem_chuva.svg"; +import RainLow from "../assets/chuva_fraca.svg"; +import RainMedium from "../assets/chuva_moderada.svg"; +import RainHigh from "../assets/chuva_forte.svg"; +import RainVeryHigh from "../assets/chuva_muito_forte.svg"; export default { floodZones: { @@ -27,10 +32,15 @@ export default { rainLevel: { RainIcon: RainIcon, rain_0_5: require("../assets/sem_chuva.png"), + Rain_0_5: RainNot, rain_1_5: require("../assets/chuva_fraca.png"), + Rain_1_5: RainLow, rain_2_5: require("../assets/chuva_peq.png"), + Rain_2_5: RainMedium, rain_3_5: require("../assets/chuva_forte.png"), + Rain_3_5: RainHigh, rain_4_5: require("../assets/chuva_muito_forte.png"), + Rain_4_5: RainVeryHigh, rain_5_5: require("../assets/chuva_pancadas.png"), }, pluviometer: require("../assets/diario_pluviometrico.png"), diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js index 04d3ed9..6cc664a 100644 --- a/src/app/screens/RainSharingDataScreen.js +++ b/src/app/screens/RainSharingDataScreen.js @@ -37,6 +37,8 @@ function RainSharingDataScreen(props) { const [date, setDate] = useState(moment()); const [time, setTime] = useState(moment()); + const dims = scaleDimsFromWidth(85, 85, 27); + return ( { }, + onPress: () => {}, }); props.navigation.navigate("Home"); }} @@ -79,11 +81,7 @@ function RainSharingDataScreen(props) { borderColor={rain == 0 ? colors.primary : colors.white} style={styles.img_block} > - - Sem chuva + @@ -92,11 +90,7 @@ function RainSharingDataScreen(props) { borderColor={rain == 1 ? colors.primary : colors.white} style={styles.img_block} > - - Chuva fraca + @@ -105,26 +99,18 @@ function RainSharingDataScreen(props) { borderColor={rain == 2 ? colors.primary : colors.white} style={styles.img_block} > - - Chuva moderada + - + setRain(3)}> - - Chuva forte + @@ -133,15 +119,11 @@ function RainSharingDataScreen(props) { borderColor={rain == 4 ? colors.primary : colors.white} style={styles.img_block} > - - Chuva muito forte + - setRain(5)}> + {/* setRain(5)}> Pancada de chuva - + */} @@ -162,9 +144,21 @@ function RainSharingDataScreen(props) { - + {/*Data da coleta:*/} - + {/*Local do evento:*/} - props.navigation.navigate("FormMap")}> + props.navigation.navigate("FormMap")} + > @@ -197,8 +193,6 @@ function RainSharingDataScreen(props) { ); } -const dims = scaleDimsFromWidth(85, 85, 27); - const styles = StyleSheet.create({ container: { padding: 10, @@ -207,26 +201,16 @@ const styles = StyleSheet.create({ img_block: { flex: 1, borderRadius: 5, - padding: 10, borderStyle: "dotted", borderColor: colors.white, borderWidth: borderWidth, alignItems: "center", - width: dims.width, - }, - floodingLogo: { - width: dims.width * 0.8, - height: dims.height * 0.8, }, + imgs_row: { flexDirection: "row", justifyContent: "space-between", }, - text: { - fontSize: dimensions.text.default, - textAlign: "center", - marginTop: 10, - }, error_txt: { fontSize: dimensions.text.default, color: colors.danger,