From ac4119652de0d4957a2e9743d0ef99822fa701f4 Mon Sep 17 00:00:00 2001
From: GabrielTrettel <gabrielmtrettel@gmail.com>
Date: Tue, 6 Apr 2021 11:21:49 -0300
Subject: [PATCH] Rolling back to account screen in bottom menu, removing Data
 screen.

---
 src/app/components/HeaderBarMenu.js  |  2 +-
 src/app/navigation/AppNavigator.js   | 12 ++++--------
 src/app/screens/DataScreen.js        |  2 --
 src/app/screens/ForecastScreen.js    |  2 --
 src/app/screens/MapFeedScreen.js     |  3 ---
 src/app/screens/MessagesScreen.js    |  2 --
 src/app/screens/SharingDataScreen.js |  2 --
 7 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/app/components/HeaderBarMenu.js b/src/app/components/HeaderBarMenu.js
index 424a22e..c62511a 100644
--- a/src/app/components/HeaderBarMenu.js
+++ b/src/app/components/HeaderBarMenu.js
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from "react";
+import React from "react";
 
 import { FontAwesome5 } from "@expo/vector-icons";
 import {
diff --git a/src/app/navigation/AppNavigator.js b/src/app/navigation/AppNavigator.js
index ec28967..48b7143 100644
--- a/src/app/navigation/AppNavigator.js
+++ b/src/app/navigation/AppNavigator.js
@@ -2,7 +2,7 @@ import React from "react";
 import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
 
-import DataNavigator from "./DataNavigator";
+import AccountNavigator from "./AccountNavigator";
 import FeedNavigator from "./FeedNavigator";
 import MessagesNavigator from "./MessagesNavigator";
 import ForecastNavigator from "./ForecastNavigator";
@@ -74,15 +74,11 @@ const AppNavigator = () => (
       }}
     />
     <Tab.Screen
-      name="Dados"
-      component={DataNavigator}
+      name="Perfil"
+      component={AccountNavigator}
       options={{
         tabBarIcon: ({ color, size }) => (
-          <MaterialCommunityIcons
-            name="layers-triple"
-            color={color}
-            size={size}
-          />
+          <MaterialCommunityIcons name="account" color={color} size={size} />
         ),
       }}
     />
diff --git a/src/app/screens/DataScreen.js b/src/app/screens/DataScreen.js
index aa43286..6d1c63e 100644
--- a/src/app/screens/DataScreen.js
+++ b/src/app/screens/DataScreen.js
@@ -6,7 +6,6 @@ import colors from "../config/colors";
 import { screen_width, screen_height } from "../config/dimensions";
 import attachFocusToQuery from "../hooks/useFocus";
 import { CurrentLocationContext } from "../context/CurrentLocationContext";
-import HeaderBarMenu from "../components/HeaderBarMenu";
 import { MapMarkerList } from "../components/MapMarkerList";
 
 function DataScreen(props) {
@@ -31,7 +30,6 @@ function DataScreen(props) {
   const [renderFlood, setRenderFlood] = useState(true);
   const [renderRiver, setRenderRiver] = useState(true);
   const [renderPluviometer, setRenderPluviometer] = useState(true);
-  HeaderBarMenu(props.navigation);
 
   return (
     <View style={styles.container}>
diff --git a/src/app/screens/ForecastScreen.js b/src/app/screens/ForecastScreen.js
index 4962931..062be2e 100644
--- a/src/app/screens/ForecastScreen.js
+++ b/src/app/screens/ForecastScreen.js
@@ -6,7 +6,6 @@ import colors from "../config/colors";
 import getWeatherForecast from "../api/weather_forecast";
 import assets from "../config/assets";
 import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
-import HeaderBarMenu from "../components/HeaderBarMenu";
 
 function forecastDay(day, setDay) {
   return (
@@ -244,7 +243,6 @@ function renderErrorScreen() {
 function ForecastScreen(props) {
   const forecast = getWeatherForecast();
 
-  HeaderBarMenu(props.navigation);
   return (
     <Screen>{forecast ? renderScreen(forecast) : renderErrorScreen()}</Screen>
   );
diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js
index fc77022..b7384ce 100644
--- a/src/app/screens/MapFeedScreen.js
+++ b/src/app/screens/MapFeedScreen.js
@@ -6,7 +6,6 @@ import colors from "../config/colors";
 import { screen_width, screen_height } from "../config/dimensions";
 import attachFocusToQuery from "../hooks/useFocus";
 import { CurrentLocationContext } from "../context/CurrentLocationContext";
-import HeaderBarMenu from "../components/HeaderBarMenu";
 import { MapMarkerList } from "../components/MapMarkerList";
 
 function MapFeedScreen(props) {
@@ -27,8 +26,6 @@ function MapFeedScreen(props) {
     longitudeDelta: map_scale * (screen_width / screen_height),
   };
 
-  HeaderBarMenu(props.navigation);
-
   return (
     <View style={styles.container}>
       <MapView
diff --git a/src/app/screens/MessagesScreen.js b/src/app/screens/MessagesScreen.js
index 4c94268..8a773b1 100644
--- a/src/app/screens/MessagesScreen.js
+++ b/src/app/screens/MessagesScreen.js
@@ -1,10 +1,8 @@
 import React from "react";
 import Screen from "../components/Screen";
 import InDevelopment from "../components/InDevelopment";
-import HeaderBarMenu from "../components/HeaderBarMenu";
 
 function MessageScreen(props) {
-  HeaderBarMenu(props.navigation);
   return (
     <Screen>
       <InDevelopment />
diff --git a/src/app/screens/SharingDataScreen.js b/src/app/screens/SharingDataScreen.js
index b08427b..7d95e63 100644
--- a/src/app/screens/SharingDataScreen.js
+++ b/src/app/screens/SharingDataScreen.js
@@ -6,14 +6,12 @@ import assets from "../config/assets";
 import { scaleDimsFromWidth, dimensions } from "../config/dimensions";
 import { Svg, Image as ImageSvg, SvgXml } from "react-native-svg";
 
-import HeaderBarMenu from "../components/HeaderBarMenu";
 //1/3
 
 function SharingDataScreen({ navigation }) {
   const dims = scaleDimsFromWidth(93, 106, 35);
   // const dims = { width: "100%", height: "100%" };
 
-  HeaderBarMenu(navigation);
   return (
     <View style={styles.container}>
       <ScrollView>