specify tracking category cervical mucus

android/app/build.gradle

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

components/common/app-switch.js

@@ -1,10 +1,10 @@
 import React from 'react'
-import { StyleSheet, Switch, View } from 'react-native'
+import { Platform, StyleSheet, Switch, View } from 'react-native'
 import PropTypes from 'prop-types'
 
 import AppText from './app-text'
 
-import { Colors, Containers } from '../../styles'
+import { Colors, Containers, Spacing } from '../../styles'
 
 const AppSwitch = ({ onToggle, text, value, disabled }) => {
   const trackColor = { true: Colors.turquoiseDark }
@@ -34,9 +34,14 @@ AppSwitch.propTypes = {
 const styles = StyleSheet.create({
   container: {
     ...Containers.rowContainer,
+    marginTop: Spacing.tiny,
   },
   switch: {
     flex: 1,
+    transform:
+      Platform.OS === 'ios'
+        ? [{ scaleX: 0.8 }, { scaleY: 0.8 }]
+        : [{ scaleX: 1 }, { scaleY: 1 }],
   },
   textContainer: {
     flex: 4,

components/settings/customization/index.js

@@ -161,7 +161,6 @@ const Settings = () => {
     if (!cervix && mucus) {
       setUseCervixAsSecondarySymptom(0)
       saveUseCervixAsSecondarySymptom(0)
-    } else if (cervix && mucus) {
     } else if (cervix && !mucus) {
       setUseCervixAsSecondarySymptom(1)
       saveUseCervixAsSecondarySymptom(1)
@@ -202,7 +201,6 @@ const Settings = () => {
           text={SYMPTOMS[1]}
           value={isTemperatureTrackingCategoryEnabled}
         />
-
         <AppSwitch
           onToggle={(enabled) => {
             mucusTrackingCategoryToggle(enabled)
@@ -210,7 +208,6 @@ const Settings = () => {
           text={SYMPTOMS[2]}
           value={isMucusTrackingCategoryEnabled}
         />
-
         <AppSwitch
           onToggle={(enabled) => {
             cervixTrackingCategoryToggle(enabled)
@@ -218,7 +215,6 @@ const Settings = () => {
           text={SYMPTOMS[3]}
           value={isCervixTrackingCategoryEnabled}
         />
-
         <AppSwitch
           onToggle={sexTrackingCategoryToggle}
           text={SYMPTOMS[4]}
@@ -246,23 +242,21 @@ const Settings = () => {
         />
       </Segment>
       <Pressable onPress={sliderDisabledPrompt}>
-
         <Segment title={labels.fertilityTracking.title}>
           {isTemperatureTrackingCategoryEnabled &&
-           isMucusTrackingCategoryEnabled ||
+          (isMucusTrackingCategoryEnabled ||
-           isCervixTrackingCategoryEnabled ?
+            isCervixTrackingCategoryEnabled) ? (
-           (
+            <>
-              <>
+              <AppText>{labels.fertilityTracking.message}</AppText>
-                <AppSwitch
+              <AppSwitch
-                  onToggle={fertilityTrackingToggle}
+                onToggle={fertilityTrackingToggle}
-                  text={fertilityTrackingText}
+                text={fertilityTrackingText}
-                  value={isFertilityTrackingEnabled}
+                value={isFertilityTrackingEnabled}
-                />
+              />
-              </>
+            </>
-            ) :
+          ) : (
-            (
             <AppText>{labels.disabled.message}</AppText>
-            )}
+          )}
         </Segment>
       </Pressable>
 
@@ -280,7 +274,6 @@ const Settings = () => {
         </Segment>
       </Pressable>
 
-      {/* used to be switch for onCervixToggle */}
       <Pressable onPress={secondarySymptomDisabledPrompt}>
         <Segment title={labels.secondarySymptom.title}>
           {!isFertilityTrackingEnabled ? (

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/settings.js

@@ -41,7 +41,7 @@ export default {
   disabled: {
     title: 'This feature is turned off',
     message:
-      'Please first enable the temperature tracking category in the customization settings.',
+      'To use the temperature scale please first enable the temperature tracking category above.',
   },
   tempReminder: {
     title: 'Temperature reminder',
@@ -68,8 +68,10 @@ export default {
   },
   fertilityTracking: {
     title: 'Fertility phases calculation',
-    on: 'The quick brown fox jumps over the lazy dog',
+    message:
-    off: 'No no',
+      'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal rules, drip will calculate cycle phases with the provided data.',
+    on: 'If you switch this off, drip will not show fertility related information.',
+    off: 'If you switch this on, drip will show fertility related information.',
   },
   secondarySymptom: {
     title: 'Secondary symptom',
@@ -80,16 +82,16 @@ export default {
     disabled: {
       title: 'Disabled',
       message:
-        'To set a secondary symptom please first enable the temperature, cervical mucus or cervix tracking category as well as the fertility feature in the customization settings.',
+        'To set a secondary symptom please first enable the temperature, cervical mucus or cervix tracking category as well as the fertility feature above.',
       noSecondaryEnabled:
-        'To switch the secondary symptom both cervical mucus an cervix need to be enabled in the customization settings.',
+        'To switch the secondary symptom both cervical mucus and cervix need to be enabled above.',
     },
     mucus: 'cervical mucus',
     cervix: 'cervix',
   },
   periodPrediction: {
     title: 'Period predictions',
-    on: 'drip predicts your 3 next menstrual bleedings based on the statistics of your previously tracked cycles, min 3 complete cycles.',
+    on: 'drip predicts your 3 next menstrual bleedings based on statistics if you previously tracked at least 3 complete cycles.',
     off: 'There are no predictions for menstrual cycles displayed. If turned on the calendar and the home screen will display period predictions.',
   },
   passwordSettings: {

ios/drip/Info.plist

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

package.json

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