diff --git a/src/app/assets/rain/chuva_forte.svg b/src/app/assets/rain/chuva_forte.svg index e08406e..70a1f64 100644 --- a/src/app/assets/rain/chuva_forte.svg +++ b/src/app/assets/rain/chuva_forte.svg @@ -1,52 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/assets/rain/chuva_fraca.svg b/src/app/assets/rain/chuva_fraca.svg index 2975077..a19ce23 100644 --- a/src/app/assets/rain/chuva_fraca.svg +++ b/src/app/assets/rain/chuva_fraca.svg @@ -1,28 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/assets/rain/chuva_moderada.svg b/src/app/assets/rain/chuva_moderada.svg index f11f5dc..389c907 100644 --- a/src/app/assets/rain/chuva_moderada.svg +++ b/src/app/assets/rain/chuva_moderada.svg @@ -1,46 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/assets/rain/sem_chuva.svg b/src/app/assets/rain/sem_chuva.svg index 7724a5a..eedc226 100644 --- a/src/app/assets/rain/sem_chuva.svg +++ b/src/app/assets/rain/sem_chuva.svg @@ -1,17 +1 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js index d5f0777..0417b57 100644 --- a/src/app/screens/RainSharingDataScreen.js +++ b/src/app/screens/RainSharingDataScreen.js @@ -14,15 +14,14 @@ import { scaleDimsFromWidth, dimensions } from "../config/dimensions"; import assets from "../config/assets"; import moment from "moment"; import { EventLocationContext } from "../context/EventLocationContext"; -import { useIsFocused } from "@react-navigation/native"; import PickEventDateLocation from "../components/PickEventDateLocation"; +import SvgLabeledButton from "../components/SvgLabeledButton"; const validationSchema = Yup.object().shape({ images: Yup.array(), description: Yup.string().label("Description"), }); - function RainSharingDataScreen(props) { const [rain, setRain] = useState(-1); const [error, setError] = useState(false); @@ -71,44 +70,41 @@ function RainSharingDataScreen(props) { paddingTop: 16, }} > - - setRain(0)}> - - {rain == 0 ? ( - - ) : ( - - )} - - - - setRain(1)}> - {rain == 1 ? ( - - ) : ( - - )} - + + setRain(0)} + SvgImage={assets.rainLevel.Rain_0_5} + label={"SEM CHUVA"} + isToggle={rain == 0} + /> + setRain(1)} + SvgImage={assets.rainLevel.Rain_1_5} + label={"CHUVA FRACA"} + isToggle={rain == 1} + /> - setRain(2)}> - - {rain == 2 ? ( - - ) : ( - - )} - - - - setRain(3)}> - {rain == 3 ? ( - - ) : ( - - )} - + setRain(2)} + SvgImage={assets.rainLevel.Rain_2_5} + label={"CHUVA MODERADA"} + isToggle={rain == 2} + /> + + setRain(3)} + SvgImage={assets.rainLevel.Rain_3_5} + label={"CHUVA FORTE"} + isToggle={rain == 3} + />