From 4fc11d2f7e25ab18f6338c0ab5e83c3d7b5e3754 Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Mon, 26 Feb 2024 13:28:43 +0100 Subject: [PATCH] changes in customization texts and small changes to styling --- components/common/app-switch.js | 2 +- components/settings/customization/index.js | 26 ++++++++++------------ i18n/en/settings.js | 14 +++++++----- styles/containers.js | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/components/common/app-switch.js b/components/common/app-switch.js index 5e74bb5..78ab610 100644 --- a/components/common/app-switch.js +++ b/components/common/app-switch.js @@ -34,10 +34,10 @@ AppSwitch.propTypes = { const styles = StyleSheet.create({ container: { ...Containers.rowContainer, + marginTop: Spacing.tiny, }, switch: { flex: 1, - marginBottom: Spacing.tiny, transform: Platform.OS === 'ios' ? [{ scaleX: 0.8 }, { scaleY: 0.8 }] diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index e292e16..fffcd7d 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -246,23 +246,21 @@ const Settings = () => { /> - {isTemperatureTrackingCategoryEnabled && - isMucusTrackingCategoryEnabled || - isCervixTrackingCategoryEnabled ? - ( - <> - - - ) : - ( + (isMucusTrackingCategoryEnabled || + isCervixTrackingCategoryEnabled) ? ( + <> + {labels.fertilityTracking.message} + + + ) : ( {labels.disabled.message} - )} + )} diff --git a/i18n/en/settings.js b/i18n/en/settings.js index eec5ea8..5a7a2e0 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -41,7 +41,7 @@ export default { disabled: { title: 'This feature is turned off', message: - 'Please first enable the temperature tracking category in the customization settings.', + 'To use the temperature scale please first enable the temperature tracking category above.', }, tempReminder: { title: 'Temperature reminder', @@ -68,8 +68,10 @@ export default { }, fertilityTracking: { title: 'Fertility phases calculation', - on: 'The quick brown fox jumps over the lazy dog', - off: 'No no', + message: + 'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal rules, drip will calculate cycle phases with the provided data.', + on: 'If you switch this off, drip will not show fertility related information.', + off: 'If you switch this on, drip will show fertility related information.', }, secondarySymptom: { title: 'Secondary symptom', @@ -80,16 +82,16 @@ export default { disabled: { title: 'Disabled', message: - 'To set a secondary symptom please first enable the temperature, cervical mucus or cervix tracking category as well as the fertility feature in the customization settings.', + 'To set a secondary symptom please first enable the temperature, cervical mucus or cervix tracking category as well as the fertility feature above.', noSecondaryEnabled: - 'To switch the secondary symptom both cervical mucus an cervix need to be enabled in the customization settings.', + 'To switch the secondary symptom both cervical mucus and cervix need to be enabled above.', }, mucus: 'cervical mucus', cervix: 'cervix', }, periodPrediction: { title: 'Period predictions', - on: 'drip predicts your 3 next menstrual bleedings based on the statistics of your previously tracked cycles, min 3 complete cycles.', + 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.', }, passwordSettings: { diff --git a/styles/containers.js b/styles/containers.js index c169fec..8560d10 100644 --- a/styles/containers.js +++ b/styles/containers.js @@ -36,6 +36,6 @@ export default { }, segmentContainer: { marginHorizontal: Spacing.base, - marginBottom: Spacing.tiny, + marginBottom: Spacing.base, }, }