Commit Graph

1000 Commits

Author SHA1 Message Date
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
mashazyu 7b87424aeb Bug fix for showing irrelevant buttons on the password management page 2019-01-08 21:31:58 +01:00
mashazyu 0a9570449b Reuse ConfirmWithPassword component in DeletePassword component 2019-01-08 21:31:58 +01:00
mashazyu 5d29bcdc7b Reuse ConfirmWithPassword component in ChangePassword component 2019-01-08 21:31:58 +01:00
mashazyu 95359ce262 Move ConfirmWithPassword component to the common folder 2019-01-08 21:31:58 +01:00
Julia Friesel 1102a40db0 Merge branch '266-implement-consent-for-legal-stuff' into 'master'
Resolve "implement consent for legal stuff"

Closes #266

See merge request bloodyhealth/drip!144
2019-01-08 16:41:33 +00:00
Julia Friesel b80c197b9c Use GNU license on license screen 2019-01-08 09:41:56 +01:00
Julia Friesel 480e4533be Fix license screen flicker 2019-01-08 09:16:11 +01:00
Julia Friesel 2c1b856234 Add press handlers to buttons 2019-01-08 09:16:11 +01:00
Julia Friesel 000e1b63c7 Add license page 2019-01-08 09:16:11 +01:00
Julia Friesel c713ed5490 Merge branch 'more-info-in-about-section' into 'master'
More info in about section

Closes #122

See merge request bloodyhealth/drip!145
2019-01-08 08:03:12 +00:00
Julia Friesel dace057b3c Remove unused import 2019-01-08 09:02:05 +01:00
Julia Friesel e87f439ff2 Update about.js with settingsSegment and give it last prop 2019-01-08 09:00:10 +01:00
Julia Friesel 5af16e28ca Improve wording 2019-01-08 08:51:16 +01:00
Julia Friesel 6a79f35e90 Think for yourself text 2019-01-08 08:51:16 +01:00
Julia Friesel b5240e32b0 Add website 2019-01-08 08:48:41 +01:00
Julia Friesel 1e98943931 Add version number 2019-01-08 08:47:05 +01:00
Julia Friesel f2cbccde9b Update GPL link 2019-01-08 08:46:15 +01:00
Julia Friesel 0126a70d64 Clean up 2019-01-08 08:46:15 +01:00
Julia Friesel 4671a2e337 Add license text 2019-01-08 08:46:15 +01:00
Julia Friesel 27b4a454ec Improve linking and link more things 2019-01-08 08:45:32 +01:00