Commit Graph

1235 Commits

Author SHA1 Message Date
bl00dymarie e2abc4dbeb Merge branch 'marie-move-info-button-out-of-header-to-body' into 'master'
Move info button out of header to body

See merge request bloodyhealth/drip!217
2019-05-25 09:35:31 +00:00
Julia Friesel 0cfc85933c Make info modal only as big as it needs to be 2019-05-25 09:17:39 +02:00
Julia Friesel c6fd5e6db2 Make sure info icon is always well pressable 2019-05-25 07:09:36 +02:00
emelko 8e57febf9e Specifying mucus as cervical mucus 2019-05-24 22:50:40 +02:00
bl00dymarie ed38a5b450 Merge branch '362-rearrange-home-screen-elements' into 'master'
Resolve "Rearrange home screen elements"

Closes #362

See merge request bloodyhealth/drip!220
2019-05-24 10:28:33 +00:00
Julia Friesel 16b3199892 Make sure drop text is always positioned correctly 2019-05-24 11:23:12 +02:00
emelko d13a776970 Position icon text for droplet 2019-05-23 22:07:46 +02:00
emelko 418b9c0f5d Styling for homescreen elements to breathe 2019-05-23 17:23:36 +02:00
Julia Friesel c35f333daa Merge branch 'import-alert-buttons-order' into 'master'
Changes order of buttons in the import alert

Closes #372

See merge request bloodyhealth/drip!219
2019-05-22 15:40:40 +00:00
Julia Friesel 668acb4afe simple way to rearrange home screen 2019-05-22 17:30:53 +02:00
emelko ac0690ec9f Set show more on homescreen to default and get rid of more/less switch 2019-05-22 17:27:31 +02:00
Julia Friesel cef2e850d7 Don't render delete icon, instead of just setting it invisible 2019-05-21 17:32:51 +02:00
Julia Friesel 4b469f2f49 Make isDeleteIconActive more readable 2019-05-21 17:08:26 +02:00
Julia Friesel b0b2e8ceb5 Merge branch '365-show-incomplete-symptom-in-day-view' into 'master'
Resolve "show incomplete symptom in day view"

Closes #365

See merge request bloodyhealth/drip!218
2019-05-21 14:22:04 +00:00
Julia Friesel 82a9bf0a0f Update README.md 2019-05-21 14:20:45 +00:00
Sofiya Tepikin 417083b0c1 Changes order of buttons in the import alert 2019-05-20 17:16:05 +02:00
Julia Friesel 25ed0d168e Remove formatting improvements that clutter up the diff 2019-05-20 15:17:27 +02:00
Julia Friesel d7b599d03b Fix cervix value display on overview 2019-05-20 06:44:34 +02:00
Julia Friesel 3f52cae04b Fix mucus value display on overview 2019-05-20 06:32:58 +02:00
Julia Friesel 59c3636139 Don't show delete icon just because symptom info is open 2019-05-20 06:08:46 +02:00
Julia Friesel 472d793627 Clean up markup 2019-05-19 19:00:05 +02:00
Julia Friesel 43b98ed9a5 Merge branch '364-delete-or-clear-button-that-is-visible-as-soon-as-any-value-is-selected-saved' into 'master'
Resolve "delete or clear button that is visible as soon as any value is selected/saved"

Closes #364

See merge request bloodyhealth/drip!216
2019-05-19 16:52:02 +00:00
Julia Friesel 69d2517dd2 Use own modal instead of alert for symptom info 2019-05-19 18:44:12 +02:00
Julia Friesel 0f6567e66b Merge branch '345-move-info-button-out-of-header-to-body' into marie-move-info-button-out-of-header-to-body 2019-05-19 17:53:14 +02:00
emelko c81f7d6291 Gets rid of trailing spaces 2019-05-19 13:09:21 +02:00
emelko e9c18add5e Gets rid of old info symptom screen 2019-05-19 12:57:07 +02:00
emelko 4071c30b8b [WIP] Adds info button to body as alert for:
* mood, pain, temperature
2019-05-19 12:56:52 +02:00
emelko ff1afcb8dc Adds info button to the body as alert 2019-05-19 12:56:08 +02:00
Julia Friesel d2c0891a68 Try out moving it to body 2019-05-18 06:40:36 +02:00
Julia Friesel a557733d30 For temperature, only show delete button when certain fields active 2019-05-17 16:47:31 +02:00
Julia Friesel 0f7ab6c803 Let symptom views overwrite isDeleteIconActive method 2019-05-17 16:09:49 +02:00
Julia Friesel b7088c44f2 Show or hide delete button based on entered data 2019-05-17 12:07:54 +02:00
Julia Friesel 00294ff6f6 Remove unused style 2019-05-17 11:54:50 +02:00
Julia Friesel 1d61675ef7 Ask before deleting entry 2019-05-17 11:01:50 +02:00
Julia Friesel 6a8d22f9f0 Change icon to trash can 2019-05-17 10:56:36 +02:00
emelko 6811b5a692 Replace info icon in header with delete 2019-05-16 16:10:17 +02:00
Julia Friesel 9ff37e2874 Merge branch '371-bug-back-navigation-doesn-t-wait-for-temperature-range-warning' into 'master'
Await alert result before navigating back

Closes #371 and #373

See merge request bloodyhealth/drip!215
2019-05-14 17:29:15 +00:00
Julia Friesel f022fb6b8a Await alert result before navigating back 2019-05-14 13:37:35 +02:00
Julia Friesel 37564621e0 Merge branch '363-alert-for-cervix-and-mucus-when-trying-to-navigate-away-and-one-value-is-missing' into 'master'
Basic auto save

Closes #363

See merge request bloodyhealth/drip!214
2019-05-13 18:56:40 +00:00
Julia Friesel 5057e1a38e Address MR change requests 2019-05-13 20:41:57 +02:00
Julia Friesel e781919434 Reset inadvertently changed file 2019-05-13 20:34:13 +02:00
Julia Friesel 3715e0c4d2 Filter incomplete mucus values in sympto adapter 2019-05-13 20:30:25 +02:00
Julia Friesel 3ff996e946 Don't crash on missing temperature value 2019-05-13 19:07:46 +02:00
Julia Friesel 6011bd9208 Fix linter problems 2019-05-13 12:55:28 +02:00
Julia Friesel d1e16abe34 Make header back arrow function for auto save 2019-05-13 12:55:28 +02:00
Julia Friesel bc13f5c1e6 Remove action button footer from symptom views 2019-05-13 12:55:28 +02:00
Julia Friesel ecf3ebf16d When nothing entered, delete entry 2019-05-13 12:55:28 +02:00
Julia Friesel 08fd3afc34 Add symptom view component with back button listener 2019-05-13 12:55:28 +02:00
Julia Friesel 2528c03315 Remove save button from footer 2019-05-13 12:55:28 +02:00
Julia Friesel d322e557a3 Remove unused line 2019-05-13 12:55:28 +02:00