diff --git a/src/app/assets/dataMenu/aguaRio.png b/src/app/assets/dataMenu/aguaRio.png new file mode 100644 index 0000000..45e41ee Binary files /dev/null and b/src/app/assets/dataMenu/aguaRio.png differ diff --git a/src/app/assets/dataMenu/alagamento.png b/src/app/assets/dataMenu/alagamento.png new file mode 100644 index 0000000..a165834 Binary files /dev/null and b/src/app/assets/dataMenu/alagamento.png differ diff --git a/src/app/assets/dataMenu/areaInundacao.png b/src/app/assets/dataMenu/areaInundacao.png new file mode 100644 index 0000000..9684d97 Binary files /dev/null and b/src/app/assets/dataMenu/areaInundacao.png differ diff --git a/src/app/assets/dataMenu/chuva.png b/src/app/assets/dataMenu/chuva.png new file mode 100644 index 0000000..9c589c9 Binary files /dev/null and b/src/app/assets/dataMenu/chuva.png differ diff --git a/src/app/assets/dataMenu/pluviometroArtesanal.png b/src/app/assets/dataMenu/pluviometroArtesanal.png new file mode 100644 index 0000000..8be4ce8 Binary files /dev/null and b/src/app/assets/dataMenu/pluviometroArtesanal.png differ diff --git a/src/app/assets/dataMenu/pluviometroOficial.png b/src/app/assets/dataMenu/pluviometroOficial.png new file mode 100644 index 0000000..565232b Binary files /dev/null and b/src/app/assets/dataMenu/pluviometroOficial.png differ diff --git a/src/app/components/FloatButton.js b/src/app/components/FloatButton.js index febb225..d9231e8 100644 --- a/src/app/components/FloatButton.js +++ b/src/app/components/FloatButton.js @@ -50,31 +50,37 @@ function FloatButton(props) { id: 1, name: 'Chuva', isSelected: context.layers.values[0].isSelected, + image: require("../assets/dataMenu/chuva.png"), }, { id: 2, name: 'Ponto de alagamento', isSelected: context.layers.values[1].isSelected, + image: require("../assets/dataMenu/alagamento.png"), }, { id: 3, name: 'Pluviômetro artesanal', isSelected: context.layers.values[2].isSelected, + image: require("../assets/dataMenu/pluviometroArtesanal.png"), }, { id: 4, name: 'Pluviômetro oficial', - isSelected: context.layers.values[3].isSelected + isSelected: context.layers.values[3].isSelected, + image: require("../assets/dataMenu/pluviometroOficial.png"), }, { id: 5, name: 'Água no rio', isSelected: context.layers.values[4].isSelected, + image: require("../assets/dataMenu/aguaRio.png"), }, { id: 6, name: 'Área de inundação', isSelected: context.layers.values[5].isSelected, + image: require("../assets/dataMenu/areaInundacao.png"), }, ] }); @@ -91,6 +97,7 @@ function FloatButton(props) { item={item} onPress={() => selectedItens(item)} icon={icon} + image={item.image} /> ); }; diff --git a/src/app/components/MenuItens.js b/src/app/components/MenuItens.js index d0278af..94f9cdf 100644 --- a/src/app/components/MenuItens.js +++ b/src/app/components/MenuItens.js @@ -1,23 +1,26 @@ -import React from "react"; -import { StyleSheet, Text, TouchableOpacity, View } from "react-native"; +import React from "react"; +import { StyleSheet, Text, TouchableOpacity, View, Image } from "react-native"; import { MaterialIcons } from '@expo/vector-icons'; import colors from "../config/colors"; import { dimensions } from "../config/dimensions"; -import { Ionicons } from '@expo/vector-icons'; -function MenuItens({ item, onPress, icon }) { +function MenuItens({ item, onPress, icon, image }) { return ( - - - + + + {item.name} + style={{ flex: 0.15, alignSelf: "flex-start", flexDirection: "row", justifyContent: "flex-start" }}> diff --git a/src/app/components/forms/FormLocationPicker.js b/src/app/components/forms/FormLocationPicker.js index e52b190..18d19ed 100644 --- a/src/app/components/forms/FormLocationPicker.js +++ b/src/app/components/forms/FormLocationPicker.js @@ -26,8 +26,6 @@ function FormLocationPicker({ subtitle }) { {local} @@ -53,6 +51,9 @@ const styles = StyleSheet.create({ }, adressText: { flex: 0.90, + height: "100%", + flexDirection: "column", + justifyContent: "center", paddingLeft: 5, }, mapIcon: { diff --git a/src/app/context/MapDataContext.js b/src/app/context/MapDataContext.js index 46a4318..5071350 100644 --- a/src/app/context/MapDataContext.js +++ b/src/app/context/MapDataContext.js @@ -13,31 +13,37 @@ const MapDataProvider = ({ children }) => { id: 1, name: 'Chuva', isSelected: true, + image: require("../assets/dataMenu/chuva.png"), }, { id: 2, name: 'Ponto de alagamento', isSelected: true, + image: require("../assets/dataMenu/alagamento.png"), }, { id: 3, name: 'Pluviômetro artesanal', isSelected: true, + image: require("../assets/dataMenu/pluviometroArtesanal.png"), }, { id: 4, name: 'Pluviômetro oficial', - isSelected: false + isSelected: false, + image: require("../assets/dataMenu/pluviometroOficial.png"), }, { id: 5, name: 'Água no rio', isSelected: true, + image: require("../assets/dataMenu/aguaRio.png"), }, { id: 6, name: 'Área de inundação', isSelected: false, + image: require("../assets/dataMenu/areaInundacao.png"), }, ] }); @@ -66,14 +72,14 @@ const MapDataProvider = ({ children }) => { const setChanges = (data) => { const json = JSON.stringify(data); const obj = JSON.parse(json); - - layers.values = obj; - setRain(layers.values[0].isSelected); - setFlood(layers.values[1].isSelected); - setPluviometer(layers.values[2].isSelected); - setOfficialPluviometer(layers.values[3].isSelected); - setRiver(layers.values[4].isSelected); - setFloodAreas(layers.values[5].isSelected); + + layers.values = obj; + setRain(layers.values[0].isSelected); + setFlood(layers.values[1].isSelected); + setPluviometer(layers.values[2].isSelected); + setOfficialPluviometer(layers.values[3].isSelected); + setRiver(layers.values[4].isSelected); + setFloodAreas(layers.values[5].isSelected); } diff --git a/src/app/navigation/AppNavigator.js b/src/app/navigation/AppNavigator.js index 48b7143..7762fe6 100644 --- a/src/app/navigation/AppNavigator.js +++ b/src/app/navigation/AppNavigator.js @@ -66,7 +66,7 @@ const AppNavigator = () => ( options={{ tabBarIcon: ({ color, size }) => ( diff --git a/src/app/navigation/FeedNavigator.js b/src/app/navigation/FeedNavigator.js index b04a7b9..e3810c0 100644 --- a/src/app/navigation/FeedNavigator.js +++ b/src/app/navigation/FeedNavigator.js @@ -8,7 +8,7 @@ const FeedNavigator = () => (