From ae3edb0a158c953233019ad4dc3603533df563a7 Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Tue, 23 Jan 2024 15:20:04 +0100 Subject: [PATCH 01/17] Add temperature toggle in customization and store value in local storage --- components/settings/customization/index.js | 17 +++++++++++++++++ local-storage.js | 8 ++++++++ 2 files changed, 25 insertions(+) diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index 537773c..ac37136 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -12,12 +12,14 @@ import { noteTrackingCategoryObservable, painTrackingCategoryObservable, sexTrackingCategoryObservable, + temperatureTrackingCategoryObservable, saveDesireTrackingCategory, saveMoodTrackingCategory, saveNoteTrackingCategory, savePainTrackingCategory, savePeriodPrediction, saveSexTrackingCategory, + saveTemperatureTrackingCategory, saveUseCervix, periodPredictionObservable, useCervixObservable, @@ -34,6 +36,10 @@ const Settings = () => { periodPredictionObservable.value ) + const [isTemperatureTrackingCategoryEnabled, setTemperatureTrackingCategory] = useState( + temperatureTrackingCategoryObservable.value + ) + const [isSexTrackingCategoryEnabled, setSexTrackingCategory] = useState( sexTrackingCategoryObservable.value ) @@ -57,6 +63,11 @@ const Settings = () => { const [isEnabled, setIsEnabled] = useState(false) const toggleSwitch = () => setIsEnabled((previousState) => !previousState) + const temperatureTrackingCategoryToggle = (value) => { + setTemperatureTrackingCategory(value) + saveTemperatureTrackingCategory(value) + } + const sexTrackingCategoryToggle = (value) => { setSexTrackingCategory(value) saveSexTrackingCategory(value) @@ -100,6 +111,12 @@ const Settings = () => { return ( + Date: Tue, 23 Jan 2024 15:20:48 +0100 Subject: [PATCH 02/17] On cycle day temp wont show if turned off --- components/cycle-day/cycle-day-overview.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js index 52dd3ec..a033135 100644 --- a/components/cycle-day/cycle-day-overview.js +++ b/components/cycle-day/cycle-day-overview.js @@ -15,6 +15,7 @@ import { noteTrackingCategoryObservable, painTrackingCategoryObservable, sexTrackingCategoryObservable, + temperatureTrackingCategoryObservable, } from '../../local-storage' import { Spacing } from '../../styles' import { SYMPTOMS } from '../../config' @@ -35,7 +36,9 @@ const CycleDayOverView = ({ date, setDate, isTemperatureEditView }) => { } const allEnabledSymptoms = SYMPTOMS.map((symptom) => { - if (symptom === 'sex') { + if (symptom === 'temperature') { + return temperatureTrackingCategoryObservable.value ? symptom : null + } else if (symptom === 'sex') { return sexTrackingCategoryObservable.value ? symptom : null } else if (symptom === 'desire') { return desireTrackingCategoryObservable.value ? symptom : null From 7dd01c0c9b09b11e9e1257036b7150fca2cca076 Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Tue, 23 Jan 2024 15:21:27 +0100 Subject: [PATCH 03/17] On chart temperature wont be displayed, also warning --- components/chart/chart.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/components/chart/chart.js b/components/chart/chart.js index c475ae2..b394129 100644 --- a/components/chart/chart.js +++ b/components/chart/chart.js @@ -21,6 +21,7 @@ import { noteTrackingCategoryObservable, painTrackingCategoryObservable, sexTrackingCategoryObservable, + temperatureTrackingCategoryObservable, } from '../../local-storage' import { makeColumnInfo } from '../helpers/chart' @@ -84,7 +85,11 @@ const CycleChart = ({ navigate, setDate }) => { } }) - const shouldShowTemperatureColumn = chartSymptoms.indexOf('temperature') > -1 + const isTemperatureEnabled = temperatureTrackingCategoryObservable.value + const shouldShowTemperatureColumn = + isTemperatureEnabled && chartSymptoms.indexOf('temperature') > -1 + const shouldShowNoDataWarning = + isTemperatureEnabled && chartSymptoms.indexOf('temperature') <= -1 const { width, height } = Dimensions.get('window') const numberOfColumnsToRender = Math.round(width / CHART_COLUMN_WIDTH) @@ -135,7 +140,7 @@ const CycleChart = ({ navigate, setDate }) => { > {shouldShowHint && } - {!shouldShowTemperatureColumn && } + {shouldShowNoDataWarning && } Date: Tue, 23 Jan 2024 15:23:19 +0100 Subject: [PATCH 04/17] Remove useless description and show only symptom name --- components/settings/customization/index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index ac37136..46fb727 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -113,37 +113,37 @@ const Settings = () => { From a99e6952a1b24d29303362611d3ad46a62d35f2a Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Tue, 23 Jan 2024 15:27:33 +0100 Subject: [PATCH 05/17] Turn tempreminder off when temperature turned off --- local-storage.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/local-storage.js b/local-storage.js index 0d13a51..ece4355 100644 --- a/local-storage.js +++ b/local-storage.js @@ -98,6 +98,13 @@ setObvWithInitValue('temperature', temperatureTrackingCategoryObservable, true) export async function saveTemperatureTrackingCategory(bool) { await AsyncStorage.setItem('temperature', JSON.stringify(bool)) temperatureTrackingCategoryObservable.set(bool) + + if (!temperatureTrackingCategoryObservable.value) { + const result = await AsyncStorage.getItem('tempReminder') + if (JSON.parse(result).enabled) { + tempReminderObservable.set(false) + } + } } export const sexTrackingCategoryObservable = Observable() From fdb892ff6bbcacecac55c0a95eabfff7cb630e6b Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Tue, 23 Jan 2024 16:07:21 +0100 Subject: [PATCH 06/17] Disable tempReminder if temp is turned off --- components/settings/reminders/reminders.js | 17 ++++++++++++++--- .../settings/reminders/temperature-reminder.js | 2 ++ i18n/en/settings.js | 5 +++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/components/settings/reminders/reminders.js b/components/settings/reminders/reminders.js index 518886b..1279d29 100644 --- a/components/settings/reminders/reminders.js +++ b/components/settings/reminders/reminders.js @@ -9,6 +9,7 @@ import { periodReminderObservable, savePeriodReminder, periodPredictionObservable, + temperatureTrackingCategoryObservable, } from '../../../local-storage' import labels from '../../../i18n/en/settings' @@ -34,6 +35,14 @@ const Reminders = () => { } } + const tempReminderDisabledPrompt = () => { + if (!temperatureTrackingCategoryObservable.value) { + Alert.alert( + labels.tempReminder.alertNoTempReminder.title, + labels.tempReminder.alertNoTempReminder.message + ) + } + } return ( @@ -46,9 +55,11 @@ const Reminders = () => { /> - - - + + + + + ) } diff --git a/components/settings/reminders/temperature-reminder.js b/components/settings/reminders/temperature-reminder.js index d5fb874..5b06b19 100644 --- a/components/settings/reminders/temperature-reminder.js +++ b/components/settings/reminders/temperature-reminder.js @@ -7,6 +7,7 @@ import AppSwitch from '../../common/app-switch' import { saveTempReminder, tempReminderObservable, + temperatureTrackingCategoryObservable, } from '../../../local-storage' import padWithZeros from '../../helpers/pad-time-with-zeros' @@ -51,6 +52,7 @@ const TemperatureReminder = () => { onToggle={temperatureReminderToggle} text={tempReminderText} value={isEnabled} + disabled={!temperatureTrackingCategoryObservable.value} /> `Daily reminder set for ${time}`, notification: 'Record your morning temperature', + alertNoTempReminder: { + title: 'Temperature turned off', + message: + 'To use the temperature reminder please first enable the temperature tracking category in the customization settings.', + }, }, periodReminder: { title: 'Next period reminder', From ec157078b22f822d025391872e45bba37813312c Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Tue, 23 Jan 2024 13:21:29 +0100 Subject: [PATCH 07/17] Rename to "sympto-thermal method" + nfp settings to "Customization" --- i18n/en.json | 2 +- i18n/en/labels.js | 6 +++--- i18n/en/settings.js | 2 +- i18n/en/symptom-info.js | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/i18n/en.json b/i18n/en.json index f3d6bff..49118fa 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -51,7 +51,7 @@ }, "philosophy": { "title": "Remember to think for yourself", - "text": "drip. makes period predictions for you and helps you apply NFP fertility awareness rules. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: \"Does this make sense?\" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure." + "text": "drip. makes period predictions for you and helps you apply the sympto-thermal method for fertility awareness. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: \"Does this make sense?\" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure." }, "title": "About", "version": { diff --git a/i18n/en/labels.js b/i18n/en/labels.js index 2348e7a..848ab64 100644 --- a/i18n/en/labels.js +++ b/i18n/en/labels.js @@ -70,14 +70,14 @@ export const fertilityStatus = { unknown: 'We cannot show any cycle information because no period data has been added.', preOvuText: - "With NFP rules, you may assume 5 days of infertility at the beginning of your cycle, provided you don't observe any fertile cervical mucus or cervix values.", + "According to the sympto-thermal method, you may assume 5 days of infertility at the beginning of your cycle, provided you don't observe any fertile cervical mucus or cervix values.", periOvuText: 'We were not able to detect both a temperature shift and cervical mucus or cervix shift.', periOvuUntilEveningText: (tempRule) => { return ( 'We detected a temperature shift (' + ['regular', '1st exception', '2nd exception'][tempRule] + - ' temperature rule), as well as a cervical mucus/cervix shift according to NFP rules. In the evening today you may assume infertility, but ' + + ' temperature rule), as well as a cervical mucus/cervix shift according to the sympto-thermal method. In the evening today you may assume infertility, but ' + 'always remember to double-check for yourself. Make sure the data makes sense to you.' ) }, @@ -85,7 +85,7 @@ export const fertilityStatus = { return ( 'We detected a temperature shift (' + ['regular', '1st exception', '2nd exception'][tempRule] + - ' temperature rule), as well as a cervical mucus/cervix shift according to NFP rules. You may assume infertility, but always remember to ' + + ' temperature rule), as well as a cervical mucus/cervix shift according to sympto-thermal method. You may assume infertility, but always remember to ' + 'double-check for yourself. Make sure the data makes sense to you.' ) }, diff --git a/i18n/en/settings.js b/i18n/en/settings.js index 15ea950..2c1f7a2 100644 --- a/i18n/en/settings.js +++ b/i18n/en/settings.js @@ -109,6 +109,6 @@ Making any changes to your password setting will keep your data as it was before }, preOvu: { title: 'Infertile days at cycle start', - note: `drip. applies NFP's rules for calculating infertile days at the start of the cycle (see ${links.wiki.url} for more info). However, drip. does not currently apply the so called 20-day-rule, which determines infertile days at the cycle start from past cycle lengths in case no past symptothermal info is available.`, + note: `drip. applies the sympto-thermal method for calculating infertile days at the start of the cycle (see ${links.wiki.url} for more info). However, drip. does not currently apply the so called 20-day-rule, which determines infertile days at the cycle start from past cycle lengths in case no past symptothermal info is available.`, }, } diff --git a/i18n/en/symptom-info.js b/i18n/en/symptom-info.js index 76f35b4..fb124e3 100644 --- a/i18n/en/symptom-info.js +++ b/i18n/en/symptom-info.js @@ -11,7 +11,7 @@ export const generalInfo = { 3. and menstrual bleeding the app helps you identify in which phase of the menstrual cycle you are. -drip. makes period predictions for you and helps you apply NFP fertility awareness rules. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: "Does this make sense?" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure. +drip. makes period predictions for you and helps you apply the sympto-thermal method for fertility awareness. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: "Does this make sense?" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure. Please find more info on the sympto-thermal method in ${links.wiki.url}.`, noNfpSymptom: `The app allows you to track this symptom for your information, it is not taken into account for any calculation. On the chart you can check how often you track this symptom.`, @@ -39,7 +39,7 @@ ${generalInfo.nfpTfyReminder}`, Tracking how open or closed and how firm or soft the cervix feels can help determine in which phase of the menstrual cycle you are. -By default, the secondary symptom the app uses for NFP evaluation is cervical mucus, but you can change it to cervix in "Settings" -> "NFP Settings". +By default, the secondary symptom the app uses for the sympto-thermal method is cervical mucus, but you can change it to cervix in "Settings" -> "Customization". · How to identify a fertile cervix? A fertile cervix is open and feels soft like your earlobes. In contrast, an infertile cervix feels closed and hard, like the tip of your nose. If the cervix feels anything other than closed and hard, drip. takes it as a sign of fertility. On the chart, a fertile cervix is colored in dark yellow, and infertile cervix is colored in light yellow. @@ -74,10 +74,10 @@ ${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 NFP evaluation is cervical mucus. +By default the secondary symptom the app uses for the sympto-thermal method is cervical mucus. · 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 NFP-conforming values. +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 lowest to best quality: · t = (dry feeling + no texture), · ∅ = (no feeling + no texture), @@ -87,7 +87,7 @@ From lowest to best quality: On the chart, cervical mucus is colored in blue: the darker the shade of blue the better the quality of your cervical mucus. -Please note that drip. does not yet support "parenthesis values": According to NFP rules, you can qualify a cervical mucus value by putting parentheses around it, to indicate that it doesn't fully meet the descriptors of one of the five categories, and instead is in between. This functionality will be supported in the future. +Please note that drip. does not yet support "parenthesis values": According to the sympto-thermal method, you can qualify a cervical mucus value by putting parentheses around it, to indicate that it doesn't fully meet the descriptors of one of the five categories, and instead is in between. This functionality will be supported in the future. ${generalInfo.chartNfp} @@ -125,7 +125,7 @@ ${generalInfo.curiousNfp}`, title: 'Tracking body basal temperature', text: `One of the body signs you need to track for knowing your fertility status is your body basal temperature. The body temperature changes over the course of a menstrual cycle, it rises after ovulation. -By default the secondary symptom is cervical mucus, but you can change it to cervix in "Settings" -> "NFP Settings". +By default the secondary symptom is cervical mucus, but you can change it to cervix in "Settings" -> "Customization". · What is body basal temperature? It's your temperature after lying still for at least 6 hours. For many, this is when they are waking up in the morning after sleeping at least 6 hours and before getting up. From 55b1c5973dec02ce0dbdb5e8d154232dbce86b2a Mon Sep 17 00:00:00 2001 From: Sofiya Tepikin Date: Tue, 6 Jun 2023 09:04:36 +0000 Subject: [PATCH 08/17] Bump @react-native-async-storage/async-storage from 1.17.9 to 1.18.2 Bumps [@react-native-async-storage/async-storage](https://github.com/react-native-async-storage/async-storage) from 1.17.9 to 1.18.2. - [Release notes](https://github.com/react-native-async-storage/async-storage/releases) - [Changelog](https://github.com/react-native-async-storage/async-storage/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-async-storage/async-storage/compare/v1.17.9...v1.18.2) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0afa863..f96cb87 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "dependencies": { "@js-joda/core": "^5.3.0", "@ptomasroos/react-native-multi-slider": "^2.2.0", - "@react-native-async-storage/async-storage": "^1.17.9", + "@react-native-async-storage/async-storage": "^1.18.2", "@react-native-community/art": "^1.2.0", "@react-native-community/datetimepicker": "^6.3.1", "@react-native-community/push-notification-ios": "^1.11.0", diff --git a/yarn.lock b/yarn.lock index de1e28e..2fee99d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1141,10 +1141,10 @@ resolved "https://registry.yarnpkg.com/@ptomasroos/react-native-multi-slider/-/react-native-multi-slider-2.2.2.tgz#35a97fb8c355627c6a2ded010b360ac5728b44ad" integrity sha512-HWyCnRD3Z3SbHK2FLWYmBBqd1B4iXipeKv1+AK0FoY/CElEDTEixHE8hN60TsqxalPrznn798LE2Q4tHuCiyaA== -"@react-native-async-storage/async-storage@^1.17.9": - version "1.19.3" - resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.19.3.tgz#ad5fe3ed0a82d4624aa4500321c1e09c02daeb46" - integrity sha512-CwGfoHCWdPOTPS+2fW6YRE1fFBpT9++ahLEroX5hkgwyoQ+TkmjOaUxixdEIoVua9Pz5EF2pGOIJzqOTMWfBlA== +"@react-native-async-storage/async-storage@^1.18.2": + version "1.18.2" + resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.18.2.tgz#ec8fd487a0b6c9500b43ece4b8779d1561f12e91" + integrity sha512-dM8AfdoeIxlh+zqgr0o5+vCTPQ0Ru1mrPzONZMsr7ufp5h+6WgNxQNza7t0r5qQ6b04AJqTlBNixTWZxqP649Q== dependencies: merge-options "^3.0.4" From 6a4d5c330ba0ad5d884e6d2c7bcd36a0c7222d3a Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Mon, 29 Jan 2024 13:40:30 +0100 Subject: [PATCH 09/17] Disable/hide TemperatureSlider if temperature category turned off --- components/settings/customization/index.js | 26 ++++++++++++++++++---- i18n/en/settings.js | 5 +++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index 46fb727..613b2e5 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -1,4 +1,5 @@ import React, { useState } from 'react' +import { Alert, Pressable } from 'react-native' import AppPage from '../../common/app-page' import AppSwitch from '../../common/app-switch' @@ -108,6 +109,14 @@ const Settings = () => { ? labels.useCervix.cervixModeOn : labels.useCervix.cervixModeOff + const sliderDisabledPrompt = () => { + if (!isTemperatureTrackingCategoryEnabled) { + Alert.alert( + labels.tempScale.disabled.title, + labels.tempScale.disabled.message + ) + } + } return ( @@ -158,10 +167,19 @@ const Settings = () => { /> - - {labels.tempScale.segmentExplainer} - - + + + {isTemperatureTrackingCategoryEnabled && ( + <> + {labels.tempScale.segmentExplainer} + + + )} + {!isTemperatureTrackingCategoryEnabled && ( + {labels.tempScale.disabled.message} + )} + + Date: Mon, 29 Jan 2024 18:21:53 +0100 Subject: [PATCH 10/17] Hide SecondarySymptom Switch if temperature category turned off --- components/settings/customization/index.js | 35 ++++++++++++---------- i18n/en/settings.js | 10 +++---- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index 613b2e5..a8decf4 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -37,9 +37,8 @@ const Settings = () => { periodPredictionObservable.value ) - const [isTemperatureTrackingCategoryEnabled, setTemperatureTrackingCategory] = useState( - temperatureTrackingCategoryObservable.value - ) + const [isTemperatureTrackingCategoryEnabled, setTemperatureTrackingCategory] = + useState(temperatureTrackingCategoryObservable.value) const [isSexTrackingCategoryEnabled, setSexTrackingCategory] = useState( sexTrackingCategoryObservable.value @@ -111,10 +110,7 @@ const Settings = () => { const sliderDisabledPrompt = () => { if (!isTemperatureTrackingCategoryEnabled) { - Alert.alert( - labels.tempScale.disabled.title, - labels.tempScale.disabled.message - ) + Alert.alert(labels.disabled.title, labels.disabled.message) } } return ( @@ -176,19 +172,26 @@ const Settings = () => { )} {!isTemperatureTrackingCategoryEnabled && ( - {labels.tempScale.disabled.message} + {labels.disabled.message} )} - - - + + + {isTemperatureTrackingCategoryEnabled && ( + + )} + {!isTemperatureTrackingCategoryEnabled && ( + {labels.disabled.message} + )} + + Date: Thu, 25 Jan 2024 12:03:51 +0100 Subject: [PATCH 11/17] Add symptom labels from config list --- components/settings/customization/index.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/components/settings/customization/index.js b/components/settings/customization/index.js index a8decf4..a8e0ab2 100644 --- a/components/settings/customization/index.js +++ b/components/settings/customization/index.js @@ -27,6 +27,7 @@ import { } from '../../../local-storage' import { Colors } from '../../../styles' import labels from '../../../i18n/en/settings' +import { SYMPTOMS } from '../../../config' const Settings = () => { const [shouldUseCervix, setShouldUseCervix] = useState( @@ -118,37 +119,37 @@ const Settings = () => { From 9991260c389b6a2f9ddd8033a471cae75ee7120c Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Tue, 6 Feb 2024 12:51:36 +0100 Subject: [PATCH 12/17] Add pw text in settings and extra container for > --- components/settings/menu-item.js | 15 +++++++++++++-- i18n/en.json | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/components/settings/menu-item.js b/components/settings/menu-item.js index 8c8df7e..7fd398c 100644 --- a/components/settings/menu-item.js +++ b/components/settings/menu-item.js @@ -20,11 +20,15 @@ const MenuItem = ({ item, last, navigate }) => { key={item.label} onPress={() => navigate(item.componentName)} > - + {t(`${item.label}.name`)} {!!item.label && {t(`${item.label}.text`)}} - + ) @@ -44,6 +48,13 @@ const styles = StyleSheet.create({ color: Colors.purple, fontSize: Sizes.subtitle, }, + textContainer: { + flex: 5, + }, + chevronContainer: { + textAlign: 'right', + flex: 1, + }, }) export default MenuItem diff --git a/i18n/en.json b/i18n/en.json index f3d6bff..acc9c77 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -122,7 +122,7 @@ }, "password": { "name": "Password", - "text": "" + "text": "set or edit your password" }, "reminders": { "name": "Reminders", From edc452381aa2606d49d552c15589138b806954b2 Mon Sep 17 00:00:00 2001 From: Liv M Date: Tue, 6 Feb 2024 13:27:55 +0000 Subject: [PATCH 13/17] Fix: Update issue templates --- .gitlab/issue_templates/bug-template.md | 29 ++++++++++++--------- .gitlab/issue_templates/chore-template.md | 15 ++++++----- .gitlab/issue_templates/feature-template.md | 25 +++++++++++------- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/.gitlab/issue_templates/bug-template.md b/.gitlab/issue_templates/bug-template.md index 47712b4..605b081 100644 --- a/.gitlab/issue_templates/bug-template.md +++ b/.gitlab/issue_templates/bug-template.md @@ -1,26 +1,29 @@ -## oh no a bug 🐛 +## 🐛 Oh no, a bug 🐛 -### Description what has happened +### What happened? -Short overview how the bug manifests. +Short overview of how the bug manifests. -### which OS + version is your device +### What is the expected behaviour? + +_It's supposed to show ... and not ..._ + +### Which OS + version is your device? - [ ] Android _number_ - [ ] iOS _number_ +- [ ] Simulator _number_ -### which drip version number are you using +### Which drip version number are you using? -_On your phone go to ➞ menu on the top right ➞ about, scroll to the very bottom and find the version number_ +_On your phone, go to ➞ menu on the top right ➞ about, scroll to the very bottom, and find the version number_ -### how did it happen +### How did it happen? -_what triggered the bug/behavior, always/sometimes, is it reproducible(how)?_ +_What triggered the bug/behavior, always/sometimes, is it reproducible(how)?_ -### describe how it looks or add screenshot +### Describe how it looks or add a screenshot -feel free to attach a file 📎 +Feel free to attach a file 📎 -### any idea to solve it - -💡 +### Any ideas on how to solve it? 💡 diff --git a/.gitlab/issue_templates/chore-template.md b/.gitlab/issue_templates/chore-template.md index 14018b4..4254e89 100644 --- a/.gitlab/issue_templates/chore-template.md +++ b/.gitlab/issue_templates/chore-template.md @@ -1,22 +1,23 @@ -## This has to be done 🪠 +## 🪠 This has to be done 🪠 -### Description what has to be done +### What has to be done? Short overview -### is it urgent? ⏳ +### Is it urgent? ⏳ - [ ] Yes - [ ] No -- [ ] something in between +- [ ] Something in between _Explain the urgency if possible, e.g. is it a security vulnerability for potentially everyone?_ +If it is a security vulnerability for potentially everyone, please reach out ASAP to drip@mailbox.org. -### which OS +### Which OS? - [ ] Android - [ ] iOS -### what shall be the ideal outcome 🎆 +### What should the ideal outcome be? 🎆 -_You can e.g. specify here the version number for a library update_ +_You can, e.g., specify the version number for a library update_ diff --git a/.gitlab/issue_templates/feature-template.md b/.gitlab/issue_templates/feature-template.md index 7abcba8..60b505f 100644 --- a/.gitlab/issue_templates/feature-template.md +++ b/.gitlab/issue_templates/feature-template.md @@ -1,19 +1,26 @@ -## Yeah a feature idea 🧩 +## 🧩 Yeah, a feature idea! 🧩 -### what should this feature do or solve? 🪄 +### This feature is a ... + +- [ ] period tracking feature (add more data points etc.) +- [ ] technological feature (password, design, settings, etc.) + +### What should this feature do or solve? 🪄 Please give a short overview so as many people as possible would be able to understand. -### what is particularly important to the people who would use this feature? +### Who is this feature for? -Do you have certain user groups in mind? +### What is particularly important to the people who would use this feature? -### Any idea where it shall be placed in the app? +### Where in the app should the feature be added? -### is it connected with or dependent on some other feature? +### Is it connected with or dependent on some other feature? -### any idea how it shall look (sketch?) +### How should the feature look (sketch or mock-up)? -feel free to attach a file 📎 +Feel free to attach a file 📎 -### what could be difficulties (with other components) 🪆 +### What could be difficulties (esp. integrating with other components)? 🪆 + +### Do you want to work on this yourself? From a74b5d58e8d66e7118d5724c27d1876382218976 Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Tue, 6 Feb 2024 21:23:48 +0100 Subject: [PATCH 14/17] get back npm install in gitlab-ci.yml I believe we actually need this and that line 11 installs that certain npm version while this line installs everything else we need. Without pipeline crashes. --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 102531a..f4ce2d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ cache: test_async: script: - npm install npm@7.0.1 -g + - npm install - npm test variables: From 318fd7cfeeccda7d7f31dbb4746525165f196187 Mon Sep 17 00:00:00 2001 From: Sofiya Tepikin Date: Thu, 22 Jun 2023 09:03:52 +0000 Subject: [PATCH 15/17] Bump @react-native-community/datetimepicker from 6.3.1 to 7.2.0 Bumps [@react-native-community/datetimepicker](https://github.com/react-native-community/datetimepicker) from 6.3.1 to 7.2.0. - [Release notes](https://github.com/react-native-community/datetimepicker/releases) - [Changelog](https://github.com/react-native-datetimepicker/datetimepicker/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-community/datetimepicker/compare/v6.3.1...v7.2.0) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f96cb87..058f7e7 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@ptomasroos/react-native-multi-slider": "^2.2.0", "@react-native-async-storage/async-storage": "^1.18.2", "@react-native-community/art": "^1.2.0", - "@react-native-community/datetimepicker": "^6.3.1", + "@react-native-community/datetimepicker": "^7.2.0", "@react-native-community/push-notification-ios": "^1.11.0", "csvtojson": "^2.0.8", "i18next": "^22.0.2", diff --git a/yarn.lock b/yarn.lock index 2fee99d..8213dfb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1294,10 +1294,10 @@ sudo-prompt "^9.0.0" wcwidth "^1.0.1" -"@react-native-community/datetimepicker@^6.3.1": - version "6.7.5" - resolved "https://registry.yarnpkg.com/@react-native-community/datetimepicker/-/datetimepicker-6.7.5.tgz#214796f2d131b6af9cb9d4dea69d4a1981fa2236" - integrity sha512-E2Zh6mwvZ6CFEMKP++rdxxjJiB45fYPpdZhJwdZ2vUVwqovqu1cQRDLZmz4XrcHSyuacgR4WUnkYFf0F2nnNIg== +"@react-native-community/datetimepicker@^7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@react-native-community/datetimepicker/-/datetimepicker-7.2.0.tgz#db8c03dbf49bf3c24b06b617a8467d8b05511f62" + integrity sha512-dO1sQy83M/EvnHE2egto05iwXZX7EYn5f/VDMp6afZFRFXRiRo7CzB3VFg4B55gJRJMNBv06NYMLPM3SlpnEGQ== dependencies: invariant "^2.2.4" From 0adea893f7289fe86d17805db67d675278ae53d0 Mon Sep 17 00:00:00 2001 From: wunderfisch Date: Thu, 8 Feb 2024 11:45:20 +0000 Subject: [PATCH 16/17] Apply 1 suggestion(s) to 1 file(s) --- i18n/en/labels.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/en/labels.js b/i18n/en/labels.js index 848ab64..6846f13 100644 --- a/i18n/en/labels.js +++ b/i18n/en/labels.js @@ -85,7 +85,7 @@ export const fertilityStatus = { return ( 'We detected a temperature shift (' + ['regular', '1st exception', '2nd exception'][tempRule] + - ' temperature rule), as well as a cervical mucus/cervix shift according to sympto-thermal method. You may assume infertility, but always remember to ' + + ' temperature rule), as well as a cervical mucus/cervix shift according to the sympto-thermal method. You may assume infertility, but always remember to ' + 'double-check for yourself. Make sure the data makes sense to you.' ) }, From 845e42eafc9e7790e12eb4352480479bbf38a1da Mon Sep 17 00:00:00 2001 From: bl00dymarie Date: Thu, 8 Feb 2024 16:16:26 +0100 Subject: [PATCH 17/17] Remove nonfunctional repair --- ios/Podfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index 90d8699..790dc25 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -19,6 +19,5 @@ target 'drip' do post_install do |installer| react_native_post_install(installer) - sed -i.bo 's/ node->getLayout()\.hadOverflow() |$/\0|/' ./node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp end end