diff --git a/src/app/components/SearchablePicker.js b/src/app/components/SearchablePicker.js index 786b788..e2013f3 100644 --- a/src/app/components/SearchablePicker.js +++ b/src/app/components/SearchablePicker.js @@ -65,10 +65,10 @@ function SearchablePicker({ return ( @@ -41,6 +41,7 @@ const styles = StyleSheet.create({ borderColor: colors.grayBG, borderWidth: 1, padding: 5, + paddingLeft: 12, }, icon: { marginRight: 10, diff --git a/src/app/components/forms/FormField.js b/src/app/components/forms/FormField.js index f0bca71..a5583cb 100644 --- a/src/app/components/forms/FormField.js +++ b/src/app/components/forms/FormField.js @@ -11,10 +11,10 @@ import { Shadow } from "react-native-shadow-2"; function IncreaseDecreaseButtons({ content }) { return ( { - increase(); + decrease(); }} style={{ paddingLeft: 4, @@ -83,12 +83,12 @@ function RenderPluviometerInput({ paddingRight: 1.5, }} > - + { - decrease(); + increase(); }} style={{ paddingLeft: 1.5, @@ -96,7 +96,7 @@ function RenderPluviometerInput({ paddingRight: 16, }} > - + ); @@ -107,6 +107,8 @@ function AppFormField({ width, increaseDecreaseButtons = false, flex = 0, + paddingLeft = 16, + paddingRight = 16, ...otherProps }) { const { @@ -122,8 +124,8 @@ function AppFormField({ {name != "pluviometer" ? ( diff --git a/src/app/screens/RegisterScreen.js b/src/app/screens/RegisterScreen.js index dbf021c..4cba4c6 100644 --- a/src/app/screens/RegisterScreen.js +++ b/src/app/screens/RegisterScreen.js @@ -50,23 +50,23 @@ function LocalDatePicker({ date, setDate, _moment }) { minimumDate={new Date(moment().subtract(110, "year"))} date={date} > - + + ); +} + function StatePicker({ value, setValue }) { const [items, setItems] = useState(states); return ( @@ -122,12 +142,10 @@ function StatePicker({ value, setValue }) { } function CityPicker({ value, setValue, state }) { - console.log(state) - useEffect(() => { - state && setItems(statesToCities[state].cities) - }, [state]) - + state && setItems(statesToCities[state].cities); + }, [state]); + const [items, setItems] = useState([]); return ( ); @@ -146,6 +168,8 @@ export default function RegisterScreen(props) { const [gender, setGender] = useState(""); const [state, setState] = useState(""); const [city, setCity] = useState(""); + const [institution, setInstitution] = useState(""); + const [secQuestion, setSecQuestion] = useState(""); const _moment = moment(); const [date, setDate] = useState(_moment); @@ -169,6 +193,7 @@ export default function RegisterScreen(props) { confirmPassword: "", state: "", gender: "", + institutionName: "", }} onSubmit={({ name, number, password, confirmPassword }) => { comparePassword(password, confirmPassword); @@ -189,6 +214,7 @@ export default function RegisterScreen(props) { color={colors.primary} /> @@ -227,6 +254,7 @@ export default function RegisterScreen(props) { secureTextEntry={true} numberOfLines={2} placeholder="Senha" + paddingRight={2} /> @@ -244,6 +272,7 @@ export default function RegisterScreen(props) { secureTextEntry={true} numberOfLines={2} placeholder="Repetir a senha" + paddingRight={2} /> - Data de nascimento + Data de nascimento: + Tipo de instituição: + + + + + + Nome da instituição + + + + + +