diff --git a/src/App.js b/src/App.js index f49e10d..e2112b9 100644 --- a/src/App.js +++ b/src/App.js @@ -8,13 +8,15 @@ import openDatabase from "./app/database/database-connection"; import SharingFloodZonesScreen from "./app/screens/SharingFloodZonesScreen"; import initDatabase from "./app/database/database-init"; +import RainSharingDataScreen from "./app/screens/RainSharingDataScreen"; export default function App() { global.userDataBase = openDatabase(); initDatabase(global.userDataBase); return ( - // + // + // diff --git a/src/app/assets/chuva_forte.png b/src/app/assets/chuva_forte.png new file mode 100644 index 0000000..9e466bb Binary files /dev/null and b/src/app/assets/chuva_forte.png differ diff --git a/src/app/assets/chuva_fraca.png b/src/app/assets/chuva_fraca.png new file mode 100644 index 0000000..e05d5bf Binary files /dev/null and b/src/app/assets/chuva_fraca.png differ diff --git a/src/app/assets/chuva_muito_forte.png b/src/app/assets/chuva_muito_forte.png new file mode 100644 index 0000000..bd792f0 Binary files /dev/null and b/src/app/assets/chuva_muito_forte.png differ diff --git a/src/app/assets/chuva_pancadas.png b/src/app/assets/chuva_pancadas.png new file mode 100644 index 0000000..5280fd1 Binary files /dev/null and b/src/app/assets/chuva_pancadas.png differ diff --git a/src/app/assets/sem_chuva.png b/src/app/assets/sem_chuva.png new file mode 100644 index 0000000..09ae435 Binary files /dev/null and b/src/app/assets/sem_chuva.png differ diff --git a/src/app/navigation/RainSharingDataNavigator.js b/src/app/navigation/RainSharingDataNavigator.js new file mode 100644 index 0000000..8f8ebf7 --- /dev/null +++ b/src/app/navigation/RainSharingDataNavigator.js @@ -0,0 +1,20 @@ +import React, { Component } from 'react'; +import { Platform, StyleSheet, Text, View, YellowBox } from 'react-native'; +import { createStackNavigator } from 'react-navigation'; +import RainSharingDataScreen from '../screens/RainSharingDataScreen'; +import SharingDataScreen from '../screens/SharingDataScreen'; + +const RootStack = createStackNavigator( + { + Home: { screen: SharingDataScreen }, + Profile: { screen: RainSharingDataScreen }, + }, + { + initialRouteName: 'SharingData', + } + ); + export default class App extends Component { + render() { + return ; + } + } \ No newline at end of file diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js new file mode 100644 index 0000000..18d4255 --- /dev/null +++ b/src/app/screens/RainSharingDataScreen.js @@ -0,0 +1,125 @@ +import React from "react"; +import { StyleSheet, View } from "react-native"; +import * as Yup from "yup"; + +import { + Form, + FormField, + FormPicker as Picker, + SubmitButton, +} from "../components/forms"; +import CategoryPickerItem from "../components/CategoryPickerItem"; +import Screen from "../components/Screen"; +import FormImagePicker from "../components/forms/FormImagePicker"; +import useLocation from "../hooks/useLocation"; +import { Image, Text, TouchableOpacity } from 'react-native'; +//1/3 +const styles = StyleSheet.create({ + container: { + paddingTop: 50, + }, + rainLogo: { + width: 110, + height: 100, + margin: 30, + }, + floodingLogo: { + width: 85, + height: 85, + marginTop: 30, + + }, +}) + +const validationSchema = Yup.object().shape({ + images: Yup.array().min(1, "Por favor, selecione ao menos uma imagem"), + description: Yup.string() + .label("Description") + .required("Por favor, forneça uma descrição"), +}); + +const RainSharingDataScreen = ({ navigation }) => { + return ( + +
console.log("submissao")} + validationSchema={validationSchema} + > + + + Enviar uma informação + + + + + + Sem chuva + + + + + Chuva fraca + + + + + Chuva{"\n"}moderada + + + + + + + + + + Chuva forte + + + + + Chuva muito{"\n"}forte + + + + + Pancada de{"\n"}chuva + + + + + + + + + +
+ ); +} + +export default RainSharingDataScreen; diff --git a/src/app/screens/SharingDataScreen.js b/src/app/screens/SharingDataScreen.js index 664d58b..5f8d42f 100644 --- a/src/app/screens/SharingDataScreen.js +++ b/src/app/screens/SharingDataScreen.js @@ -12,8 +12,7 @@ import CategoryPickerItem from "../components/CategoryPickerItem"; import Screen from "../components/Screen"; import FormImagePicker from "../components/forms/FormImagePicker"; import useLocation from "../hooks/useLocation"; -import { Image, Text } from 'react-native'; -import { Ionicons } from '@expo/vector-icons'; +import { Image, Text, TouchableOpacity} from 'react-native'; //1/3 const styles = StyleSheet.create({ container:{ @@ -31,27 +30,37 @@ const styles = StyleSheet.create({ }, }) - -const SharingDataScreen = () => { +class SharingDataScreen extends React.Component { + static navigationOptions = { + title: "SharingDataScreen", + headerStyle: { + backgroundColor: "#73C6B6" + } + }; + render() { return( Enviar uma informação - + + + + this.props.navigation.navigate("RainSharingData")}> + Pontos de {"\n"}alagamento - Chuva + Chuva @@ -71,6 +80,6 @@ const SharingDataScreen = () => { ); } - +} export default SharingDataScreen;