From 3a91b5ffa4a3b069199d64ae9e8b7923ba7ecaa4 Mon Sep 17 00:00:00 2001 From: Julia Friesel Date: Mon, 27 Aug 2018 11:32:10 +0200 Subject: [PATCH] Shorten line lengths --- components/settings.js | 64 ++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/components/settings.js b/components/settings.js index d6eeda4..aac1a65 100644 --- a/components/settings.js +++ b/components/settings.js @@ -14,7 +14,7 @@ import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker import rnfs from 'react-native-fs' import styles, { secondaryColor } from '../styles/index' import config from '../config' -import { settings as settingsLabels, shared as sharedLabels } from './labels' +import { settings as labels, shared as sharedLabels } from './labels' import getDataAsCsvDataUri from '../lib/import-export/export-to-csv' import importCsv from '../lib/import-export/import-from-csv' import { @@ -36,34 +36,34 @@ export default class Settings extends Component { - {settingsLabels.tempScale.segmentTitle} + {labels.tempScale.segmentTitle} - {settingsLabels.tempScale.segmentExplainer} + {labels.tempScale.segmentExplainer} - {settingsLabels.export.button} + {labels.export.button} - {settingsLabels.export.segmentExplainer} + {labels.export.segmentExplainer} - {settingsLabels.export.button} + {labels.export.button} - {settingsLabels.import.button} + {labels.import.button} - {settingsLabels.import.segmentExplainer} + {labels.import.segmentExplainer} - {settingsLabels.import.button} + {labels.import.button} @@ -85,22 +85,24 @@ class TempReminderPicker extends Component { onPress={() => this.setState({ isTimePickerVisible: true })} > - {settingsLabels.tempReminder.title} + {labels.tempReminder.title} {this.state.time && this.state.enabled ? - {settingsLabels.tempReminder.timeSet(this.state.time)} + {labels.tempReminder.timeSet(this.state.time)} : - {settingsLabels.tempReminder.noTimeSet} + {labels.tempReminder.noTimeSet} } { - this.setState({ enabled: val }) - if (val && !this.state.time) this.setState({ isTimePickerVisible: true }) - if (!val) saveTempReminder({ enabled: false }) + onValueChange={switchOn => { + this.setState({ enabled: switchOn }) + if (switchOn && !this.state.time) { + this.setState({ isTimePickerVisible: true }) + } + if (!switchOn) saveTempReminder({ enabled: false }) }} onTintColor={secondaryColor} /> @@ -151,15 +153,15 @@ class TempSlider extends Component { try { saveTempScale(this.state) } catch(err) { - alertError(settingsLabels.tempScale.saveError) + alertError(labels.tempScale.saveError) } } render() { return ( - {`${settingsLabels.tempScale.min} ${this.state.min}`} - {`${settingsLabels.tempScale.max} ${this.state.max}`} + {`${labels.tempScale.min} ${this.state.min}`} + {`${labels.tempScale.max} ${this.state.max}`} getFileContentAndImport({ deleteExisting: false }) }, { - text: settingsLabels.import.deleteOption, + text: labels.import.deleteOption, onPress: () => getFileContentAndImport({ deleteExisting: true }) }, { text: sharedLabels.cancel, style: 'cancel', onPress: () => { } @@ -251,12 +253,12 @@ async function getFileContentAndImport({ deleteExisting }) { try { fileContent = await rnfs.readFile(fileInfo.uri, 'utf8') } catch (err) { - return importError(settingsLabels.import.errors.couldNotOpenFile) + return importError(labels.import.errors.couldNotOpenFile) } try { await importCsv(fileContent, deleteExisting) - Alert.alert(sharedLabels.successTitle, settingsLabels.import.success.message) + Alert.alert(sharedLabels.successTitle, labels.import.success.message) } catch(err) { importError(err.message) } @@ -267,7 +269,7 @@ function alertError(msg) { } function importError(msg) { - const postFixed = `${msg}\n\n${settingsLabels.import.errors.postFix}` + const postFixed = `${msg}\n\n${labels.import.errors.postFix}` alertError(postFixed) }