Extract link component and parse all app text for links

This commit is contained in:
Julia Friesel
2019-02-02 11:55:03 +01:00
parent 87301da648
commit 0878654e82
8 changed files with 41 additions and 45 deletions
+2 -9
View File
@@ -1,21 +1,16 @@
import React, { Component } from 'react'
import { ScrollView } from 'react-native'
import Hyperlink from 'react-native-hyperlink'
import AppText from '../app-text'
import SettingsSegment from './shared/settings-segment'
import styles from '../../styles/index'
import labels from '../../i18n/en/settings'
import links from '../../i18n/en/links'
import replace from '../helpers/replace-url-with-text'
export default class AboutSection extends Component {
render() {
return (
<ScrollView>
<SettingsSegment title={labels.aboutSection.title}>
<Hyperlink linkStyle={styles.link} linkText={replace} linkDefault>
<AppText>{labels.aboutSection.text}</AppText>
</Hyperlink>
<AppText>{labels.aboutSection.text}</AppText>
</SettingsSegment>
<SettingsSegment title={labels.philosophy.title}>
<AppText>{labels.philosophy.text}</AppText>
@@ -24,9 +19,7 @@ export default class AboutSection extends Component {
<AppText>{labels.credits.note}</AppText>
</SettingsSegment>
<SettingsSegment title={labels.website.title}>
<Hyperlink linkStyle={styles.link} linkDefault>
<AppText>{links.website.url}</AppText>
</Hyperlink>
<AppText>{links.website.url}</AppText>
</SettingsSegment>
<SettingsSegment title={labels.version.title} last>
<AppText>{require('../../package.json').version}</AppText>
+2 -6
View File
@@ -1,20 +1,16 @@
import React, { Component } from 'react'
import { View, ScrollView } from 'react-native'
import Hyperlink from 'react-native-hyperlink'
import AppText from '../app-text'
import styles from '../../styles/index'
import labels from '../../i18n/en/settings'
import replace from '../helpers/replace-url-with-text'
export default class License extends Component {
render() {
return (
<ScrollView>
<View style={styles.settingsSegment}>
<Hyperlink linkStyle={styles.link} linkText={replace} linkDefault>
<AppText style={styles.settingsSegmentTitle}>{`${labels.license.title} `}</AppText>
<AppText>{`${labels.license.text} `}</AppText>
</Hyperlink>
<AppText style={styles.settingsSegmentTitle}>{`${labels.license.title} `}</AppText>
<AppText>{`${labels.license.text} `}</AppText>
</View>
</ScrollView>
)
+1 -5
View File
@@ -2,7 +2,6 @@ import React, { Component } from 'react'
import {
ScrollView, View
} from 'react-native'
import Hyperlink from 'react-native-hyperlink'
import styles, { iconStyles } from '../../../styles'
import labels from '../../../i18n/en/settings'
import AppText from '../../app-text'
@@ -10,7 +9,6 @@ import SettingsSegment from '../shared/settings-segment'
import TempSlider from './temp-slider'
import UseCervixSetting from './use-cervix'
import Icon from 'react-native-vector-icons/Entypo'
import replaceUrlWithText from '../../helpers/replace-url-with-text'
export default class Settings extends Component {
constructor(props) {
@@ -33,9 +31,7 @@ export default class Settings extends Component {
<Icon name="info-with-circle" style={iconStyles.infoInHeading}/>
<AppText style={styles.settingsSegmentTitle}>{`${labels.preOvu.title} `}</AppText>
</View>
<Hyperlink linkStyle={styles.link} linkText={replaceUrlWithText} linkDefault>
<AppText>{labels.preOvu.note}</AppText>
</Hyperlink>
<AppText>{labels.preOvu.note}</AppText>
</SettingsSegment>
</ScrollView>
)