diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-02-09 13:47:35 -0500 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-02-09 13:47:35 -0500 |
| commit | dbbbcfd6c73979632d42429479f0ce2e5c9987a4 (patch) | |
| tree | ade0d0216089dcdadc653de1c6c06db1a3b37e40 /src/screens | |
| parent | a25ec0b95017a9b6e0c3392f8fe1ad4c604de520 (diff) | |
using centered view, updated TaggSquareButton styles
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/onboarding/Login.tsx | 12 | ||||
| -rw-r--r-- | src/screens/onboarding/WelcomeScreen.tsx | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/screens/onboarding/Login.tsx b/src/screens/onboarding/Login.tsx index 4d1fb09a..450c5039 100644 --- a/src/screens/onboarding/Login.tsx +++ b/src/screens/onboarding/Login.tsx @@ -28,6 +28,7 @@ import {fcmService} from '../../services'; import {RootState} from '../../store/rootReducer'; import {BackgroundGradientType, UserType} from '../../types'; import {normalize, userLogin} from '../../utils'; +import UpdateRequired from './UpdateRequired'; type VerificationScreenRouteProp = RouteProp<OnboardingStackParams, 'Login'>; type VerificationScreenNavigationProp = StackNavigationProp< @@ -212,6 +213,7 @@ const Login: React.FC<LoginProps> = ({navigation}: LoginProps) => { gradientType={BackgroundGradientType.Light}> <StatusBar barStyle="light-content" /> {/* <Modal visible={newVersionAvailable} /> */} + <UpdateRequired visible={newVersionAvailable} /> <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : 'height'} style={styles.keyboardAvoidingView}> @@ -255,14 +257,16 @@ const Login: React.FC<LoginProps> = ({navigation}: LoginProps) => { <TaggSquareButton onPress={handleLogin} title={'Login'} - mode={'normal'} - color={'white'} + buttonStyle={'normal'} + buttonColor={'white'} + labelColor={'blue'} /> <TaggSquareButton onPress={startRegistrationProcess} title={'Sign up'} - mode={'normal'} - color={'purple'} + buttonStyle={'normal'} + buttonColor={'purple'} + labelColor={'blue'} /> </KeyboardAvoidingView> </Background> diff --git a/src/screens/onboarding/WelcomeScreen.tsx b/src/screens/onboarding/WelcomeScreen.tsx index bfb1a127..ae31f933 100644 --- a/src/screens/onboarding/WelcomeScreen.tsx +++ b/src/screens/onboarding/WelcomeScreen.tsx @@ -39,8 +39,9 @@ const WelcomeScreen: React.FC<WelcomeScreenProps> = ({navigation}) => { <TaggSquareButton onPress={handleNext} title={'Next'} - mode={'large'} - color={'purple'} + buttonStyle={'large'} + buttonColor={'purple'} + labelColor={'white'} style={styles.nextButton} /> </Background> |
