From 713d169915a82edfcfe4b44622e3dce8c6adaf0c Mon Sep 17 00:00:00 2001 From: Shravya Ramesh <37447613+shravyaramesh@users.noreply.github.com> Date: Tue, 17 Nov 2020 18:06:14 -0800 Subject: [TMA-382] Edit profile screen (#121) * added more icon * a less fat icon * and the actual icon asset * bottom drawer skeleton done * removed warning, better code * a more completed skeleton done * bottom drawer done! * Added content container, sent birthday picker props, minor styling * differenciating defined and undefined birthdate in birthdate, datepicker * removed restricting width for TaggDropDown * Added edit profile screen to navigator stack * Add EditProfile view, refresh profile view on save * Removes unnecessary import * Stores gender and birthdate as part of ProfileType * Added gender, birthdate, isEditProfile to AuthProv * Conditional view applied for edit profile button * Includes discarded changes in previous merge- BD * removed unused icon * resolved scary warnings * added icon to drawer * Small fix * minor code improvement * sc * fixed birthday bug * custom gender updation fixed * small change to birthday default value * missed something * cleaned up types! Warnings gone! * fixed another gender picker bug * fixed gender bug and cleaned up logic * removed warning, MUCH better code now Co-authored-by: Ivan Chen Co-authored-by: Ashm Walia --- src/components/onboarding/BirthDatePicker.tsx | 9 +++++++-- src/components/onboarding/TaggDropDown.tsx | 7 +++---- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/components/onboarding') diff --git a/src/components/onboarding/BirthDatePicker.tsx b/src/components/onboarding/BirthDatePicker.tsx index f97f1a72..0fc597c3 100644 --- a/src/components/onboarding/BirthDatePicker.tsx +++ b/src/components/onboarding/BirthDatePicker.tsx @@ -15,6 +15,8 @@ import {TaggDatePicker} from '../common'; interface BirthDatePickerProps extends TextInputProps { handleBDUpdate: (_: Date) => void; width?: number | string; + date: Date | undefined; + showPresetdate: boolean; } const BirthDatePicker = React.forwardRef( @@ -23,7 +25,7 @@ const BirthDatePicker = React.forwardRef( const maxDate = moment().subtract(13, 'y').subtract(1, 'd'); return maxDate.toDate(); }; - const [date, setDate] = useState(new Date(0)); + const [date, setDate] = useState(props.date); const [hidden, setHidden] = useState(true); const [updated, setUpdated] = useState(false); const textColor = updated ? 'white' : '#ddd'; @@ -42,7 +44,9 @@ const BirthDatePicker = React.forwardRef( style={[styles.input, {width: props.width}, {color: textColor}]} ref={ref} {...props}> - {updated ? moment(date).format('YYYY-MM-DD') : 'Date of Birth'} + {(updated || props.showPresetdate) && date + ? moment(date).format('YYYY-MM-DD') + : 'Date of Birth'} @@ -67,6 +71,7 @@ const BirthDatePicker = React.forwardRef( handleDateUpdate={updateDate} maxDate={getMaxDate()} textColor={'black'} + date={date} /> diff --git a/src/components/onboarding/TaggDropDown.tsx b/src/components/onboarding/TaggDropDown.tsx index a45426ca..db531cc4 100644 --- a/src/components/onboarding/TaggDropDown.tsx +++ b/src/components/onboarding/TaggDropDown.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import RNSelectPicker from 'react-native-picker-select'; -import {View, StyleSheet, TextInputProps} from 'react-native'; +import {StyleSheet, View} from 'react-native'; +import RNSelectPicker, {PickerSelectProps} from 'react-native-picker-select'; -interface TaggDropDownProps extends TextInputProps { +interface TaggDropDownProps extends PickerSelectProps { width?: number | string; } @@ -19,7 +19,6 @@ const TaggDropDown = React.forwardRef((props: TaggDropDownProps, ref: any) => { const styles = StyleSheet.create({ container: { - width: '66.67%', alignItems: 'center', marginVertical: 11, }, -- cgit v1.2.3-70-g09d2