 tina
|
4de32e3801
|
Merge branch 'main' into '650-long-text-in-note-hides-behind-keyboard-1.2402.16'
# Conflicts:
# android/app/build.gradle
# ios/drip/Info.plist
# package.json
|
2024-10-01 15:20:11 +00:00 |
|
|
wunderfisch
|
a0482291cf
|
Merge branch '712-chore-testing-feedback-for-v1-2403-11-part-2' into 'main'
Resolve "Chore: Testing Feedback for v1.2403.11 part 2"
Closes #712
See merge request bloodyhealth/drip!675
|
2024-03-19 11:54:58 +00:00 |
|
|
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 |
|
|
wunderfisch
|
f7c6f4bfd0
|
replace hard coded label
|
2024-03-18 18:46:00 +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 |
|
|
wunderfisch
|
693c766da8
|
fixing cervical mucus button also showing disabled alert
|
2024-03-14 18:02:15 +01:00 |
|
|
bl00dymarie
|
fc4bc625ce
|
Add some info to home text elements
|
2024-03-14 14:28:38 +01:00 |
|
|
bl00dymarie
|
0e7d84874c
|
Add more padding to button if home is almost empty
|
2024-03-14 14:28:09 +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
|
f170bf608b
|
Differentiate keyboardavoiding behavior based on ios/android
|
2024-02-16 17:43:38 +01:00 |
|
|
bl00dymarie
|
1979005ca0
|
Allow more lines for "other" under mood, pain, sex
|
2024-02-16 17:43:32 +01:00 |
|
|
bl00dymarie
|
8badf0cabb
|
Limit lines to 3 for symptom day boxes
|
2024-02-16 17:43:26 +01:00 |
|
|
bl00dymarie
|
216a6b73ee
|
Add multiline to notes in edit view
|
2024-02-16 17:43:20 +01:00 |
|
|
bl00dymarie
|
90ad1cb12f
|
Add KeyboardAvoidingView for visible TextInput
|
2024-02-15 17:38:08 +01:00 |
|