diff --git a/src/app/components/forms/FormDatePicker.js b/src/app/components/forms/FormDatePicker.js index 5cea852..8e53a04 100644 --- a/src/app/components/forms/FormDatePicker.js +++ b/src/app/components/forms/FormDatePicker.js @@ -13,6 +13,7 @@ import DateTimePicker from "@react-native-community/datetimepicker"; import moment from "moment"; import colors from "../../config/colors"; +import { dimensions } from "../../config/dimensions"; const FormDatePicker = (props) => { const { textStyle, defaultDate } = props; @@ -65,15 +66,21 @@ const FormDatePicker = (props) => { return ( setShow(true)}> - - - {date.format("DD/MM/YYYY")} + + + + {" "} + {date.format("DD/MM/YYYY")} + - + {Platform.OS !== "ios" && show && renderDatePicker()} @@ -140,7 +147,7 @@ const FormDatePicker = (props) => { FormDatePicker.defaultProps = { textStyle: {}, defaultDate: moment(), - onDateChange: () => { }, + onDateChange: () => {}, }; const styles = StyleSheet.create({ @@ -165,7 +172,7 @@ const styles = StyleSheet.create({ borderRadius: 25, padding: 18, marginVertical: 10, - } + }, }); export default FormDatePicker; diff --git a/src/app/components/forms/FormImagePicker.js b/src/app/components/forms/FormImagePicker.js index e100dd0..1e56733 100644 --- a/src/app/components/forms/FormImagePicker.js +++ b/src/app/components/forms/FormImagePicker.js @@ -5,6 +5,7 @@ import ErrorMessage from "./ErrorMessage"; import ImageInputList from "../ImageInputList"; import { View, Text, StyleSheet } from "react-native"; import colors from "../../config/colors"; +import { dimensions } from "../../config/dimensions"; function FormImagePicker({ name }) { const { errors, setFieldValue, touched, values } = useFormikContext(); @@ -36,7 +37,7 @@ function FormImagePicker({ name }) { const styles = StyleSheet.create({ labelStyle: { - fontSize: 16, + fontSize: dimensions.text.secondary, fontWeight: "bold", textAlign: "left", color: colors.primary, diff --git a/src/app/config/dimensions.js b/src/app/config/dimensions.js index 0b35402..93a48b3 100644 --- a/src/app/config/dimensions.js +++ b/src/app/config/dimensions.js @@ -2,6 +2,15 @@ import { Dimensions } from "react-native"; const screen_width = Dimensions.get("window").width; +const dimensions = { + text: { + header: 24, + secondary: 20, + default: 18, + tertiary: 14, + }, +}; + /* imageScaleToSize (iw, ih, scale_w) * function for scaling images dinamically based on screen width * @@ -21,4 +30,4 @@ function scaleDimsFromWidth(iw, ih, scale_w) { return { width: sw, height: sh }; } -export { screen_width, scaleDimsFromWidth }; +export { screen_width, scaleDimsFromWidth, dimensions }; diff --git a/src/app/screens/AccountScreen.js b/src/app/screens/AccountScreen.js index 77d35af..bb70f52 100644 --- a/src/app/screens/AccountScreen.js +++ b/src/app/screens/AccountScreen.js @@ -3,15 +3,18 @@ import { StyleSheet, View, Text } from "react-native"; import colors from "../config/colors"; import Screen from "../components/Screen"; -import { AntDesign } from '@expo/vector-icons'; +import { AntDesign } from "@expo/vector-icons"; +import { dimensions } from "../config/dimensions"; function AccountScreen({ navigation }) { return ( - - Em construção... - + + + Em construção... + + ); } @@ -23,9 +26,8 @@ const styles = StyleSheet.create({ container: { flex: 1, flexDirection: "column", - alignItems:"center", - justifyContent: "flex-start" - + alignItems: "center", + justifyContent: "flex-start", }, }); diff --git a/src/app/screens/MessagesScreen.js b/src/app/screens/MessagesScreen.js index 9ffd65b..6874b74 100644 --- a/src/app/screens/MessagesScreen.js +++ b/src/app/screens/MessagesScreen.js @@ -9,7 +9,8 @@ import { } from "../components/lists"; import colors from "../config/colors"; -import { AntDesign } from '@expo/vector-icons'; +import { AntDesign } from "@expo/vector-icons"; +import { dimensions } from "../config/dimensions"; /*const initialMessages = [ { @@ -36,7 +37,8 @@ function MessagesScreen(props) { }; */ return ( - {/* + { + /* message.id.toString()} @@ -64,13 +66,20 @@ function MessagesScreen(props) { ]); }} /> - */}, - - - - Em construção... - - + */ + }, + ( + + + + + Em construção... + + + + ) ); } @@ -82,8 +91,7 @@ const styles = StyleSheet.create({ flex: 1, flexDirection: "column", alignItems: "center", - justifyContent: "flex-start" - + justifyContent: "flex-start", }, }); diff --git a/src/app/screens/OfficialMessagesScreen.js b/src/app/screens/OfficialMessagesScreen.js index 83132a8..075c143 100644 --- a/src/app/screens/OfficialMessagesScreen.js +++ b/src/app/screens/OfficialMessagesScreen.js @@ -3,14 +3,17 @@ import { StyleSheet, View, Text } from "react-native"; import colors from "../config/colors"; import Screen from "../components/Screen"; -import { AntDesign } from '@expo/vector-icons'; +import { AntDesign } from "@expo/vector-icons"; +import { dimensions } from "../config/dimensions"; function OfficialMessagesScreen(props) { return ( - + - Em construção... + + Em construção... + ); @@ -24,8 +27,7 @@ const styles = StyleSheet.create({ flex: 1, flexDirection: "column", alignItems: "center", - justifyContent: "flex-start" - + justifyContent: "flex-start", }, }); diff --git a/src/app/screens/PluviometerSharingDataScreen.js b/src/app/screens/PluviometerSharingDataScreen.js index c88f19d..ecf37fd 100644 --- a/src/app/screens/PluviometerSharingDataScreen.js +++ b/src/app/screens/PluviometerSharingDataScreen.js @@ -12,7 +12,7 @@ import useLocation from "../hooks/useLocation"; import FormImagePicker from "../components/forms/FormImagePicker"; import { insertPluviometerData } from "../database/databaseLoader"; import { showMessage } from "react-native-flash-message"; -import { scaleDimsFromWidth } from "../config/dimensions"; +import { dimensions, scaleDimsFromWidth } from "../config/dimensions"; import FormDatePicker from "../components/forms/FormDatePicker"; import colors from "../config/colors/"; @@ -41,7 +41,11 @@ function PluviometerSharingDataScreen(props) { source={require("../assets/pluviometro.png")} /> Pluviômetro @@ -112,7 +116,7 @@ const styles = StyleSheet.create({ alignItems: "center", }, labelStyle: { - fontSize: 16, + fontSize: dimensions.text.secondary, fontWeight: "bold", textAlign: "left", color: colors.primary, diff --git a/src/app/screens/RainSharingDataScreen.js b/src/app/screens/RainSharingDataScreen.js index a7fa7b9..fe5d4fe 100644 --- a/src/app/screens/RainSharingDataScreen.js +++ b/src/app/screens/RainSharingDataScreen.js @@ -11,7 +11,7 @@ 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 } from "../config/dimensions"; +import { scaleDimsFromWidth, dimensions } from "../config/dimensions"; import assets from "../config/assets"; const validationSchema = Yup.object().shape({ @@ -29,7 +29,7 @@ function RainSharingDataScreen(props) {