Commit Graph

920 Commits

Author SHA1 Message Date
Julia Friesel d8ce68d1ed Show error message when future data edit 2019-01-17 18:11:17 +01:00
Julia Friesel 23c6a60258 Fix var name 2019-01-17 15:58:42 +01:00
Julia Friesel 5947c4f3f5 Merge branch '230-change-standard-font' into 'master'
Resolve "change standard font"

Closes #230

See merge request bloodyhealth/drip!120
2019-01-17 14:41:08 +00:00
bl00dymarie 53f662279d Merge branch '185-add-info-for-symptoms' into 'master'
Resolve "add info for symptoms"

Closes #185

See merge request bloodyhealth/drip!97
2019-01-17 14:38:08 +00:00
Julia Friesel df36e53743 Add letter spacing 2019-01-17 14:37:56 +00:00
Julia Friesel 5a57b2bb8c Merge branch 'add-cancel-button' into 'master'
Add cancel button to ConfirmWithPassword component

Closes #274

See merge request bloodyhealth/drip!148
2019-01-17 14:05:33 +00:00
emelko 84be9900de Handles the back navigation from info symptom to CycleDay 2019-01-17 11:04:14 +01:00
emelko 8d3d04af47 Adds symptom info screens to each symptom 2019-01-17 10:23:35 +01:00
Sofiya Tepikin 714d9fd681 Styles the buttons in password confirmation 2019-01-16 22:55:33 +01:00
mashazyu 3babba0d92 Add cancel button to ConfirmWithPassword component 2019-01-16 22:07:47 +01:00
Julia Friesel 5c925ea762 Add thing to build.gradle so release works 2019-01-16 19:48:23 +01:00
Julia Friesel b9636574fc Avoid naming collision error 2019-01-16 19:35:45 +01:00
Julia Friesel bb6af10fe1 Merge branch 'update-rn' into 'master'
Update RN and its dependencies

See merge request bloodyhealth/drip!157
2019-01-16 09:21:24 +00:00
bl00dymarie 58f8f4e25d Merge branch '283-bug-header-in-cycle-day-overview-is-not-aligned' into 'master'
Fix header alignement in CycleDayOverView and SymptomView

Closes #283

See merge request bloodyhealth/drip!155
2019-01-16 08:31:32 +00:00
Julia Friesel ea79d6b902 Remove deprecated aapt option 2019-01-15 22:55:30 +01:00
Julia Friesel 726e20280e Move babel stuff to dev dependencies 2019-01-15 22:55:01 +01:00
Julia Friesel 40366b51a4 Add missing deps 2019-01-15 22:19:10 +01:00
Julia Friesel e320e95f2a Update RN and its dependencies 2019-01-15 22:14:50 +01:00
emelko 8882f17595 The headerText does not need absolute position to look good :)! 2019-01-14 11:11:39 +01:00
emelko 180d07aa82 Circle needs position absolute for CycleDayOverView and SymptomView to align all 3 header elements 2019-01-14 11:03:54 +01:00
Julia Friesel a604482f85 Merge branch '178-add-hints-for-required-selections' into 'master'
Resolve "Change symptom category descriptions to make clear which are required (for mucus and cervix) for fertility detection"

Closes #178

See merge request bloodyhealth/drip!153
2019-01-13 16:16:36 +00:00
birgitta410 42847a8c50 Fix ESLint error 2019-01-13 15:40:33 +01:00
birgitta410 5ae5dec98c Remove wrapping View from ActionHint
Wasn't necessary after all
Issue: 178
2019-01-13 14:30:33 +01:00
Julia Friesel 896ae72632 Merge branch '127-extract-text-of-titles-and-subtitles-for-translation-and-or-modification' into 'master'
Resolve "Extract text of titles and subtitles for translation and/or modification."

Closes #127

See merge request bloodyhealth/drip!152
2019-01-13 12:25:56 +00:00
Julia Friesel 644b1e1af6 Merge branch 'fonts-on-home-screen' into 'master'
Use same font for more, less and phase.

