From e4ef1e4eb64f904d49c14e79ead2881b01eb9db6 Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Wed, 16 Dec 2020 18:09:19 -0300
Subject: [PATCH] Going back 1 level in navigation stack when some data is
 inserted

---
 src/app/screens/PluviometerSharingDataScreen.js |  7 ++++---
 src/app/screens/RainSharingDataScreen.js        |  5 ++++-
 src/app/screens/RiverFloodSharingDataScreen.js  | 15 ++++++++++-----
 src/app/screens/SharingFloodZonesScreen.js      |  5 ++++-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/app/screens/PluviometerSharingDataScreen.js b/src/app/screens/PluviometerSharingDataScreen.js
index f76f6a4..09f0cea 100644
--- a/src/app/screens/PluviometerSharingDataScreen.js
+++ b/src/app/screens/PluviometerSharingDataScreen.js
@@ -48,9 +48,10 @@ function PluviometerSharingDataScreen() {
           pluviometer: "",
           images: [],
         }}
-        onSubmit={(values) =>
-          insertPluviometerData({ ...values, date, location })
-        }
+        onSubmit={(values) => {
+          insertPluviometerData({ ...values, date, location });
+          props.navigation.goBack(null);
+        }}
         validationSchema={validationSchema}
       >
         <View style={{ marginTop: 30 }}>
diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js
index 559e41c..7426faf 100644
--- a/src/app/screens/RainSharingDataScreen.js
+++ b/src/app/screens/RainSharingDataScreen.js
@@ -44,7 +44,10 @@ function RainSharingDataScreen() {
         initialValues={{
           images: [],
         }}
-        onSubmit={(values) => insertRainData({ ...values, rain, location })}
+        onSubmit={(values) => {
+          insertRainData({ ...values, rain, location });
+          props.navigation.goBack(null);
+        }}
         validationSchema={validationSchema}
       >
         <View>
diff --git a/src/app/screens/RiverFloodSharingDataScreen.js b/src/app/screens/RiverFloodSharingDataScreen.js
index 63b02a1..13ec016 100644
--- a/src/app/screens/RiverFloodSharingDataScreen.js
+++ b/src/app/screens/RiverFloodSharingDataScreen.js
@@ -17,7 +17,7 @@ const validationSchema = Yup.object().shape({
 
 const borderWidth = 4;
 
-function RiverFloodSharingDataScreen() {
+function RiverFloodSharingDataScreen(props) {
   const [riverScale, setRiverScale] = useState(0);
   const location = useLocation();
 
@@ -38,9 +38,10 @@ function RiverFloodSharingDataScreen() {
         initialValues={{
           images: [],
         }}
-        onSubmit={(values) =>
-          insertRiverData({ ...values, riverScale, location })
-        }
+        onSubmit={(values) => {
+          insertRiverData({ ...values, riverScale, location });
+          props.navigation.goBack(null);
+        }}
         validationSchema={validationSchema}
       >
         <View>
@@ -106,7 +107,11 @@ function RiverFloodSharingDataScreen() {
         </View>
         <FormImagePicker backgroundColor="#1976D2" name="images" />
 
-        <SubmitButton title="Enviar" backgroundColor={colors.primary} />
+        <SubmitButton
+          title="Enviar"
+          backgroundColor={colors.primary}
+          onPress={() => props.navigation.pop()}
+        />
       </Form>
     </Screen>
   );
diff --git a/src/app/screens/SharingFloodZonesScreen.js b/src/app/screens/SharingFloodZonesScreen.js
index f36814f..52bd538 100644
--- a/src/app/screens/SharingFloodZonesScreen.js
+++ b/src/app/screens/SharingFloodZonesScreen.js
@@ -54,7 +54,10 @@ function SharingFloodZonesScreen() {
           images: [],
           description: "",
         }}
-        onSubmit={(values) => submitForm({ ...values, passable, location })}
+        onSubmit={(values) => {
+          submitForm({ ...values, passable, location });
+          props.navigation.goBack(null);
+        }}
         validationSchema={validationSchema}
       >
         <View style={styles.imgs_container}>