diff --git a/components/settings/about.js b/components/settings/about.js index 0732edc..6ee5451 100644 --- a/components/settings/about.js +++ b/components/settings/about.js @@ -1,5 +1,5 @@ import React, { Component } from 'react' -import { View, ScrollView } from 'react-native' +import { ScrollView } from 'react-native' import Hyperlink from 'react-native-hyperlink' import AppText from '../app-text' import SettingsSegment from './settings-segment' @@ -11,34 +11,25 @@ export default class AboutSection extends Component { render() { return ( - + - {`${labels.aboutSection.segmentExplainer} `} + {`${labels.aboutSection.text} `} - - {`${labels.philosophy.title} `} + {labels.philosophy.text} - - - - {`${labels.aboutSection.title} `} - {labels.aboutSection.text} - - - + + {`${labels.credits.note}`} - + - {`${labels.website.title} `} {links.website.url} - - - {`${labels.version.title} `} + + {require('../../package.json').version} - + ) } diff --git a/components/settings/data-management/index.js b/components/settings/data-management/index.js index 4199760..04d4628 100644 --- a/components/settings/data-management/index.js +++ b/components/settings/data-management/index.js @@ -26,7 +26,7 @@ const DataManagement = () => { {labels.deleteSegment.explainer} diff --git a/components/settings/settings-segment.js b/components/settings/settings-segment.js index 0a87719..f29f7c5 100644 --- a/components/settings/settings-segment.js +++ b/components/settings/settings-segment.js @@ -6,8 +6,10 @@ import AppText from '../app-text' import styles from '../../styles' const SettingsSegment = ({ children, ...props }) => { + const style = [styles.settingsSegment, props.style] + if (props.last) style.push(styles.settingsSegmentLast) return ( - + {props.title} {children}