See merge request bloodyhealth/drip!150
2019-01-13 12:20:09 +00:00
Julia Friesel 1469dea6ef Merge branch '279-bug-header-text-not-centered-vertically' into 'master'
Improve positioning of header text

Closes #279

See merge request bloodyhealth/drip!151
2019-01-13 12:12:28 +00:00
Birgitta B 88973290cb Only show the hints if minimum not selected 2019-01-13 12:10:36 +01:00
Birgitta B 971c99ad9f Add action hints to cervix and mucus views
Issue: 178
2019-01-13 12:10:36 +01:00
Birgitta B 2e95300166 Add component to display hints above action buttons
This component can be placed right above an ActionButtonFooter to display a "turquoise" colored, slightly smaller text, e.g. to give helpful hints what to do before saving. If put outside the ScrollView, it will permanently display and cover up part of the scrollable area until the area is scrolled.

Issue: 178
2019-01-13 12:10:36 +01:00
susott bb669e0ad3 delete Promt-Light - not used 2019-01-12 19:34:17 +01:00
susott 3bb257d518 Renamed and checked fonts 2019-01-12 19:08:04 +01:00
Stefanie Grewenig 9fe1940907 postfix all i18n imports with 'labels'
- issue: 127
- by: sg
2019-01-12 16:29:31 +01:00
Stefanie Grewenig a951ffe959 move hard coded headers and explainers from temperature to i18n labels
- issue: 127
- by: sg
2019-01-12 16:25:40 +01:00
Emma Callahan 195990b780 Improve positioning of header text 2019-01-12 16:13:34 +01:00
Stefanie Grewenig 6d88f2bbc0 use enter from i18n instead of hard-coded string
- issue: 127
- by: sg
2019-01-12 15:59:16 +01:00
Stefanie Grewenig 08faf477a6 move hard coded headers from sex into cycle day and shared labels i18n
- issue: 127
- by: sg
2019-01-12 15:54:03 +01:00
Stefanie Grewenig 201fb5e2b6 move hard coded headers and explainers from bleeding into cycle day i18n
- issue: 127
- by: sg
2019-01-12 15:47:20 +01:00
Lieblingswelt 008d218674 Use same font for more, less and phase. 2019-01-12 15:11:04 +01:00
Julia Friesel 5a40f6cbb1 Merge branch 'macos-troubleshooting' into 'master'
README: MacOS troubleshooting, 'ninja' and 'adb' errors

See merge request bloodyhealth/drip!149
2019-01-12 13:31:14 +00:00
Birgitta B 2eddaa7126 README: MacOS troubleshooting, 'ninja' and 'adb' errors 2019-01-12 14:20:57 +01:00
tina e241deb902 Update README.md, it seems one needs to run npm install before opening android studio 2019-01-12 12:12:57 +00:00
Julia Friesel ea58d738a9 Update README.md 2019-01-12 11:49:48 +00:00
Julia Friesel 999c65379d Merge branch 'refactoring-settings-view' into 'master'
Refactoring settings view

Closes #275

See merge request bloodyhealth/drip!147
2019-01-10 08:06:32 +00:00
Sofiya Tepikin 0feab0ed61 Renames common->shared component directory 2019-01-09 22:33:42 +01:00
Julia Friesel b7b6f98bad Change values 2019-01-09 09:21:42 +01:00
mashazyu bee0550372 Move reusable components to separate folder, password view refactoring 2019-01-08 21:50:39 +01:00
mashazyu 94940238a6 Reuse of SettingsSegment component in the Reminders section 2019-01-08 21:50:39 +01:00
mashazyu 18c8432cc2 Minor refactoring of about page 2019-01-08 21:50:39 +01:00
mashazyu 0c081926b5 Fixes warning due to incorrect import of labels 2019-01-08 21:44:29 +01:00
mashazyu 373dbea60c Refactor npf settings component 2019-01-08 21:44:29 +01:00