From 95e73ae6219c712811033cb2a1af0ea65c7bff8b Mon Sep 17 00:00:00 2001
From: analuizaff <nanaluff@hotmail.com>
Date: Fri, 16 Apr 2021 19:15:17 -0300
Subject: [PATCH] minor adjustments

---
 src/app/components/FloatButton.js             | 56 +++++++++++++------
 src/app/components/MenuItens.js               |  2 +-
 .../navigation/SharingDataOptionsNavigator.js |  2 +-
 src/app/screens/AccountScreen.js              |  4 +-
 src/app/screens/LoginScreen.js                |  4 +-
 src/app/screens/MapFeedScreen.js              |  2 -
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/app/components/FloatButton.js b/src/app/components/FloatButton.js
index c6596cf..85b295d 100644
--- a/src/app/components/FloatButton.js
+++ b/src/app/components/FloatButton.js
@@ -18,6 +18,7 @@ import MenuItens from "./MenuItens";
 
 const screenWidth = Dimensions.get("window").width;
 const screenHeight = Dimensions.get("window").height;
+console.log("-----screenHeight: " + screenHeight);
 
 
 function FloatButton(props) {
@@ -77,7 +78,6 @@ function FloatButton(props) {
   });
 
   const selectedItens = (item) => {
-    
     item.isSelected = !item.isSelected;
     setChanged(!changed);
   }
