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

chore(a11y): E2EEnterYourPasswordView #6010

Merged
merged 11 commits into from
Jan 13, 2025
Merged

chore(a11y): E2EEnterYourPasswordView #6010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
77356f2
chore: updated E2EEnterYourPasswordView layout
OtavioStasiak Nov 18, 2024
678d3b2
fix: added label on show and hide password input
OtavioStasiak Nov 22, 2024
8ed9726
action: organized translations
OtavioStasiak Nov 22, 2024
2483bf9
fix: label on closeButton
OtavioStasiak Nov 22, 2024
ed83e9a
fix: lint
OtavioStasiak Nov 22, 2024
c4ff9a6
fix: i18n translation
OtavioStasiak Dec 4, 2024
6991759
action: organized translations
OtavioStasiak Dec 4, 2024
7c362cc
fix: style and i18n label
OtavioStasiak Dec 9, 2024
f72b809
fix: i18n label
OtavioStasiak Dec 9, 2024
026fbd4
action: organized translations
OtavioStasiak Dec 9, 2024
807b71f
Merge branch 'develop' into chore-a11y-e2e-enter-password-view
OtavioStasiak Jan 13, 2025
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
2 changes: 1 addition & 1 deletion app/stacks/InsideStack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ const InsideStackNavigator = () => {
<InsideStack.Screen
name='E2EEnterYourPasswordStackNavigator'
component={E2EEnterYourPasswordStackNavigator}
options={{ headerShown: false }}
options={{ headerShown: false, presentation: 'modal', animation: 'slide_from_bottom' }}
/>
<InsideStack.Screen name='AttachmentView' component={AttachmentView} />
<InsideStack.Screen
Expand Down
22 changes: 17 additions & 5 deletions app/views/E2EEnterYourPasswordView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const styles = StyleSheet.create({
info: {
fontSize: 16,
lineHeight: 24,
marginVertical: 4,
marginTop: 24,
...sharedStyles.textRegular
}
});
Expand Down Expand Up @@ -66,7 +66,9 @@ const E2EEnterYourPasswordView = (): React.ReactElement => {

useLayoutEffect(() => {
navigation.setOptions({
headerLeft: () => <HeaderButton.CloseModal testID='e2e-enter-your-password-view-close' />,
headerLeft: () => (
<HeaderButton.CloseModal accessibilityLabel={I18n.t('Close')} testID='e2e-enter-your-password-view-close' />
),
title: I18n.t('Enter_E2EE_Password')
});
}, [navigation]);
Expand All @@ -82,18 +84,28 @@ const E2EEnterYourPasswordView = (): React.ReactElement => {
contentContainerStyle={sharedStyles.container}
keyboardVerticalOffset={128}>
<StatusBar />
<ScrollView {...scrollPersistTaps} style={sharedStyles.container} contentContainerStyle={sharedStyles.containerScrollView}>
<ScrollView
{...scrollPersistTaps}
style={sharedStyles.container}
contentContainerStyle={{ ...sharedStyles.containerScrollView, paddingTop: 24 }}>
<SafeAreaView style={{ backgroundColor: colors.surfaceRoom }} testID='e2e-enter-your-password-view'>
<FormTextInput
placeholder={I18n.t('Password')}
label={I18n.t('Password')}
returnKeyType='send'
secureTextEntry
onSubmitEditing={submit}
onChangeText={setPassword}
testID='e2e-enter-your-password-view-password'
textContentType='password'
containerStyle={{ marginBottom: 0 }}
/>
<Button
onPress={submit}
title={I18n.t('Confirm')}
disabled={!password}
testID='e2e-enter-your-password-view-confirm'
style={{ marginTop: 36 }}
/>
<Button onPress={submit} title={I18n.t('Confirm')} disabled={!password} testID='e2e-enter-your-password-view-confirm' />
<Text style={[styles.info, { color: colors.fontDefault }]}>{I18n.t('Enter_E2EE_Password_description')}</Text>
</SafeAreaView>
</ScrollView>
Expand Down
Loading