Allow more lines for "other" under mood, pain, sex

Release ios fix 1.2401.17

See merge request bloodyhealth/drip!653

.gitlab-ci.yml

@@ -9,6 +9,7 @@ cache:
 test_async:
   script:
     - npm install npm@7.0.1 -g
+    - npm install
     - npm test
 
 variables:

.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? 💡
-
-💡

.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_

.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?

CHANGELOG.md

@@ -2,7 +2,42 @@
 
 All notable changes to this project will be documented in this file.
 
-## v1.2311.14
+## v1.2401.17 iOS
+
+### Changes
+
+- Updating React Native to 0.68.3
+- Minor changes in temperature chart
+
+### Adds
+
+- Temperature scale slider
+- out of range warning messages for temperature values
+
+### Fixed
+
+- Order of import buttons
+
+## v1.2312.11 iOS
+
+### Changes
+
+- Chart: Improved readability
+  - Finer temperature lines and dots
+  - Enlarge screen space for temperature chart
+  - A very light grey background color for weekend days on the whole chart screen
+- Homescreen: date displayed in new format
+- Minor changes in "about" section
+
+See more under v1.2311.14 Android
+
+### Adds
+
+- Stats: Show period details, including cycle start, cycle length and amount of days with bleeding
+- Stats: Explainer text for standard deviation
+- App asks for permissions for notifications right at the start, which allows you to set reminders (this is a new requirement for Android 13)
+
+## v1.2311.14 Android
 
 ### Changes
 
@@ -64,11 +99,22 @@ All notable changes to this project will be documented in this file.
 - Chart: Grid for symptoms
 - Chart: Horizontal lines in temperature chart
 
-## Unreleased
+### Unreleased
 
 - Partially implemented translations with react-i18next
 
-## v1.2102.28
+## v1.2208.11 iOS
+
+### Adds
+
+- first iOS Release
+
+### Unreleased
+
+- Temperature scale slider
+- Warning message for out of scope temperature values
+
+## v1.2102.28 Android
 
 ### Changes
 
@@ -81,7 +127,7 @@ All notable changes to this project will be documented in this file.
 - Phase text on home screen for last fertile day
 - Styling improvements
 
-## v1.2101.9
+## v1.2101.9 Android
 
 ### Adds
 
@@ -124,7 +170,7 @@ All notable changes to this project will be documented in this file.
 - Fixed react-native-vector-icon
 - Fixed AppLoadingView component centering
 
-## v0.2007-12.beta
+## v0.2007-12.beta Android
 
 ### Adds
 
@@ -159,7 +205,7 @@ All notable changes to this project will be documented in this file.
 
 - Updates of node.js to fix security issue
 
-## v0.2005.3-beta
+## v0.2005.3-beta Android
 
 - Adds arm64-v8a and x86_64 for supporting 64-bit architecture
 - Adds Mariya & Sofiya as contributors <3
@@ -259,7 +305,7 @@ All notable changes to this project will be documented in this file.
 - Adds release wizard
 - Updates nodejs-mobile to fix security issue
 
-## v0.1905.29-beta
+## v0.1905.29-beta Android
 
 ### Changes
 
@@ -280,7 +326,7 @@ All notable changes to this project will be documented in this file.
 - Line width in chart
 - Prediction range in drop on homescreen
 
-## v0.1905.28-beta
+## v0.1905.28-beta Android
 
 - Displays all the text for Home Elements; Shortens margin btw Home Elements; Adds missing "visit" to text
 - Adds donation section to about
@@ -355,7 +401,7 @@ All notable changes to this project will be documented in this file.
 - Nicer formatting for past bleeding prediction
 - Fixed prediction range in drop on homescreen
 
-## v0.1905.10-beta
+## v0.1905.10-beta Android
 
 - Filter release commits from changelog
 - Adds update-changelog script
@@ -380,7 +426,7 @@ All notable changes to this project will be documented in this file.
 - Delete password button bug fix
 - temperature screen styling update
 
-## v0.0.3 - 2019-04-17
+## v0.0.3 - 2019-04-17 Android
 
 ### Changes
 
@@ -390,9 +436,9 @@ All notable changes to this project will be documented in this file.
 
 - Button functionality in settings for password
 
-## v0.0.2 - 2019-04-09
+## v0.0.2 - 2019-04-09 Android
 
