specify tracking category cervical mucus

CONTRIBUTING.md

@@ -33,10 +33,9 @@ We are an open source project and we highly appreciate contributions. At the sam
   - 🔮 open source
   - 🩸 feminist and gender inclusive
   - 🔒 secure: data entered stays with that person/on their device
-  - 🔬 science-based: we implemented the sympto-thermal method
-
+  - 🔬 science based: we implemented the symptothermal method
+  
 This means that we will never implement anything that contradicts these core values. Some examples: We will never build a cloud integration, we will never make an ovulation prediction.
-
 - If you would like to make a sustainable contribution to the project, we would be happy to join the game.
 
 ### Reporting Bugs or Making Suggestions
@@ -49,6 +48,7 @@ If you found a bug or have suggestions, please :one: first review the [list of e
 - If you want to open a merge request, yeah :tada: exciting! We are using a template for merge requests to make sure we explain what we have done and why.
 - Keep in mind that people who will review your merge request are more motivated to do so when the merge request is well explained and ideally not too big.
 
+
 ### Thank you
 
 ![](https://media.giphy.com/media/kPA88elN9kYco/giphy.gif)

RELEASE.md

@@ -6,8 +6,8 @@ _Note: You need the release-key for Android to bundle a signed release that can
 
 1. [version updating](#Version-updating)
 2. [android building](#Building-in-Android)
-   - [APK](#APK)
-   - [AAB](#AAB)
+    - [APK](#APK)
+    - [AAB](#AAB)
 3. [release sharing](#Share-the-release)
 
 ## Version updating
@@ -25,15 +25,6 @@ yarn release
 
 The versionName and versionCode [are defined here](https://gitlab.com/bloodyhealth/drip/-/blob/5401789c46f4a02915ab900ef284581be420451c/android/app/build.gradle#L137-138) and in [package.json](https://gitlab.com/bloodyhealth/drip/-/blob/5401789c46f4a02915ab900ef284581be420451c/package.json#L3).
 
-**Note for iOS**
-
-Update the version number for iOS in `ios/drip/Info.plist` under:
-
-```
-<key>CFBundleShortVersionString</key>
-<string>1.2403.19</string>
-```
-
 ## Building in Android
 
 APK versus AAB
@@ -84,17 +75,6 @@ yarn sign-android-aab-release
 
 _which is a shortcut for:_ `jarsigner -keystore ./android/app/drip-release-key.keystore ./android/app/build/outputs/bundle/release/app-release.aab drip-release-key`
 
-## Building in iOS
-
-To build an .ipa archive file for an upload to the AppStore you need to go to xCode and select Build -> "Any iOS Device" and under "Product" -> "Archive".
-
-Once the archiving process has completed you can chose to do the following:
-
-"Distribute the app"
-
-- TestFlight & App Store for when you want to upload it for external testing and/or production release
-- TestFlight Internal Only for when you want to upload it for internal testing
-
 ## Share the release
 
 ### Gitlab repository

android/app/build.gradle

@@ -134,8 +134,8 @@ android {
         applicationId "com.drip"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 33
-        versionName "1.2403.19"
+        versionCode 29
+        versionName "1.2402.23"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }

components/Home.js

@@ -51,7 +51,6 @@ const Home = ({ navigate, setDate }) => {
     >
       <AppText style={styles.title}>{moment().format('MMM Do YYYY')}</AppText>
 
-      {/* display if at least 1 bleeding day has been entered */}
       {cycleDayNumber && (
         <View style={styles.line}>
           <AppText style={styles.whiteSubtitle}>{cycleDayText}</AppText>
@@ -60,8 +59,6 @@ const Home = ({ navigate, setDate }) => {
           </AppText>
         </View>
       )}
-
-      {/* display if fertility tracking enabled and if phase 1, 2 or 3 has been identified  */}
       {isFertilityTrackingEnabled && phase && (
         <View style={styles.line}>
           <AppText style={styles.whiteSubtitle}>
@@ -74,14 +71,11 @@ const Home = ({ navigate, setDate }) => {
           <Asterisk />
         </View>
       )}
-
       {isPeriodPredictionEnabled && (
         <View style={styles.line}>
           <AppText style={styles.turquoiseText}>{prediction}</AppText>
         </View>
       )}
-
-      {!isFertilityTrackingEnabled && <View style={styles.largePadding}></View>}
       <Button isCTA isSmall={false} onPress={navigateToCycleDayView}>
         {t('labels.home.addDataForToday')}
       </Button>
@@ -120,9 +114,6 @@ const styles = StyleSheet.create({
     color: 'white',
     fontSize: Sizes.subtitle,
   },
-  largePadding: {
-    padding: Spacing.large,
-  },
 })
 
 Home.propTypes = {

components/common/segment.js

@@ -6,14 +6,13 @@ import AppText from './app-text'
 
 import { Colors, Containers, Spacing, Typography } from '../../styles'
 
-const Segment = ({ children, last, title, subheader }) => {
+const Segment = ({ children, last, title }) => {
   const containerStyle = last ? styles.containerLast : styles.container
   const commonStyle = Object.assign({}, containerStyle)
 
   return (
     <View style={commonStyle}>
       {title && <AppText style={styles.title}>{title}</AppText>}
-      {subheader && <AppText style={styles.subheader}>{subheader}</AppText>}
       {children}
     </View>
   )
@@ -24,7 +23,6 @@ Segment.propTypes = {
   last: PropTypes.bool,
   style: PropTypes.object,
   title: PropTypes.string,
-  subheader: PropTypes.string,
 }
 
 const styles = StyleSheet.create({
@@ -41,11 +39,6 @@ const styles = StyleSheet.create({
   title: {
     ...Typography.subtitle,
   },
-  subheader: {
-    ...Typography.subtitle,
-    fontWeight: 'bold',
-    marginBottom: Spacing.zero,
-  },
 })
 
 export default Segment

components/common/tracking-category-switch.js

@@ -1,63 +0,0 @@
-import React from 'react'
-import { Platform, StyleSheet, Switch, View } from 'react-native'
-import PropTypes from 'prop-types'
-
-import AppText from './app-text'
-
-import DripIcon from '../../assets/drip-icons'
-import { Colors, Containers, Sizes, Spacing } from '../../styles'
-
-const TrackingCategorySwitch = ({ onToggle, symptom, text, value }) => {
-  const trackColor = { true: Colors.turquoiseDark }
-  const iconColor = value ? Colors.iconColors[symptom].color : Colors.grey
-
-  return (
-    <View style={styles.container}>
-      <View style={styles.iconContainer}>
-        <DripIcon
-          color={iconColor}
-          name={`drip-icon-${symptom}`}
-          size={Sizes.title}
-        />
-      </View>
-      <View style={styles.textContainer}>
-        <AppText>{text}</AppText>
-      </View>
-      <Switch
-        onValueChange={onToggle}
-        style={styles.appSwitch}
-        value={value}
-        trackColor={trackColor}
-      />
-    </View>
-  )
-}
-
-TrackingCategorySwitch.propTypes = {
-  onToggle: PropTypes.func.isRequired,
-  symptom: PropTypes.string,
-  text: PropTypes.string,
-  value: PropTypes.bool,
-}
-
-const styles = StyleSheet.create({
-  container: {
-    ...Containers.rowContainer,
-    marginVertical: Spacing.tiny,
-  },
-  iconContainer: {
-    marginRight: Spacing.tiny,
-    flex: 1,
-  },
-  textContainer: {
-    flex: 5,
-  },
-  appSwitch: {
-    flex: 2,
-    transform:
-      Platform.OS === 'ios'
-        ? [{ scaleX: 0.8 }, { scaleY: 0.8 }]
-        : [{ scaleX: 1 }, { scaleY: 1 }],
-  },
-})
-export default TrackingCategorySwitch

components/cycle-day/select-tab-group.js

@@ -1,37 +1,17 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Alert, StyleSheet, TouchableOpacity, View } from 'react-native'
+import { StyleSheet, TouchableOpacity, View } from 'react-native'
 
 import AppText from '../common/app-text'
 
 import { Colors, Containers } from '../../styles'
 import labels from '../../i18n/en/settings'
 
-export default function SelectTabGroup({
-  activeButton,
-  buttons,
-  onSelect,
-  disabled,
-}) {
-  // TODO https://gitlab.com/bloodyhealth/drip/-/issues/707
+export default function SelectTabGroup({ activeButton, buttons, onSelect }) {
   const oneTimeTransformIntoNumber =
     typeof activeButton === 'boolean' && Number(activeButton)
   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 showDisabledAlert = (label) => {
-    if (
-      label === labels.secondarySymptom.cervix ||
-      label === labels.secondarySymptom.mucus
-    ) {
-      Alert.alert(
-        labels.secondarySymptom.disabled.title,
-        labels.secondarySymptom.disabled.message
-      )
-    }
-  }
-
   return (
     <View style={styles.container}>
       {buttons.map(({ label, value }, i) => {
@@ -42,20 +22,16 @@ export default function SelectTabGroup({
           isActive && styles.boxActive,
           isSecondarySymptomSwitch && styles.purpleBox,
           isSecondarySymptomSwitch && isActive && styles.activePurpleBox,
-          disabled && styles.disabledBox,
         ]
         const textStyle = [
           styles.text,
           isSecondarySymptomSwitch && styles.purpleText,
           isActive && styles.textActive,
-          disabled && styles.greyText,
         ]
 
         return (
           <TouchableOpacity
-            onPress={() =>
-              !disabled ? onSelect(value) : showDisabledAlert(label)
-            }
+            onPress={() => onSelect(value)}
             key={i}
             style={boxStyle}
           >
@@ -71,7 +47,6 @@ SelectTabGroup.propTypes = {
   activeButton: PropTypes.number,
   buttons: PropTypes.array.isRequired,
   onSelect: PropTypes.func.isRequired,
-  disabled: PropTypes.bool,
 }
 
 const styles = StyleSheet.create({
@@ -99,11 +74,4 @@ const styles = StyleSheet.create({
   purpleText: {
     color: Colors.purple,
   },
-  greyText: {
-    color: Colors.grey,
-  },
-  disabledBox: {
-    borderColor: Colors.grey,
-    backgroundColor: Colors.turquoiseLight,
-  },
 })

components/cycle-day/symptom-box.js

@@ -20,7 +20,7 @@ const SymptomBox = ({
   editedSymptom,
   setEditedSymptom,
 }) => {
-  const { t } = useTranslation(null, { keyPrefix: 'symptoms' })
+  const { t } = useTranslation(null, { keyPrefix: 'cycleDay.symptomBox' })
   const isSymptomEdited = editedSymptom === symptom
   const isSymptomDisabled = isDateInFuture(date) && symptom !== 'note'
   const isExcluded = symptomData !== null ? symptomData.exclude : false

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

@@ -15,7 +15,6 @@ import Temperature from './temperature'
 import { blank, save, shouldShow, symtomPage } from '../helpers/cycle-day'
 import { showToast } from '../helpers/general'
 
-import { fertilityTrackingObservable } from '../../local-storage'
 import { shared as sharedLabels } from '../../i18n/en/labels'
 import info from '../../i18n/en/symptom-info'
 import { Colors, Containers, Sizes, Spacing } from '../../styles'
@@ -26,7 +25,6 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
   const [shouldShowInfo, setShouldShowInfo] = useState(false)
   const getParsedData = () => JSON.parse(JSON.stringify(data))
   const onPressLearnMore = () => setShouldShowInfo(!shouldShowInfo)
-  const isFertilityTrackingEnabled = fertilityTrackingObservable.value
 
   const onEditNote = (note) => {
     const parsedData = getParsedData()
@@ -169,18 +167,15 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
               </Segment>
             )
           })}
-        {/* show exclude AppSwitch for bleeding, mucus, cervix, temperature */}
-        {/* but if fertility is off only for bleeding */}
-        {shouldShow(symptomConfig.excludeText) &&
-          (symptom === 'bleeding' || isFertilityTrackingEnabled) && (
-            <Segment style={styles.segmentBorder}>
-              <AppSwitch
-                onToggle={onExcludeToggle}
-                text={symtomPage[symptom].excludeText}
-                value={data.exclude}
-              />
-            </Segment>
-          )}
+        {shouldShow(symptomConfig.excludeText) && (
+          <Segment style={styles.segmentBorder}>
+            <AppSwitch
+              onToggle={onExcludeToggle}
+              text={symtomPage[symptom].excludeText}
+              value={data.exclude}
+            />
+          </Segment>
+        )}
         {shouldShow(symptomConfig.note) && (
           <Segment style={styles.segmentBorder}>
             <AppText>{symtomPage[symptom].note}</AppText>

components/settings/customization/index.js

@@ -1,15 +1,11 @@
 import React, { useEffect, useState } from 'react'
-import { Alert, Pressable, StyleSheet, View } from 'react-native'
-import { useTranslation } from 'react-i18next'
+import { Alert, Pressable } from 'react-native'
 
-import AppIcon from '../../common/app-icon'
 import AppPage from '../../common/app-page'
 import AppSwitch from '../../common/app-switch'
 import AppText from '../../common/app-text'
-import { Colors, Spacing, Typography } from '../../../styles'
 import TemperatureSlider from './temperature-slider'
 import Segment from '../../common/segment'
-import TrackingCategorySwitch from '../../common/tracking-category-switch'
 import SelectTabGroup from '../../cycle-day/select-tab-group'
 
 import {
@@ -22,8 +18,6 @@ import {
   temperatureTrackingCategoryObservable,
   mucusTrackingCategoryObservable,
   cervixTrackingCategoryObservable,
-  periodPredictionObservable,
-  useCervixAsSecondarySymptomObservable,
   saveDesireTrackingCategory,
   saveFertilityTrackingEnabled,
   saveMoodTrackingCategory,
@@ -35,13 +29,13 @@ import {
   saveSexTrackingCategory,
   saveTemperatureTrackingCategory,
   saveUseCervixAsSecondarySymptom,
+  periodPredictionObservable,
+  useCervixAsSecondarySymptomObservable,
 } from '../../../local-storage'
 import labels from '../../../i18n/en/settings'
 import { SYMPTOMS } from '../../../config'
 
 const Settings = () => {
-  const { t } = useTranslation(null, { keyPrefix: 'symptoms' })
-
   const [useCervixAsSecondarySymptom, setUseCervixAsSecondarySymptom] =
     useState(useCervixAsSecondarySymptomObservable.value)
 
@@ -83,7 +77,6 @@ const Settings = () => {
   const [isFertilityTrackingEnabled, setFertilityTrackingEnabled] = useState(
     fertilityTrackingObservable.value
   )
-
   const fertilityTrackingToggle = (value) => {
     setFertilityTrackingEnabled(value)
     saveFertilityTrackingEnabled(value)
@@ -182,14 +175,7 @@ const Settings = () => {
   }
 
   const secondarySymptomDisabledPrompt = () => {
-    if (!isFertilityTrackingEnabled) {
-      Alert.alert(
-        labels.secondarySymptom.disabled.title,
-        labels.secondarySymptom.disabled.message
-      )
-    } else if (
-      !isMucusTrackingCategoryEnabled == isCervixTrackingCategoryEnabled
-    ) {
+    if (!isMucusTrackingCategoryEnabled == isCervixTrackingCategoryEnabled) {
       Alert.alert(
         labels.secondarySymptom.disabled.title,
         labels.secondarySymptom.disabled.noSecondaryEnabled
@@ -197,155 +183,123 @@ const Settings = () => {
     }
   }
 
-  const manageFertilityFeature =
-    isTemperatureTrackingCategoryEnabled &&
-    (isMucusTrackingCategoryEnabled || isCervixTrackingCategoryEnabled)
-
   const cervixText = useCervixAsSecondarySymptom
     ? labels.secondarySymptom.cervixModeOn
     : labels.secondarySymptom.cervixModeOff
 
   const sliderDisabledPrompt = () => {
     if (!isTemperatureTrackingCategoryEnabled) {
-      Alert.alert(labels.tempScale.disabled, labels.tempScale.disabledMessage)
-    }
-  }
-
-  const fertilityDisabledPrompt = () => {
-    if (!manageFertilityFeature) {
-      Alert.alert(
-        labels.fertilityTracking.disabledTitle,
-        labels.fertilityTracking.disabled
-      )
+      Alert.alert(labels.disabled.title, labels.disabled.message)
     }
   }
 
   return (
-    <AppPage title={labels.customization.title}>
-      <Segment title={labels.customization.trackingCategories}>
-        <TrackingCategorySwitch
+    <AppPage title={'Customization'}>
+      <Segment title={'Tracking categories'}>
+        <AppSwitch
           onToggle={temperatureTrackingCategoryToggle}
-          text={t(SYMPTOMS[1])}
+          text={SYMPTOMS[1]}
           value={isTemperatureTrackingCategoryEnabled}
-          symptom={SYMPTOMS[1]}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={(enabled) => {
             mucusTrackingCategoryToggle(enabled)
           }}
-          text={t(SYMPTOMS[2])}
+          text={SYMPTOMS[2]}
           value={isMucusTrackingCategoryEnabled}
-          symptom={SYMPTOMS[2]}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={(enabled) => {
             cervixTrackingCategoryToggle(enabled)
           }}
-          text={t(SYMPTOMS[3])}
+          text={SYMPTOMS[3]}
           value={isCervixTrackingCategoryEnabled}
-          symptom={SYMPTOMS[3]}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={sexTrackingCategoryToggle}
-          text={t(SYMPTOMS[4])}
+          text={SYMPTOMS[4]}
           value={isSexTrackingCategoryEnabled}
-          symptom={SYMPTOMS[4]}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={desireTrackingCategoryToggle}
-          text={t(SYMPTOMS[5])}
+          text={SYMPTOMS[5]}
           value={isDesireTrackingCategoryEnabled}
-          symptom={SYMPTOMS[5]}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={painTrackingCategoryToggle}
-          text={t(SYMPTOMS[6])}
+          text={SYMPTOMS[6]}
           value={isPainTrackingCategoryEnabled}
-          symptom={SYMPTOMS[6]}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={moodTrackingCategoryToggle}
-          text={t(SYMPTOMS[7])}
+          text={SYMPTOMS[7]}
           value={isMoodTrackingCategoryEnabled}
-          symptom={SYMPTOMS[7]}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={noteTrackingCategoryToggle}
-          text={t(SYMPTOMS[8])}
+          text={SYMPTOMS[8]}
           value={isNoteTrackingCategoryEnabled}
-          symptom={SYMPTOMS[8]}
         />
       </Segment>
-
-      <Pressable onPress={fertilityDisabledPrompt}>
+      <Pressable onPress={sliderDisabledPrompt}>
         <Segment title={labels.fertilityTracking.title}>
-          <AppText>{labels.fertilityTracking.message}</AppText>
-          <AppSwitch
-            onToggle={fertilityTrackingToggle}
-            text={fertilityTrackingText}
-            value={isFertilityTrackingEnabled}
-            disabled={!manageFertilityFeature}
-          />
+          {isTemperatureTrackingCategoryEnabled &&
+          (isMucusTrackingCategoryEnabled ||
+            isCervixTrackingCategoryEnabled) ? (
+            <>
+              <AppText>{labels.fertilityTracking.message}</AppText>
+              <AppSwitch
+                onToggle={fertilityTrackingToggle}
+                text={fertilityTrackingText}
+                value={isFertilityTrackingEnabled}
+              />
+            </>
+          ) : (
+            <AppText>{labels.disabled.message}</AppText>
+          )}
         </Segment>
       </Pressable>
 
-      <Segment title={labels.periodPrediction.title}>
+      <Pressable onPress={sliderDisabledPrompt}>
+        <Segment title={labels.tempScale.segmentTitle}>
+          {isTemperatureTrackingCategoryEnabled && (
+            <>
+              <AppText>{labels.tempScale.segmentExplainer}</AppText>
+              <TemperatureSlider />
+            </>
+          )}
+          {!isTemperatureTrackingCategoryEnabled && (
+            <AppText>{labels.disabled.message}</AppText>
+          )}
+        </Segment>
+      </Pressable>
+
+      <Pressable onPress={secondarySymptomDisabledPrompt}>
+        <Segment title={labels.secondarySymptom.title}>
+          {!isFertilityTrackingEnabled ? (
+            <AppText>{labels.secondarySymptom.disabled.message}</AppText>
+          ) : (
+            <>
+              <AppText>{cervixText}</AppText>
+              <SelectTabGroup
+                activeButton={useCervixAsSecondarySymptom}
+                buttons={secondarySymptomButtons}
+                onSelect={(value) => onSelectTab(value)}
+              />
+            </>
+          )}
+        </Segment>
+      </Pressable>
+
+      <Segment title={labels.periodPrediction.title} last>
         <AppSwitch
           onToggle={onPeriodPredictionToggle}
           text={periodPredictionText}
           value={isPeriodPredictionEnabled}
         />
       </Segment>
-
-      <Segment
-        subheader={labels.customization.subheaderSymptoThermalMethod}
-        last
-      ></Segment>
-
-      <Pressable onPress={sliderDisabledPrompt}>
-        <Segment title={labels.tempScale.segmentTitle}>
-          <AppText>{labels.tempScale.segmentExplainer}</AppText>
-          <TemperatureSlider disabled={!isTemperatureTrackingCategoryEnabled} />
-        </Segment>
-      </Pressable>
-
-      <Pressable onPress={secondarySymptomDisabledPrompt}>
-        <Segment title={labels.secondarySymptom.title}>
-          <AppText>{cervixText}</AppText>
-          <SelectTabGroup
-            activeButton={useCervixAsSecondarySymptom}
-            buttons={secondarySymptomButtons}
-            onSelect={(value) => onSelectTab(value)}
-            disabled={!isFertilityTrackingEnabled}
-          />
-        </Segment>
-      </Pressable>
-      <Segment last>
-        <View style={styles.line}>
-          <AppIcon
-            color={Colors.purple}
-            name="info-with-circle"
-            style={styles.icon}
-          />
-          <AppText style={styles.title}>{labels.preOvu.title}</AppText>
-        </View>
-        <AppText>{labels.preOvu.note}</AppText>
-      </Segment>
     </AppPage>
   )
 }
 
 export default Settings
-
-const styles = StyleSheet.create({
-  icon: {
-    marginRight: Spacing.base,
-  },
-  line: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  title: {
-    ...Typography.subtitle,
-  },
-})

components/settings/customization/temperature-slider.js

@@ -1,6 +1,5 @@
 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'
@@ -11,7 +10,7 @@ import { Colors, Sizes } from '../../../styles'
 import labels from '../../../i18n/en/settings'
 import { TEMP_MIN, TEMP_MAX, TEMP_SLIDER_STEP } from '../../../config'
 
-const TemperatureSlider = ({ disabled }) => {
+const TemperatureSlider = () => {
   const savedValue = scaleObservable.value
   const [minTemperature, setMinTemperature] = useState(savedValue.min)
   const [maxTemperature, setMaxTemperature] = useState(savedValue.max)
@@ -26,14 +25,6 @@ const TemperatureSlider = ({ disabled }) => {
     }
   }
 
-  const sliderAccentBackground = disabled
-    ? styles.disabledSliderAccentBackground
-    : styles.sliderAccentBackground
-
-  const sliderBackground = disabled
-    ? styles.disabledSliderBackground
-    : styles.sliderBackground
-
   return (
     <View style={styles.container}>
       <Slider
@@ -44,13 +35,11 @@ const TemperatureSlider = ({ disabled }) => {
         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}
       />
     </View>
   )
@@ -58,10 +47,6 @@ const TemperatureSlider = ({ disabled }) => {
 
 export default TemperatureSlider
 
-TemperatureSlider.propTypes = {
-  disabled: PropTypes.bool,
-}
-
 const styles = StyleSheet.create({
   container: {
     alignItems: 'center',
@@ -69,7 +54,6 @@ const styles = StyleSheet.create({
   },
   marker: {
     backgroundColor: Colors.turquoiseDark,
-
     borderRadius: 50,
     elevation: 4,
     height: Sizes.subtitle,
@@ -82,13 +66,7 @@ const styles = StyleSheet.create({
   sliderAccentBackground: {
     backgroundColor: Colors.turquoiseDark,
   },
-  disabledSliderAccentBackground: {
-    backgroundColor: Colors.grey,
-  },
   sliderBackground: {
     backgroundColor: Colors.turquoise,
   },
-  disabledSliderBackground: {
-    backgroundColor: Colors.greyLight,
-  },
 })

components/settings/settings-menu.js

@@ -11,6 +11,7 @@ const menuItems = [
   { label: 'reminders', componentName: 'Reminders' },
   { label: 'dataManagement', componentName: 'DataManagement' },
   { label: 'password', componentName: 'Password' },
+  { label: 'info', componentName: 'Info' },
 ]
 
 const SettingsMenu = ({ navigate }) => {

config.js

@@ -4,7 +4,7 @@ import { scale, verticalScale } from 'react-native-size-matters'
 export const SYMPTOMS = [
   'bleeding',
   'temperature',
-  'mucus',
+  'cervical mucus',
   'cervix',
   'sex',
   'desire',

i18n/en.json

@@ -7,16 +7,18 @@
   "chart": {
     "tutorial": "You can swipe the chart to view more dates."
   },
-  "symptoms": {
-    "bleeding": "bleeding",
-    "temperature": "temperature",
-    "mucus": "cervical mucus",
-    "cervix": "cervix",
-    "note": "note",
-    "desire": "desire",
-    "sex": "sex",
-    "pain": "pain",
-    "mood": "mood"
+  "cycleDay": {
+    "symptomBox": {
+      "bleeding": "bleeding",
+      "temperature": "temperature",
+      "mucus": "cervical mucus",
+      "cervix": "cervix",
+      "note": "note",
+      "desire": "desire",
+      "sex": "sex",
+      "pain": "pain",
+      "mood": "mood"
+    }
   },
   "labels": {
     "bleedingPrediction": {
@@ -112,19 +114,19 @@
       "menuItem": {
         "dataManagement": {
           "name": "Data",
-          "text": "Import, export or delete your data"
+          "text": "import, export or delete your data"
         },
         "customization": {
           "name": "Customization",
-          "text": "Define how you want to use drip"
+          "text": "define how you want to use drip"
         },
         "password": {
           "name": "Password",
-          "text": "Set, edit or delete your password"
+          "text": "set or edit your password"
         },
         "reminders": {
           "name": "Reminders",
-          "text": "Turn on/off reminders"
+          "text": "turn on/off reminders"
         },
         "info": {
           "name": "Info",

i18n/en/cycle-day.js

@@ -4,71 +4,70 @@ export const intensity = ['low', 'medium', 'high']
 export const bleeding = {
   labels: ['spotting', 'light', 'medium', 'heavy'],
   heaviness: {
-    header: 'Heaviness',
-    explainer: 'How heavy is the bleeding?',
+    header: "Heaviness",
+    explainer: "How heavy is the bleeding?",
   },
   exclude: {
-    header: 'Exclude',
-    explainer: "You can exclude this value if it's not menstrual bleeding",
-  },
+    header: "Exclude",
+    explainer: "You can exclude this value if it's not menstrual bleeding"
+  }
 }
 
 export const cervix = {
   subcategories: {
     opening: 'opening',
     firmness: 'firmness',
-    position: 'position',
+    position: 'position'
   },
   opening: {
     categories: ['closed', 'medium', 'open'],
-    explainer: 'Is your cervix open or closed?',
+    explainer: 'Is your cervix open or closed?'
   },
   firmness: {
     categories: ['hard', 'soft'],
-    explainer: "When it's hard, it might feel like the tip of your nose",
+    explainer: "When it's hard, it might feel like the tip of your nose"
   },
   position: {
     categories: ['low', 'medium', 'high'],
-    explainer: 'How high up in the vagina is the cervix?',
+    explainer: 'How high up in the vagina is the cervix?'
   },
-  excludeExplainer:
-    "You can exclude this value if you don't want to use it for fertility detection.",
+  excludeExplainer: "You can exclude this value if you don't want to use it for fertility detection.",
+  actionHint: 'Choose values for at least "Opening" and "Firmness" to save.'
 }
 
 export const mucus = {
   subcategories: {
     feeling: 'feeling',
-    texture: 'texture',
+    texture: 'texture'
   },
   feeling: {
     categories: ['dry', 'nothing', 'wet', 'slippery'],
-    explainer: 'What does your vaginal entrance feel like?',
+    explainer: 'What does your vaginal entrance feel like?'
   },
   texture: {
     categories: ['nothing', 'creamy', 'egg white'],
-    explainer:
-      'Looking at and touching your cervical mucus, which describes it best?',
+    explainer: "Looking at and touching your cervical mucus, which describes it best?"
   },
-  excludeExplainer:
-    "You can exclude this value if you don't want to use it for fertility detection",
+  excludeExplainer: "You can exclude this value if you don't want to use it for fertility detection",
+  actionHint: 'Choose values for both "Feeling" and "Texture" to save.'
 }
 
 export const desire = {
   header: 'Intensity',
-  explainer: 'How would you rate your sexual desire?',
+  explainer: 'How would you rate your sexual desire?'
 }
 
 export const sex = {
-  categories: {
+  categories:{
     solo: 'solo',
     partner: 'partner',
   },
-  header: 'Activity',
+  header: "Activity",
   explainer: 'Were you sexually active today?',
 }
 
 export const contraceptives = {
-  categories: {
+  categories:{
     condom: 'condom',
     pill: 'pill',
     iud: 'iud',
@@ -79,8 +78,8 @@ export const contraceptives = {
     none: 'none',
     other: 'other',
   },
-  header: 'Contraceptives',
-  explainer: 'Did you use contraceptives?',
+  header: "Contraceptives",
+  explainer: 'Did you use contraceptives?'
 }
 
 export const pain = {
@@ -92,9 +91,9 @@ export const pain = {
     nausea: 'nausea',
     tenderBreasts: 'tender breasts',
     migraine: 'migraine',
-    other: 'other',
+    other: 'other'
   },
-  explainer: 'How did your body feel today?',
+  explainer: 'How did your body feel today?'
 }
 
 export const mood = {
@@ -108,39 +107,34 @@ export const mood = {
     energetic: 'energetic',
     fatigue: 'fatigue',
     angry: 'angry',
-    other: 'other',
+    other: 'other'
   },
-  explainer: 'How did you feel today?',
+  explainer: 'How did you feel today?'
 }
 
 export const temperature = {
-  outOfRangeWarning:
-    'This temperature value is out of the current range for the temperature chart. You can change the range in the settings.',
-  outOfAbsoluteRangeWarning:
-    'This temperature value is too high or low to be shown on the temperature chart.',
+  outOfRangeWarning: 'This temperature value is out of the current range for the temperature chart. You can change the range in the settings.',
+  outOfAbsoluteRangeWarning: 'This temperature value is too high or low to be shown on the temperature chart.',
   temperature: {
-    header: 'Temperature',
-    explainer:
-      'Take your temperature right after waking up, before getting out of bed',
+    header: "Temperature",
+    explainer: 'Take your temperature right after waking up, before getting out of bed'
   },
-  time: 'Time',
+  time: "Time",
   note: {
-    header: 'Note',
-    explainer:
-      'Is there anything that could have influenced this value, such as bad sleep or alcohol consumption?',
+    header: "Note",
+    explainer: 'Is there anything that could have influenced this value, such as bad sleep or alcohol consumption?'
   },
   exclude: {
-    header: 'Exclude',
-    explainer:
-      "You can exclude this value if you don't want to use it for fertility detection",
-  },
+    header: "Exclude",
+    explainer: "You can exclude this value if you don't want to use it for fertility detection"
+  }
 }
 
-export const noteExplainer = 'Anything you want to add for the day?'
+export const noteExplainer = "Anything you want to add for the day?"
 
 export const general = {
-  cycleDayNumber: 'Cycle day ',
-  today: 'Today',
+  cycleDayNumber: "Cycle day ",
+  today: "Today"
 }
 
 export const sharedDialogs = {
@@ -150,5 +144,5 @@ export const sharedDialogs = {
   reallyDeleteData: 'Yes, I am sure',
   save: 'Save',
   delete: 'Delete',
-  disabledInfo: 'There is some data missing',
+  disabledInfo: 'There is some data missing'
 }

i18n/en/settings.js

@@ -1,11 +1,6 @@
 import links from './links'
 
 export default {
-  customization: {
-    title: 'Customization',
-    trackingCategories: 'Tracking categories',
-    subheaderSymptoThermalMethod: 'Sympto-thermal method settings',
-  },
   export: {
     errors: {
       noData: 'There is no data to export',
@@ -37,16 +32,17 @@ 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',
     saveError: 'Could not save temperature scale settings',
-    disabled: 'Disabled',
-    disabledMessage:
-      'To use the temperature scale please first enable temperature tracking 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',
@@ -72,24 +68,21 @@ export default {
   },
   fertilityTracking: {
     title: 'Fertility phases calculation',
-    disabledTitle: 'Disabled',
-    disabled:
-      'To use fertility phases calculation please enable both temperature tracking and either cervical mucus or cervix tracking above.',
     message:
-      'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal method, drip will calculate cycle phases with the provided data.',
+      'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal rules, drip will calculate cycle phases with the provided data.',
     on: 'If you switch this off, drip will not show fertility related information.',
     off: 'If you switch this on, drip will show fertility related information.',
   },
   secondarySymptom: {
     title: 'Secondary symptom',
     cervixModeOn:
-      'Cervix values are being used for fertility detection according to the sympto-thermal method.',
+      'Cervix values are being used for symptothermal fertility detection. You can switch here to use cervical mucus values for symptothermal fertility detection',
     cervixModeOff:
-      'Cervical mucus values are being used for fertility detection according to the sympto-thermal method.',
+      'By default, cervical mucus values are being used for symptothermal fertility detection. You can switch here to use cervix values for symptothermal fertility detection',
     disabled: {
       title: 'Disabled',
       message:
-        'To set a secondary symptom please first enable the cervical mucus or cervix tracking category as well as temperature and fertility phases calculation above.',
+        'To set a secondary symptom please first enable the temperature, cervical mucus or cervix tracking category as well as the fertility feature above.',
       noSecondaryEnabled:
         'To switch the secondary symptom both cervical mucus and cervix need to be enabled above.',
     },
@@ -99,7 +92,7 @@ export default {
   periodPrediction: {
     title: 'Period predictions',
     on: 'drip predicts your 3 next menstrual bleedings based on statistics if you previously tracked at least 3 complete cycles.',
-    off: 'There are no predictions for menstrual cycles displayed. If turned on, the calendar and the home screen will display period predictions.',
+    off: 'There are no predictions for menstrual cycles displayed. If turned on the calendar and the home screen will display period predictions.',
   },
   passwordSettings: {
     title: 'App password',
@@ -142,6 +135,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 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 sympto-thermal 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

@@ -25,7 +25,7 @@ export default {
 After tracking at least 3 menstrual cycles, drip. will give you an overview of
 · how long your cycles last on average (in "stats"),
 · whether the length of your cycles varied significantly (in "stats" and in bleeding predictions)
-· and predict your next 3 cycles with a range of 3 or 5 days (on home screen and "calendar") if this functionality is enabled in the customization settings.
+· and predict your next 3 cycles with a range of 3 or 5 days (on home screen and "calendar").
 
 The app allows you to track different intensities of bleeding. On the chart and on the calendar, bleeding values are colored in different shades of red. The darker, the more intense your bleeding. Every bleeding value that is not excluded is taken into account for fertility calculation and period predictions.
 
@@ -74,7 +74,7 @@ ${generalInfo.curiousNfp}`,
     title: 'Tracking cervical mucus',
     text: `Cervical mucus can help determine in which phase of the menstrual cycle you are.
 
-By default the secondary symptom the app uses for the sympto-thermal method is cervical mucus. You can change this in the customization settings.
+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 values following the sympto-thermal method.

ios/drip/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2403.19</string>
+	<string>1.2402.23</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drip.",
-  "version": "1.2403.19",
+  "version": "1.2402.23",
   "contributors": [
     "Julia Friesel <julia.friesel@gmail.com>",
     "Marie Kochsiek",

styles/colors.js

@@ -18,7 +18,6 @@ const shadesOfPink = ['#c485a6', '#b15c89', pinkColor] // light to dark
 const lightGreenColor = '#bccd67'
 const orangeColor = '#bc6642'
 const mintColor = '#6ca299'
-const turquoiseDark = '#69CBC1'
 
 export default {
   greyDark: '#555',
@@ -28,7 +27,7 @@ export default {
   orange: '#F38337',
   purple: '#3A2671',
   purpleLight: '#938EB2',
-  turquoiseDark: turquoiseDark,
+  turquoiseDark: '#69CBC1',
   turquoise: '#CFECEA',
   turquoiseLight: '#E9F2ED',
   iconColors: {
@@ -36,9 +35,6 @@ export default {
       color: redColor,
       shades: shadesOfRed,
     },
-    temperature: {
-      color: turquoiseDark,
-    },
     mucus: {
       color: violetColor,
       shades: shadesOfViolet,

styles/spacing.js

@@ -1,11 +1,10 @@
 import { scale } from 'react-native-size-matters'
 
 export default {
-  zero: '0%',
   tiny: scale(4),
   small: scale(10),
   base: scale(16),
   large: scale(20),
   symptomTileWidth: '48%',
-  textWidth: '70%',
+  textWidth: '70%'
 }