1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00

Merge branch 'master' of github.com:laurent22/joplin

This commit is contained in:
Laurent Cozic
2018-11-02 19:56:18 +00:00
13 changed files with 218 additions and 37 deletions

View File

@@ -9,9 +9,10 @@ const { themeStyle } = require('lib/components/global-style.js');
const Setting = require('lib/models/Setting.js');
const shared = require('lib/components/shared/config-shared.js');
const SyncTargetRegistry = require('lib/SyncTargetRegistry');
import VersionInfo from 'react-native-version-info';
class ConfigScreenComponent extends BaseScreenComponent {
static navigationOptions(options) {
return { header: null };
}
@@ -229,7 +230,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
</TouchableOpacity>
</View>
);
settingComps.push(
<View key="website_link" style={this.styles().settingContainer}>
<TouchableOpacity onPress={() => { Linking.openURL('https://joplin.cozic.net/') }}>
@@ -246,6 +247,12 @@ class ConfigScreenComponent extends BaseScreenComponent {
</View>
);
settingComps.push(
<View key="version_info" style={this.styles().settingContainer}>
<Text key="version" style={this.styles().settingText}>Version {VersionInfo.appVersion}</Text>
</View>
);
return (
<View style={this.rootStyle(this.props.theme).root}>
<ScreenHeader
@@ -272,4 +279,4 @@ const ConfigScreen = connect(
}
)(ConfigScreenComponent)
module.exports = { ConfigScreen };
module.exports = { ConfigScreen };