-## Second updated beta release version
+## Second updated beta release version Android
 
 ### Changes
 
@@ -406,9 +452,9 @@ All notable changes to this project will be documented in this file.
 - Delete button for sex, pain and mood
 - Dates on chart
 
-## v0.0.1 - 2019-02-15
+## v0.0.1 - 2019-02-15 Android
 
-## First beta release version
+## First beta release version Android
 
 ### Added (list of core functionality)
 

android/app/build.gradle

@@ -134,8 +134,8 @@ android {
         applicationId "com.drip"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 25
+        versionCode 27
-        versionName "1.2311.14"
+        versionName "1.2402.15"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }

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 }) => {
     >
       <View style={styles.chartContainer}>
         {shouldShowHint && <Tutorial onClose={hideHint} />}
-        {!shouldShowTemperatureColumn && <NoTemperature />}
+        {shouldShowNoDataWarning && <NoTemperature />}
         <View style={styles.chartArea}>
           <YAxis
             height={columnHeight}

components/common/app-modal.js

@@ -1,6 +1,7 @@
 import React from 'react'
 import {
   Dimensions,
+  KeyboardAvoidingView,
   Modal,
   StyleSheet,
   TouchableOpacity,
@@ -19,13 +20,15 @@ const AppModal = ({ children, onClose }) => (
     transparent={true}
     visible={true}
   >
-    <TouchableOpacity onPress={onClose} style={styles.blackBackground} />
+    <KeyboardAvoidingView behavior={'padding'} style={styles.safeAreaView}>
-    <View style={styles.modalWindow}>
+      <TouchableOpacity onPress={onClose} style={styles.blackBackground} />
-      <View style={styles.headerContainer}>
+      <View style={styles.modalWindow}>
-        <CloseIcon onClose={onClose} />
+        <View style={styles.headerContainer}>
+          <CloseIcon onClose={onClose} />
+        </View>
+        {children}
       </View>
-      {children}
+    </KeyboardAvoidingView>
-    </View>
   </Modal>
 )
 
@@ -62,6 +65,11 @@ const styles = StyleSheet.create({
     elevation: 2, // works on android
     minWidth: '80%',
   },
+  safeAreaView: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
 })
 
 export default AppModal

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

components/cycle-day/symptom-box.js

@@ -64,7 +64,7 @@ const SymptomBox = ({
         <View style={styles.textContainer}>
           <AppText style={symptomNameStyle}>{t(symptom)}</AppText>
           {symptomDataToDisplay && (
-            <AppText style={textStyle} numberOfLines={4}>
+            <AppText style={textStyle} numberOfLines={3}>
               {symptomDataToDisplay}
             </AppText>
           )}

components/cycle-day/symptom-edit-view.js

@@ -109,8 +109,8 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
   const noteText = symptom === 'note' ? data.value : data.note
   const inputProps = {
     multiline: true,
-    numberOfLines: 3,
+    numberOfLines: 4,
-    scrollEnabled: false,
+    scrollEnabled: true,
     style: styles.input,
     textAlignVertical: 'top',
   }
@@ -180,7 +180,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
           <Segment style={styles.segmentBorder}>
             <AppText>{symtomPage[symptom].note}</AppText>
             <AppTextInput
-              {...inputProps}
+              multiline={true}
               onChangeText={onEditNote}
               placeholder={sharedLabels.enter}
               testID="noteInput"

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'
@@ -12,18 +13,21 @@ import {
   noteTrackingCategoryObservable,
   painTrackingCategoryObservable,
   sexTrackingCategoryObservable,
+  temperatureTrackingCategoryObservable,
   saveDesireTrackingCategory,
   saveMoodTrackingCategory,
   saveNoteTrackingCategory,
   savePainTrackingCategory,
   savePeriodPrediction,
   saveSexTrackingCategory,
+  saveTemperatureTrackingCategory,
   saveUseCervix,
   periodPredictionObservable,
   useCervixObservable,
 } from '../../../local-storage'
 import { Colors } from '../../../styles'
 import labels from '../../../i18n/en/settings'
+import { SYMPTOMS } from '../../../config'
 
 const Settings = () => {
   const [shouldUseCervix, setShouldUseCervix] = useState(
@@ -34,6 +38,9 @@ const Settings = () => {
     periodPredictionObservable.value
   )
 
+  const [isTemperatureTrackingCategoryEnabled, setTemperatureTrackingCategory] =
+    useState(temperatureTrackingCategoryObservable.value)
+
   const [isSexTrackingCategoryEnabled, setSexTrackingCategory] = useState(
     sexTrackingCategoryObservable.value
   )
@@ -57,6 +64,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)
@@ -97,36 +109,47 @@ const Settings = () => {
     ? labels.useCervix.cervixModeOn
     : labels.useCervix.cervixModeOff
 
+  const sliderDisabledPrompt = () => {
+    if (!isTemperatureTrackingCategoryEnabled) {
+      Alert.alert(labels.disabled.title, labels.disabled.message)
+    }
+  }
   return (
     <AppPage title={'Customization'}>
       <Segment title={'Tracking categories'}>
+        <AppSwitch
+          onToggle={temperatureTrackingCategoryToggle}
+          text={SYMPTOMS[1]}
+          value={isTemperatureTrackingCategoryEnabled}
+          trackColor={{ true: Colors.turquoiseDark }}
+        />
         <AppSwitch
           onToggle={sexTrackingCategoryToggle}
-          text={"sex: when turned off it won't show"}
+          text={SYMPTOMS[4]}
           value={isSexTrackingCategoryEnabled}
           trackColor={{ true: Colors.turquoiseDark }}
         />
         <AppSwitch
           onToggle={desireTrackingCategoryToggle}
-          text={"desire: when turned off it won't show"}
+          text={SYMPTOMS[5]}
           value={isDesireTrackingCategoryEnabled}
           trackColor={{ true: Colors.turquoiseDark }}
         />
         <AppSwitch
           onToggle={painTrackingCategoryToggle}
-          text={"pain: when turned off it won't show"}
+          text={SYMPTOMS[6]}
           value={isPainTrackingCategoryEnabled}
           trackColor={{ true: Colors.turquoiseDark }}
         />
         <AppSwitch
           onToggle={moodTrackingCategoryToggle}
-          text={"mood: when turned off it won't show"}
+          text={SYMPTOMS[7]}
           value={isMoodTrackingCategoryEnabled}
           trackColor={{ true: Colors.turquoiseDark }}
         />
         <AppSwitch
           onToggle={noteTrackingCategoryToggle}
-          text={"note: when turned off it won't show"}
+          text={SYMPTOMS[8]}
           value={isNoteTrackingCategoryEnabled}
           trackColor={{ true: Colors.turquoiseDark }}
         />
@@ -141,19 +164,35 @@ const Settings = () => {
         />
       </Segment>
 
-      <Segment title={labels.tempScale.segmentTitle}>
+      <Pressable onPress={sliderDisabledPrompt}>
-        <AppText>{labels.tempScale.segmentExplainer}</AppText>
+        <Segment title={labels.tempScale.segmentTitle}>
-        <TemperatureSlider />
+          {isTemperatureTrackingCategoryEnabled && (
-      </Segment>
+            <>
+              <AppText>{labels.tempScale.segmentExplainer}</AppText>
+              <TemperatureSlider />
+            </>
+          )}
+          {!isTemperatureTrackingCategoryEnabled && (
+            <AppText>{labels.disabled.message}</AppText>
+          )}
+        </Segment>
+      </Pressable>
 
-      <Segment title={labels.useCervix.title}>
+      <Pressable onPress={sliderDisabledPrompt}>
-        <AppSwitch
+        <Segment title={labels.useCervix.title}>
-          onToggle={onCervixToggle}
+          {isTemperatureTrackingCategoryEnabled && (
-          text={cervixText}
+            <AppSwitch
-          value={shouldUseCervix}
+              onToggle={onCervixToggle}
-          trackColor={{ true: Colors.turquoiseDark }}
+              text={cervixText}
-        />
+              value={shouldUseCervix}
-      </Segment>
+              trackColor={{ true: Colors.turquoiseDark }}
+            />
+          )}
+          {!isTemperatureTrackingCategoryEnabled && (
+            <AppText>{labels.disabled.message}</AppText>
+          )}
+        </Segment>
+      </Pressable>
 
       <Segment title={labels.periodPrediction.title} last>
         <AppSwitch

components/settings/data-management/ImportData.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Alert } from 'react-native'
+import { Alert, Platform } from 'react-native'
 import DocumentPicker from 'react-native-document-picker'
 import rnfs from 'react-native-fs'
 import importCsv from '../../../lib/import-export/import-from-csv'
@@ -59,21 +59,28 @@ export default function ImportData({ resetIsDeletingData, setIsLoading }) {
 
   function openImportDialog() {
     resetIsDeletingData()
-    Alert.alert(t('dialog.title'), t('dialog.message'), [
+
+    let buttons = [
       {
         text: t('dialog.cancel'),
         style: 'cancel',
         onPress: () => {},
       },
-      {
-        text: t('dialog.delete'),
-        onPress: () => startImport(true),
-      },
       {
         text: t('dialog.replace'),
         onPress: () => startImport(false),
       },
-    ])
+      {
+        text: t('dialog.delete'),
+        onPress: () => startImport(true),
+      },
+    ]
+
+    if (Platform.OS === 'android') {
+      buttons = [buttons[0], buttons[2], buttons[1]]
+    }
+
+    Alert.alert(t('dialog.title'), t('dialog.message'), buttons)
   }
 
   function showImportErrorAlert(message) {

components/settings/menu-item.js

@@ -20,11 +20,15 @@ const MenuItem = ({ item, last, navigate }) => {
         key={item.label}
         onPress={() => navigate(item.componentName)}
       >
-        <View>
+        <View style={styles.textContainer}>
           <AppText style={styles.title}>{t(`${item.label}.name`)}</AppText>
           {!!item.label && <AppText>{t(`${item.label}.text`)}</AppText>}
         </View>
-        <AppIcon name="chevron-right" color={Colors.orange} />
+        <AppIcon
+          style={styles.chevronContainer}
+          name="chevron-right"
+          color={Colors.orange}
+        />
       </TouchableOpacity>
     </Segment>
   )
@@ -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

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 (
     <AppPage>
       <Pressable onPress={reminderDisabledPrompt}>
@@ -46,9 +55,11 @@ const Reminders = () => {
           />
         </Segment>
       </Pressable>
-      <Segment title={labels.tempReminder.title} last>
+      <Pressable onPress={tempReminderDisabledPrompt}>
-        <TemperatureReminder />
+        <Segment title={labels.tempReminder.title} last>
-      </Segment>
+          <TemperatureReminder />
+        </Segment>
+      </Pressable>
     </AppPage>
   )
 }

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}
       />
       <DateTimePicker
         isVisible={isTimePickerVisible}

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": {
@@ -122,7 +122,7 @@
         },
         "password": {
           "name": "Password",
-          "text": ""
+          "text": "set or edit your password"
         },
         "reminders": {
           "name": "Reminders",

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 the sympto-thermal method. You may assume infertility, but always remember to ' +
       'double-check for yourself. Make sure the data makes sense to you.'
     )
   },

i18n/en/settings.js

@@ -38,11 +38,21 @@ export default {
     loadError: 'Could not load saved temperature scale settings',
     saveError: 'Could not save temperature scale settings',
   },
+  disabled: {
+    title: 'This feature is turned off',
+    message:
+      'Please first enable the temperature tracking category in the customization settings.',
+  },
   tempReminder: {
     title: 'Temperature reminder',
     noTimeSet: 'Set a time for a daily reminder to take your temperature',
     timeSet: (time) => `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',
@@ -109,6 +119,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.`,
   },
 }

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.

ios/Podfile

@@ -32,6 +32,5 @@ target 'drip' do
 
   post_install do |installer|
     react_native_post_install(installer)
-    __apply_Xcode_12_5_M1_post_install_workaround(installer)
+  end  
-  end
 end

ios/drip.xcodeproj/project.pbxproj

@@ -31,17 +31,16 @@
 		5472A45A25BB7807005E81DE /* drip-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5472A44925BB7806005E81DE /* drip-icon-font.ttf */; };
 		5472A45B25BB7807005E81DE /* drip-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5472A44925BB7806005E81DE /* drip-icon-font.ttf */; };
 		5472A45E25BB7C43005E81DE /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5472A45C25BB7C42005E81DE /* Entypo.ttf */; };
-		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		54DFE73A25D94D6E0025C3FC /* swipe.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73925D94D6E0025C3FC /* swipe.png */; };
 		54DFE73B25D94D6E0025C3FC /* swipe.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73925D94D6E0025C3FC /* swipe.png */; };
 		54DFE73D25D94DED0025C3FC /* cycle-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73C25D94DED0025C3FC /* cycle-icon.png */; };
 		54DFE73E25D94DED0025C3FC /* cycle-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73C25D94DED0025C3FC /* cycle-icon.png */; };
