From 88973290cb525185f7e5475185c5ac51a7b8f96b Mon Sep 17 00:00:00 2001
From: Birgitta B <bboeckel@thoughtworks.com>
Date: Sun, 13 Jan 2019 12:05:44 +0100
Subject: [PATCH] Only show the hints if minimum not selected
---
components/app-text.js | 23 ++++++++++++++---------
components/cycle-day/symptoms/cervix.js | 5 +++--
components/cycle-day/symptoms/mucus.js | 5 +++--
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/components/app-text.js b/components/app-text.js
index aaf70985..a7892b93 100644
--- a/components/app-text.js
+++ b/components/app-text.js
@@ -22,15 +22,20 @@ export function AppTextLight(props) {
}
export function ActionHint(props) {
- return (
- <View
- style={styles.actionHintWrappingView}>
- <AppText
- style={[styles.actionHint, props.style]}>
- {props.children}
- </AppText>
- </View>
- )
+ if(props.isVisible) {
+ return (
+ <View
+ style={styles.actionHintWrappingView}
+ isVisible={false}>
+ <AppText
+ style={[styles.actionHint, props.style]}>
+ {props.children}
+ </AppText>
+ </View>
+ )
+ } else {
+ return null
+ }
}
export function SymptomSectionHeader(props) {
diff --git a/components/cycle-day/symptoms/cervix.js b/components/cycle-day/symptoms/cervix.js
index dacf31f5..d0e3e07c 100644
--- a/components/cycle-day/symptoms/cervix.js
+++ b/components/cycle-day/symptoms/cervix.js
@@ -36,6 +36,7 @@ export default class Cervix extends Component {
{ label: labels.position.categories[1], value: 1 },
{ label: labels.position.categories[2], value: 2 }
]
+ const mandatoryNotCompletedYet = typeof this.state.opening != 'number' || typeof this.state.firmness != 'number'
return (
<View style={{ flex: 1 }}>
<ScrollView style={styles.page}>
@@ -82,7 +83,7 @@ export default class Cervix extends Component {
/>
</SymptomSection>
</ScrollView>
- <ActionHint>{labels.actionHint}</ActionHint>
+ <ActionHint isVisible={mandatoryNotCompletedYet}>{labels.actionHint}</ActionHint>
<ActionButtonFooter
symptom='cervix'
date={this.props.date}
@@ -95,7 +96,7 @@ export default class Cervix extends Component {
exclude: Boolean(this.state.exclude)
})
}}
- saveDisabled={typeof this.state.opening != 'number' || typeof this.state.firmness != 'number'}
+ saveDisabled={mandatoryNotCompletedYet}
navigate={this.props.navigate}
/>
</View>
diff --git a/components/cycle-day/symptoms/mucus.js b/components/cycle-day/symptoms/mucus.js
index 7a6f5de0..6e2d2ce0 100644
--- a/components/cycle-day/symptoms/mucus.js
+++ b/components/cycle-day/symptoms/mucus.js
@@ -34,6 +34,7 @@ export default class Mucus extends Component {
{ label: labels.texture.categories[1], value: 1 },
{ label: labels.texture.categories[2], value: 2 }
]
+ const mandatoryNotCompletedYet = typeof this.state.feeling != 'number' || typeof this.state.texture != 'number'
return (
<View style={{ flex: 1 }}>
<ScrollView style={styles.page}>
@@ -70,7 +71,7 @@ export default class Mucus extends Component {
/>
</SymptomSection>
</ScrollView>
- <ActionHint>{labels.actionHint}</ActionHint>
+ <ActionHint isVisible={mandatoryNotCompletedYet}>{labels.actionHint}</ActionHint>
<ActionButtonFooter
symptom='mucus'
date={this.props.date}
@@ -85,7 +86,7 @@ export default class Mucus extends Component {
exclude: Boolean(this.state.exclude)
})
}}
- saveDisabled={typeof this.state.feeling != 'number' || typeof this.state.texture != 'number'}
+ saveDisabled={mandatoryNotCompletedYet}
navigate={this.props.navigate}
/>
</View>
--
GitLab