diff --git a/src/app/components/EventLocationInput.js b/src/app/components/EventLocationInput.js index e63aad5..01dccb4 100644 --- a/src/app/components/EventLocationInput.js +++ b/src/app/components/EventLocationInput.js @@ -2,12 +2,19 @@ import React, { useContext } from "react"; import { EventLocationContext } from "../context/EventLocationContext"; import { Text } from "react-native"; +import { dimensions } from "../config/dimensions"; const EventLocationInput = () => { const context = useContext(EventLocationContext); - return( - {context.eventLocation} + return ( + + {context.eventLocation} + ); } diff --git a/src/app/components/forms/FormDatePicker.js b/src/app/components/forms/FormDatePicker.js index 753513c..658c453 100644 --- a/src/app/components/forms/FormDatePicker.js +++ b/src/app/components/forms/FormDatePicker.js @@ -72,6 +72,7 @@ const FormDatePicker = (props) => { value={new Date(auxDate)} mode={mode} is24Hour={true} + locale={"pt-br"} minimumDate={new Date(moment().subtract(1, "month"))} maximumDate={new Date(moment())} formatChosenDate={(selectedDate) => { @@ -91,9 +92,9 @@ const FormDatePicker = (props) => { setShow(true)}> @@ -107,8 +108,7 @@ const FormDatePicker = (props) => { - {" "} - {date.format("DD/MM/YYYY")} {"\n "} {time.format("HH:mm")} + {" "}{date.format("DD/MM/YYYY")} {"\n"} {time.format("HH:mm")} @@ -199,9 +199,8 @@ const styles = StyleSheet.create({ }, dateInput: { flex: 0.8, - backgroundColor: colors.white, - borderRadius: 25, - marginVertical: 10, + backgroundColor: colors.white, + paddingLeft: 5, }, dateIcon: { backgroundColor: colors.primary, diff --git a/src/app/components/forms/FormLocationPicker.js b/src/app/components/forms/FormLocationPicker.js index a9d0cbd..fba949a 100644 --- a/src/app/components/forms/FormLocationPicker.js +++ b/src/app/components/forms/FormLocationPicker.js @@ -8,7 +8,7 @@ import EventLocationInput from "../EventLocationInput"; function FormLocationPicker() { return ( - + - + - - Defina o local no mapa + + + Defina o local no mapa + ); } const styles = StyleSheet.create({ location: { - flex: 1, + //flex: 1, + width:"100%", flexDirection: "row", - alignItems: "center", + alignItems: "flex-start", justifyContent: "space-between", + // backgroundColor: colors.secondary, }, adressText: { - flex: 0.78, - backgroundColor: colors.white, - borderRadius: 25, - marginVertical: 10, + flex: 0.80, + paddingLeft: 5, }, mapIcon: { backgroundColor: colors.primary, padding: 8, width: 20, - alignItems: "center", + alignItems: "flex-start", borderRadius: 5, - flex: 0.2, + flex: 0.20, }, }); diff --git a/src/app/screens/PluviometerSharingDataScreen.js b/src/app/screens/PluviometerSharingDataScreen.js index 433d033..729c3bc 100644 --- a/src/app/screens/PluviometerSharingDataScreen.js +++ b/src/app/screens/PluviometerSharingDataScreen.js @@ -86,6 +86,7 @@ function PluviometerSharingDataScreen(props) { flex: 1, flexDirection: "row", justifyContent: "space-between", + alignContent:"flex-start", }} > {/*Data da coleta:*/} @@ -107,7 +108,7 @@ function PluviometerSharingDataScreen(props) { /> {/*Local do evento:*/} - + props.navigation.navigate("FormMap")} > diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js index d7093fa..5bf79aa 100644 --- a/src/app/screens/RainSharingDataScreen.js +++ b/src/app/screens/RainSharingDataScreen.js @@ -132,6 +132,7 @@ function RainSharingDataScreen(props) { flex: 1, flexDirection: "row", justifyContent: "space-between", + alignContent:"flex-start", }} > {/*Data da coleta:*/} @@ -153,7 +154,7 @@ function RainSharingDataScreen(props) { /> {/*Local do evento:*/} - + props.navigation.navigate("FormMap")} > diff --git a/src/app/screens/RiverFloodSharingDataScreen.js b/src/app/screens/RiverFloodSharingDataScreen.js index 363be19..11c8a54 100644 --- a/src/app/screens/RiverFloodSharingDataScreen.js +++ b/src/app/screens/RiverFloodSharingDataScreen.js @@ -130,6 +130,7 @@ function RiverFloodSharingDataScreen(props) { flex: 1, flexDirection: "row", justifyContent: "space-between", + alignContent:"flex-start", }} > {/*Data da coleta:*/} @@ -151,7 +152,7 @@ function RiverFloodSharingDataScreen(props) { /> {/*Local do evento:*/} - + props.navigation.navigate("FormMap")} > diff --git a/src/app/screens/SharingFloodZonesScreen.js b/src/app/screens/SharingFloodZonesScreen.js index bb6a377..897c550 100644 --- a/src/app/screens/SharingFloodZonesScreen.js +++ b/src/app/screens/SharingFloodZonesScreen.js @@ -118,6 +118,7 @@ function SharingFloodZonesScreen(props) { flex: 1, flexDirection: "row", justifyContent: "space-between", + alignContent:"flex-start", }} > {/*Data da coleta:*/} @@ -139,7 +140,7 @@ function SharingFloodZonesScreen(props) { /> {/*Local do evento:*/} - + props.navigation.navigate("FormMap")} >