Make link press handler work

This commit is contained in:
Julia Friesel
2019-01-17 16:36:36 +01:00
parent 23c6a60258
commit 8178303e3a
6 changed files with 10 additions and 7 deletions
@@ -2,5 +2,8 @@ import {links} from '../../i18n/en/settings'
export default function(url) { export default function(url) {
const link = Object.values(links).find(link => link.url === url) const link = Object.values(links).find(link => link.url === url)
if (url === 'mailto:bloodyhealth@mailbox.org') {
console.log(links.email.url === url)
}
return link ? link.text : url return link ? link.text : url
} }
+1 -1
View File
@@ -13,7 +13,7 @@ const labels = settingsLabels.license
export default function License({setLicense}) { export default function License({setLicense}) {
return ( return (
<ScrollView style={styles.licensePage}> <ScrollView style={styles.licensePage}>
<Hyperlink linkStyle={styles.link} linkText={replace}> <Hyperlink linkStyle={styles.link} linkText={replace} linkDefault>
<AppText style={styles.settingsSegmentTitle}>{labels.title}</AppText> <AppText style={styles.settingsSegmentTitle}>{labels.title}</AppText>
<AppText>{labels.text}</AppText> <AppText>{labels.text}</AppText>
</Hyperlink> </Hyperlink>
+2 -2
View File
@@ -12,7 +12,7 @@ export default class AboutSection extends Component {
return ( return (
<ScrollView> <ScrollView>
<SettingsSegment title={labels.aboutSection.title}> <SettingsSegment title={labels.aboutSection.title}>
<Hyperlink linkStyle={styles.link} linkText={replace}> <Hyperlink linkStyle={styles.link} linkText={replace} linkDefault>
<AppText>{labels.aboutSection.text}</AppText> <AppText>{labels.aboutSection.text}</AppText>
</Hyperlink> </Hyperlink>
</SettingsSegment> </SettingsSegment>
@@ -23,7 +23,7 @@ export default class AboutSection extends Component {
<AppText>{labels.credits.note}</AppText> <AppText>{labels.credits.note}</AppText>
</SettingsSegment> </SettingsSegment>
<SettingsSegment title={labels.website.title}> <SettingsSegment title={labels.website.title}>
<Hyperlink linkStyle={styles.link}> <Hyperlink linkStyle={styles.link} linkDefault>
<AppText>{links.website.url}</AppText> <AppText>{links.website.url}</AppText>
</Hyperlink> </Hyperlink>
</SettingsSegment> </SettingsSegment>
+1 -1
View File
@@ -11,7 +11,7 @@ export default class License extends Component {
return ( return (
<ScrollView> <ScrollView>
<View style={styles.settingsSegment}> <View style={styles.settingsSegment}>
<Hyperlink linkStyle={styles.link} linkText={replace}> <Hyperlink linkStyle={styles.link} linkText={replace} linkDefault>
<AppText style={styles.settingsSegmentTitle}>{`${labels.license.title} `}</AppText> <AppText style={styles.settingsSegmentTitle}>{`${labels.license.title} `}</AppText>
<AppText>{`${labels.license.text} `}</AppText> <AppText>{`${labels.license.text} `}</AppText>
</Hyperlink> </Hyperlink>
+1 -1
View File
@@ -33,7 +33,7 @@ export default class Settings extends Component {
<Icon name="info-with-circle" style={iconStyles.infoInHeading}/> <Icon name="info-with-circle" style={iconStyles.infoInHeading}/>
<AppText style={styles.settingsSegmentTitle}>{`${labels.preOvu.title} `}</AppText> <AppText style={styles.settingsSegmentTitle}>{`${labels.preOvu.title} `}</AppText>
</View> </View>
<Hyperlink linkStyle={styles.link} linkText={replaceUrlWithText}> <Hyperlink linkStyle={styles.link} linkText={replaceUrlWithText} linkDefault>
<AppText>{labels.preOvu.note}</AppText> <AppText>{labels.preOvu.note}</AppText>
</Hyperlink> </Hyperlink>
</SettingsSegment> </SettingsSegment>
+2 -2
View File
@@ -5,7 +5,7 @@ export const links = {
text: 'GitLab' text: 'GitLab'
}, },
email: { email: {
url: 'mailto:bl00dyhealth@mailbox.org', url: 'mailto:bloodyhealth@mailbox.org',
text: 'email' text: 'email'
}, },
wiki: { wiki: {
@@ -124,7 +124,7 @@ export default {
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details: https://www.gnu.org/licenses/gpl-3.0.html This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details: https://www.gnu.org/licenses/gpl-3.0.html
You can contact us by email at bloodyhealth@mailbox.com.` You can contact us by bloodyhealth@mailbox.org.`
}, },
version: { version: {
title: 'Version' title: 'Version'