-		54E1D49923E7588F003FA37B /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54E1D49823E7588F003FA37B /* JavaScriptCore.framework */; };
+		54E1D49923E7588F003FA37B /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
 		62F2A4645AC84CDC9506FF27 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AEBF0735214455AAEDF56D5 /* libc++.tbd */; };
+		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		BD7041F2826E4A2CBE6CB87D /* RealmJSTests.xctest in Frameworks */ = {isa = PBXBuildFile; fileRef = F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */; };
-		BEF6784666BF8E0791A27E51 /* libPods-drip-dripTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 30AC577EFD5F39ABAA1E303C /* libPods-drip-dripTests.a */; };
-		D6B2ED16118E4B66DE895C51 /* libPods-drip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-drip-dripTests.a */; };
 		D91133DCE120440893E2FD2E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CD8C8B91E0A747B3883A0D56 /* libz.tbd */; };
+		DFCB30DF40F45C00CFBBE07E /* libPods-drip-dripTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-drip-dripTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -55,7 +54,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
 		00E356EE1AD99517003FC87E /* dripTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = dripTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* dripTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = dripTests.m; sourceTree = "<group>"; };
@@ -65,18 +63,14 @@
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = drip/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = drip/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = drip/main.m; sourceTree = "<group>"; };
-		2C52A2D4C769AF39D11D7017 /* Pods-drip.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.release.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.release.xcconfig"; sourceTree = "<group>"; };
+		19F6CBCC0A4E27FBF8BF4A61 /* libPods-drip-dripTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-dripTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		30AC577EFD5F39ABAA1E303C /* libPods-drip-dripTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-dripTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		3B4392A12AC88292D35C810B /* Pods-drip.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.debug.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.debug.xcconfig"; sourceTree = "<group>"; };
-		3BFD860D9B7CFC35432CDE5C /* Pods-drip-dripTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.debug.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.debug.xcconfig"; sourceTree = "<group>"; };
-		5409189625AB725F00086AE1 /* OpenSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-LightItalic.ttf"; path = "../../assets/fonts/OpenSans-LightItalic.ttf"; sourceTree = "<group>"; };
-		540918A225AB725F00086AE1 /* Prompt-ExtraLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Prompt-ExtraLight.ttf"; path = "../../assets/fonts/Prompt-ExtraLight.ttf"; sourceTree = "<group>"; };
 		540918A325AB725F00086AE1 /* OpenSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Light.ttf"; path = "../../assets/fonts/OpenSans-Light.ttf"; sourceTree = "<group>"; };
 		540918A425AB725F00086AE1 /* Jost-700-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Jost-700-Bold.otf"; path = "../../assets/fonts/Jost-700-Bold.otf"; sourceTree = "<group>"; };
 		540918A525AB725F00086AE1 /* Menu.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Menu.ttf; path = ../../assets/fonts/Menu.ttf; sourceTree = "<group>"; };
 		540918A625AB726000086AE1 /* drip-home-icons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "drip-home-icons.ttf"; path = "../../assets/fonts/drip-home-icons.ttf"; sourceTree = "<group>"; };
 		540918A725AB726000086AE1 /* Jost-400-Book.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Jost-400-Book.otf"; path = "../../assets/fonts/Jost-400-Book.otf"; sourceTree = "<group>"; };
-		540918A825AB726000086AE1 /* drip-icon-font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "drip-icon-font.ttf"; path = "../../assets/fonts/drip-icon-font.ttf"; sourceTree = "<group>"; };
 		540918A925AB726000086AE1 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-SemiBold.ttf"; path = "../../assets/fonts/OpenSans-SemiBold.ttf"; sourceTree = "<group>"; };
 		5472A44125BB7806005E81DE /* drip-home-icons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "drip-home-icons.ttf"; path = "../assets/fonts/drip-home-icons.ttf"; sourceTree = "<group>"; };
 		5472A44225BB7806005E81DE /* OpenSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Light.ttf"; path = "../assets/fonts/OpenSans-Light.ttf"; sourceTree = "<group>"; };
@@ -88,26 +82,24 @@
 		5472A44825BB7806005E81DE /* OpenSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-LightItalic.ttf"; path = "../assets/fonts/OpenSans-LightItalic.ttf"; sourceTree = "<group>"; };
 		5472A44925BB7806005E81DE /* drip-icon-font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "drip-icon-font.ttf"; path = "../assets/fonts/drip-icon-font.ttf"; sourceTree = "<group>"; };
 		5472A45C25BB7C42005E81DE /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
-		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = drip/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		548C3D3A2898FB0600013449 /* drip-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "drip-Bridging-Header.h"; sourceTree = "<group>"; };
 		54DFE73925D94D6E0025C3FC /* swipe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = swipe.png; path = ../assets/swipe.png; sourceTree = "<group>"; };
 		54DFE73C25D94DED0025C3FC /* cycle-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cycle-icon.png"; path = "../assets/cycle-icon.png"; sourceTree = "<group>"; };
-		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		5709B34CF0A7D63546082F79 /* Pods-drip.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.release.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.release.xcconfig"; sourceTree = "<group>"; };
+		5B7EB9410499542E8C5724F5 /* Pods-drip-dripTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.debug.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5C649EDC281151BC005FED46 /* dripRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = dripRelease.entitlements; path = drip/dripRelease.entitlements; sourceTree = "<group>"; };
+		5DCACB8F33CDC322A6C60F78 /* libPods-drip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7A5827160B914D2B99C47381 /* libRealmReact.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRealmReact.a; sourceTree = "<group>"; };
+		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = drip/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		84CCEBD3B2C44758853BC941 /* libRNFS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFS.a; sourceTree = "<group>"; };
+		89C6BE57DB24E9ADA2F236DE /* Pods-drip-dripTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.release.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.release.xcconfig"; sourceTree = "<group>"; };
 		90224CB4571D41C4969E9722 /* libGCDWebServers.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libGCDWebServers.a; sourceTree = "<group>"; };
 		9AEBF0735214455AAEDF56D5 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
-		3B4392A12AC88292D35C810B /* Pods-drip.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.debug.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.debug.xcconfig"; sourceTree = "<group>"; };
-		5709B34CF0A7D63546082F79 /* Pods-drip.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.release.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.release.xcconfig"; sourceTree = "<group>"; };
 		A8B59389C2FC4F19BD30ABC3 /* libRNShare.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNShare.a; sourceTree = "<group>"; };
 		AB636AA0286D45CE9B23B2C3 /* libRCTRestart.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTRestart.a; sourceTree = "<group>"; };
 		CD8C8B91E0A747B3883A0D56 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		D211D71BE5A8436A978770A9 /* libRNDocumentPicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDocumentPicker.a; sourceTree = "<group>"; };
-		89C6BE57DB24E9ADA2F236DE /* Pods-drip-dripTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.release.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.release.xcconfig"; sourceTree = "<group>"; };
+		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
-		5B7EB9410499542E8C5724F5 /* Pods-drip-dripTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.debug.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.debug.xcconfig"; sourceTree = "<group>"; };
-		19F6CBCC0A4E27FBF8BF4A61 /* libPods-drip-dripTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-dripTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		5DCACB8F33CDC322A6C60F78 /* libPods-drip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		F5039D0A572B4BBCB7995891 /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
 		F710D85E391D4094816E1B62 /* libRealmJS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRealmJS.a; sourceTree = "<group>"; };
 		F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = RealmJSTests.xctest; sourceTree = "<group>"; };
@@ -118,7 +110,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7699B88040F8A987B510C191 /* libPods-drip-dripTests.a in Frameworks */,
+				DFCB30DF40F45C00CFBBE07E /* libPods-drip-dripTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -126,7 +118,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				54E1D49923E7588F003FA37B /* JavaScriptCore.framework in Frameworks */,
+				54E1D49923E7588F003FA37B /* BuildFile in Frameworks */,
 				62F2A4645AC84CDC9506FF27 /* libc++.tbd in Frameworks */,
 				D91133DCE120440893E2FD2E /* libz.tbd in Frameworks */,
 				BD7041F2826E4A2CBE6CB87D /* RealmJSTests.xctest in Frameworks */,
