diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..2f5e5f8
--- /dev/null
+++ b/android/app/src/main/res/values/colors.xml
@@ -0,0 +1,12 @@
+
+
+
+ #ff7e5f
+
+
+ #c74e34
+
+
+ #351c4d
+
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 319eb0c..5536275 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -3,6 +3,7 @@
diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js
index c85a7e7..0c9b9d7 100644
--- a/components/cycle-day/cycle-day-overview.js
+++ b/components/cycle-day/cycle-day-overview.js
@@ -51,6 +51,7 @@ export default class CycleDayOverView extends Component {
const cycleDay = this.state.cycleDay
const getCycleDayNumber = cycleModule().getCycleDayNumber
const cycleDayNumber = getCycleDayNumber(cycleDay.date)
+ const dateInFuture = LocalDate.now().isBefore(LocalDate.parse(this.state.cycleDay.date))
return (
this.navigate('BleedingEditView')}
data={getLabel('bleeding', cycleDay.bleeding)}
+ disabled={dateInFuture}
/>
this.navigate('TemperatureEditView')}
data={getLabel('temperature', cycleDay.temperature)}
+ disabled={dateInFuture}
/>
this.navigate('MucusEditView')}
data={getLabel('mucus', cycleDay.mucus)}
+ disabled={dateInFuture}
/>
this.navigate('CervixEditView')}
data={getLabel('cervix', cycleDay.cervix)}
- />
- this.navigate('NoteEditView')}
- data={getLabel('note', cycleDay.note)}
+ disabled={dateInFuture}
/>
this.navigate('DesireEditView')}
data={getLabel('desire', cycleDay.desire)}
+ disabled={dateInFuture}
/>
this.navigate('SexEditView')}
data={getLabel('sex', cycleDay.sex)}
+ disabled={dateInFuture}
+ />
+ this.navigate('NoteEditView')}
+ data={getLabel('note', cycleDay.note)}
/>
-
+
+
- {this.props.title}
+ {this.props.title}
-
+
{this.props.data}
diff --git a/components/cycle-day/symptoms/temperature.js b/components/cycle-day/symptoms/temperature.js
index 11ee7da..ae7d74e 100644
--- a/components/cycle-day/symptoms/temperature.js
+++ b/components/cycle-day/symptoms/temperature.js
@@ -33,7 +33,8 @@ export default class Temp extends Component {
exclude: temp ? temp.exclude : false,
time: temp ? temp.time : LocalTime.now().truncatedTo(minutes).toString(),
isTimePickerVisible: false,
- outOfRange: null
+ outOfRange: null,
+ note: temp ? temp.note : null
}
if (temp) {
@@ -54,7 +55,8 @@ export default class Temp extends Component {
const dataToSave = {
value: Number(this.state.temperature),
exclude: this.state.exclude,
- time: this.state.time
+ time: this.state.time,
+ note: this.state.note
}
saveSymptom('temperature', this.cycleDay, dataToSave)
this.props.navigate('CycleDay', {cycleDay: this.cycleDay})
@@ -126,6 +128,21 @@ export default class Temp extends Component {
}}
onCancel={() => this.setState({ isTimePickerVisible: false })}
/>
+
+ Note
+
+
+ {
+ this.setState({ note: val })
+ }}
+ />
+
Exclude