Skip to content
Snippets Groups Projects
Commit 3a91b5ff authored by Julia Friesel's avatar Julia Friesel
Browse files

Shorten line lengths

parent 660f19a7
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker ...@@ -14,7 +14,7 @@ import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker
import rnfs from 'react-native-fs' import rnfs from 'react-native-fs'
import styles, { secondaryColor } from '../styles/index' import styles, { secondaryColor } from '../styles/index'
import config from '../config' 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 getDataAsCsvDataUri from '../lib/import-export/export-to-csv'
import importCsv from '../lib/import-export/import-from-csv' import importCsv from '../lib/import-export/import-from-csv'
import { import {
...@@ -36,34 +36,34 @@ export default class Settings extends Component { ...@@ -36,34 +36,34 @@ export default class Settings extends Component {
<TempReminderPicker/> <TempReminderPicker/>
<View style={styles.settingsSegment}> <View style={styles.settingsSegment}>
<Text style={styles.settingsSegmentTitle}> <Text style={styles.settingsSegmentTitle}>
{settingsLabels.tempScale.segmentTitle} {labels.tempScale.segmentTitle}
</Text> </Text>
<Text>{settingsLabels.tempScale.segmentExplainer}</Text> <Text>{labels.tempScale.segmentExplainer}</Text>
<TempSlider/> <TempSlider/>
</View> </View>
<View style={styles.settingsSegment}> <View style={styles.settingsSegment}>
<Text style={styles.settingsSegmentTitle}> <Text style={styles.settingsSegmentTitle}>
{settingsLabels.export.button} {labels.export.button}
</Text> </Text>
<Text>{settingsLabels.export.segmentExplainer}</Text> <Text>{labels.export.segmentExplainer}</Text>
<TouchableOpacity <TouchableOpacity
onPress={openShareDialogAndExport} onPress={openShareDialogAndExport}
style={styles.settingsButton}> style={styles.settingsButton}>
<Text style={styles.settingsButtonText}> <Text style={styles.settingsButtonText}>
{settingsLabels.export.button} {labels.export.button}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={styles.settingsSegment}> <View style={styles.settingsSegment}>
<Text style={styles.settingsSegmentTitle}> <Text style={styles.settingsSegmentTitle}>
{settingsLabels.import.button} {labels.import.button}
</Text> </Text>
<Text>{settingsLabels.import.segmentExplainer}</Text> <Text>{labels.import.segmentExplainer}</Text>
<TouchableOpacity <TouchableOpacity
onPress={openImportDialogAndImport} onPress={openImportDialogAndImport}
style={styles.settingsButton}> style={styles.settingsButton}>
<Text style={styles.settingsButtonText}> <Text style={styles.settingsButtonText}>
{settingsLabels.import.button} {labels.import.button}
</Text> </Text>
</TouchableOpacity> </TouchableOpacity>
</View> </View>
...@@ -85,22 +85,24 @@ class TempReminderPicker extends Component { ...@@ -85,22 +85,24 @@ class TempReminderPicker extends Component {
onPress={() => this.setState({ isTimePickerVisible: true })} onPress={() => this.setState({ isTimePickerVisible: true })}
> >
<Text style={styles.settingsSegmentTitle}> <Text style={styles.settingsSegmentTitle}>
{settingsLabels.tempReminder.title} {labels.tempReminder.title}
</Text> </Text>
<View style={{ flexDirection: 'row', alignItems: 'center' }}> <View style={{ flexDirection: 'row', alignItems: 'center' }}>
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
{this.state.time && this.state.enabled ? {this.state.time && this.state.enabled ?
<Text>{settingsLabels.tempReminder.timeSet(this.state.time)}</Text> <Text>{labels.tempReminder.timeSet(this.state.time)}</Text>
: :
<Text>{settingsLabels.tempReminder.noTimeSet}</Text> <Text>{labels.tempReminder.noTimeSet}</Text>
} }
</View> </View>
<Switch <Switch
value={this.state.enabled} value={this.state.enabled}
onValueChange={val => { onValueChange={switchOn => {
this.setState({ enabled: val }) this.setState({ enabled: switchOn })
if (val && !this.state.time) this.setState({ isTimePickerVisible: true }) if (switchOn && !this.state.time) {
if (!val) saveTempReminder({ enabled: false }) this.setState({ isTimePickerVisible: true })
}
if (!switchOn) saveTempReminder({ enabled: false })
}} }}
onTintColor={secondaryColor} onTintColor={secondaryColor}
/> />
...@@ -151,15 +153,15 @@ class TempSlider extends Component { ...@@ -151,15 +153,15 @@ class TempSlider extends Component {
try { try {
saveTempScale(this.state) saveTempScale(this.state)
} catch(err) { } catch(err) {
alertError(settingsLabels.tempScale.saveError) alertError(labels.tempScale.saveError)
} }
} }
render() { render() {
return ( return (
<View style={{ alignItems: 'center' }}> <View style={{ alignItems: 'center' }}>
<Text>{`${settingsLabels.tempScale.min} ${this.state.min}`}</Text> <Text>{`${labels.tempScale.min} ${this.state.min}`}</Text>
<Text>{`${settingsLabels.tempScale.max} ${this.state.max}`}</Text> <Text>{`${labels.tempScale.max} ${this.state.max}`}</Text>
<Slider <Slider
values={[this.state.min, this.state.max]} values={[this.state.min, this.state.max]}
min={config.temperatureScale.min} min={config.temperatureScale.min}
...@@ -194,36 +196,36 @@ async function openShareDialogAndExport() { ...@@ -194,36 +196,36 @@ async function openShareDialogAndExport() {
try { try {
data = getDataAsCsvDataUri() data = getDataAsCsvDataUri()
if (!data) { if (!data) {
return alertError(settingsLabels.errors.noData) return alertError(labels.errors.noData)
} }
} catch (err) { } catch (err) {
console.error(err) console.error(err)
return alertError(settingsLabels.errors.couldNotConvert) return alertError(labels.errors.couldNotConvert)
} }
try { try {
await Share.open({ await Share.open({
title: settingsLabels.export.title, title: labels.export.title,
url: data, url: data,
subject: settingsLabels.export.subject, subject: labels.export.subject,
type: 'text/csv', type: 'text/csv',
showAppsToView: true showAppsToView: true
}) })
} catch (err) { } catch (err) {
console.error(err) console.error(err)
return alertError(settingsLabels.export.errors.problemSharing) return alertError(labels.export.errors.problemSharing)
} }
} }
function openImportDialogAndImport() { function openImportDialogAndImport() {
Alert.alert( Alert.alert(
settingsLabels.import.title, labels.import.title,
settingsLabels.import.message, labels.import.message,
[{ [{
text: settingsLabels.import.replaceOption, text: labels.import.replaceOption,
onPress: () => getFileContentAndImport({ deleteExisting: false }) onPress: () => getFileContentAndImport({ deleteExisting: false })
}, { }, {
text: settingsLabels.import.deleteOption, text: labels.import.deleteOption,
onPress: () => getFileContentAndImport({ deleteExisting: true }) onPress: () => getFileContentAndImport({ deleteExisting: true })
}, { }, {
text: sharedLabels.cancel, style: 'cancel', onPress: () => { } text: sharedLabels.cancel, style: 'cancel', onPress: () => { }
...@@ -251,12 +253,12 @@ async function getFileContentAndImport({ deleteExisting }) { ...@@ -251,12 +253,12 @@ async function getFileContentAndImport({ deleteExisting }) {
try { try {
fileContent = await rnfs.readFile(fileInfo.uri, 'utf8') fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
} catch (err) { } catch (err) {
return importError(settingsLabels.import.errors.couldNotOpenFile) return importError(labels.import.errors.couldNotOpenFile)
} }
try { try {
await importCsv(fileContent, deleteExisting) await importCsv(fileContent, deleteExisting)
Alert.alert(sharedLabels.successTitle, settingsLabels.import.success.message) Alert.alert(sharedLabels.successTitle, labels.import.success.message)
} catch(err) { } catch(err) {
importError(err.message) importError(err.message)
} }
...@@ -267,7 +269,7 @@ function alertError(msg) { ...@@ -267,7 +269,7 @@ function alertError(msg) {
} }
function importError(msg) { function importError(msg) {
const postFixed = `${msg}\n\n${settingsLabels.import.errors.postFix}` const postFixed = `${msg}\n\n${labels.import.errors.postFix}`
alertError(postFixed) alertError(postFixed)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment