Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Commit

Permalink
Merge pull request #562 from /issues/554/android-off-screen
Browse files Browse the repository at this point in the history
Use multiline text component in the All Set page
  • Loading branch information
smcmurtry authored Jul 9, 2020
2 parents c5956f7 + 8339093 commit f5182b7
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 16 deletions.
1 change: 1 addition & 0 deletions src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export * from './InfoBlock';
export * from './ProgressCircles';
export * from './Ripple';
export * from './Text';
export * from './TextMultiline';
export * from './Toolbar';
export * from './TouchableIcon';
export * from './LanguageToggle';
Expand Down
6 changes: 2 additions & 4 deletions src/screens/home/components/AllSetView.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {Text} from 'components';
import {Text, TextMultiline} from 'components';

import {BaseHomeView} from './BaseHomeView';

Expand All @@ -9,9 +9,7 @@ export const AllSetView = ({titleText, bodyText}: {titleText: string; bodyText:
<Text variant="bodyTitle" color="bodyText" marginBottom="m" accessibilityRole="header">
{titleText}
</Text>
<Text variant="bodyText" color="bodyText" marginBottom="m">
{bodyText}
</Text>
<TextMultiline text={bodyText} marginBottom="m" />
</BaseHomeView>
);
};
3 changes: 1 addition & 2 deletions src/screens/home/views/NoExposureCoveredRegionView.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from 'react';
import {Text, LastCheckedDisplay} from 'components';
import {Text, TextMultiline, LastCheckedDisplay} from 'components';
import {useI18n} from '@shopify/react-i18n';
import {useStorage} from 'services/StorageService';
import {hoursFromNow} from 'shared/date-fns';
import {TextMultiline} from 'components/TextMultiline';

import {AllSetView} from '../components/AllSetView';
import {BaseHomeView} from '../components/BaseHomeView';
Expand Down
3 changes: 1 addition & 2 deletions src/screens/home/views/NoExposureNoRegionView.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from 'react';
import {Text, LastCheckedDisplay} from 'components';
import {Text, TextMultiline, LastCheckedDisplay} from 'components';
import {useI18n} from '@shopify/react-i18n';
import {useStorage} from 'services/StorageService';
import {hoursFromNow} from 'shared/date-fns';
import {TextMultiline} from 'components/TextMultiline';

import {BaseHomeView} from '../components/BaseHomeView';
import {AllSetView} from '../components/AllSetView';
Expand Down
3 changes: 1 addition & 2 deletions src/screens/home/views/NoExposureUncoveredRegionView.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from 'react';
import {Text} from 'components';
import {Text, TextMultiline} from 'components';
import {useI18n} from '@shopify/react-i18n';
import {useStorage} from 'services/StorageService';
import {hoursFromNow} from 'shared/date-fns';
import {TextMultiline} from 'components/TextMultiline';

import {BaseHomeView} from '../components/BaseHomeView';
import {AllSetView} from '../components/AllSetView';
Expand Down
3 changes: 1 addition & 2 deletions src/screens/nocode/NoCode.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import React, {useCallback} from 'react';
import {ScrollView, StyleSheet, Linking} from 'react-native';
import {Box, Text, Toolbar, ButtonSingleLine} from 'components';
import {Box, Text, TextMultiline, Toolbar, ButtonSingleLine} from 'components';
import {useI18n} from '@shopify/react-i18n';
import {useNavigation} from '@react-navigation/native';
import {useStorage} from 'services/StorageService';
import {getRegionCase} from 'shared/RegionLogic';
import {BulletPoint} from 'components/BulletPoint';
import {SafeAreaView} from 'react-native-safe-area-context';
import {TextMultiline} from 'components/TextMultiline';

interface ContentProps {
title: string;
Expand Down
3 changes: 1 addition & 2 deletions src/screens/regionPicker/RegionPickerSettings.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import React, {useCallback} from 'react';
import {useNavigation} from '@react-navigation/native';
import {Box, Toolbar, Text} from 'components';
import {Box, Toolbar, Text, TextMultiline} from 'components';
import {ScrollView} from 'react-native';
import {SafeAreaView} from 'react-native-safe-area-context';
import {useStorage} from 'services/StorageService';
import {useI18n} from '@shopify/react-i18n';
import {Region} from 'shared/Region';
import {TextMultiline} from 'components/TextMultiline';

import {regionData, RegionItem, regionStyles} from './RegionPickerShared';

Expand Down
3 changes: 1 addition & 2 deletions src/screens/tutorial/views/ItemView.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React from 'react';
import {StyleSheet, Image, ImageSourcePropType} from 'react-native';
import {Text} from 'components';
import {Text, TextMultiline} from 'components';
import {useI18n} from '@shopify/react-i18n';
import {TextMultiline} from 'components/TextMultiline';
import {useAccessibilityAutoFocus} from 'shared/useAccessibilityAutoFocus';

import {TutorialKey} from '../TutorialContent';
Expand Down

0 comments on commit f5182b7

Please sign in to comment.