Browse Source

Rolling back to account screen in bottom menu, removing Data screen.

master
GabrielTrettel 4 years ago
parent
commit
ac4119652d
  1. 2
      src/app/components/HeaderBarMenu.js
  2. 12
      src/app/navigation/AppNavigator.js
  3. 2
      src/app/screens/DataScreen.js
  4. 2
      src/app/screens/ForecastScreen.js
  5. 3
      src/app/screens/MapFeedScreen.js
  6. 2
      src/app/screens/MessagesScreen.js
  7. 2
      src/app/screens/SharingDataScreen.js

2
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 { FontAwesome5 } from "@expo/vector-icons";
import { import {

12
src/app/navigation/AppNavigator.js

@ -2,7 +2,7 @@ import React from "react";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import { MaterialCommunityIcons } from "@expo/vector-icons"; import { MaterialCommunityIcons } from "@expo/vector-icons";
import DataNavigator from "./DataNavigator";
import AccountNavigator from "./AccountNavigator";
import FeedNavigator from "./FeedNavigator"; import FeedNavigator from "./FeedNavigator";
import MessagesNavigator from "./MessagesNavigator"; import MessagesNavigator from "./MessagesNavigator";
import ForecastNavigator from "./ForecastNavigator"; import ForecastNavigator from "./ForecastNavigator";
@ -74,15 +74,11 @@ const AppNavigator = () => (
}} }}
/> />
<Tab.Screen <Tab.Screen
name="Dados"
component={DataNavigator}
name="Perfil"
component={AccountNavigator}
options={{ options={{
tabBarIcon: ({ color, size }) => ( tabBarIcon: ({ color, size }) => (
<MaterialCommunityIcons
name="layers-triple"
color={color}
size={size}
/>
<MaterialCommunityIcons name="account" color={color} size={size} />
), ),
}} }}
/> />

2
src/app/screens/DataScreen.js

@ -6,7 +6,6 @@ import colors from "../config/colors";
import { screen_width, screen_height } from "../config/dimensions"; import { screen_width, screen_height } from "../config/dimensions";
import attachFocusToQuery from "../hooks/useFocus"; import attachFocusToQuery from "../hooks/useFocus";
import { CurrentLocationContext } from "../context/CurrentLocationContext"; import { CurrentLocationContext } from "../context/CurrentLocationContext";
import HeaderBarMenu from "../components/HeaderBarMenu";
import { MapMarkerList } from "../components/MapMarkerList"; import { MapMarkerList } from "../components/MapMarkerList";
function DataScreen(props) { function DataScreen(props) {
@ -31,7 +30,6 @@ function DataScreen(props) {
const [renderFlood, setRenderFlood] = useState(true); const [renderFlood, setRenderFlood] = useState(true);
const [renderRiver, setRenderRiver] = useState(true); const [renderRiver, setRenderRiver] = useState(true);
const [renderPluviometer, setRenderPluviometer] = useState(true); const [renderPluviometer, setRenderPluviometer] = useState(true);
HeaderBarMenu(props.navigation);
return ( return (
<View style={styles.container}> <View style={styles.container}>

2
src/app/screens/ForecastScreen.js

@ -6,7 +6,6 @@ import colors from "../config/colors";
import getWeatherForecast from "../api/weather_forecast"; import getWeatherForecast from "../api/weather_forecast";
import assets from "../config/assets"; import assets from "../config/assets";
import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view"; import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
import HeaderBarMenu from "../components/HeaderBarMenu";
function forecastDay(day, setDay) { function forecastDay(day, setDay) {
return ( return (
@ -244,7 +243,6 @@ function renderErrorScreen() {
function ForecastScreen(props) { function ForecastScreen(props) {
const forecast = getWeatherForecast(); const forecast = getWeatherForecast();
HeaderBarMenu(props.navigation);
return ( return (
<Screen>{forecast ? renderScreen(forecast) : renderErrorScreen()}</Screen> <Screen>{forecast ? renderScreen(forecast) : renderErrorScreen()}</Screen>
); );

3
src/app/screens/MapFeedScreen.js

@ -6,7 +6,6 @@ import colors from "../config/colors";
import { screen_width, screen_height } from "../config/dimensions"; import { screen_width, screen_height } from "../config/dimensions";
import attachFocusToQuery from "../hooks/useFocus"; import attachFocusToQuery from "../hooks/useFocus";
import { CurrentLocationContext } from "../context/CurrentLocationContext"; import { CurrentLocationContext } from "../context/CurrentLocationContext";
import HeaderBarMenu from "../components/HeaderBarMenu";
import { MapMarkerList } from "../components/MapMarkerList"; import { MapMarkerList } from "../components/MapMarkerList";
function MapFeedScreen(props) { function MapFeedScreen(props) {
@ -27,8 +26,6 @@ function MapFeedScreen(props) {
longitudeDelta: map_scale * (screen_width / screen_height), longitudeDelta: map_scale * (screen_width / screen_height),
}; };
HeaderBarMenu(props.navigation);
return ( return (
<View style={styles.container}> <View style={styles.container}>
<MapView <MapView

2
src/app/screens/MessagesScreen.js

@ -1,10 +1,8 @@
import React from "react"; import React from "react";
import Screen from "../components/Screen"; import Screen from "../components/Screen";
import InDevelopment from "../components/InDevelopment"; import InDevelopment from "../components/InDevelopment";
import HeaderBarMenu from "../components/HeaderBarMenu";
function MessageScreen(props) { function MessageScreen(props) {
HeaderBarMenu(props.navigation);
return ( return (
<Screen> <Screen>
<InDevelopment /> <InDevelopment />

2
src/app/screens/SharingDataScreen.js

@ -6,14 +6,12 @@ import assets from "../config/assets";
import { scaleDimsFromWidth, dimensions } from "../config/dimensions"; import { scaleDimsFromWidth, dimensions } from "../config/dimensions";
import { Svg, Image as ImageSvg, SvgXml } from "react-native-svg"; import { Svg, Image as ImageSvg, SvgXml } from "react-native-svg";
import HeaderBarMenu from "../components/HeaderBarMenu";
//1/3 //1/3
function SharingDataScreen({ navigation }) { function SharingDataScreen({ navigation }) {
const dims = scaleDimsFromWidth(93, 106, 35); const dims = scaleDimsFromWidth(93, 106, 35);
// const dims = { width: "100%", height: "100%" }; // const dims = { width: "100%", height: "100%" };
HeaderBarMenu(navigation);
return ( return (
<View style={styles.container}> <View style={styles.container}>
<ScrollView> <ScrollView>

Loading…
Cancel
Save