Commit Graph

524 Commits

Author SHA1 Message Date
emelko ca905c6bc6 Denastify nesting to make styles.emphasis work
Co-Authored-By: tina <1700791-liv-theo@users.noreply.gitlab.com>
2019-02-04 23:00:37 +01:00
emelko 7f170d06ef Make sure stats output some result after one completed cycle 2019-02-04 22:15:34 +01:00
bl00dymarie 4605f5b81c Merge branch '298-add-back-button-to-settings-children' into 'master'
Adds back button to settings header

Closes #298

See merge request bloodyhealth/drip!171
2019-02-04 20:23:01 +00:00
Julia Friesel a7bf4c814f Merge branch 'master' into link-nfp-rules 2019-02-04 21:04:38 +01:00
emelko d0dcbd543d Adds back button to settings header 2019-02-04 21:04:17 +01:00
emelko 1a49b79eec Rename info symptom header into back button 2019-02-04 20:34:57 +01:00
Julia Friesel d2282f6667 Use built-in numberOfLines prop instead of truncating by hand 2019-02-02 21:25:29 +01:00
tina bdda36de83 Merge branch '299-subcategories-in-setting-in-lowercase' into 'master'
changes titles of subcategory in setting to lowercase

Closes #299

See merge request bloodyhealth/drip!170
2019-02-02 15:32:01 +00:00
emelko 563a5a1821 Give this framed segment bottom margin, since it's only one segment 2019-02-02 13:02:12 +01:00
emelko 324820ebab Rearrange Segment Element: * Rename SettingsSegment into FramedSegment * Move it out of Settings into Components 2019-02-02 12:58:05 +01:00
Julia Friesel 0878654e82 Extract link component and parse all app text for links 2019-02-02 11:55:03 +01:00
Julia Friesel 8318f5d313 Make link work 2019-02-02 11:23:40 +01:00
Julia Friesel 3e94df56e2 Limit press handler to just button 2019-02-02 10:54:51 +01:00
Julia Friesel 5dc519980d Merge branch 'master' into link-nfp-rules 2019-02-02 10:26:18 +01:00
tina d407255fcc changes titles of subcategory in setting to lowercase 2019-01-30 23:19:42 +01:00
emelko ce3a81ad5f Hyperlink activation 2019-01-30 17:44:43 +01:00
emelko 9c56c04432 Implements SettingsSegment Boxes for info symptom texts 2019-01-30 12:28:55 +01:00
Sofiya Tepikin fee13da2dc Changing the mood icon 2019-01-30 13:15:12 +03:00
mashazyu 570d0dc608 Add mood category to chart 2019-01-30 01:44:51 +03:00
mashazyu 56f5c92f87 Add mood component, add mood as tracking category to db schemas, add mood category description, add mood to the cycle-day-overview 2019-01-30 01:44:50 +03:00
Sofiya Tepikin 1e39c71a4e temp 2019-01-28 23:52:00 +03:00
Julia Friesel 228ae781b9 Merge branch '286-increase-stroke-width-for-home-screen-elements' into 'master'
Resolve "increase stroke width for home screen elements"

Closes #286

See merge request bloodyhealth/drip!160
2019-01-26 12:01:12 +00:00
Julia Friesel 90766bc1dc Merge branch 'settings-menu-footer' into 'master'
Fixes settings item menu in footer missing active state

Closes #282

See merge request bloodyhealth/drip!164
2019-01-22 16:01:48 +00:00
Sofiya Tepikin 4408334d7c Makes some order in home component 2019-01-21 00:48:30 +01:00
Sofiya Tepikin 31268186f1 Refactors app.js for readability 2019-01-19 23:06:07 +01:00
Julia Friesel ab3ca68902 Merge branch '285-bug-coming-from-track-your-period-cycle-day-doesn-t-show-data' into 'master'
Pass correct props to bleeding edit view from home screen

Closes #285

See merge request bloodyhealth/drip!162
2019-01-18 09:13:28 +00:00
Sofiya Tepikin ff8765b9f8 Makes also the subpages of Settings to activate the menu item in footer 2019-01-17 23:15:30 +01:00
Sofiya Tepikin faf7dbac95 Fixes settings item menu in footer missing active state 2019-01-17 22:11:44 +01:00
Julia Friesel 1aad11b504 Fix label reference 2019-01-17 21:20:19 +01:00
Julia Friesel 86e0d967be Pass correct props to bleeding edit view from home screen 2019-01-17 21:02:32 +01:00
Julia Friesel d905139958 Remove light app text 2019-01-17 17:17:22 +01:00
Julia Friesel 8178303e3a Make link press handler work 2019-01-17 16:36:36 +01: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
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 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
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
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
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