Clean up markup

This commit is contained in:
Julia Friesel
2019-05-19 19:00:05 +02:00
parent 69d2517dd2
commit 472d793627
8 changed files with 99 additions and 129 deletions
+1 -6
View File
@@ -1,9 +1,7 @@
import React from 'react' import React from 'react'
import { import {
Switch, Switch,
ScrollView, ScrollView} from 'react-native'
View
} from 'react-native'
import { bleeding } from '../../../i18n/en/cycle-day' import { bleeding } from '../../../i18n/en/cycle-day'
import styles from '../../../styles' import styles from '../../../styles'
@@ -46,7 +44,6 @@ export default class Bleeding extends SymptomView {
] ]
return ( return (
<ScrollView style={styles.page}> <ScrollView style={styles.page}>
<View style={{ flexDirection: 'row' }}>
<SymptomSection <SymptomSection
header={bleeding.heaviness.header} header={bleeding.heaviness.header}
explainer={bleeding.heaviness.explainer} explainer={bleeding.heaviness.explainer}
@@ -57,8 +54,6 @@ export default class Bleeding extends SymptomView {
onSelect={val => this.setState({ currentValue: val })} onSelect={val => this.setState({ currentValue: val })}
/> />
</SymptomSection> </SymptomSection>
<View style={{ flex: 1 }}></View>
</View>
<SymptomSection <SymptomSection
header={bleeding.exclude.header} header={bleeding.exclude.header}
explainer={bleeding.exclude.explainer} explainer={bleeding.exclude.explainer}
+1 -5
View File
@@ -1,8 +1,6 @@
import React from 'react' import React from 'react'
import { import {
ScrollView, ScrollView} from 'react-native'
View
} from 'react-native'
import { intensity, desire } from '../../../i18n/en/cycle-day' import { intensity, desire } from '../../../i18n/en/cycle-day'
import styles from '../../../styles' import styles from '../../../styles'
@@ -39,7 +37,6 @@ export default class Desire extends SymptomView {
] ]
return ( return (
<ScrollView style={styles.page}> <ScrollView style={styles.page}>
<View style={{ flexDirection: 'row' }}>
<SymptomSection <SymptomSection
header={desire.header} header={desire.header}
explainer={desire.explainer} explainer={desire.explainer}
@@ -50,7 +47,6 @@ export default class Desire extends SymptomView {
onSelect={val => this.setState({ currentValue: val })} onSelect={val => this.setState({ currentValue: val })}
/> />
</SymptomSection> </SymptomSection>
</View>
</ScrollView> </ScrollView>
) )
} }
+1 -6
View File
@@ -1,15 +1,12 @@
import React from 'react' import React from 'react'
import { import {
ScrollView, ScrollView,
TextInput, TextInput} from 'react-native'
View
} from 'react-native'
import { mood as labels } from '../../../i18n/en/cycle-day' import { mood as labels } from '../../../i18n/en/cycle-day'
import styles from '../../../styles' import styles from '../../../styles'
import SelectBoxGroup from '../select-box-group' import SelectBoxGroup from '../select-box-group'
import SymptomSection from './symptom-section' import SymptomSection from './symptom-section'
import SymptomView from './symptom-view' import SymptomView from './symptom-view'
@@ -53,7 +50,6 @@ export default class Mood extends SymptomView {
renderContent() { renderContent() {
return ( return (
<ScrollView style={styles.page}> <ScrollView style={styles.page}>
<View style={{ flexDirection: 'row' }}>
<SymptomSection <SymptomSection
explainer={labels.explainer} explainer={labels.explainer}
> >
@@ -74,7 +70,6 @@ export default class Mood extends SymptomView {
/> />
} }
</SymptomSection> </SymptomSection>
</View>
</ScrollView> </ScrollView>
) )
} }
+1 -5
View File
@@ -1,9 +1,7 @@
import React from 'react' import React from 'react'
import { import {
Switch, Switch,
ScrollView, ScrollView} from 'react-native'
View
} from 'react-native'
import styles from '../../../styles' import styles from '../../../styles'
import { mucus as labels } from '../../../i18n/en/cycle-day' import { mucus as labels } from '../../../i18n/en/cycle-day'
@@ -57,7 +55,6 @@ export default class Mucus extends SymptomView {
// const mandatoryNotCompletedYet = typeof this.state.feeling != 'number' || typeof this.state.texture != 'number' // const mandatoryNotCompletedYet = typeof this.state.feeling != 'number' || typeof this.state.texture != 'number'
return ( return (
<ScrollView style={styles.page}> <ScrollView style={styles.page}>
<View style={{ flexDirection: 'row' }}>
<SymptomSection <SymptomSection
header='Feeling' header='Feeling'
explainer={labels.feeling.explainer} explainer={labels.feeling.explainer}
@@ -68,7 +65,6 @@ export default class Mucus extends SymptomView {
active={this.state.feeling} active={this.state.feeling}
/> />
</SymptomSection> </SymptomSection>
</View>
<SymptomSection <SymptomSection
header='Texture' header='Texture'
+1 -5
View File
@@ -1,9 +1,7 @@
import React from 'react' import React from 'react'
import { import {
ScrollView, ScrollView,
TextInput, TextInput} from 'react-native'
View
} from 'react-native'
import { noteExplainer } from '../../../i18n/en/cycle-day' import { noteExplainer } from '../../../i18n/en/cycle-day'
import { shared as sharedLabels } from '../../../i18n/en/labels' import { shared as sharedLabels } from '../../../i18n/en/labels'
@@ -38,7 +36,6 @@ export default class Note extends SymptomView {
renderContent() { renderContent() {
return ( return (
<ScrollView style={styles.page}> <ScrollView style={styles.page}>
<View style={{ flexDirection: 'row' }}>
<SymptomSection <SymptomSection
explainer={noteExplainer} explainer={noteExplainer}
> >
@@ -52,7 +49,6 @@ export default class Note extends SymptomView {
value={this.state.currentValue} value={this.state.currentValue}
/> />
</SymptomSection> </SymptomSection>
</View>
</ScrollView> </ScrollView>
) )
} }
+1 -5
View File
@@ -1,9 +1,7 @@
import React from 'react' import React from 'react'
import { import {
ScrollView, ScrollView,
TextInput, TextInput} from 'react-native'
View
} from 'react-native'
import { pain as labels } from '../../../i18n/en/cycle-day' import { pain as labels } from '../../../i18n/en/cycle-day'
import { shared as sharedLabels } from '../../../i18n/en/labels' import { shared as sharedLabels } from '../../../i18n/en/labels'
@@ -55,7 +53,6 @@ export default class Pain extends SymptomView {
renderContent() { renderContent() {
return ( return (
<ScrollView style={styles.page}> <ScrollView style={styles.page}>
<View style={{ flexDirection: 'row' }}>
<SymptomSection <SymptomSection
explainer={labels.explainer} explainer={labels.explainer}
> >
@@ -76,7 +73,6 @@ export default class Pain extends SymptomView {
/> />
} }
</SymptomSection> </SymptomSection>
</View>
</ScrollView>) </ScrollView>)
} }
} }
-2
View File
@@ -55,7 +55,6 @@ export default class Sex extends SymptomView {
renderContent() { renderContent() {
return ( return (
<ScrollView style={styles.page}> <ScrollView style={styles.page}>
<View style={{ flexDirection: 'row' }}>
<SymptomSection <SymptomSection
header={sexLabels.header} header={sexLabels.header}
explainer={sexLabels.explainer} explainer={sexLabels.explainer}
@@ -67,7 +66,6 @@ export default class Sex extends SymptomView {
/> />
</SymptomSection> </SymptomSection>
<View style={{ flex: 1 }}></View> <View style={{ flex: 1 }}></View>
</View>
<SymptomSection <SymptomSection
header={contraceptivesLabels.header} header={contraceptivesLabels.header}
explainer={contraceptivesLabels.explainer} explainer={contraceptivesLabels.explainer}
@@ -144,7 +144,6 @@ export default class Temp extends SymptomView {
} }
return ( return (
<ScrollView style={styles.page}> <ScrollView style={styles.page}>
<View style={{ flexDirection: 'row' }}>
<SymptomSection <SymptomSection
header={labels.temperature.header} header={labels.temperature.header}
explainer={labels.temperature.explainer} explainer={labels.temperature.explainer}
@@ -162,7 +161,6 @@ export default class Temp extends SymptomView {
<AppText style={{ marginLeft: 5 }}>°C</AppText> <AppText style={{ marginLeft: 5 }}>°C</AppText>
</View> </View>
</SymptomSection> </SymptomSection>
</View>
<SymptomSection <SymptomSection
header={labels.time} header={labels.time}
> >