From c020a69e929fda5a83f988250ea883c98de42b8c Mon Sep 17 00:00:00 2001 From: GabrielTrettel Date: Fri, 27 Aug 2021 18:17:33 -0300 Subject: [PATCH] Adding profile screen navigator in header bar --- src/app/screens/ForecastScreen.js | 2 ++ src/app/screens/MapFeedScreen.js | 5 ++++- src/app/screens/MessagesScreen.js | 2 ++ src/app/screens/SharingDataScreen.js | 2 ++ src/package.json | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/screens/ForecastScreen.js b/src/app/screens/ForecastScreen.js index 4eed66d..b697af1 100644 --- a/src/app/screens/ForecastScreen.js +++ b/src/app/screens/ForecastScreen.js @@ -7,6 +7,7 @@ import getWeatherForecast from "../api/weather_forecast"; import assets from "../config/assets"; import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view"; import Swipeable from "react-native-gesture-handler/Swipeable"; +import HeaderBarMenu from "../components/HeaderBarMenu"; function forecastDay(day, setDay) { return ( @@ -297,6 +298,7 @@ function renderErrorScreen() { } function ForecastScreen(props) { + HeaderBarMenu(props.navigation); const forecast = getWeatherForecast(); return ( diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js index 60ce4e5..c9c9679 100644 --- a/src/app/screens/MapFeedScreen.js +++ b/src/app/screens/MapFeedScreen.js @@ -5,8 +5,11 @@ import attachFocusToQuery from "../hooks/useFocus"; import { MapMarkerList } from "../components/MapMarkerList"; import formsApi from "../api/getforms"; import useMarkers from "../hooks/selectFromDB"; +import HeaderBarMenu from "../components/HeaderBarMenu"; + +export default function MapFeedScreen(props) { + HeaderBarMenu(props.navigation); -export default function MapFeedScreen() { const focusChanged = attachFocusToQuery(); const [error, setError] = useState(false); const markers = useMarkers(focusChanged); diff --git a/src/app/screens/MessagesScreen.js b/src/app/screens/MessagesScreen.js index 8a773b1..4c94268 100644 --- a/src/app/screens/MessagesScreen.js +++ b/src/app/screens/MessagesScreen.js @@ -1,8 +1,10 @@ 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 ( diff --git a/src/app/screens/SharingDataScreen.js b/src/app/screens/SharingDataScreen.js index 294df99..2c5b134 100644 --- a/src/app/screens/SharingDataScreen.js +++ b/src/app/screens/SharingDataScreen.js @@ -5,9 +5,11 @@ import { TouchableOpacity, ScrollView } from "react-native"; import assets from "../config/assets"; import { scaleDimsFromWidth, dimensions } from "../config/dimensions"; import SvgLabeledButton from "../components/SvgLabeledButton"; +import HeaderBarMenu from "../components/HeaderBarMenu"; //1/3 function SharingDataScreen({ navigation }) { + HeaderBarMenu(navigation); const dims = scaleDimsFromWidth(93, 106, 35); // const dims = { width: "100%", height: "100%" }; diff --git a/src/package.json b/src/package.json index 33bed79..bde29e5 100644 --- a/src/package.json +++ b/src/package.json @@ -59,7 +59,7 @@ "react-native-web": "~0.13.12", "react-native-webview": "10.7.0", "react-navigation": "^4.4.3", - "react-navigation-header-buttons": "^7.0.1", + "react-navigation-header-buttons": "^7.0.2", "react-navigation-tabs": "^2.10.1", "rn-checkbox-list": "^0.4.0", "searchable-flatlist": "0.0.4",