Browse Source

[Sprint 8 fix] Rain, River, Flood zones sharing data screens now with

gray bg
master
GabrielTrettel 2 years ago
parent
commit
00ddc971b7
  1. 11
      src/app/screens/RainSharingDataScreen.js
  2. 8
      src/app/screens/RiverFloodSharingDataScreen.js
  3. 10
      src/app/screens/SharingFloodZonesScreen.js

11
src/app/screens/RainSharingDataScreen.js

@ -4,12 +4,8 @@ import * as Yup from "yup";
import { Form, SubmitButton, FormField } from "../components/forms"; import { Form, SubmitButton, FormField } from "../components/forms";
import Screen from "../components/Screen"; import Screen from "../components/Screen";
import FormImagePicker from "../components/forms/FormImagePicker";
import { Text } from "react-native"; import { Text } from "react-native";
import colors from "../config/colors"; import colors from "../config/colors";
import { TouchableNativeFeedback } from "react-native-gesture-handler";
import { insertRainData } from "../database/databaseLoader";
import { showMessage } from "react-native-flash-message";
import { scaleDimsFromWidth, dimensions, screen_height } from "../config/dimensions"; import { scaleDimsFromWidth, dimensions, screen_height } from "../config/dimensions";
import assets from "../config/assets"; import assets from "../config/assets";
import moment from "moment"; import moment from "moment";
@ -33,8 +29,6 @@ function RainSharingDataScreen(props) {
const [rainSituation, setRainSituation] = useState(null); const [rainSituation, setRainSituation] = useState(null);
const [error, setError] = useState(false); const [error, setError] = useState(false);
const dims = scaleDimsFromWidth(85, 85, 27);
const [date, setDate] = useState(moment()); const [date, setDate] = useState(moment());
const [time, setTime] = useState(moment()); const [time, setTime] = useState(moment());
const context = useContext(EventLocationContext); const context = useContext(EventLocationContext);
@ -76,7 +70,7 @@ function RainSharingDataScreen(props) {
}; };
return ( return (
<Screen style={styles.container}>
<Screen>
<OnSubmitAwaitModal <OnSubmitAwaitModal
show={showAwaitModal} show={showAwaitModal}
/> />
@ -205,9 +199,6 @@ function RainSharingDataScreen(props) {
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: {
backgroundColor: colors.white,
},
error_txt: { error_txt: {
paddingHorizontal: 16, paddingHorizontal: 16,
marginTop: 12, marginTop: 12,

8
src/app/screens/RiverFloodSharingDataScreen.js

@ -4,11 +4,8 @@ import * as Yup from "yup";
import { Form, SubmitButton, FormField } from "../components/forms"; import { Form, SubmitButton, FormField } from "../components/forms";
import Screen from "../components/Screen"; import Screen from "../components/Screen";
import FormImagePicker from "../components/forms/FormImagePicker";
import { Text } from "react-native"; import { Text } from "react-native";
import colors from "../config/colors"; import colors from "../config/colors";
import { insertRiverData } from "../database/databaseLoader";
import { showMessage } from "react-native-flash-message";
import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view"; import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
import assets from "../config/assets"; import assets from "../config/assets";
import { dimensions } from "../config/dimensions"; import { dimensions } from "../config/dimensions";
@ -76,7 +73,7 @@ function RiverFloodSharingDataScreen(props) {
}; };
return ( return (
<Screen style={styles.container}>
<Screen>
<OnSubmitAwaitModal show={showAwaitModal} /> <OnSubmitAwaitModal show={showAwaitModal} />
<OnSubmitMessageModal <OnSubmitMessageModal
show={showMessageModal} show={showMessageModal}
@ -212,9 +209,6 @@ function RiverFloodSharingDataScreen(props) {
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: {
backgroundColor: colors.white,
},
imgs_row: { imgs_row: {
flexDirection: "row", flexDirection: "row",
justifyContent: "space-between", justifyContent: "space-between",

10
src/app/screens/SharingFloodZonesScreen.js

@ -3,11 +3,8 @@ import { StyleSheet, Text, View } from "react-native";
import * as Yup from "yup"; import * as Yup from "yup";
import { Form, SubmitButton, FormField } from "../components/forms"; import { Form, SubmitButton, FormField } from "../components/forms";
import FormImagePicker from "../components/forms/FormImagePicker";
import colors from "../config/colors"; import colors from "../config/colors";
import { scaleDimsFromWidth, dimensions } from "../config/dimensions";
import { insertFloodZone } from "../database/databaseLoader";
import { showMessage } from "react-native-flash-message";
import { dimensions } from "../config/dimensions";
import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view"; import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
import Screen from "../components/Screen"; import Screen from "../components/Screen";
import assets from "../config/assets"; import assets from "../config/assets";
@ -75,7 +72,7 @@ function SharingFloodZonesScreen(props) {
return ( return (
<Screen style={styles.container}>
<Screen>
<OnSubmitAwaitModal show={showAwaitModal} /> <OnSubmitAwaitModal show={showAwaitModal} />
<OnSubmitMessageModal <OnSubmitMessageModal
show={showMessageModal} show={showMessageModal}
@ -172,9 +169,6 @@ function SharingFloodZonesScreen(props) {
} }
const styles = StyleSheet.create({ const styles = StyleSheet.create({
container: {
backgroundColor: colors.white,
},
imgs_container: { imgs_container: {
paddingTop: 16, paddingTop: 16,
flexDirection: "row", flexDirection: "row",

Loading…
Cancel
Save