From d1f1f864d4d9a1356957957c0b4a612cb610ca9a Mon Sep 17 00:00:00 2001 From: rikkekantega <61825573+rikkekantega@users.noreply.github.com> Date: Mon, 2 Nov 2020 12:29:43 +0100 Subject: [PATCH 01/18] fix: Accessible text contents on 200% text enlargement (#616) * fix: Make ticket splash content accessible on text enlargenment * fix: Onboarding text accessible on max text enlargement * fix: Remove wrongful change --- .../Onboarding/components/StepContainer.tsx | 10 ++- src/screens/Onboarding/index.tsx | 2 - src/screens/Ticketing/Splash/index.tsx | 77 +++++++++++-------- 3 files changed, 54 insertions(+), 35 deletions(-) diff --git a/src/screens/Onboarding/components/StepContainer.tsx b/src/screens/Onboarding/components/StepContainer.tsx index 37f975f84e..62b8fc4e83 100644 --- a/src/screens/Onboarding/components/StepContainer.tsx +++ b/src/screens/Onboarding/components/StepContainer.tsx @@ -1,11 +1,14 @@ import React from 'react'; import {SafeAreaView, View} from 'react-native'; import {StyleSheet} from '../../../theme'; +import {ScrollView} from 'react-native-gesture-handler'; const StepOuterContainer: React.FC = ({children}) => { const styles = useStyles(); return ( - {children} + + {children} + ); }; @@ -16,13 +19,14 @@ const useStyles = StyleSheet.createThemeHook((theme) => ({ flex: 1, alignItems: 'center', }, + contentContainer: { + flexGrow: 1, + }, innerContainer: { flex: 1, alignItems: 'center', maxWidth: 500, justifyContent: 'space-between', - position: 'absolute', - bottom: 0, }, })); export default StepOuterContainer; diff --git a/src/screens/Onboarding/index.tsx b/src/screens/Onboarding/index.tsx index f3657bec47..c1c320c7b9 100644 --- a/src/screens/Onboarding/index.tsx +++ b/src/screens/Onboarding/index.tsx @@ -160,8 +160,6 @@ const StepThree: React.FC = () => { const useStyles = StyleSheet.createThemeHook((theme, themeName) => ({ textContainer: { padding: theme.spacings.xLarge, - backgroundColor: - themeName === 'light' ? 'rgba(235,236,237,0.85)' : 'rgba(22,23,24,0.85)', }, title: { fontWeight: 'bold', diff --git a/src/screens/Ticketing/Splash/index.tsx b/src/screens/Ticketing/Splash/index.tsx index 708d640703..77bf4098bf 100644 --- a/src/screens/Ticketing/Splash/index.tsx +++ b/src/screens/Ticketing/Splash/index.tsx @@ -13,6 +13,7 @@ import {useRemoteConfig} from '../../../RemoteConfigContext'; import ThemeText from '../../../components/text'; import ThemeIcon from '../../../components/theme-icon'; import Button from '../../../components/button'; +import {ScrollView} from 'react-native-gesture-handler'; function openOtherTicketingApp() { const url = Platform.OS === 'ios' @@ -52,29 +53,34 @@ export default function Splash() { height={windowWidth / 2} > - - - Billettkjøp i app kommer snart! - - - Her kan du snart kjøpe og administrere billetter til reisen din. - - - Frem til da kan du kjøpe billett fra{'\n'} - - AtB Mobillett - - - -