diff --git a/src/app/components/LoadingMarkersModal.js b/src/app/components/LoadingMarkersModal.js
new file mode 100644
index 0000000..30f94bb
--- /dev/null
+++ b/src/app/components/LoadingMarkersModal.js
@@ -0,0 +1,64 @@
+import React from "react";
+import {
+ Modal,
+ StyleSheet,
+ Text,
+ TouchableHighlight,
+ View,
+} from "react-native";
+
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+import colors from "../config/colors";
+import { dimensions } from "../config/dimensions";
+
+export default function LoadingMarkersModal({ show }) {
+ return (
+
+
+
+
+
+ Aguarde um momento enquanto os dados são carregados
+
+
+
+
+ );
+}
+
+const styles = StyleSheet.create({
+ container: {
+ width: "80%",
+ height: 170,
+ justifyContent: "center",
+ alignSelf: "center",
+ backgroundColor: colors.lightestGray,
+ borderColor: colors.primary,
+ borderWidth: 2,
+ borderRadius: 12,
+ padding: 12,
+ },
+ text: {
+ fontSize: dimensions.text.secondary,
+ textAlign: "center",
+ color: colors.primary,
+ fontWeight: "bold",
+ },
+});
diff --git a/src/app/screens/MapFeedScreen.js b/src/app/screens/MapFeedScreen.js
index 6ade136..93a1904 100644
--- a/src/app/screens/MapFeedScreen.js
+++ b/src/app/screens/MapFeedScreen.js
@@ -1,22 +1,15 @@
-import React, { useEffect, useContext, useState } from "react";
+import React, { useState } from "react";
import { StyleSheet, View } from "react-native";
import OpenStreetMap from "../components/map/OpenStreetMap";
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";
-import { getFormsAnswers } from "../hooks/useFormsAswers";
-import SocketClient from "../api/Websockets/SocketClient";
-import { useFiltering } from "../hooks/useFiltering";
import useSocketMarkers from "../hooks/useSocketMarkers";
+import LoadingMarkersModal from "../components/LoadingMarkersModal";
export default function MapFeedScreen(props) {
HeaderBarMenu(props.navigation);
const focusChanged = attachFocusToQuery();
- //const [error, setError] = useState(false);
- //const markersdb = useMarkers(focusChanged);// (apagar useMarker - não será mais usado)
const [dataOptionsToShow, setDataOptionsToShow] = useState({
oficial: {
@@ -33,25 +26,11 @@ export default function MapFeedScreen(props) {
});
const markers = useSocketMarkers();
- // console.log(markers);
-
- // useEffect(() => {
- // loadForms();
- // }, []);
-
- // const loadForms = async () => {
- // const response = await formsApi.getForms();
- // console.log(response);
- // if (!response.ok) {
- // console.log("resposta não ok!");
- // return setError(true);
- // }
- // setError(false);
- // }
-
return (
+