self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Fixed config page

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-31 22:51:24 +02:00
parent 8ce02e6e4c
commit 72c4ed8453
2 changed files with 37 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
ReactNativeClient/lib/components/screens/config.js
View File

@@ -48,64 +48,48 @@ class ConfigScreenComponent extends BaseScreenComponent {
return { header: null };
}
constructor() {
super();
this.state = {
values: {},
};
}
componentWillMount() {
const settings = Setting.publicSettings(Setting.value('appType'));
let values = {};
for (let key in settings) {
if (!settings.hasOwnProperty(key)) continue;
values[key] = settings[key].value;
}
this.setState({ values: values });
}
settingToComponent(key, setting) {
settingToComponent(key, value) {
let output = null;
const updateSettingValue = (key, value) => {
let values = this.state.values;
values[key] = value;
this.setState({ values: values });
this.saveSettings();
Setting.setValue(key, value);
}
const value = this.state.values[key];
const md = Setting.settingMetadata(key);
if (md.isEnum) {
// The Picker component doesn't work properly with int values, so
// convert everything to string (Setting.setValue will convert
// back to the correct type.
value = value.toString();
if (setting.isEnum) {
let items = [];
const settingOptions = setting.options();
const settingOptions = md.options();
for (let k in settingOptions) {
if (!settingOptions.hasOwnProperty(k)) continue;
items.push(<Picker.Item label={settingOptions[k]} value={k} key={k}/>);
items.push(<Picker.Item label={settingOptions[k]} value={k.toString()} key={k}/>);
}
return (
<View key={key} style={styles.settingContainer}>
<Text key="label" style={styles.settingText}>{setting.label()}</Text>
<Text key="label" style={styles.settingText}>{md.label()}</Text>
<Picker key="control" style={styles.settingControl} selectedValue={value} onValueChange={(itemValue, itemIndex) => updateSettingValue(key, itemValue)} >
{ items }
</Picker>
</View>
);
} else if (setting.type == Setting.TYPE_BOOL) {
} else if (md.type == Setting.TYPE_BOOL) {
return (
<View key={key} style={styles.switchSettingContainer}>
<Text key="label" style={styles.switchSettingText}>{setting.label()}</Text>
<Text key="label" style={styles.switchSettingText}>{md.label()}</Text>
<Switch key="control" style={styles.switchSettingControl} value={value} onValueChange={(value) => updateSettingValue(key, value)} />
</View>
);
} else if (setting.type == Setting.TYPE_INT) {
} else if (md.type == Setting.TYPE_INT) {
return (
<View key={key} style={styles.settingContainer}>
<Text key="label" style={styles.settingText}>{setting.label()}</Text>
<Text key="label" style={styles.settingText}>{md.label()}</Text>
<Slider key="control" style={styles.settingControl} value={value} onValueChange={(value) => updateSettingValue(key, value)} />
</View>
);
@@ -116,25 +100,15 @@ class ConfigScreenComponent extends BaseScreenComponent {
return output;
}
saveSettings() {
const values = this.state.values;
for (let key in values) {
if (!values.hasOwnProperty(key)) continue;
Setting.setValue(key, values[key]);
}
Setting.saveAll();
setLocale(Setting.value('locale'));
}
render() {
const settings = Setting.publicSettings(Setting.value('appType'));
const settings = this.props.settings;
let settingComps = [];
for (let key in settings) {
if (key == 'sync.target') continue;
if (!settings.hasOwnProperty(key)) continue;
if (!Setting.isPublic(key)) continue;
const comp = this.settingToComponent(key, settings[key]);
if (!comp) continue;
settingComps.push(comp);
@@ -154,7 +128,7 @@ class ConfigScreenComponent extends BaseScreenComponent {
const ConfigScreen = connect(
(state) => {
return {};
return { settings: state.settings };
}
)(ConfigScreenComponent)