Commit Graph

225 Commits

Author SHA1 Message Date
bl00dymarie e395730d98 First step for fertilityTracking Toggle 2024-02-23 15:27:44 +01:00
wunderfisch 092b557396 make second symptom buttons show alert if switched off 2024-02-23 12:39:31 +01:00
wunderfisch 4ebec41a0a fix saving of secondary symptom 2024-02-23 12:16:32 +01:00
bl00dymarie e69ca93382 Remove idle code 2024-02-22 13:29:16 +00:00
bl00dymarie aa440742ca Merge branch 'main' into '676-feature-customisation-not-display-mucus-cervix'
# Conflicts:
#   components/settings/customization/index.js
2024-02-22 13:22:38 +00:00
bl00dymarie cbaf6977f6 Add trackColor to Switch element directly 2024-02-22 13:22:41 +01:00
bl00dymarie b9ec4c7108 Merge branch 'main' into 676-feature-customisation-not-display-mucus-cervix 2024-02-20 12:29:28 +01:00
bl00dymarie d66e5f36e5 Rename to secondarySymptomDisabledPrompt 2024-02-19 18:10:57 +01:00
bl00dymarie 69c546f684 Rename shouldUseCervix to useCervixAsSecondarySymptom 2024-02-19 18:05:20 +01:00
bl00dymarie dc304afe75 Rename labels to more neutral 'secondarySymptom' 2024-02-19 18:01:57 +01:00
bl00dymarie 63bc8a1daf Rename to useCervixAsSecondarySymptom 2024-02-19 17:51:25 +01:00
bl00dymarie 7fa130f9e1 Rename to useCervixAsSecondarySymptomObservable 2024-02-19 17:13:40 +01:00
wunderfisch 5f55500831 small changes on secondary symptom to make it work nicly with the button logic instead of the former switch and to display the correct texts 2024-02-19 12:13:58 +01:00
bl00dymarie 6fb0d1fc1e Merge branch 'main' into 'release-ios-fix-1.2401.17'
# Conflicts:
#   ios/Podfile
2024-02-15 11:16:49 +00:00
Liv 601d618352 Reorder import buttons depending on OS 2024-02-15 11:21:56 +01:00
bl00dymarie 76137fc000 Replace hard coded text 2024-02-14 16:09:47 +01:00
bl00dymarie 09614319e3 Add SelectTabGroup for secondary Symptom Switch 2024-02-14 16:08:07 +01:00
wunderfisch ebbfd8aba5 merging work on secondary symptom logic and buttons 2024-02-14 10:26:13 +01:00
bl00dymarie a59dfa8336 Add SelectTabGroup for secondary Symptom Switch 2024-02-13 17:24:26 +01:00
wunderfisch d7f1eb81fb centralizing code to set the Secondary Symptom from different actions in one function 2024-02-13 15:46:04 +01:00
wunderfisch 82803bbb83 fix: disabling the secondary symptom toggle when not both categories are enabled, didn't work before after new save 2024-02-13 11:52:33 +01:00
wunderfisch 8a8b3217fa small changes on Secondary Symptom disable function 2024-02-12 16:05:49 +01:00
wunderfisch e11acbab78 Disable and switch secondary symptom depending on cervical mucus and cervix turned on or off. 2024-02-12 14:49:43 +01:00
bl00dymarie 1db2f3a945 Merge branch 'feature/Customize-tracking-categories-temperature' into 'main'
Feature: customize tracking categories temperature

See merge request bloodyhealth/drip!650
2024-02-08 17:20:56 +00:00
bl00dymarie 9991260c38 Add pw text in settings and extra container for > 2024-02-06 12:55:29 +01:00
bl00dymarie a289edb7f1 Add symptom labels from config list 2024-01-29 18:22:08 +01:00
bl00dymarie 080ce0f3d3 Hide SecondarySymptom Switch if temperature category turned off 2024-01-29 18:21:53 +01:00
bl00dymarie 6a4d5c330b Disable/hide TemperatureSlider if temperature category turned off 2024-01-29 18:20:58 +01:00
bl00dymarie fdb892ff6b Disable tempReminder if temp is turned off 2024-01-23 16:07:21 +01:00
bl00dymarie 3799ff68bd Remove useless description and show only symptom name 2024-01-23 15:23:19 +01:00
bl00dymarie ae3edb0a15 Add temperature toggle in customization and store value in local storage 2024-01-23 15:20:04 +01:00
bl00dymarie 28fd610e9d Make desire, pain, mood and note customizable 2024-01-22 17:43:03 +01:00
bl00dymarie 750bfa58c3 Add sexTrackingCategory as toggle 2024-01-22 17:43:03 +01:00
bl00dymarie db93aa74bb Typo and other text corrections 2024-01-22 15:07:16 +01:00
wunderfisch b53be31868 functionality that disables the next-periode-reminder-switch if menstrual bleeding shall not be predicted (new customization feature). also an alert pops up when the user still tries to press the disabled toggle or the text area next to it 2024-01-15 18:05:54 +01:00
bl00dymarie c7c905fd5f Add functionality to turn on/off period predictions 2024-01-08 11:58:02 +01:00
wunderfisch 9800b663fb Merge branch '683-ui-scaffold-for-customization' into 'main'
Resolve "UI scaffold for customization"

Closes #683

See merge request bloodyhealth/drip!642
2024-01-08 10:40:19 +00:00
wunderfisch 4d7895b9f2 Toggles set to true by default 2024-01-08 10:35:13 +00:00
bl00dymarie 09f0a0f11d Add WIP for customization section 2024-01-05 15:51:56 +01:00
wunderfisch dd9ad9e393 switched temperature reminder and periode reminder. now periode reminder is at the top, temperature reminder below 2024-01-05 15:51:46 +01:00
bl00dymarie e18eedd4e7 Add info section under settings 2024-01-05 15:51:25 +01:00
bl00dymarie 3e50991d12 Rename nfp-settings into customization 2024-01-05 15:50:47 +01:00
bl00dymarie 7418fc2cce Give some marginTop on very first License screen 2023-12-12 15:19:59 +01:00
wunderfisch 32cec10a79 change to data import dialog. first have replace option, second delete. like this synchronous to text above. 2023-11-10 12:30:17 +01:00
Lisa 446638d6de 618 Refactor import section to use translation lib 2022-11-06 14:47:05 +00:00
Sofiya Tepikin 9dfe8b4b05 Merge branch '614/Use-translation-library-for-settings-menu' into 'main'
614 Use translation library for settings menu

See merge request bloodyhealth/drip!529
2022-09-27 16:24:41 +00:00
Lisa b7d97f0589 614 Use translation library for settings menu 2022-09-27 16:24:40 +00:00
Sofiya Tepikin f5004f2d7a Use jshashes on Enter new password 2022-09-19 15:15:48 +02:00
Sofiya Tepikin afc177cb53 Use jshashes on Confirmation with password 2022-09-19 15:07:03 +02:00
Sofiya Tepikin f957553026 Chore/Retire hyperlink library 2022-09-19 09:25:16 +00:00