diff --git a/src/App.js b/src/App.js index 15d6d2b..5d27841 100644 --- a/src/App.js +++ b/src/App.js @@ -2,21 +2,24 @@ import React from "react"; import { NavigationContainer } from "@react-navigation/native"; import navigationTheme from "./app/navigation/navigationTheme"; -import AppNavigator from "./app/navigation/AppNavigator"; import "./app/config/globals.js"; import openDatabase from "./app/database/database-connection"; import initDatabase from "./app/database/database-init"; import FlashMessage from "react-native-flash-message"; +import { createStackNavigator } from '@react-navigation/stack'; +import SharingDataOptionsNavigator from "./app/navigation/SharingDataOptionsNavigator"; export default function App() { global.userDataBase = openDatabase(); initDatabase(global.userDataBase); - + const Stack = createStackNavigator(); return ( - - - + + + + + ); } diff --git a/src/app/navigation/AppNavigator.js b/src/app/navigation/AppNavigator.js index 6538b58..df57855 100644 --- a/src/app/navigation/AppNavigator.js +++ b/src/app/navigation/AppNavigator.js @@ -6,9 +6,9 @@ import AccountNavigator from "./AccountNavigator"; import FeedNavigator from "./FeedNavigator"; import MessagesNavigator from "./MessagesNavigator"; import OfficialMessagesNavigator from "./OfficialMessagesNavigator"; -import SharingDataScreen from "../screens/SharingDataScreen"; import NewListingButton from "./NewListingButton"; import routes from "./routes"; +import SharingDataNavigator from "./SharingDataNavigator"; const Tab = createBottomTabNavigator(); @@ -39,11 +39,14 @@ const AppNavigator = () => ( ({ tabBarButton: () => ( navigation.navigate(routes.SHARING_DATA)} + onPress={() => + //navigation.goBack(null) + navigation.navigate(routes.SHARING_DATA)} + /> ), tabBarIcon: ({ color, size }) => ( diff --git a/src/app/navigation/RainSharingDataNavigator.js b/src/app/navigation/RainSharingDataNavigator.js deleted file mode 100644 index 340e2f0..0000000 --- a/src/app/navigation/RainSharingDataNavigator.js +++ /dev/null @@ -1,18 +0,0 @@ -import { NavigationContainer } from '@react-navigation/native'; -import React, { Component } from 'react'; -import { Platform, StyleSheet, Text, View, YellowBox } from 'react-native'; - -import { createStackNavigator } from "@react-navigation/stack"; -import RainSharingDataScreen from '../screens/RainSharingDataScreen'; -import SharingDataScreen from '../screens/SharingDataScreen'; - -const Stack = createStackNavigator(); - -function RainSharingDataNavigator() { - return ( - - - - ); -} -export default RainSharingDataNavigator; \ No newline at end of file diff --git a/src/app/navigation/SharingDataNavigator.js b/src/app/navigation/SharingDataNavigator.js new file mode 100644 index 0000000..d1c903d --- /dev/null +++ b/src/app/navigation/SharingDataNavigator.js @@ -0,0 +1,19 @@ +import React from "react"; +import { createStackNavigator } from "@react-navigation/stack"; +import SharingDataScreen from "../screens/SharingDataScreen"; + +const Stack = createStackNavigator(); + +const SharingDataNavigator = () => ( + + + +); + +export default SharingDataNavigator; \ No newline at end of file diff --git a/src/app/navigation/SharingDataOptionsNavigator.js b/src/app/navigation/SharingDataOptionsNavigator.js new file mode 100644 index 0000000..b095c27 --- /dev/null +++ b/src/app/navigation/SharingDataOptionsNavigator.js @@ -0,0 +1,67 @@ +import React from 'react'; + +import { createStackNavigator } from "@react-navigation/stack"; +import AppNavigator from './AppNavigator'; + +import RainSharingDataScreen from '../screens/RainSharingDataScreen'; +import RiverFloodSharingDataScreen from '../screens/RiverFloodSharingDataScreen'; +import SharingFloodZonesScreen from '../screens/SharingFloodZonesScreen'; +import PluviometerSharingDataScreen from '../screens/PluviometerSharingDataScreen'; + + +const Stack = createStackNavigator(); + +function SharingDataOptionsNavigator() { + return ( + + + + + + + + ); +} +export default SharingDataOptionsNavigator; \ No newline at end of file diff --git a/src/app/screens/PluviometerSharingDataScreen.js b/src/app/screens/PluviometerSharingDataScreen.js index 22e84b9..34eece5 100644 --- a/src/app/screens/PluviometerSharingDataScreen.js +++ b/src/app/screens/PluviometerSharingDataScreen.js @@ -23,7 +23,7 @@ import colors from "../config/colors"; const validationSchema = Yup.object().shape({ pluviometer: Yup.number().required("Campo obrigatório").min(0, "O valor deve ser maior ou igual a 0.").max(10000).label("pluviometer"), data: Yup.string().min(1, "Por favor preencha a data"), - images: Yup.array().min(1, "Por favor, selecione uma imagem."), + images: Yup.array(), }); function PluviometerSharingDataScreen(props) { @@ -94,7 +94,7 @@ function PluviometerSharingDataScreen(props) { insertPluviometerData({ ...values, dateTime, location }); showMessage({ message: "Informação enviada!", - duration: 1950, + duration: 3000, icon: "success", type: "success", }); diff --git a/src/app/screens/SharingDataScreen.js b/src/app/screens/SharingDataScreen.js index f3b07a0..ccb4c1c 100644 --- a/src/app/screens/SharingDataScreen.js +++ b/src/app/screens/SharingDataScreen.js @@ -2,12 +2,7 @@ import React from "react"; import { StyleSheet, View } from "react-native"; import { Image, Text, TouchableOpacity } from "react-native"; -import { createStackNavigator } from "@react-navigation/stack"; -import RainSharingDataScreen from "../screens/RainSharingDataScreen"; -import SharingFloodZonesScreen from "./SharingFloodZonesScreen"; -import PluviometerSharingDataScreen from "./PluviometerSharingDataScreen"; -import RiverFloodSharingDataScreen from "./RiverFloodSharingDataScreen"; -import assets from "../config/assets"; +import assets from "../config/assets" //1/3 function SharingDataScreen({ navigation }) { @@ -79,65 +74,8 @@ const styles = StyleSheet.create({ }, }); -const Stack = createStackNavigator(); -function RainSharingDataNavigator() { - return ( - - - - - - - - ); -} -export default RainSharingDataNavigator; + +export default SharingDataScreen;