From eedf428a4c7c741ec0936b208dafd7ce6a1c4710 Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Wed, 8 Dec 2021 19:33:09 -0300
Subject: [PATCH 1/5] Removing ImagePicker from forms

---
 src/app/screens/PluviometerSharingDataScreen.js | 2 +-
 src/app/screens/RainSharingDataScreen.js        | 2 +-
 src/app/screens/RiverFloodSharingDataScreen.js  | 3 ++-
 src/app/screens/SharingFloodZonesScreen.js      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/screens/PluviometerSharingDataScreen.js b/src/app/screens/PluviometerSharingDataScreen.js
index f3be0c1..8a80543 100644
--- a/src/app/screens/PluviometerSharingDataScreen.js
+++ b/src/app/screens/PluviometerSharingDataScreen.js
@@ -106,7 +106,7 @@ function PluviometerSharingDataScreen(props) {
             increaseDecreaseButtons={true}
           />
 
-          <FormImagePicker backgroundColor={colors.primary} name="images" />
+          {/* <FormImagePicker backgroundColor={colors.primary} name="images" /> */}
 
           <PickEventDateLocation
             date={date}
diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js
index bc23668..69dae1d 100644
--- a/src/app/screens/RainSharingDataScreen.js
+++ b/src/app/screens/RainSharingDataScreen.js
@@ -175,7 +175,7 @@ function RainSharingDataScreen(props) {
             <Text style={styles.error_txt}>Selecione o nível da chuva </Text>
           )}
 
-          <FormImagePicker backgroundColor={colors.primary} name="images" />
+          {/* <FormImagePicker backgroundColor={colors.primary} name="images" /> */}
 
           <PickEventDateLocation
             date={date}
diff --git a/src/app/screens/RiverFloodSharingDataScreen.js b/src/app/screens/RiverFloodSharingDataScreen.js
index 34a1548..37899cc 100644
--- a/src/app/screens/RiverFloodSharingDataScreen.js
+++ b/src/app/screens/RiverFloodSharingDataScreen.js
@@ -128,6 +128,7 @@ function RiverFloodSharingDataScreen(props) {
               flexDirection="row"
               justifyContent="center"
               paddingBottom={16}
+
             >
               <View style={styles.imgs_row}>
                 <SvgLabeledButton
@@ -181,7 +182,7 @@ function RiverFloodSharingDataScreen(props) {
             <Text style={styles.error_txt}>Selecione o nível do rio</Text>
           )}
 
-          <FormImagePicker backgroundColor={colors.primary} name="images" />
+          {/* <FormImagePicker backgroundColor={colors.primary} name="images" /> */}
 
           <PickEventDateLocation
             date={date}
diff --git a/src/app/screens/SharingFloodZonesScreen.js b/src/app/screens/SharingFloodZonesScreen.js
index 03d035a..e6b063a 100644
--- a/src/app/screens/SharingFloodZonesScreen.js
+++ b/src/app/screens/SharingFloodZonesScreen.js
@@ -143,7 +143,7 @@ function SharingFloodZonesScreen(props) {
             <Text style={styles.error_txt}>Selecione uma opção</Text>
           )}
 
-          <FormImagePicker name="images" height={10} />
+          {/* <FormImagePicker name="images" height={10} /> */}
 
           <PickEventDateLocation
             date={date}

From 3d3055af8ff4937bd682301164815a493a050cb8 Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Wed, 8 Dec 2021 19:34:40 -0300
Subject: [PATCH 2/5] Increasing spacing above datelocation picker

---
 src/app/components/PickEventDateLocation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/components/PickEventDateLocation.js b/src/app/components/PickEventDateLocation.js
