 emelko
|
edc701873e
|
Adding missing android res files
|
2018-07-25 11:23:08 +02:00 |
|
|
Julia Friesel
|
2950abf047
|
Merge branch '70-implement-note-2' into 'master'
Resolve "implement note"
Closes #70
See merge request bloodyhealth/drip!33
|
2018-07-25 09:14:58 +00:00 |
|
|
Julia Friesel
|
d44b6c348e
|
Add note symptom view
|
2018-07-25 11:11:57 +02:00 |
|
|
Julia Friesel
|
2d3c74db02
|
Merge branch '73-implement-nfp-logic-for-mucus-mode' into 'master'
Resolve "implement NFP logic for mucus mode"
Closes #73
See merge request bloodyhealth/drip!20
|
2018-07-25 08:56:34 +00:00 |
|
|
Julia Friesel
|
e3b8e5d717
|
Fix label, replace old property
|
2018-07-24 17:52:44 +02:00 |
|
|
Julia Friesel
|
a2400983cf
|
Move status labels to cycle day labels
|
2018-07-24 14:30:20 +02:00 |
|
|
Julia Friesel
|
5ce6bc8cfc
|
Handle cycle with mucus on first cycle day
|
2018-07-24 14:21:10 +02:00 |
|
|
bl00dymarie
|
444991fbec
|
Merge branch '92-investigate-error-message-on-master' into 'master'
Resolve "Investigate error message on master"
Closes #92
See merge request bloodyhealth/drip!32
|
2018-07-24 06:42:44 +00:00 |
|
|
Julia Friesel
|
5468c8051d
|
Merge branch 'master' into 73-implement-nfp-logic-for-mucus-mode
|
2018-07-23 19:00:49 +02:00 |
|
|
Julia Friesel
|
cac2e4b6e9
|
Merge branch '90-show-mucus-on-chart' into 'master'
Resolve "show mucus on chart"
Closes #90
See merge request bloodyhealth/drip!30
|
2018-07-23 16:44:54 +00:00 |
|
|
emelko
|
bae2192a60
|
Consistency of no space in {}
|
2018-07-23 18:16:22 +02:00 |
|
|
emelko
|
bcc901c061
|
Fixing bleeding and temperature button label on cycle day overview
|
2018-07-23 18:15:57 +02:00 |
|
|
bl00dymarie
|
fb56fe4c2e
|
Merge branch 'adding-cervix-symptom' into 'master'
Adding cervix symptom
See merge request bloodyhealth/drip!31
|
2018-07-23 12:01:23 +00:00 |
|
|
Julia Friesel
|
201a0d0ae1
|
Re-add delete all button
|
2018-07-23 12:59:40 +02:00 |
|
|
Julia Friesel
|
f52401d05d
|
Add button to add dummy data
|
2018-07-23 12:22:27 +02:00 |
|
|
emelko
|
0f6f28e8e4
|
Implementing Julia's suggestion to remove repetition
|
2018-07-20 19:11:24 +02:00 |
|
|
Julia Friesel
|
32c08c8df7
|
Fix cycle day overview categories inline
|
2018-07-20 18:58:30 +02:00 |
|
|
emelko
|
b8e99194d9
|
Reorganise labels for cylce day overview
|
2018-07-20 18:25:20 +02:00 |
|
|
emelko
|
4a2b99f9d5
|
Adds cervix to symptoms:
has 3 properties: opening, firmness and position (which is optional);
|
2018-07-20 18:24:04 +02:00 |
|
|
Julia Friesel
|
c184485c1d
|
Add mucus icon to chart
|
2018-07-20 12:52:10 +02:00 |
|
|
Julia Friesel
|
fc014f3ee2
|
Merge branch '89-make-symptom-views-vertically-scrollable' into 'master'
Resolve "make symptom views vertically scrollable"
Closes #89
See merge request bloodyhealth/drip!29
|
2018-07-20 10:08:11 +00:00 |
|
|
Julia Friesel
|
2a2f91fc55
|
Make everything scrollable
|
2018-07-20 11:54:47 +02:00 |
|
|
Julia Friesel
|
48aba2bbaf
|
Merge branch '66-add-local-time-to-temp' into 'master'
Resolve "add local time to temp"
Closes #66
See merge request bloodyhealth/drip!26
|
2018-07-20 05:58:09 +00:00 |
|
|
Julia Friesel
|
44c31b197e
|
Use time picker for time field
|
2018-07-19 18:27:46 +02:00 |
|
|
Julia Friesel
|
b63a9560df
|
Draw horizontal line only during temp measuring phase
|
2018-07-19 07:51:28 +02:00 |
|
|
Julia Friesel
|
4b5f4f905a
|
Extract styles and move vertical line a bit so it's completely visible
|
2018-07-19 07:29:54 +02:00 |
|
|
Julia Friesel
|
955207ed8d
|
Draw vertical and horizontal line in chart for completed sympto eval
|
2018-07-19 07:17:30 +02:00 |
|
|
Julia Friesel
|
8afbaa485c
|
Only activate save button when time is a valid one
|
2018-07-18 16:51:49 +02:00 |
|
|
Julia Friesel
|
67ebacfdd7
|
Fix whitespace
|
2018-07-18 16:39:52 +02:00 |
|
|
Julia Friesel
|
58aa0c4b8d
|
Remove assumeFertility from status, derive from phases instead
|
2018-07-18 14:18:04 +02:00 |
|
|
Julia Friesel
|
ebf18dac22
|
Refactor getStatusAsString
|
2018-07-18 14:14:43 +02:00 |
|
|
Julia Friesel
|
42a96da69d
|
Change cycle module API, add getCycleForDay, remove unused functions
|
2018-07-18 13:32:40 +02:00 |
|
|
Julia Friesel
|
1fb6c24629
|
Update directories to be linted
|
2018-07-18 13:31:44 +02:00 |
|
|
Julia Friesel
|
52b6e5de0a
|
Make previousCycle explicit in signature
|
2018-07-18 10:02:11 +02:00 |
|
|
Julia Friesel
|
ce87dda091
|
Make time field visible for new temps also
|
2018-07-16 19:01:45 +02:00 |
|
|
Julia Friesel
|
e3ddcaa0b1
|
Save time when first entering temp
|
2018-07-16 18:54:09 +02:00 |
|
|
Julia Friesel
|
b455a030cc
|
Label last day of post-ovu phase differently
|
2018-07-16 18:39:40 +02:00 |
|
|
Julia Friesel
|
79f17644d7
|
ComputedNfp => value
|
2018-07-16 18:21:58 +02:00 |
|
|
Julia Friesel
|
c96d3d4550
|
Merge branch 'master' into 73-implement-nfp-logic-for-mucus-mode
|
2018-07-16 13:55:07 +02:00 |
|
|
bl00dymarie
|
5725739d4e
|
Merge branch '67-implement-mucus' into 'master'
Resolve "implement mucus"
Closes #67
See merge request bloodyhealth/drip!22
|
2018-07-16 10:43:31 +00:00 |
|
|
emelko
|
6f755c55dc
|
Post refactor clean-up
|
2018-07-16 12:39:11 +02:00 |
|
|
emelko
|
0da3810aeb
|
Better naming for bleedin labels
|
2018-07-16 11:58:55 +02:00 |
|
|
emelko
|
d89e103843
|
Adding computed NFP mucus value to database and do cycle day overview
|
2018-07-16 11:58:42 +02:00 |
|
|
emelko
|
7e0456c10f
|
Adding unit tests to all possible mucus feeling/texture combinations
|
2018-07-16 11:58:42 +02:00 |
|
|
emelko
|
9ab4bd0dfa
|
If existing display mucus feeling and texture value on button
|
2018-07-16 11:58:42 +02:00 |
|
|
emelko
|
bb27cb0983
|
Add disabled to check for feeling AND texture to be selected; needs state
|
2018-07-16 11:57:20 +02:00 |
|
|
emelko
|
2b5e6351f7
|
[WIP] first draft implementing mucus
|
2018-07-16 11:56:55 +02:00 |
|
|
Julia Friesel
|
7dee497431
|
Merge branch 'refactor' into 'master'
Refactor markup
See merge request bloodyhealth/drip!25
|
2018-07-16 09:26:38 +00:00 |
|
|
Julia Friesel
|
8639208018
|
Style radio button row
|
2018-07-15 23:01:10 +02:00 |
|
|
Julia Friesel
|
eba5837350
|
Simplify markup and move symptom screens to symptom dir
|
2018-07-15 22:38:41 +02:00 |
|