From 661abc8aee3c9580487f7a43c5b44e42aafdfb89 Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Tue, 27 Feb 2024 18:10:11 +0100 Subject: [PATCH 1/6] revision of customization texts and refactoring behavior when disabled --- components/cycle-day/select-tab-group.js | 21 +++++- components/settings/customization/index.js | 83 ++++++++++++---------- i18n/en/settings.js | 10 +-- 3 files changed, 70 insertions(+), 44 deletions(-) diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js index f2839d7..22c0c88 100644 --- a/components/cycle-day/select-tab-group.js +++ b/components/cycle-day/select-tab-group.js @@ -7,12 +7,18 @@ import AppText from '../common/app-text' import { Colors, Containers } from '../../styles' import labels from '../../i18n/en/settings' -export default function SelectTabGroup({ activeButton, buttons, onSelect }) { -// TODO https://gitlab.com/bloodyhealth/drip/-/issues/707 +export default function SelectTabGroup({ + activeButton, + buttons, + onSelect, + disabled, +}) { + // TODO https://gitlab.com/bloodyhealth/drip/-/issues/707 const oneTimeTransformIntoNumber = typeof activeButton === 'boolean' && Number(activeButton) const isSecondarySymptomSwitch = buttons[0]['label'] === labels.secondarySymptom.mucus + return ( {buttons.map(({ label, value }, i) => { @@ -23,16 +29,18 @@ export default function SelectTabGroup({ activeButton, buttons, onSelect }) { isActive && styles.boxActive, isSecondarySymptomSwitch && styles.purpleBox, isSecondarySymptomSwitch && isActive && styles.activePurpleBox, + disabled && styles.inActiveBox, ] const textStyle = [ styles.text, isSecondarySymptomSwitch && styles.purpleText, isActive && styles.textActive, + disabled && styles.greyText, ] return ( onSelect(value)} + onPress={() => !disabled && onSelect(value)} key={i} style={boxStyle} > @@ -75,4 +83,11 @@ const styles = StyleSheet.create({ purpleText: { color: Colors.purple, }, + greyText: { + color: Colors.grey, + }, + inActiveBox: { + borderColor: Colors.grey, + backgroundColor: Colors.turquoiseLight, + }, }) diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index 1d6cc3f..5614bd4 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -143,6 +143,7 @@ const Settings = () => { }, ] + // NOTE: when disabled (!isFertilityTrackingEnabled) button press doesn't yet trigger alert const onSelectTab = (value) => { if (isMucusTrackingCategoryEnabled && isCervixTrackingCategoryEnabled) { setUseCervixAsSecondarySymptom(value) @@ -178,7 +179,14 @@ const Settings = () => { } const secondarySymptomDisabledPrompt = () => { - if (!isMucusTrackingCategoryEnabled == isCervixTrackingCategoryEnabled) { + if (!isFertilityTrackingEnabled) { + Alert.alert( + labels.secondarySymptom.disabled.title, + labels.secondarySymptom.disabled.message + ) + } else if ( + !isMucusTrackingCategoryEnabled == isCervixTrackingCategoryEnabled + ) { Alert.alert( labels.secondarySymptom.disabled.title, labels.secondarySymptom.disabled.noSecondaryEnabled @@ -186,6 +194,10 @@ const Settings = () => { } } + const manageFertilityFeature = + isTemperatureTrackingCategoryEnabled && + (isMucusTrackingCategoryEnabled || isCervixTrackingCategoryEnabled) + const cervixText = useCervixAsSecondarySymptom ? labels.secondarySymptom.cervixModeOn : labels.secondarySymptom.cervixModeOff @@ -196,6 +208,14 @@ const Settings = () => { } } + const fertilityDisabledPrompt = () => { + if (!isFertilityTrackingEnabled) { + Alert.alert(labels.disabled.title, labels.fertilityTracking.disabled) + } + } + + console.log('useCervixAsSecondarySymptom :>> ', useCervixAsSecondarySymptom) + return ( @@ -244,53 +264,42 @@ const Settings = () => { value={isNoteTrackingCategoryEnabled} /> - + - {isTemperatureTrackingCategoryEnabled && - (isMucusTrackingCategoryEnabled || - isCervixTrackingCategoryEnabled) ? ( - <> - {labels.fertilityTracking.message} - - - ) : ( - {labels.disabled.message} - )} + {labels.fertilityTracking.message} + + {/* NOTE: still needs to be greyed out and not moveable */} - {isTemperatureTrackingCategoryEnabled && ( - <> - {labels.tempScale.segmentExplainer} - - - )} - {!isTemperatureTrackingCategoryEnabled && ( - {labels.disabled.message} - )} + {/* {isTemperatureTrackingCategoryEnabled && ( + <> */} + {labels.tempScale.segmentExplainer} + + {/* + )} + {!isTemperatureTrackingCategoryEnabled && ( + {labels.disabled.message} + )} */} - {!isFertilityTrackingEnabled ? ( - {labels.secondarySymptom.disabled.message} - ) : ( - <> - {cervixText} - onSelectTab(value)} - /> - - )} + {cervixText} + onSelectTab(value)} + disabled={!isFertilityTrackingEnabled} + /> diff --git a/i18n/en/settings.js b/i18n/en/settings.js index 6f4ae40..aec4513 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -36,7 +36,7 @@ export default { tempScale: { segmentTitle: 'Temperature scale', segmentExplainer: - 'Change the minimum and maximum value for the temperature chart', + 'Change the minimum and maximum value for the temperature chart.', min: 'Min', max: 'Max', loadError: 'Could not load saved temperature scale settings', @@ -72,6 +72,8 @@ export default { }, fertilityTracking: { title: 'Fertility phases calculation', + disabled: + 'To use this feature please enable temperature tracking and cervical mucus or cervix tracking.', 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.', @@ -80,13 +82,13 @@ export default { secondarySymptom: { title: 'Secondary symptom', cervixModeOn: - 'Cervix values are being used for symptothermal fertility detection. You can switch here to use cervical mucus values for symptothermal fertility detection', + 'Cervix values are being used for fertility detection according to the sympto-thermal rules.', cervixModeOff: - 'By default, cervical mucus values are being used for symptothermal fertility detection. You can switch here to use cervix values for symptothermal fertility detection', + 'Cervical mucus values are being used for fertility detection according to the sympto-thermal rules.', 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 above.', + 'To set a secondary symptom please first enable the cervical mucus or cervix tracking category as well as temperature and fertility phases calculation above.', noSecondaryEnabled: 'To switch the secondary symptom both cervical mucus and cervix need to be enabled above.', }, From ad47b4bee092a0e330312df5ed6bcc60c1e44203 Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Wed, 28 Feb 2024 13:06:25 +0100 Subject: [PATCH 2/6] enabling alert for disabled button in tab group --- components/cycle-day/select-tab-group.js | 16 ++++++++++++++-- components/settings/customization/index.js | 5 +++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js index 22c0c88..3800fa4 100644 --- a/components/cycle-day/select-tab-group.js +++ b/components/cycle-day/select-tab-group.js @@ -1,6 +1,6 @@ import React from 'react' import PropTypes from 'prop-types' -import { StyleSheet, TouchableOpacity, View } from 'react-native' +import { Alert, StyleSheet, TouchableOpacity, View } from 'react-native' import AppText from '../common/app-text' @@ -19,6 +19,16 @@ export default function SelectTabGroup({ const isSecondarySymptomSwitch = buttons[0]['label'] === labels.secondarySymptom.mucus + // Disable is only used for secondarySymptom in customization, if more come up maybe consider more tidy solution + const showDisableAlert = (label) => { + if (label === 'cervix' || 'mucus') { + Alert.alert( + labels.secondarySymptom.disabled.title, + labels.secondarySymptom.disabled.message + ) + } + } + return ( {buttons.map(({ label, value }, i) => { @@ -40,7 +50,9 @@ export default function SelectTabGroup({ return ( !disabled && onSelect(value)} + onPress={() => + !disabled ? onSelect(value) : showDisableAlert(label) + } key={i} style={boxStyle} > diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index 5614bd4..9e06407 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -148,7 +148,12 @@ const Settings = () => { if (isMucusTrackingCategoryEnabled && isCervixTrackingCategoryEnabled) { setUseCervixAsSecondarySymptom(value) saveUseCervixAsSecondarySymptom(value) + console.log('show SecSymp value :>> ', value) + } else if (!isFertilityTrackingEnabled) { + console.log('2 show SecSymp value :>> ', value) + secondarySymptomDisabledPrompt() } else { + console.log('3 show SecSymp value :>> ', value) secondarySymptomDisabledPrompt() } } From 3e8f15e04e74eeb18ea28e4ec6b107c3cb565a3a Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Thu, 29 Feb 2024 17:46:56 +0100 Subject: [PATCH 3/6] disable temperature slider when fertility or temperature turned off --- .../disabled-temperature-slider.js | 62 +++++++++++++++++++ components/settings/customization/index.js | 37 +++++------ i18n/en/settings.js | 9 ++- 3 files changed, 81 insertions(+), 27 deletions(-) create mode 100644 components/settings/customization/disabled-temperature-slider.js diff --git a/components/settings/customization/disabled-temperature-slider.js b/components/settings/customization/disabled-temperature-slider.js new file mode 100644 index 0000000..44e8147 --- /dev/null +++ b/components/settings/customization/disabled-temperature-slider.js @@ -0,0 +1,62 @@ +import React from 'react' +import { StyleSheet, View } from 'react-native' +import Slider from '@ptomasroos/react-native-multi-slider' + +import SliderLabel from './slider-label' + +import { scaleObservable } from '../../../local-storage' +import { Colors, Sizes } from '../../../styles' + +import { TEMP_MIN, TEMP_MAX, TEMP_SLIDER_STEP } from '../../../config' + +const DisabledTemperatureSlider = () => { + const savedValue = scaleObservable.value + const minTemperature = savedValue.min + const maxTemperature = savedValue.max + + return ( + + + + ) +} + +export default DisabledTemperatureSlider + +const styles = StyleSheet.create({ + container: { + alignItems: 'center', + paddingTop: Sizes.base, + }, + marker: { + backgroundColor: Colors.grey, + borderRadius: 50, + elevation: 4, + height: Sizes.subtitle, + width: Sizes.subtitle, + }, + slider: { + borderRadius: 25, + height: Sizes.small, + }, + sliderAccentBackground: { + backgroundColor: Colors.grey, + }, + sliderBackground: { + backgroundColor: Colors.greyLight, + }, +}) diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index 9e06407..f147a41 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -19,6 +19,8 @@ import { temperatureTrackingCategoryObservable, mucusTrackingCategoryObservable, cervixTrackingCategoryObservable, + periodPredictionObservable, + useCervixAsSecondarySymptomObservable, saveDesireTrackingCategory, saveFertilityTrackingEnabled, saveMoodTrackingCategory, @@ -30,11 +32,10 @@ import { saveSexTrackingCategory, saveTemperatureTrackingCategory, saveUseCervixAsSecondarySymptom, - periodPredictionObservable, - useCervixAsSecondarySymptomObservable, } from '../../../local-storage' import labels from '../../../i18n/en/settings' import { SYMPTOMS } from '../../../config' +import DisabledTemperatureSlider from './disabled-temperature-slider' const Settings = () => { const { t } = useTranslation(null, { keyPrefix: 'symptoms' }) @@ -143,17 +144,11 @@ const Settings = () => { }, ] - // NOTE: when disabled (!isFertilityTrackingEnabled) button press doesn't yet trigger alert const onSelectTab = (value) => { if (isMucusTrackingCategoryEnabled && isCervixTrackingCategoryEnabled) { setUseCervixAsSecondarySymptom(value) saveUseCervixAsSecondarySymptom(value) - console.log('show SecSymp value :>> ', value) - } else if (!isFertilityTrackingEnabled) { - console.log('2 show SecSymp value :>> ', value) - secondarySymptomDisabledPrompt() } else { - console.log('3 show SecSymp value :>> ', value) secondarySymptomDisabledPrompt() } } @@ -208,8 +203,8 @@ const Settings = () => { : labels.secondarySymptom.cervixModeOff const sliderDisabledPrompt = () => { - if (!isTemperatureTrackingCategoryEnabled) { - Alert.alert(labels.disabled.title, labels.disabled.message) + if (!isFertilityTrackingEnabled) { + Alert.alert(labels.tempScale.disabled, labels.tempScale.disabledMessage) } } @@ -219,8 +214,6 @@ const Settings = () => { } } - console.log('useCervixAsSecondarySymptom :>> ', useCervixAsSecondarySymptom) - return ( @@ -280,19 +273,19 @@ const Settings = () => { /> - - {/* NOTE: still needs to be greyed out and not moveable */} + {/* Not ideal to have a extra DisabledTemperatureSlider but right now hard to have always the correct state of fertilityTrackingObservable in TemperatureSlider */} - {/* {isTemperatureTrackingCategoryEnabled && ( - <> */} {labels.tempScale.segmentExplainer} - - {/* - )} - {!isTemperatureTrackingCategoryEnabled && ( - {labels.disabled.message} - )} */} + {isTemperatureTrackingCategoryEnabled & isFertilityTrackingEnabled ? ( + <> + + + ) : ( + <> + + + )} diff --git a/i18n/en/settings.js b/i18n/en/settings.js index aec4513..119f887 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -41,12 +41,11 @@ export default { max: 'Max', loadError: 'Could not load saved temperature scale settings', saveError: 'Could not save temperature scale settings', + disabled: 'Disabled', + disabledMessage: + 'To use the temperature scale please first enable both temperature tracking and fertility phase calculation above.', }, - disabled: { - title: 'This feature is turned off', - message: - 'To use the temperature scale please first enable the temperature tracking category above.', - }, + tempReminder: { title: 'Temperature reminder', noTimeSet: 'Set a time for a daily reminder to take your temperature', From b65b5f3561c89a1edb8a1cb90a35fc713279549a Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Thu, 7 Mar 2024 18:58:37 +0100 Subject: [PATCH 4/6] refactoring disable function of temperature slider --- components/cycle-day/select-tab-group.js | 3 +- .../disabled-temperature-slider.js | 62 ------------------- components/settings/customization/index.js | 23 +++---- .../customization/temperature-slider.js | 28 ++++++++- i18n/en/settings.js | 5 +- 5 files changed, 39 insertions(+), 82 deletions(-) delete mode 100644 components/settings/customization/disabled-temperature-slider.js diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js index 3800fa4..9794561 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 showDisableAlert = (label) => { - if (label === 'cervix' || 'mucus') { + if (label === 'cervix' || label === 'mucus') { Alert.alert( labels.secondarySymptom.disabled.title, labels.secondarySymptom.disabled.message @@ -68,6 +68,7 @@ SelectTabGroup.propTypes = { activeButton: PropTypes.number, buttons: PropTypes.array.isRequired, onSelect: PropTypes.func.isRequired, + disabled: PropTypes.bool, } const styles = StyleSheet.create({ diff --git a/components/settings/customization/disabled-temperature-slider.js b/components/settings/customization/disabled-temperature-slider.js deleted file mode 100644 index 44e8147..0000000 --- a/components/settings/customization/disabled-temperature-slider.js +++ /dev/null @@ -1,62 +0,0 @@ -import React from 'react' -import { StyleSheet, View } from 'react-native' -import Slider from '@ptomasroos/react-native-multi-slider' - -import SliderLabel from './slider-label' - -import { scaleObservable } from '../../../local-storage' -import { Colors, Sizes } from '../../../styles' - -import { TEMP_MIN, TEMP_MAX, TEMP_SLIDER_STEP } from '../../../config' - -const DisabledTemperatureSlider = () => { - const savedValue = scaleObservable.value - const minTemperature = savedValue.min - const maxTemperature = savedValue.max - - return ( - - - - ) -} - -export default DisabledTemperatureSlider - -const styles = StyleSheet.create({ - container: { - alignItems: 'center', - paddingTop: Sizes.base, - }, - marker: { - backgroundColor: Colors.grey, - borderRadius: 50, - elevation: 4, - height: Sizes.subtitle, - width: Sizes.subtitle, - }, - slider: { - borderRadius: 25, - height: Sizes.small, - }, - sliderAccentBackground: { - backgroundColor: Colors.grey, - }, - sliderBackground: { - backgroundColor: Colors.greyLight, - }, -}) diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index f147a41..ddb2db9 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -35,7 +35,6 @@ import { } from '../../../local-storage' import labels from '../../../i18n/en/settings' import { SYMPTOMS } from '../../../config' -import DisabledTemperatureSlider from './disabled-temperature-slider' const Settings = () => { const { t } = useTranslation(null, { keyPrefix: 'symptoms' }) @@ -81,6 +80,7 @@ const Settings = () => { const [isFertilityTrackingEnabled, setFertilityTrackingEnabled] = useState( fertilityTrackingObservable.value ) + const fertilityTrackingToggle = (value) => { setFertilityTrackingEnabled(value) saveFertilityTrackingEnabled(value) @@ -203,14 +203,17 @@ const Settings = () => { : labels.secondarySymptom.cervixModeOff const sliderDisabledPrompt = () => { - if (!isFertilityTrackingEnabled) { + if (!isTemperatureTrackingCategoryEnabled) { Alert.alert(labels.tempScale.disabled, labels.tempScale.disabledMessage) } } const fertilityDisabledPrompt = () => { - if (!isFertilityTrackingEnabled) { - Alert.alert(labels.disabled.title, labels.fertilityTracking.disabled) + if (!manageFertilityFeature) { + Alert.alert( + labels.fertilityTracking.disabledTitle, + labels.fertilityTracking.disabled + ) } } @@ -273,19 +276,11 @@ const Settings = () => { /> - {/* Not ideal to have a extra DisabledTemperatureSlider but right now hard to have always the correct state of fertilityTrackingObservable in TemperatureSlider */} + {labels.tempScale.segmentExplainer} - {isTemperatureTrackingCategoryEnabled & isFertilityTrackingEnabled ? ( - <> - - - ) : ( - <> - - - )} + diff --git a/components/settings/customization/temperature-slider.js b/components/settings/customization/temperature-slider.js index 2019d55..7d91f7a 100644 --- a/components/settings/customization/temperature-slider.js +++ b/components/settings/customization/temperature-slider.js @@ -1,5 +1,6 @@ import React, { useState } from 'react' import { StyleSheet, View } from 'react-native' +import PropTypes from 'prop-types' import Slider from '@ptomasroos/react-native-multi-slider' import alertError from '../common/alert-error' @@ -10,7 +11,7 @@ import { Colors, Sizes } from '../../../styles' import labels from '../../../i18n/en/settings' import { TEMP_MIN, TEMP_MAX, TEMP_SLIDER_STEP } from '../../../config' -const TemperatureSlider = () => { +const TemperatureSlider = ({ disabled }) => { const savedValue = scaleObservable.value const [minTemperature, setMinTemperature] = useState(savedValue.min) const [maxTemperature, setMaxTemperature] = useState(savedValue.max) @@ -25,6 +26,14 @@ const TemperatureSlider = () => { } } + const sliderAccentBackground = disabled + ? styles.disabledSliderAccentBackground + : styles.sliderAccentBackground + + const sliderBackground = disabled + ? styles.disabledSliderBackground + : styles.sliderBackground + return ( { max={TEMP_MAX} min={TEMP_MIN} onValuesChange={onTemperatureSliderChange} - selectedStyle={styles.sliderAccentBackground} step={TEMP_SLIDER_STEP} trackStyle={styles.slider} - unselectedStyle={styles.sliderBackground} values={[minTemperature, maxTemperature]} + enabledOne={!disabled} + enabledTwo={!disabled} + selectedStyle={sliderAccentBackground} + unselectedStyle={sliderBackground} /> ) @@ -47,6 +58,10 @@ const TemperatureSlider = () => { export default TemperatureSlider +TemperatureSlider.propTypes = { + disabled: PropTypes.bool, +} + const styles = StyleSheet.create({ container: { alignItems: 'center', @@ -54,6 +69,7 @@ const styles = StyleSheet.create({ }, marker: { backgroundColor: Colors.turquoiseDark, + borderRadius: 50, elevation: 4, height: Sizes.subtitle, @@ -66,7 +82,13 @@ const styles = StyleSheet.create({ sliderAccentBackground: { backgroundColor: Colors.turquoiseDark, }, + disabledSliderAccentBackground: { + backgroundColor: Colors.grey, + }, sliderBackground: { backgroundColor: Colors.turquoise, }, + disabledSliderBackground: { + backgroundColor: Colors.greyLight, + }, }) diff --git a/i18n/en/settings.js b/i18n/en/settings.js index 119f887..fdd3a88 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -43,7 +43,7 @@ export default { saveError: 'Could not save temperature scale settings', disabled: 'Disabled', disabledMessage: - 'To use the temperature scale please first enable both temperature tracking and fertility phase calculation above.', + 'To use the temperature scale please first enable temperature tracking above.', }, tempReminder: { @@ -71,8 +71,9 @@ export default { }, fertilityTracking: { title: 'Fertility phases calculation', + disabledTitle: 'Disabled', disabled: - 'To use this feature please enable temperature tracking and cervical mucus or cervix tracking.', + 'To use fertility phases calculation please enable temperature tracking and cervical mucus or cervix tracking above.', 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.', From f5894c028e637f2b4ae22bd376e5b24e0f2adb1e Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Thu, 14 Mar 2024 10:54:18 +0000 Subject: [PATCH 5/6] renaming --- components/cycle-day/select-tab-group.js | 4 ++-- i18n/en/settings.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js index 9794561..195c6e7 100644 --- a/components/cycle-day/select-tab-group.js +++ b/components/cycle-day/select-tab-group.js @@ -20,7 +20,7 @@ export default function SelectTabGroup({ buttons[0]['label'] === labels.secondarySymptom.mucus // Disable is only used for secondarySymptom in customization, if more come up maybe consider more tidy solution - const showDisableAlert = (label) => { + const showDisabledAlert = (label) => { if (label === 'cervix' || label === 'mucus') { Alert.alert( labels.secondarySymptom.disabled.title, @@ -51,7 +51,7 @@ export default function SelectTabGroup({ return ( - !disabled ? onSelect(value) : showDisableAlert(label) + !disabled ? onSelect(value) : showDisabledAlert(label) } key={i} style={boxStyle} diff --git a/i18n/en/settings.js b/i18n/en/settings.js index f20e024..5748d02 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -75,16 +75,16 @@ export default { disabled: 'To use fertility phases calculation please enable temperature tracking and cervical mucus or cervix tracking above.', 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.', + '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.', off: 'If you switch this on, drip will show fertility related information.', }, secondarySymptom: { title: 'Secondary symptom', cervixModeOn: - 'Cervix values are being used for fertility detection according to the sympto-thermal rules.', + 'Cervix values are being used for fertility detection according to the sympto-thermal method.', cervixModeOff: - 'Cervical mucus values are being used for fertility detection according to the sympto-thermal rules.', + 'Cervical mucus values are being used for fertility detection according to the sympto-thermal method.', disabled: { title: 'Disabled', message: From eaf01e98d5f9ffd1251d4a55a8e0b001d95137f7 Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Thu, 14 Mar 2024 10:58:56 +0000 Subject: [PATCH 6/6] renaming --- components/cycle-day/select-tab-group.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cycle-day/select-tab-group.js b/components/cycle-day/select-tab-group.js index 195c6e7..25db72a 100644 --- a/components/cycle-day/select-tab-group.js +++ b/components/cycle-day/select-tab-group.js @@ -39,7 +39,7 @@ export default function SelectTabGroup({ isActive && styles.boxActive, isSecondarySymptomSwitch && styles.purpleBox, isSecondarySymptomSwitch && isActive && styles.activePurpleBox, - disabled && styles.inActiveBox, + disabled && styles.disabledBox, ] const textStyle = [ styles.text, @@ -99,7 +99,7 @@ const styles = StyleSheet.create({ greyText: { color: Colors.grey, }, - inActiveBox: { + disabledBox: { borderColor: Colors.grey, backgroundColor: Colors.turquoiseLight, },