index 004738f..6840e96 100644
--- a/src/app/components/PickEventDateLocation.js
+++ b/src/app/components/PickEventDateLocation.js
@@ -19,7 +19,7 @@ export default function PickEventDateLocation({
     <View
       style={{
         flex: 1,
-        paddingTop: 24,
+        paddingTop: 36,
         paddingHorizontal: 16,
         paddingBottom:24
       }}

From e34810691b61dcbd69c9cef8897d523734218cf7 Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Wed, 8 Dec 2021 20:03:24 -0300
Subject: [PATCH 3/5] Fixing spacing in pluviometerRegister

---
 src/app/screens/PluviometerRegisterScreen.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/screens/PluviometerRegisterScreen.js b/src/app/screens/PluviometerRegisterScreen.js
index 3cf5e45..b675665 100644
--- a/src/app/screens/PluviometerRegisterScreen.js
+++ b/src/app/screens/PluviometerRegisterScreen.js
@@ -36,7 +36,7 @@ function Institution({ user }) {
         </Text>
       </View>
 
-      <Text style={[styles.label, { marginTop: 24 }]}>
+      <Text style={[styles.label, { marginTop: 24, marginBottom:16, }]}>
         Nome da instituição:
       </Text>
       <View style={{ flexDirection: "row" }}>
@@ -69,7 +69,7 @@ function LocationPicker({
       <MaterialIcons name="location-on" size={30} color={colors.primary} />
 
       {pluviometer && (
-        <View style={{ flexDirection: "row", marginTop: 16 }}>
+        <View style={{ flexDirection: "row"}}>
           <Text style={styles.subText}>
             {pluviometer.address
               ? pluviometer.address
@@ -130,7 +130,7 @@ function PluvDateTimePicker({
   pluviometer,
 }) {
   return (
-    <View style={{ height: 58 }}>
+    <View style={{ height: 48 }}>
       {!pluviometer && (
         <FormDatePicker
           onDateChange={onDateChange}
@@ -154,13 +154,11 @@ function PluvDateTimePicker({
             size={30}
             color={colors.primary}
           />
-          <View style={styles.date}>
             <Text style={styles.subTextDate}>
               {pluviometer.regiterDate
                 ? pluviometer.regiterDate
                 : "Erro ao carregar a data"}
             </Text>
-          </View>
         </View>
       )}
     </View>
@@ -265,7 +263,7 @@ function PluviometerRegisterScreen(props) {
 
           <Text style={styles.label}>Endereço do pluviômetro*: </Text>
 
-          <View marginBottom={24} marginTop={12}>
+          <View marginBottom={24} marginTop={16}>
             <LocationPicker
               navigation={props.navigation}
               location={location}
@@ -289,7 +287,7 @@ function PluviometerRegisterScreen(props) {
 const styles = StyleSheet.create({
   label: {
     fontSize: dimensions.text.secondary,
-    marginBottom: 12,
+    // marginBottom: 12,
     fontWeight: "bold",
     textAlign: "left",
     color: colors.secondary,
@@ -309,6 +307,7 @@ const styles = StyleSheet.create({
   },
   subTextDate: {
     color: colors.subText,
+    paddingLeft: 16,
     fontSize: 16,
     alignSelf: "center",
     fontWeight: "500",

From e1faac4eddd7ed61014c3677c9bd2710e277f914 Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Wed, 8 Dec 2021 20:11:01 -0300
Subject: [PATCH 4/5] Implementing no gps locations error in mapfeed screen

---
 src/app/components/NoGPSError.js | 47 ++++++++++++++++++++++++++++++++
 src/app/screens/MapFeedScreen.js |  7 ++---
 2 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 src/app/components/NoGPSError.js

diff --git a/src/app/components/NoGPSError.js b/src/app/components/NoGPSError.js
new file mode 100644
index 0000000..94ebb48
--- /dev/null
+++ b/src/app/components/NoGPSError.js
@@ -0,0 +1,47 @@
+import React from "react";
+import { StyleSheet, Text, View } from "react-native";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+import colors from "../config/colors";
+import { dimensions } from "../config/dimensions";
+
+export default function NoGPSError() {
+  return (
+    <View style={styles.containter}>
+      <View style={styles.icon}>
+        <MaterialCommunityIcons
+          name="map-marker-outline"
+          size={58}
+          color={colors.primary}
+          alignSelf="center"
+        />
+      </View>
+      <Text style={styles.txtHeader}>Ops, algo deu errado...</Text>
+      <Text style={styles.txtStyle}>
+        Não foi possível definir a sua localização. Ative o GPS e tente novamente.
+      </Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  containter: {
+    flex: 1,
+    justifyContent: "center",
+    padding: 10,
+  },
+  icon:{
+      alignSelf:"center",
+  },
+  txtHeader: {
+    color: colors.primary,
+    fontSize: dimensions.text.header,
+    fontWeight: "bold",
+    textAlign: "center",
+    paddingBottom: 20,
+  },
+  txtStyle: {
+    fontSize: dimensions.text.secondary,
+    fontWeight: "bold",
+    textAlign: "center",
+  },
+});
diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js
index 2ea86da..7a0b609 100644
--- a/src/app/screens/MapFeedScreen.js
+++ b/src/app/screens/MapFeedScreen.js
@@ -5,6 +5,7 @@ import attachFocusToQuery from "../hooks/useFocus";
 import HeaderBarMenu from "../components/HeaderBarMenu";
 import useSocketMarkers from "../hooks/useSocketMarkers";
 import LoadingMarkersModal from "../components/LoadingMarkersModal";
+import NoGPSError from "../components/NoGPSError";
 
 export default function MapFeedScreen(props) {
   HeaderBarMenu(props.navigation);
@@ -28,7 +29,7 @@ export default function MapFeedScreen(props) {
 
   // console.log("location:  " + JSON.stringify(global.location))
   return (
-    (global.location) ? (
+    (!global.location) ? (
     <View style={styles.container}>
       <OpenStreetMap
         markers={markers}
@@ -40,9 +41,7 @@ export default function MapFeedScreen(props) {
         show={markers.markers.size <= 0}/>
     </View>
     ):(
-      <View>
-        <Text>Apresentar um erro no futuro</Text>
-        </View>
+      <NoGPSError/>
     )
   );
 }

From 5dd0445072d6376baa7e169c9448d8bad17fd773 Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Wed, 8 Dec 2021 20:13:55 -0300
Subject: [PATCH 5/5] Fixing typo

---
 src/app/screens/MapFeedScreen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js
index 7a0b609..0dd6af4 100644
--- a/src/app/screens/MapFeedScreen.js
+++ b/src/app/screens/MapFeedScreen.js
@@ -29,7 +29,7 @@ export default function MapFeedScreen(props) {
 
   // console.log("location:  " + JSON.stringify(global.location))
   return (
-    (!global.location) ? (
+    (global.location) ? (
     <View style={styles.container}>
       <OpenStreetMap
         markers={markers}