Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix resize of screen when showing/hiding keyboard #24

Merged
merged 1 commit into from
Jan 6, 2021
Merged

Fix resize of screen when showing/hiding keyboard #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 51 additions & 48 deletions packages/app/components/login.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,42 +94,44 @@ export const Login = ({ navigation, route }) => {
)

return (
<SafeAreaView style={{ flex: 1, backgroundColor: '#fff' }}>
<TopNavigation title={`Skolplattformen.org - det ${argument} alternativet`} alignment='center' />
{loggedIn
? <Layout style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
<Image source={require('../assets/man.png')} style={{ maxHeight: 300, width: '100%', borderBottomWidth: 1 }} />
<View style={{ marginTop: 80, justifyContent: 'flex-start', alignItems: 'flex-start', flex: 1 }}>
<Text category='h4'>{socialSecurityNumber}</Text>
<Text>{error || 'Hurra, du är inloggad!'}</Text>
<Button
status='success'
size='medium'
style={{ marginTop: 10, width: 200 }}
accessoryRight={CheckIcon}
onPress={() => navigateToChildren()}
>
{error ? 'Försök igen' : 'Fortsätt'}
</Button>
<Button
onPress={() => startLogout()}
accessoryRight={LogoutIcon}
style={{ marginTop: 10, width: 200 }}
size='medium'
>
Logga ut
<KeyboardAvoidingView behavior={Platform.OS === "ios" ? "padding" : "height"} style={{ flex: 1 }}>
<SafeAreaView style={{ flex: 1, backgroundColor: '#fff' }}>
{loggedIn
? <Layout style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
<TopNavigation title={`Skolplattformen.org - det ${argument} alternativet`} alignment='center' />
<Image source={require('../assets/man.png')} style={{ maxHeight: 300, width: '100%', borderBottomWidth: 1 }} />
<View style={{ marginTop: 80, justifyContent: 'flex-start', alignItems: 'flex-start', flex: 1 }}>
<Text category='h4'>{socialSecurityNumber}</Text>
<Text>{error || 'Hurra, du är inloggad!'}</Text>
<Button
status='success'
size='medium'
style={{ marginTop: 10, width: 200 }}
accessoryRight={CheckIcon}
onPress={() => navigateToChildren()}
>
{error ? 'Försök igen' : 'Fortsätt'}
</Button>
<Button
onPress={() => startLogout()}
accessoryRight={LogoutIcon}
style={{ marginTop: 10, width: 200 }}
size='medium'
>
Logga ut
</Button>
</View>
</Layout>
: <KeyboardAvoidingView>
<Layout style={{ flex: 1 }}>
</View>
</Layout>
:
<Layout style={{ flex: 1, padding: 24 }}>
<TopNavigation title={`Skolplattformen.org - det ${argument} alternativet`} alignment='center' />
{
// hidden easter egg, just touch the image to login without bankId if you still have a valid token
}
<TouchableOpacity onPress={navigateToChildren} style={{ height: 320 }}>
<TouchableOpacity onPress={navigateToChildren} >
<Image source={require('../assets/boys.png')} style={{ height: 320, marginTop: -20, marginLeft: -10, width: '110%' }} />
</TouchableOpacity>
<View style={{ flex: 1, justifyContent: 'flex-start', alignItems: 'flex-start', paddingHorizontal: 20 }}>
<View style={{ flex: 1, justifyContent: 'flex-end', alignItems: 'flex-start', paddingHorizontal: 20, paddingBottom: 72 }}>
<Input
label='Personnummer' autoFocus value={socialSecurityNumber}
style={{ minHeight: 70 }}
Expand All @@ -151,25 +153,26 @@ export const Login = ({ navigation, route }) => {
</Button>
</View>
</Layout>
</KeyboardAvoidingView>}
<Modal
visible={visible}
style={styles.modal}
backdropStyle={styles.backdrop}
onBackdropPress={() => showModal(false)}
>
<Card disabled>
<Text style={{ margin: 10 }}>Väntar på BankID...</Text>

<Button
visible={!loggedIn}
onPress={() => showModal(false)}
>
Avbryt
}
<Modal
visible={visible}
style={styles.modal}
backdropStyle={styles.backdrop}
onBackdropPress={() => showModal(false)}
>
<Card disabled>
<Text style={{ margin: 10 }}>Väntar på BankID...</Text>

<Button
visible={!loggedIn}
onPress={() => showModal(false)}
>
Avbryt
</Button>
</Card>
</Modal>
</SafeAreaView>
</Card>
</Modal>
</SafeAreaView>
</KeyboardAvoidingView>
)
}

Expand Down