@@ -176,9 +168,7 @@
 		13B07FAE1A68108700A75B9A /* drip */ = {
 			isa = PBXGroup;
 			children = (
-				5488D8D628ABF478008DD66D /* LaunchScreen.storyboard */,
 				5C649EDC281151BC005FED46 /* dripRelease.entitlements */,
-				008F07F21AC5B25A0029DE68 /* main.jsbundle */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
 				13B07FB01A68108700A75B9A /* AppDelegate.mm */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
@@ -215,30 +205,16 @@
 				90224CB4571D41C4969E9722 /* libGCDWebServers.a */,
 				F710D85E391D4094816E1B62 /* libRealmJS.a */,
 				F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */,
+				540918A325AB725F00086AE1 /* OpenSans-Light.ttf */,
+				540918A925AB726000086AE1 /* OpenSans-SemiBold.ttf */,
+				540918A725AB726000086AE1 /* Jost-400-Book.otf */,
+				540918A525AB725F00086AE1 /* Menu.ttf */,
+				540918A625AB726000086AE1 /* drip-home-icons.ttf */,
+				540918A425AB725F00086AE1 /* Jost-700-Bold.otf */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
 		};
-		6817ABC38854EEB6D3EE933A /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				540918A625AB726000086AE1 /* drip-home-icons.ttf */,
-				540918A825AB726000086AE1 /* drip-icon-font.ttf */,
-				540918A725AB726000086AE1 /* Jost-400-Book.otf */,
-				540918A425AB725F00086AE1 /* Jost-700-Bold.otf */,
-				540918A525AB725F00086AE1 /* Menu.ttf */,
-				540918A325AB725F00086AE1 /* OpenSans-Light.ttf */,
-				5409189625AB725F00086AE1 /* OpenSans-LightItalic.ttf */,
-				540918A925AB726000086AE1 /* OpenSans-SemiBold.ttf */,
-				540918A225AB725F00086AE1 /* Prompt-ExtraLight.ttf */,
-				9C2B39F53B3E9590D7F199B8 /* Pods-drip.debug.xcconfig */,
-				2C52A2D4C769AF39D11D7017 /* Pods-drip.release.xcconfig */,
-				3BFD860D9B7CFC35432CDE5C /* Pods-drip-dripTests.debug.xcconfig */,
-				DCE7F65AA04F4A0851ED5A7A /* Pods-drip-dripTests.release.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
@@ -335,7 +311,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
@@ -343,7 +319,6 @@
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
-						DevelopmentTeam = 6AD72X6W26;
 						LastSwiftMigration = 1120;
 					};
 				};
@@ -416,6 +391,8 @@
 			files = (
 			);
 			inputPaths = (
+				"$(SRCROOT)/.xcode.env.local",
+				"$(SRCROOT)/.xcode.env",
 			);
 			name = "Bundle React Native code and images";
 			outputPaths = (
@@ -590,13 +567,14 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-drip-dripTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = dripTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -617,10 +595,11 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-drip-dripTests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
 				INFOPLIST_FILE = dripTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -644,6 +623,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 6AD72X6W26;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = drip/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -670,6 +650,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 6AD72X6W26;
 				INFOPLIST_FILE = drip/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -680,7 +661,7 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = org.heartofcode.drip.cycle.tracking;
 				PRODUCT_NAME = drip;
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -736,7 +717,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -800,7 +781,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",

ios/drip.xcodeproj/xcshareddata/xcschemes/drip.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/drip/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,46 +1,55 @@
 {
   "images": [
     {
+      "filename": "40 1.png",
       "idiom": "iphone",
       "scale": "2x",
       "size": "20x20"
     },
     {
+      "filename": "60 1.png",
       "idiom": "iphone",
       "scale": "3x",
       "size": "20x20"
     },
     {
+      "filename": "58 1.png",
       "idiom": "iphone",
       "scale": "2x",
       "size": "29x29"
     },
     {
+      "filename": "87 1.png",
       "idiom": "iphone",
       "scale": "3x",
       "size": "29x29"
     },
     {
+      "filename": "80 1.png",
       "idiom": "iphone",
       "scale": "2x",
       "size": "40x40"
     },
     {
+      "filename": "120 2.png",
       "idiom": "iphone",
       "scale": "3x",
       "size": "40x40"
     },
     {
+      "filename": "120 1.png",
       "idiom": "iphone",
       "scale": "2x",
       "size": "60x60"
     },
     {
+      "filename": "180 1.png",
       "idiom": "iphone",
       "scale": "3x",
       "size": "60x60"
     },
     {
+      "filename": "appstore 1.png",
       "idiom": "ios-marketing",
       "scale": "1x",
       "size": "1024x1024"

ios/drip/Info.plist

@@ -8,8 +8,10 @@
 	<string>drip.</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconName</key>
+	<string>AppIcon</string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>org.heartofcode.drip.cycle.tracking</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>drip. menstrual cycle &amp; fertility tracking</string>
+	<string>1.2402.15</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

local-storage.js

@@ -92,6 +92,21 @@ export async function setChartFlag() {
   await AsyncStorage.setItem('isFirstChartView', JSON.stringify(false))
 }
 
+export const temperatureTrackingCategoryObservable = Observable()
+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()
 setObvWithInitValue('sex', sexTrackingCategoryObservable, true)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drip.",
-  "version": "1.2311.14",
+  "version": "1.2402.15",
   "contributors": [
     "Julia Friesel <julia.friesel@gmail.com>",
     "Marie Kochsiek",
@@ -12,8 +12,8 @@
   "scripts": {
     "start": "react-native start",
     "android": "react-native run-android",
-    "ios": "react-native run-ios --simulator=\"iPhone 8 Plus\"",
+    "ios": "react-native run-ios --simulator=\"iPhone 15\"",
-    "ios14": "react-native run-ios --simulator=\"iPhone 14 Plus\"",
+    "iosSE": "react-native run-ios --simulator=\"iPhone SE (2nd generation)\"",
     "log": "react-native log-android",
     "test": "jest test && yarn lint",
     "test-watch": "jest --watch test",
@@ -34,9 +34,9 @@
   "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/datetimepicker": "^7.2.0",
     "@react-native-community/push-notification-ios": "^1.11.0",
     "csvtojson": "^2.0.8",
     "i18next": "^22.0.2",

yarn.lock

@@ -1320,10 +1320,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":
+"@react-native-async-storage/async-storage@^1.18.2":
-  version "1.19.3"
+  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.19.3.tgz#ad5fe3ed0a82d4624aa4500321c1e09c02daeb46"
+  resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.18.2.tgz#ec8fd487a0b6c9500b43ece4b8779d1561f12e91"
-  integrity sha512-CwGfoHCWdPOTPS+2fW6YRE1fFBpT9++ahLEroX5hkgwyoQ+TkmjOaUxixdEIoVua9Pz5EF2pGOIJzqOTMWfBlA==
+  integrity sha512-dM8AfdoeIxlh+zqgr0o5+vCTPQ0Ru1mrPzONZMsr7ufp5h+6WgNxQNza7t0r5qQ6b04AJqTlBNixTWZxqP649Q==
   dependencies:
     merge-options "^3.0.4"
 
@@ -1505,10 +1505,10 @@
     sudo-prompt "^9.0.0"
     wcwidth "^1.0.1"
 
-"@react-native-community/datetimepicker@^6.3.1":
+"@react-native-community/datetimepicker@^7.2.0":
-  version "6.7.5"
+  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/datetimepicker/-/datetimepicker-6.7.5.tgz#214796f2d131b6af9cb9d4dea69d4a1981fa2236"
+  resolved "https://registry.yarnpkg.com/@react-native-community/datetimepicker/-/datetimepicker-7.2.0.tgz#db8c03dbf49bf3c24b06b617a8467d8b05511f62"
-  integrity sha512-E2Zh6mwvZ6CFEMKP++rdxxjJiB45fYPpdZhJwdZ2vUVwqovqu1cQRDLZmz4XrcHSyuacgR4WUnkYFf0F2nnNIg==
+  integrity sha512-dO1sQy83M/EvnHE2egto05iwXZX7EYn5f/VDMp6afZFRFXRiRo7CzB3VFg4B55gJRJMNBv06NYMLPM3SlpnEGQ==
   dependencies:
     invariant "^2.2.4"