From a93a338e6e0e360f52e8a607aca878b9a6b6c4ec Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Thu, 14 Mar 2024 14:27:18 +0100 Subject: [PATCH 1/6] Improve wording for disabled alerts --- i18n/en/settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/en/settings.js b/i18n/en/settings.js index 5748d02..8d2181e 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -73,7 +73,7 @@ export default { title: 'Fertility phases calculation', disabledTitle: 'Disabled', disabled: - 'To use fertility phases calculation please enable temperature tracking and cervical mucus or cervix tracking above.', + 'To use fertility phases calculation please enable both temperature tracking and either cervical mucus or cervix tracking above.', message: 'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal method, drip will calculate cycle phases with the provided data.', on: 'If you switch this off, drip will not show fertility related information.', @@ -98,7 +98,7 @@ export default { periodPrediction: { title: 'Period predictions', on: 'drip predicts your 3 next menstrual bleedings based on statistics if you previously tracked at least 3 complete cycles.', - off: 'There are no predictions for menstrual cycles displayed. If turned on the calendar and the home screen will display period predictions.', + off: 'There are no predictions for menstrual cycles displayed. If turned on, the calendar and the home screen will display period predictions.', }, passwordSettings: { title: 'App password', From 0e7d84874c1d4cc88556150a4a364e927f64e5d4 Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Thu, 14 Mar 2024 14:28:09 +0100 Subject: [PATCH 2/6] Add more padding to button if home is almost empty --- components/Home.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/Home.js b/components/Home.js index af02576..7baea96 100644 --- a/components/Home.js +++ b/components/Home.js @@ -76,6 +76,8 @@ const Home = ({ navigate, setDate }) => { {prediction} )} + + {!isFertilityTrackingEnabled && } @@ -114,6 +116,9 @@ const styles = StyleSheet.create({ color: 'white', fontSize: Sizes.subtitle, }, + largePadding: { + padding: Spacing.large, + }, }) Home.propTypes = { From fc4bc625ce1d5954853062e17d2cb0f0d0cf454b Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Thu, 14 Mar 2024 14:28:38 +0100 Subject: [PATCH 3/6] Add some info to home text elements --- components/Home.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/Home.js b/components/Home.js index 7baea96..4729f47 100644 --- a/components/Home.js +++ b/components/Home.js @@ -51,6 +51,7 @@ const Home = ({ navigate, setDate }) => { > {moment().format('MMM Do YYYY')} + {/* display if at least 1 bleeding day has been entered */} {cycleDayNumber && ( {cycleDayText} @@ -59,6 +60,8 @@ const Home = ({ navigate, setDate }) => { )} + + {/* display if fertility tracking enabled and if phase 1, 2 or 3 has been identified */} {isFertilityTrackingEnabled && phase && ( @@ -71,6 +74,7 @@ const Home = ({ navigate, setDate }) => { )} + {isPeriodPredictionEnabled && ( {prediction} From 693c766da8a1483fd65438a9a57a9bd0ef2e9fa2 Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Thu, 14 Mar 2024 18:02:15 +0100 Subject: [PATCH 4/6] fixing cervical mucus button also showing disabled alert --- components/cycle-day/select-tab-group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js index 25db72a..6805b66 100644 --- a/components/cycle-day/select-tab-group.js +++ b/components/cycle-day/select-tab-group.js @@ -21,7 +21,7 @@ export default function SelectTabGroup({ // Disable is only used for secondarySymptom in customization, if more come up maybe consider more tidy solution const showDisabledAlert = (label) => { - if (label === 'cervix' || label === 'mucus') { + if (label === 'cervix' || label === 'cervical mucus') { Alert.alert( labels.secondarySymptom.disabled.title, labels.secondarySymptom.disabled.message From 15a0b3d270164ee2deedb3096f7054550e569ff7 Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Mon, 18 Mar 2024 18:29:10 +0100 Subject: [PATCH 5/6] adapt text according to customization --- i18n/en/symptom-info.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/en/symptom-info.js b/i18n/en/symptom-info.js index fb124e3..583ceaf 100644 --- a/i18n/en/symptom-info.js +++ b/i18n/en/symptom-info.js @@ -25,7 +25,7 @@ export default { After tracking at least 3 menstrual cycles, drip. will give you an overview of · how long your cycles last on average (in "stats"), · whether the length of your cycles varied significantly (in "stats" and in bleeding predictions) -· and predict your next 3 cycles with a range of 3 or 5 days (on home screen and "calendar"). +· and predict your next 3 cycles with a range of 3 or 5 days (on home screen and "calendar") if this functionality is enabled in the customization settings. The app allows you to track different intensities of bleeding. On the chart and on the calendar, bleeding values are colored in different shades of red. The darker, the more intense your bleeding. Every bleeding value that is not excluded is taken into account for fertility calculation and period predictions. @@ -74,7 +74,7 @@ ${generalInfo.curiousNfp}`, title: 'Tracking cervical mucus', text: `Cervical mucus can help determine in which phase of the menstrual cycle you are. -By default the secondary symptom the app uses for the sympto-thermal method is cervical mucus. +By default the secondary symptom the app uses for the sympto-thermal method is cervical mucus. You can change this in the customization settings. · How to identify fertile cervical mucus? Tracking the feeling and the texture of your cervical mucus on a daily basis helps you identify changes of the quality of the cervical mucus. The values you enter for both feeling and texture of your cervical mucus are combined by drip. into one of five values following the sympto-thermal method. From f7c6f4bfd01b5ee7b2ca8caa6115093ed50e38e8 Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Mon, 18 Mar 2024 18:36:30 +0100 Subject: [PATCH 6/6] replace hard coded label --- components/cycle-day/select-tab-group.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js index 6805b66..f94601a 100644 --- a/components/cycle-day/select-tab-group.js +++ b/components/cycle-day/select-tab-group.js @@ -21,7 +21,10 @@ export default function SelectTabGroup({ // Disable is only used for secondarySymptom in customization, if more come up maybe consider more tidy solution const showDisabledAlert = (label) => { - if (label === 'cervix' || label === 'cervical mucus') { + if ( + label === labels.secondarySymptom.cervix || + label === labels.secondarySymptom.mucus + ) { Alert.alert( labels.secondarySymptom.disabled.title, labels.secondarySymptom.disabled.message