diff --git a/src/app/assets/pluviometer/pluviometer-logo.svg b/src/app/assets/pluviometer/pluviometer-logo.svg index d8bcd40..6181c15 100644 --- a/src/app/assets/pluviometer/pluviometer-logo.svg +++ b/src/app/assets/pluviometer/pluviometer-logo.svg @@ -1,7 +1,6 @@ - + - diff --git a/src/app/assets/rain/chuva_forte_toggle.svg b/src/app/assets/rain/chuva_forte_toggle.svg new file mode 100644 index 0000000..9acc35d --- /dev/null +++ b/src/app/assets/rain/chuva_forte_toggle.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/rain/chuva_fraca_toggle.svg b/src/app/assets/rain/chuva_fraca_toggle.svg new file mode 100644 index 0000000..7b7dc6a --- /dev/null +++ b/src/app/assets/rain/chuva_fraca_toggle.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/rain/chuva_moderada_toggle.svg b/src/app/assets/rain/chuva_moderada_toggle.svg new file mode 100644 index 0000000..fd76afd --- /dev/null +++ b/src/app/assets/rain/chuva_moderada_toggle.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/rain/chuva_muito_forte_toggle.svg b/src/app/assets/rain/chuva_muito_forte_toggle.svg new file mode 100644 index 0000000..3721f21 --- /dev/null +++ b/src/app/assets/rain/chuva_muito_forte_toggle.svg @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/rain/rain-icon.svg b/src/app/assets/rain/rain-icon.svg index 8b09e93..e0a1f1f 100644 --- a/src/app/assets/rain/rain-icon.svg +++ b/src/app/assets/rain/rain-icon.svg @@ -1 +1,46 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/rain/sem_chuva_toggle.svg b/src/app/assets/rain/sem_chuva_toggle.svg new file mode 100644 index 0000000..7c39296 --- /dev/null +++ b/src/app/assets/rain/sem_chuva_toggle.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/app/assets/river/river-logo.svg b/src/app/assets/river/river-logo.svg index c4e26fc..ff960b1 100644 --- a/src/app/assets/river/river-logo.svg +++ b/src/app/assets/river/river-logo.svg @@ -1,5 +1,5 @@ - + diff --git a/src/app/config/assets.js b/src/app/config/assets.js index 05ab648..8366300 100644 --- a/src/app/config/assets.js +++ b/src/app/config/assets.js @@ -17,6 +17,11 @@ import RainLow from "../assets/rain/chuva_fraca.svg"; import RainMedium from "../assets/rain/chuva_moderada.svg"; import RainHigh from "../assets/rain/chuva_forte.svg"; import RainVeryHigh from "../assets/rain/chuva_muito_forte.svg"; +import RainNotToggle from "../assets/rain/sem_chuva_toggle.svg"; +import RainLowToggle from "../assets/rain/chuva_fraca_toggle.svg"; +import RainMediumToggle from "../assets/rain/chuva_moderada_toggle.svg"; +import RainHighToggle from "../assets/rain/chuva_forte_toggle.svg"; +import RainVeryHighToggle from "../assets/rain/chuva_muito_forte_toggle.svg"; export default { floodZones: { @@ -52,14 +57,24 @@ export default { RainIcon: RainIcon, rain_0_5: require("../assets/rain/sem_chuva.png"), Rain_0_5: RainNot, + Rain_0_5_Toggle: RainNotToggle, + rain_1_5: require("../assets/rain/chuva_fraca.png"), Rain_1_5: RainLow, + Rain_1_5_Toggle: RainLowToggle, + rain_2_5: require("../assets/rain/chuva_peq.png"), Rain_2_5: RainMedium, + Rain_2_5_Toggle: RainMediumToggle, + rain_3_5: require("../assets/rain/chuva_forte.png"), Rain_3_5: RainHigh, + Rain_3_5_Toggle: RainHighToggle, + rain_4_5: require("../assets/rain/chuva_muito_forte.png"), Rain_4_5: RainVeryHigh, + Rain_4_5_Toggle: RainVeryHighToggle, + rain_5_5: require("../assets/rain/chuva_pancadas.png"), }, pluviometer: require("../assets/pluviometer/diario_pluviometrico.png"), diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js index 799da5a..d7093fa 100644 --- a/src/app/screens/RainSharingDataScreen.js +++ b/src/app/screens/RainSharingDataScreen.js @@ -2,16 +2,10 @@ import React, { useContext, useEffect, useState } from "react"; import { StyleSheet, View, ScrollView } from "react-native"; import * as Yup from "yup"; -import { - Form, - FormPicker as Picker, - SubmitButton, - FormField, -} from "../components/forms"; +import { Form, SubmitButton, FormField } from "../components/forms"; import Screen from "../components/Screen"; import FormImagePicker from "../components/forms/FormImagePicker"; -import useLocation from "../hooks/useLocation"; -import { Image, Text, TouchableOpacity } from "react-native"; +import { Text, TouchableOpacity } from "react-native"; import colors from "../config/colors"; import { TouchableNativeFeedback } from "react-native-gesture-handler"; import { insertRainData } from "../database/databaseLoader"; @@ -39,12 +33,12 @@ function RainSharingDataScreen(props) { const [date, setDate] = useState(moment()); const [time, setTime] = useState(moment()); - const context = useContext(EventLocationContext); + const context = useContext(EventLocationContext); useEffect(() => { context.defaultLocation(); }, []); - + const location = context.eventCoordinates; return ( @@ -74,64 +68,56 @@ function RainSharingDataScreen(props) { setRain(0)}> - - + + {rain == 0 ? ( + + ) : ( + + )} setRain(1)}> - - + + {rain == 1 ? ( + + ) : ( + + )} setRain(2)}> - - + + {rain == 2 ? ( + + ) : ( + + )} setRain(3)}> - - + + {rain == 3 ? ( + + ) : ( + + )} setRain(4)}> - - + + {rain == 4 ? ( + + ) : ( + + )} - - {/* setRain(5)}> - - - Pancada de chuva - - */} @@ -203,7 +189,6 @@ const styles = StyleSheet.create({ borderWidth: borderWidth, alignItems: "center", }, - imgs_row: { flexDirection: "row", justifyContent: "space-between",