@@ -103,18 +103,32 @@ function FloatButton(props) {
     return (
       <View>
         <View style={styles.Menucontainer} >
-
           <View style={{
             flex: 1,
-            height: screenHeight * 0.70,//solução temporária, procurar soluções pro menu se ajustar melhor ao layout
-            paddingTop: (screenHeight > 600 ? 0 : screenHeight * 0.09)
+            flexDirection: "column",
+            height: screenHeight * 0.75,//solução temporária, procurar soluções pro menu se ajustar melhor ao layout
+            paddingTop: (screenHeight > 600 ? 0 : screenHeight * 0.10)
           }}>
-            <FlatList
-              data={layers.values}
-              keyExtractor={(datas) => datas.id.toString()}
-              renderItem={renderItem}
-              extraData={changed}
-            />
+            <View style={{
+              flex: 0.05,
+              marginTop: screenHeight * 0.09,  
+              paddingBottom: 10,   
+              zIndex:3,
+              justifyContent: "center"
+            }}>
+              <Text style={styles.menuLabel}>
+                Escolha o que deseja ver no mapa:
+              </Text>
+            </View>
+            <View
+              style={{ flex: 0.85, flexGrow: 0.85, marginTop: 2 }}>
+              <FlatList
+                data={layers.values}
+                keyExtractor={(datas) => datas.id.toString()}
+                renderItem={renderItem}
+                extraData={changed, open}
+              />
+            </View>
             <View style={styles.submit_btn}>
               <TouchableOpacity onPress={() => applyLayers()}>
                 <View style={styles.button}>
@@ -128,19 +142,17 @@ function FloatButton(props) {
     );
   }
   /*------------------------------------------------------------------------------------------------------------------------ */
-  
+
   return (
     <View style={[styles.container]}>
-      <View style={{
-        width: (open ? screenWidth * 0.70 : 0),
-        flex: 1,
+      {open && (<View style={{
+        width: screenWidth * 0.70,
       }}>
         <Animated.View>
           {DataMenu()}
         </Animated.View>
-
-      </View>
-      <View style={{ margin: 35, alignSelf: "flex-end" }}>
+      </View>)}
+      <View style={{ flex: 0.10, margin: 12, alignSelf: "flex-end" }}>
         <TouchableWithoutFeedback onPress={toggleMenu}>
           <Animated.View style={[styles.floatButton, styles.menu]}>
             <MaterialCommunityIcons
@@ -187,6 +199,7 @@ const styles = StyleSheet.create({
     bottom: 0,
     width: "100%",
     padding: 20,
+    flex: 0.10
   },
   button: {
     backgroundColor: "#1976D2",
@@ -212,7 +225,14 @@ const styles = StyleSheet.create({
     color: colors.lightBlue,
     fontSize: dimensions.text.tertiary,
     fontWeight: "bold",
-  }
+  },
+  menuLabel: {
+    color: colors.lightBlue,
+    fontSize: 16,
+    fontWeight: "bold",
+    padding: 10,
+    backgroundColor: colors.white,
+  },
 });
 
 export default FloatButton;
diff --git a/src/app/components/MenuItens.js b/src/app/components/MenuItens.js
index f2d4520..4a045e7 100644
--- a/src/app/components/MenuItens.js
+++ b/src/app/components/MenuItens.js
@@ -10,7 +10,7 @@ import { Ionicons } from '@expo/vector-icons';
 function MenuItens({ item, onPress, icon }) {   
     return (
         <TouchableOpacity onPress={onPress} style={[styles.item]}>
-            <View style={{ flexDirection: "row", flex: 1, marginTop: 12 }}>
+            <View style={{ flexDirection: "row", flex: 1, paddingTop: 20 }}>
                 <View style={{ flexDirection: "row", flex: 0.20 }}>
                     <Ionicons name="md-rainy" size={24} color={colors.lightBlue} />
                 </View>
diff --git a/src/app/navigation/SharingDataOptionsNavigator.js b/src/app/navigation/SharingDataOptionsNavigator.js
index 4a2415f..45d0b8b 100644
--- a/src/app/navigation/SharingDataOptionsNavigator.js
+++ b/src/app/navigation/SharingDataOptionsNavigator.js
@@ -67,7 +67,7 @@ function SharingDataOptionsNavigator() {
         name="FormMap"
         component={MapFormScreen}
         options={{
-          title: "Voltar",
+          title: "Selecione o ponto no mapa",
           headerStyle: {
             backgroundColor: "white",
           },
diff --git a/src/app/screens/AccountScreen.js b/src/app/screens/AccountScreen.js
index baf3c1f..694c6d2 100644
--- a/src/app/screens/AccountScreen.js
+++ b/src/app/screens/AccountScreen.js
@@ -34,7 +34,7 @@ function AccountScreen(props) {
       <Text>{user.name}</Text>
       <Text>{user.email}</Text>
 
-      <TouchableOpacity onPress={()=> props.navigation.navigate("PluviometerRegister")}>
+      {/* <TouchableOpacity onPress={()=> props.navigation.navigate("PluviometerRegister")}>
         <View style={{
           flexDirection: "row",
           justifyContent: "flex-start",
@@ -55,7 +55,7 @@ function AccountScreen(props) {
               </Text>
           </View>
         </View>
-      </TouchableOpacity>
+          </TouchableOpacity>*/}
       <View style={{ paddingTop: 40 }}>
         <Button
           title="Logout"
diff --git a/src/app/screens/LoginScreen.js b/src/app/screens/LoginScreen.js
index 32a36d7..a87e6a3 100644
--- a/src/app/screens/LoginScreen.js
+++ b/src/app/screens/LoginScreen.js
@@ -85,7 +85,7 @@ export default function LoginScreen(props) {
 
         <SubmitButton title="entrar" backgroundColor={colors.primary} />
 
-        <TouchableNativeFeedback
+        {/* <TouchableNativeFeedback
           onPress={() => {
             props.navigation.navigate("Register");
           }}
@@ -94,7 +94,7 @@ export default function LoginScreen(props) {
             <Text>Não tem uma conta? </Text>
             <Text style={{ color: colors.lightBlue }}>Cadastre-se</Text>
           </View>
-        </TouchableNativeFeedback>
+        </TouchableNativeFeedback>*/}
       </Form>
     </Screen>
   );
diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js
index 40b6cd9..84f576d 100644
--- a/src/app/screens/MapFeedScreen.js
+++ b/src/app/screens/MapFeedScreen.js
@@ -16,8 +16,6 @@ function MapFeedScreen(props) {
   const datas = useContext(MapDataContext);
   const location = context.currentCoordinates;
   const focusChanged = attachFocusToQuery();
-  console.log("-----------latitude: "+ location.latitude);
-  console.log("-----------longitude: "+ location.longitude);
 
   const default_location = {
     latitude: -12.901799,