diff --git a/src/app/api/weather_forecast.js b/src/app/api/weather_forecast.js
index 0e600e2..a332448 100644
--- a/src/app/api/weather_forecast.js
+++ b/src/app/api/weather_forecast.js
@@ -28,7 +28,7 @@ function getWeatherForecast() {
rain_fall_mm: 0,
},
{
- week_day: " Terça ",
+ week_day: "Terça",
date: "20/03",
weather_index: 2,
rain_fall_mm: 5,
diff --git a/src/app/components/MapDataMenu.js b/src/app/components/MapDataMenu.js
new file mode 100644
index 0000000..787e61f
--- /dev/null
+++ b/src/app/components/MapDataMenu.js
@@ -0,0 +1,142 @@
+import React, { useState } from "react";
+
+import { View, StyleSheet, Text, Button, TouchableOpacity } from "react-native";
+import SelfClosingModal from "./SelfClosingModal";
+import colors from "../config/colors";
+import { FontAwesome5 } from '@expo/vector-icons';
+import { MaterialIcons } from "@expo/vector-icons";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+import { Shadow } from "react-native-shadow-2";
+
+function DataMenuHeader({ setShowModal }) {
+ return (
+
+ DADOS
+
+ setShowModal(null)}
+ >
+
+
+
+ );
+}
+
+function DataOriginSelector() {
+ const [dataOriginToShow, setDataOriginToShow] = useState("oficial")
+ const bgToUse = (selected) => dataOriginToShow == selected ? colors.secondary : colors.gray;
+
+ return (
+
+
+ setDataOriginToShow("oficial")}
+ >
+
+ OFICIAL
+
+
+
+ setDataOriginToShow("citzen")}
+ >
+
+ CIDADÃO
+
+
+
+ );
+}
+
+function DataMenuBody({ setShowModal }) {
+ return (
+
+
+
+
+ );
+}
+
+export default function MapDataMenu(props) {
+ const [showModal, setShowModal] = useState(null);
+ return (
+
+
+ );
+}
+
+const styles = StyleSheet.create({
+ choicesBtn: {
+ width: "50%",
+ backgroundColor: colors.secondary,
+ height: "100%",
+ justifyContent: "center",
+ paddingHorizontal: 12,
+ alignItems: "center",
+ justifyContent: "flex-start",
+ flexDirection: "row"
+ },
+ text: {
+ color: colors.white,
+ alignSelf: "center",
+ fontWeight: "500",
+ fontSize: 16,
+ },
+ topBarIcon: {
+ alignSelf: "center",
+ },
+});
diff --git a/src/app/components/MapModal.js b/src/app/components/MapModal.js
index c3a1c67..087fd27 100644
--- a/src/app/components/MapModal.js
+++ b/src/app/components/MapModal.js
@@ -24,7 +24,7 @@ function notImplemented() {
});
}
-function topBar(setMarkerToRender) {
+function topBar(setShowModal) {
return (
setMarkerToRender(null)}
+ onPress={() => setShowModal(null)}
>
- {topBar(setMarkerToRender)}
+ {topBar(setShowModal)}
{componentBody(currentMarker)}
{isPluviometer(currentMarker.name) ? moreInfo(currentMarker) : null}
{!isPluviometer(currentMarker.name) ? reviews(currentMarker) : null}
diff --git a/src/app/components/SelfClosingModal.js b/src/app/components/SelfClosingModal.js
index 3819d98..23801db 100644
--- a/src/app/components/SelfClosingModal.js
+++ b/src/app/components/SelfClosingModal.js
@@ -14,10 +14,10 @@ export default function SelfClosingModal(props) {
props.setMarkerToRender(null)}
+ onPress={() => props.setShowModal(null)}
>
diff --git a/src/app/components/map/OpenStreetMap.js b/src/app/components/map/OpenStreetMap.js
index ebd3fe1..b656daf 100644
--- a/src/app/components/map/OpenStreetMap.js
+++ b/src/app/components/map/OpenStreetMap.js
@@ -8,6 +8,7 @@ import {
} from "./LeafLetMap";
import MapModal from "../MapModal";
import html_content from "./Map.js";
+import MapDataMenu from "../MapDataMenu";
function bindEventsToListeners(
@@ -83,10 +84,11 @@ export default function OpenStreetMap({
)}
+
);
diff --git a/src/app/config/colors.js b/src/app/config/colors.js
index d6e9cf3..bda41f4 100644
--- a/src/app/config/colors.js
+++ b/src/app/config/colors.js
@@ -1,6 +1,6 @@
export default {
primary: "#006493",
- secondary: "#4ecdc4",
+ secondary: "rgba(74, 141, 183, 0.87)",
black: "#000",
white: "#fff",
medium: "#6e6969",
diff --git a/src/app/screens/ForecastScreen.js b/src/app/screens/ForecastScreen.js
index 2f0492d..4eed66d 100644
--- a/src/app/screens/ForecastScreen.js
+++ b/src/app/screens/ForecastScreen.js
@@ -114,7 +114,6 @@ function renderTodayForecast(forecast) {
);
}
-// FIXME: The border line must be in full wcreen width.
function border() {
return (
- Previsão do tempo não disponível no momento
+ Ops, algo deu errado...
+
+ Não conseguimos encontrar a previsão do tempo para sua localização
+
+
);
}