Commit Graph

1006 Commits

Author SHA1 Message Date
bl00dymarie 37f718d1b0 Remove info from menu temporarily 2024-03-18 19:03:40 +01:00
bl00dymarie 9b0abd5367 Add one small info text to the bottom of customization index 2024-03-18 19:03:21 +01:00
bl00dymarie 56e90b69e6 Rearrange segments in customization + add subheader 2024-03-16 14:39:38 +01:00
bl00dymarie b481bd8352 Don't show the exclude switch when fertility is off 2024-03-16 14:37:58 +01:00
bl00dymarie eaf01e98d5 renaming 2024-03-14 10:58:56 +00:00
bl00dymarie f5894c028e renaming 2024-03-14 10:54:18 +00:00
bl00dymarie a29c0e2eec Merge branch '676-feature-customisation-not-display-mucus-cervix' into 'chore/refactor-customization'
# Conflicts:
#   i18n/en/settings.js
2024-03-13 15:19:17 +00:00
wunderfisch b65b5f3561 refactoring disable function of temperature slider 2024-03-07 18:58:37 +01:00
wunderfisch 3e8f15e04e disable temperature slider when fertility or temperature turned off 2024-02-29 17:46:56 +01:00
wunderfisch ad47b4bee0 enabling alert for disabled button in tab group 2024-02-28 13:06:25 +01:00
bl00dymarie ffe8fab822 Add colored tracking icons to customization toggles 2024-02-28 12:27:59 +01:00
wunderfisch 661abc8aee revision of customization texts and refactoring behavior when disabled 2024-02-27 18:10:11 +01:00
bl00dymarie 46a02560e8 Add title labels to customization 2024-02-26 18:23:04 +01:00
bl00dymarie 9ec52b78cf Add comment for future TODO linking gitlab issue 2024-02-26 16:51:29 +00:00
bl00dymarie 8a65c081a8 Use translation for customization tracking categories 2024-02-26 17:24:44 +01:00
bl00dymarie 72823ef95c Generalize title of symptom labels 2024-02-26 17:24:44 +01:00
wunderfisch ef4095d61c fixing issue import and empty statement 2024-02-26 16:32:08 +01:00
wunderfisch 4fc11d2f7e changes in customization texts and small changes to styling 2024-02-26 16:31:53 +01:00
wunderfisch 37152b3fec small changes in styling. more space beween switch lines, smaller switches in iOS (testing please), less bottom margin for segments 2024-02-26 16:31:29 +01:00
bl00dymarie 405e27bdbe Remove isSecondarySymptomDisabled;
because maybe we don't need it anymore with fertilityTracking taking its job
2024-02-23 16:50:30 +01:00
bl00dymarie 1c73509473 Move cervix & mucus off turn fertility off logic out of local storage 2024-02-23 16:38:44 +01:00
bl00dymarie 5855ea0a34 Move temp off turns fertility off logic out of local storage 2024-02-23 16:38:11 +01:00
bl00dymarie 8150b791ed Only check if fertility tracking enabled for display of secondary Symptom 2024-02-23 15:27:44 +01:00
bl00dymarie 29c3b9b108 Disable fertility tracking switch depending on temp, mucus or cervix 2024-02-23 15:27:44 +01:00
bl00dymarie 31888c3331 Check for FertilityTrackingEnabled on chart 2024-02-23 15:27:44 +01:00
bl00dymarie faad51f4f1 Check for FertilityTrackingEnabled on home 2024-02-23 15:27:44 +01:00
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 d23b5fe420 Add oneTimeTransformIntoNumber for secondarySymptom Switch 2024-02-14 16:10:05 +01:00
bl00dymarie 311cee0e17 Adapt color for secondarySymptom Boxes 2024-02-14 16:10:00 +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