 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 |
|
|
bl00dymarie
|
18466ebcee
|
Merge branch 'feature/Add-symptom-icons-to-customization' into '676-feature-customisation-not-display-mucus-cervix'
Feature: Add symptom icons to customization toggles
See merge request bloodyhealth/drip!666
|
2024-03-11 11:42:36 +00:00 |
|
|
wunderfisch
|
b65b5f3561
|
refactoring disable function of temperature slider
|
2024-03-07 18:58:37 +01:00 |
|
|
wunderfisch
|
4212906917
|
addding condriputers
|
2024-02-29 17:54:25 +01:00 |
|
|
wunderfisch
|
3e8f15e04e
|
disable temperature slider when fertility or temperature turned off
|
2024-02-29 17:46:56 +01:00 |
|
|
bl00dymarie
|
b17c86ffd6
|
Merge branch 'Chore/Unify-spelling-of-sympto-thermal' into '676-feature-customisation-not-display-mucus-cervix'
Chore: Unify spelling of sympto-thermal
See merge request bloodyhealth/drip!667
|
2024-02-29 10:37:05 +00:00 |
|
|
bl00dymarie
|
24df5cea31
|
Spell "science-based"
|
2024-02-29 10:35:22 +00:00 |
|
|
bl00dymarie
|
610383a103
|
Unify the spelling of "sympto-thermal"
|
2024-02-28 13:06:32 +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 |
|
|
bl00dymarie
|
27776f93cc
|
Merge branch '675-feature-customisation-not-display-fertility-phases' into '676-feature-customisation-not-display-mucus-cervix'
Resolve "feature: customisation (not) display fertility phases"
See merge request bloodyhealth/drip!659
|
2024-02-26 15:48:27 +00: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
|
27bb25e6da
|
Add check for if tempReminder is null
|
2024-02-23 15:27:44 +01:00 |
|
|
bl00dymarie
|
8150b791ed
|
Only check if fertility tracking enabled for display of secondary Symptom
|
2024-02-23 15:27:44 +01:00 |
|
|
bl00dymarie
|
3c0ea9b208
|
Turn fertility tracking off when mucus and cervix tracking are off
|
2024-02-23 15:27:44 +01:00 |
|
|
bl00dymarie
|
d0d691c6af
|
Turn fertility tracking off when temperature tracking is off
|
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
|
c037c630d3
|
Check for FertilityTrackingEnabled in sympto-adapter
|
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
|
7fff6cbdf4
|
Merge branch 'Chore/Bring-back-prettier' into 'main'
Bring back prettierrc as before
See merge request bloodyhealth/drip!664
|
2024-02-22 12:56:31 +00:00 |
|
|
bl00dymarie
|
75dbe8bfde
|
Merge branch 'Chore/Add-color-to-switch-element' into 'main'
Add trackColor to Switch element directly
See merge request bloodyhealth/drip!663
|
2024-02-22 12:43:57 +00:00 |
|
|
bl00dymarie
|
4921aca3c3
|
Bring back prettierrc as before
|
2024-02-22 13:32:58 +01: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 |
|
|
bl00dymarie
|
d338df1460
|
Merge branch 'Chore/ReactNative-Upgrade-0.68.3-Android' into 'main'
Chore: React native upgrade 0.68.3 android
See merge request bloodyhealth/drip!660
|
2024-02-19 16:01:09 +00: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
|
4eedb171a3
|
Full upgrade to react native v0.68.3 for Android
|
2024-02-15 14:31:46 +01:00 |
|
|
bl00dymarie
|
3193fa4f33
|
Partial update RN to 0.68.3 for android build
|
2024-02-15 13:14:28 +01:00 |
|
|
bl00dymarie
|
e24c69977c
|
Merge branch 'release-ios-fix-1.2401.17' into 'main'
Release ios fix 1.2401.17
See merge request bloodyhealth/drip!653
|
2024-02-15 11:19:05 +00:00 |
|