Release: iOS-1.2401.17

.gitignore

@@ -59,9 +59,8 @@ buck-out/
 # Bundle artifact
 *.jsbundle
 
-# Ruby / CocoaPods
+# CocoaPods
 /ios/Pods/
-/vendor/bundle/
 
 # RN android release
 android/app/bin/

.gitlab-ci.yml

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

.gitlab/issue_templates/bug-template.md

@@ -1,29 +1,26 @@
-## 🐛 Oh no, a bug 🐛
+## oh no a bug 🐛
 
-### What happened?
+### Description what has happened
 
-Short overview of how the bug manifests.
+Short overview how the bug manifests.
 
-### What is the expected behaviour?
+### which OS + version is your device
-
-_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 a screenshot
+### describe how it looks or add screenshot
 
-Feel free to attach a file 📎
+feel free to attach a file 📎
 
-### Any ideas on how to solve it? 💡
+### any idea to solve it
+
+💡

.gitlab/issue_templates/chore-template.md

@@ -1,23 +1,22 @@
-## 🪠 This has to be done 🪠
+## This has to be done 🪠
 
-### What has to be done?
+### Description 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 should the ideal outcome be? 🎆
+### what shall be the ideal outcome 🎆
 
-_You can, e.g., specify the version number for a library update_
+_You can e.g. specify here the version number for a library update_

.gitlab/issue_templates/feature-template.md

@@ -1,26 +1,19 @@
-## 🧩 Yeah, a feature idea! 🧩
+## Yeah a feature idea 🧩
 
-### This feature is a ...
+### what should this feature do or solve? 🪄
-
-- [ ] 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.
 
-### Who is this feature for?
+### what is particularly important to the people who would use this feature?
 
-### What is particularly important to the people who would use this feature?
+Do you have certain user groups in mind?
 
-### Where in the app should the feature be added?
+### Any idea where it shall be placed in the app?
 
-### Is it connected with or dependent on some other feature?
+### is it connected with or dependent on some other feature?
 
-### How should the feature look (sketch or mock-up)?
+### any idea how it shall look (sketch?)
 
-Feel free to attach a file 📎
+feel free to attach a file 📎
 
-### What could be difficulties (esp. integrating with other components)? 🪆
+### what could be difficulties (with other components) 🪆
-
-### Do you want to work on this yourself?

CHANGELOG.md

@@ -2,47 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## v1.2403.19 Android & iOS
-
-### Changes
-
-- Disables temperature slider if temperature tracking off
-- Disables secondary symptom if fertility and or cervix/cervical mucus are off
-- Disables temperature reminder if temperature tracking off
-- Disabled period reminder if period predictions off
-- Return from sympto adapter if fertility off
-- Restructure settings menu
-- Unify wording to "sympto-thermal method"
-- Format decimal to x.0 instead of x.00 used for standard deviation and average cycle in stats
-- Use SelectTabGroup for secondary symptom customization
-
-- Android changes after updating React Native to 0.68.3
-- Update Android Gradle plugin from 7.0.3 to 7.0.4
-- Update NDK to "24.0.8215888" only for M1 users which added support for aarch64
-- Update metadata phone screenshots for Fdroid store listing
-- Updated dependencies:
-  - @react-native-community/datetimepicker from 6.3.1 to 7.2.0
-  - @react-native-async-storage/async-storage from ^1.17.9 to ^1.18.2
-  - metro-react-native-babel-preset from ^0.66.2 to ^0.67.0
-
-### Adds
-
-- Customization settings can turn on & off:
-
-  - Tracking categories
-  - Period predictions
-  - Fertility phases calculation
-
-- Home displays text elements depending on customization settings
-- Chart displays tracking category elements depending on customization settings
-- CycleDay displays tracking category elements and exclude switch depending on customization settings
-- Reminder can be disabled depending on customization settings
-- Adds disabled and more styling to AppSwitch
-- Adds TrackingCategorySwitch
-- Adds disabled, more styling and alert to SelectTabGroup
-- Adds more marginTop to License page
-- Adds info text to Password menu item in Settings
-
 ## v1.2401.17 iOS
 
 ### Changes

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

@@ -1,31 +1,14 @@
-# How to release
+# How to release a new app version for Android
 
-drip is developed in React Native for iOS and Android and is released on 4 different platforms:
+_Note: You need the release-key for Android to bundle a signed release that can be uploaded and published via the Google Play Store. A similar process for Apple requires a certificate to upload and publish the app to the App Store. More documentation on 'How to release a new app version for iOS' coming soon._
 
-1. [Google Play Store](https://play.google.com/store/apps/details?id=com.drip)
+# Table of Contents
-2. [Apple App Store](https://apps.apple.com/us/app/drip/id1584564949)
-3. [F-Droid](https://f-droid.org/packages/com.drip/)
-4. [drip Website](https://dripapp.org)
 
-In an ideal world the app version is the same across platforms. In reality this has never been the case.
+1. [version updating](#Version-updating)
-
+2. [android building](#Building-in-Android)
-Releasing a new version is very exciting and brings happy changes like fixing a bug, improving a feature, updating dependencies or adding a new functionality to the app. It is more than just pressing the button "publish new version".
+    - [APK](#APK)
-
+    - [AAB](#AAB)
-_Note_: You need the release-key for Android to bundle a signed release that can be uploaded and published via the Google Play Store. A similar process for Apple requires a certificate to upload and publish the app to the App Store.
+3. [release sharing](#Share-the-release)
-
-### Release steps
-
-1. [Version updating](#version-updating)
-2. [Android builds](#android-builds)
-3. [iOS builds](#ios-builds)
-4. [User testing](#user-testing)
-5. [Changelog](#changelog)
-6. [Release notes](#release-notes)
-7. [Release tag](#release-tag)
-8. [Phone screenshots](#phone-screenshots)
-9. [Publishing](#publishing)
-10. [Communication](#communication)
-11. [Self care](#self-care)
 
 ## Version updating
 
@@ -42,16 +25,7 @@ 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**
+## Building in Android
-
-Update the version number for iOS in `ios/drip/Info.plist` under:
-
-```
-<key>CFBundleShortVersionString</key>
-<string>1.2403.19</string>
-```
-
-### Android builds
 
 APK versus AAB
 
@@ -59,7 +33,7 @@ APK versus AAB
 
 (https://developer.android.com/build/building-cmdline)
 
-#### APK
+### APK
 
 To build a release apk file, run the following command:
 
@@ -81,7 +55,7 @@ _which is a shortcut for:_ `zipalign -v -p 4 ./android/app/build/outputs/apk/rel
 
 It adds a file name `app-release_signed.apk` in the same folder in `./android/app/build/outputs/apk/release/`
 
-#### AAB
+### AAB
 
 To build a release aab file, run:
 
@@ -101,74 +75,29 @@ 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`
 
-### iOS builds
+## Share the release
 
-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".
+### Gitlab repository
-
-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
-
-## User testing
-
-To enable external testing you need to remember that Google Play and Apple App Store might take up to 1 day for their review process. "External testing" for iOS allows testing drip on Testflight anonymously via a public link. "Open testing" for Android allows testing drip on Google Play as beta tester below the normal production listing.
 
 For a quick and easy way to share an apk to testers who are willing to sideload drip onto their Android phones, do this: Upload a signed apk to the Gitlab repository of the drip website under `/release` https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/tree/main/release and maybe adapt the name of the apk with a more specific name than "app-release.apk". Now you can simply share a direct link to download your newly bundled apk, e.g. [a download link for v1.2311.14](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/main/release/v1.2311.14.apk).
 
-## Changelog
-
-The [changelog](https://gitlab.com/bloodyhealth/drip/-/blob/main/CHANGELOG.md) should reflect the technical / code changes between a previous and the new version. Please update the changelog file with any relevant additions, fixes and changes in the following format:
-
-**v1.yymm.d**
-
-**Changes**
-
-Changing the color of funky button
-Updating a library from 1.2.3 to 2.3.4
-
-**Adds**
-
-New feature for calendar
-
-**Fixed**
-
-Small bug in chart
-
-## Release notes
-
-These notes are for the users and curious ones who may want to start using drip. They should be based on the changelog but written in a friendly and easy to understand way. The focus is on the user perspective and the impact of the changes for the user. Behind the scenes and in depth code changes are less relevant.
-
-Google Play limits these notes to 500 characters, whereas Apple's App Store limits these notes to 4.000 characters. In Fdroid there are no release notes.
-
-## Release tag
-
-[Tags](https://gitlab.com/bloodyhealth/drip/-/tags) can mark a specific point in the coding/commmit history and helps us identify the version status of a released app. They are named "iOS-v1.2401.17" or "Release-v1.yymm.d".
-
-## Phone screenshots
-
-If there are visual changes in the app you may want to update the screenshots for the Google Play Store listing, which allows up to 8 and for Apple's App Store, which allows up to 10 screenshots. Keep in mind that both Google Play and Apple have specific resolution requirements. You'll find Google's in Grow -> Store presence -> Main Store Listing -> Phone screenshots and Apple's on the main App Store Connect site. Here is a link for [Apple's screenshot specifications](https://developer.apple.com/help/app-store-connect/reference/screenshot-specifications).
-
-Please also update [phone screenshots for the website](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/tree/main/assets) and set links on [/index](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L47) and [/media](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/c7f999bb7ad736345321537cbffa3f4c24eeee6d/media.html#L33) that can then also be attached to a social media post.
-
-## Publishing
-
 ### Google Play Console
 
 Upload a signed aab to the [Google Play Console for developers](https://play.google.com/console/) and add it to the "App bundle explorer". This requires a higher versionCode and a different version name compared to previously uploaded aab or apk files.
 You can decide if you want the new app version to get released for testing (internal, closed or open) or for production. Keep in mind that any track other than "internal testing" triggers an external review by Google and might take a few hours.
 
-### Apple App Store Connect
+#### Phone screenshots
 
-Upload a new version and submit it for review, before it can be published.
+If there are visual changes in the app you may want to update the screenshots for the Google Play Store listing. Keep in mind that Google Play has specific resolution requirements. You'll find them in Grow -> Store presence -> Main Store Listing -> Phone screenshots.
 
 ### drip website
 
-After a new version has been published on Google Play (or F-Droid) the apk version that is downloadable directly from the [drip website](https://dripapp.org) needs to get updated as well. Therefore you upload a signed apk to the [repository](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/) as [we did in this commit](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/commit/f8c0f90c1ae9f23bf8e1bc311790b85443149a4d), and adapt the name and link on /index.html [as we did in this commit](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/commit2f8850ff5fa78615a4f335b625ea4a67d4acf03a) and [this commit](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/commit/f3da9776b1943ffa32458e74ef86eeca98c1891c). Last time I checked it was [here](f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L114).
+After a new version has been published on Google Play (or F-Droid) the apk version that is downloadable directly from the [drip website](https://dripapp.org) needs to get updated as well. Therefore you upload a signed apk to the [repository](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/) and adapt the name and link on /index.html.
+Last time I checked it was [here](f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L114).
 
-## Communication
+#### Phone screenshots
+
+Please also update [phone screenshots here](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/tree/main/assets) and set links on [/index](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L47) and [/media](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/c7f999bb7ad736345321537cbffa3f4c24eeee6d/media.html#L33) that can then also be attached to a social media post.
 
 You probably want to share the app update by posting on one or more of these platforms:
 
@@ -177,7 +106,3 @@ You probably want to share the app update by posting on one or more of these pla
 - [Ko-fi](https://ko-fi.com/dripapp)
 - [Linkedin](https://www.linkedin.com/company/34899684/)
 - Different tech, privacy, feminist oriented slacks
-
-## Self care
-
-Congratulations. Take a break, eat some chocolate, go see a live show of your favorite band, masturbate <3!

android/app/build.gradle

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

android/app/src/debug/AndroidManifest.xml

@@ -8,6 +8,6 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
         tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
     </application>    
 </manifest>

android/app/src/debug/java/com/drip/ReactNativeFlipper.java

@@ -1,10 +1,10 @@
 /**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
  */
-package com.drip;
+package com.rndiffapp;
 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.android.utils.FlipperUtils;
@@ -18,7 +18,6 @@ import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
 import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
-import com.facebook.react.ReactInstanceEventListener;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.NetworkingModule;
@@ -47,7 +46,7 @@ public class ReactNativeFlipper {
       ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
       if (reactContext == null) {
         reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceEventListener() {
+            new ReactInstanceManager.ReactInstanceEventListener() {
               @Override
               public void onReactContextInitialized(ReactContext reactContext) {
                 reactInstanceManager.removeReactInstanceEventListener(this);

android/app/src/main/AndroidManifest.xml

@@ -57,12 +57,12 @@
 
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="sensorPortrait"
+            android:screenOrientation="sensorPortrait">
-            android:exported="true">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/app/src/main/java/com/drip/MainActivity.java

@@ -1,8 +1,6 @@
 package com.drip;
 
 import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactRootView;
 
 public class MainActivity extends ReactActivity {
 
@@ -14,27 +12,4 @@ public class MainActivity extends ReactActivity {
   protected String getMainComponentName() {
     return "drip";
   }
-
-  /**
-   * Returns the instance of the {@link ReactActivityDelegate}. There the RootView is created and
-   * you can specify the rendered you wish to use (Fabric or the older renderer).
-   */
-  @Override
-  protected ReactActivityDelegate createReactActivityDelegate() {
-    return new MainActivityDelegate(this, getMainComponentName());
-  }
- 
-  public static class MainActivityDelegate extends ReactActivityDelegate {
-    public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
-      super(activity, mainComponentName);
-    }
- 
-    @Override
-    protected ReactRootView createRootView() {
-      ReactRootView reactRootView = new ReactRootView(getContext());
-      // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-      return reactRootView;
-    }
-  }
 }
-

android/app/src/main/java/com/drip/MainApplication.java

@@ -8,7 +8,6 @@ import com.facebook.react.ReactInstanceManager;
 import cl.json.ShareApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.soloader.SoLoader;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
@@ -63,7 +62,7 @@ public class MainApplication extends Application implements ReactApplication, Sh
          We use reflection here to pick up the class that initializes Flipper,
         since Flipper library is not available in release mode
         */
-        Class<?> aClass = Class.forName("com.drip.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.rndiffapp.ReactNativeFlipper");
         aClass
             .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);

android/build.gradle

@@ -1,5 +1,3 @@
-import org.apache.tools.ant.taskdefs.condition.Os
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
@@ -9,9 +7,8 @@ buildscript {
     }
     ext.kotlinVersion = '1.3.40'
     dependencies {
-        classpath('com.android.tools.build:gradle:7.0.4')
+        classpath('com.android.tools.build:gradle:7.0.3')
-        classpath("com.facebook.react:react-native-gradle-plugin")
+
-        classpath("de.undercouch:gradle-download-task:4.1.2")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -53,12 +50,5 @@ ext {
     minSdkVersion = 21
     compileSdkVersion = 33
     targetSdkVersion = 33
-
+    ndkVersion = "21.4.7075529"
-    if (System.properties['os.arch'] == "aarch64") {
-        // For M1 Users we need to use the NDK 24 which added support for aarch64
-        ndkVersion = "24.0.8215888"
-    } else {
-        // Otherwise we default to the side-by-side NDK version from AGP.
-        ndkVersion = "21.4.7075529"
-    }
 }

android/gradle.properties

@@ -9,8 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -25,16 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.125.0
+FLIPPER_VERSION=0.99.0
 
-# Use this property to specify which architecture you want to build.
+# https://github.com/facebook/react-native/issues/30729
-# You can also override it from the CLI using
+org.gradle.jvmargs=-Xmx4g
-# ./gradlew <task> -PreactNativeArchitectures=x86_64
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
-
-# Use this property to enable support to the new architecture.
-# This will allow you to use TurboModules and the Fabric render in
-# your application. You should enable this flag either if you want
-# to write custom TurboModules/Fabric components OR use libraries that
-# are providing them.
-newArchEnabled=false

components/Home.js

@@ -14,10 +14,7 @@ import {
   determinePredictionText,
   formatWithOrdinalSuffix,
 } from './helpers/home'
-import {
+import { periodPredictionObservable } from '../local-storage'
-  fertilityTrackingObservable,
-  periodPredictionObservable,
-} from '../local-storage'
 
 import { Colors, Fonts, Sizes, Spacing } from '../styles'
 import { LocalDate } from '@js-joda/core'
@@ -31,12 +28,11 @@ const Home = ({ navigate, setDate }) => {
     navigate('CycleDay')
   }
 
-  const isFertilityTrackingEnabled = fertilityTrackingObservable.value
   const todayDateString = LocalDate.now().toString()
   const { getCycleDayNumber, getPredictedMenses } = cycleModule()
   const cycleDayNumber = getCycleDayNumber(todayDateString)
   const { status, phase, statusText } =
-    isFertilityTrackingEnabled && getFertilityStatusForDay(todayDateString)
+    getFertilityStatusForDay(todayDateString)
   const isPeriodPredictionEnabled = periodPredictionObservable.value
   const prediction = determinePredictionText(getPredictedMenses(), t)
 
@@ -51,7 +47,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,9 +55,7 @@ const Home = ({ navigate, setDate }) => {
           </AppText>
         </View>
       )}
-
+      {phase && (
-      {/* 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}>
             {formatWithOrdinalSuffix(phase)}
@@ -74,14 +67,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 +110,6 @@ const styles = StyleSheet.create({
     color: 'white',
     fontSize: Sizes.subtitle,
   },
-  largePadding: {
-    padding: Spacing.large,
-  },
 })
 
 Home.propTypes = {

components/chart/chart.js

@@ -21,9 +21,6 @@ import {
   noteTrackingCategoryObservable,
   painTrackingCategoryObservable,
   sexTrackingCategoryObservable,
-  temperatureTrackingCategoryObservable,
-  mucusTrackingCategoryObservable,
-  cervixTrackingCategoryObservable,
 } from '../../local-storage'
 import { makeColumnInfo } from '../helpers/chart'
 
@@ -74,10 +71,6 @@ const CycleChart = ({ navigate, setDate }) => {
   const symptomRowEnabledSymptoms = symptomRowSymptoms.filter((symptom) => {
     if (symptom === 'sex') {
       return sexTrackingCategoryObservable.value ? symptom : null
-    } else if (symptom === 'mucus') {
-      return mucusTrackingCategoryObservable.value ? symptom : null
-    } else if (symptom === 'cervix') {
-      return cervixTrackingCategoryObservable.value ? symptom : null
     } else if (symptom === 'desire') {
       return desireTrackingCategoryObservable.value ? symptom : null
     } else if (symptom === 'pain') {
@@ -91,11 +84,7 @@ const CycleChart = ({ navigate, setDate }) => {
     }
   })
 
-  const isTemperatureEnabled = temperatureTrackingCategoryObservable.value
+  const shouldShowTemperatureColumn = chartSymptoms.indexOf('temperature') > -1
-  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)
@@ -146,7 +135,7 @@ const CycleChart = ({ navigate, setDate }) => {
     >
       <View style={styles.chartContainer}>
         {shouldShowHint && <Tutorial onClose={hideHint} />}
-        {shouldShowNoDataWarning && <NoTemperature />}
+        {!shouldShowTemperatureColumn && <NoTemperature />}
         <View style={styles.chartArea}>
           <YAxis
             height={columnHeight}

components/common/app-switch.js

@@ -1,13 +1,12 @@
 import React from 'react'
-import { Platform, StyleSheet, Switch, View } from 'react-native'
+import { StyleSheet, Switch, View } from 'react-native'
 import PropTypes from 'prop-types'
 
 import AppText from './app-text'
 
-import { Colors, Containers, Spacing } from '../../styles'
+import { Containers } from '../../styles'
 
-const AppSwitch = ({ onToggle, text, value, disabled }) => {
+const AppSwitch = ({ onToggle, text, value, trackColor, disabled }) => {
-  const trackColor = { true: Colors.turquoiseDark }
   return (
     <View style={styles.container}>
       <View style={styles.textContainer}>
@@ -28,20 +27,16 @@ AppSwitch.propTypes = {
   onToggle: PropTypes.func.isRequired,
   text: PropTypes.string,
   value: PropTypes.bool,
+  trackColor: PropTypes.string,
   disabled: PropTypes.bool,
 }
 
 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/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/cycle-day-overview.js

@@ -15,9 +15,6 @@ import {
   noteTrackingCategoryObservable,
   painTrackingCategoryObservable,
   sexTrackingCategoryObservable,
-  temperatureTrackingCategoryObservable,
-  mucusTrackingCategoryObservable,
-  cervixTrackingCategoryObservable,
 } from '../../local-storage'
 import { Spacing } from '../../styles'
 import { SYMPTOMS } from '../../config'
@@ -38,14 +35,8 @@ const CycleDayOverView = ({ date, setDate, isTemperatureEditView }) => {
   }
 
   const allEnabledSymptoms = SYMPTOMS.map((symptom) => {
-    if (symptom === 'temperature') {
+    if (symptom === 'sex') {
-      return temperatureTrackingCategoryObservable.value ? symptom : null
-    } else if (symptom === 'sex') {
       return sexTrackingCategoryObservable.value ? symptom : null
-    } else if (symptom === 'mucus') {
-      return mucusTrackingCategoryObservable.value ? symptom : null
-    } else if (symptom === 'cervix') {
-      return cervixTrackingCategoryObservable.value ? symptom : null
     } else if (symptom === 'desire') {
       return desireTrackingCategoryObservable.value ? symptom : null
     } else if (symptom === 'pain') {

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

@@ -1,61 +1,22 @@
 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
-  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
-      )
-    }
-  }
 
+export default function SelectTabGroup({ activeButton, buttons, onSelect }) {
   return (
     <View style={styles.container}>
       {buttons.map(({ label, value }, i) => {
-        const isActive =
+        const isActive = value === activeButton
-          value === activeButton || value === oneTimeTransformIntoNumber
+        const boxStyle = [styles.box, isActive && styles.boxActive]
-        const boxStyle = [
+        const textStyle = [styles.text, isActive && styles.textActive]
-          styles.box,
-          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={() =>
+            onPress={() => onSelect(value)}
-              !disabled ? onSelect(value) : showDisabledAlert(label)
-            }
             key={i}
             style={boxStyle}
           >
@@ -71,7 +32,6 @@ SelectTabGroup.propTypes = {
   activeButton: PropTypes.number,
   buttons: PropTypes.array.isRequired,
   onSelect: PropTypes.func.isRequired,
-  disabled: PropTypes.bool,
 }
 
 const styles = StyleSheet.create({
@@ -90,20 +50,4 @@ const styles = StyleSheet.create({
   textActive: {
     color: 'white',
   },
-  purpleBox: {
-    borderColor: Colors.purple,
-  },
-  activePurpleBox: {
-    backgroundColor: Colors.purple,
-  },
-  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
@@ -63,11 +63,11 @@ const SymptomBox = ({
         />
         <View style={styles.textContainer}>
           <AppText style={symptomNameStyle}>{t(symptom)}</AppText>
-          {symptomDataToDisplay ? (
+          {symptomDataToDisplay && (
             <AppText style={textStyle} numberOfLines={4}>
               {symptomDataToDisplay}
             </AppText>
-          ) : null}
+          )}
         </View>
       </TouchableOpacity>
     </>

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

@@ -12,22 +12,19 @@ import SelectBoxGroup from './select-box-group'
 import SelectTabGroup from './select-tab-group'
 import Temperature from './temperature'
 
-import { blank, save, shouldShow, symptomPage } from '../helpers/cycle-day'
+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'
 
 const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
-  const symptomConfig = symptomPage[symptom]
+  const symptomConfig = symtomPage[symptom]
   const [data, setData] = useState(symptomData ? symptomData : blank[symptom])
   const [shouldShowInfo, setShouldShowInfo] = useState(false)
-  const isBleeding = symptom === 'bleeding'
   const getParsedData = () => JSON.parse(JSON.stringify(data))
   const onPressLearnMore = () => setShouldShowInfo(!shouldShowInfo)
-  const isFertilityTrackingEnabled = fertilityTrackingObservable.value
 
   const onEditNote = (note) => {
     const parsedData = getParsedData()
@@ -117,15 +114,6 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
     style: styles.input,
     textAlignVertical: 'top',
   }
-  const excludeToggle = shouldShow(symptomConfig.excludeText) && (
-    <Segment style={styles.segmentBorder}>
-      <AppSwitch
-        onToggle={onExcludeToggle}
-        text={symptomPage[symptom].excludeText}
-        value={data.exclude}
-      />
-    </Segment>
-  )
 
   return (
     <AppModal onClose={onSave}>
@@ -140,16 +128,10 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
             save={(value, field) => onSaveTemperature(value, field)}
           />
         )}
-
-        {/* There should not be a line between the bleeding tab group and the exclude toggle */}
         {shouldShow(symptomConfig.selectTabGroups) &&
-          symptomPage[symptom].selectTabGroups.map((group) => {
+          symtomPage[symptom].selectTabGroups.map((group) => {
             return (
-              <Segment
+              <Segment key={group.key} style={styles.segmentBorder}>
-                key={group.key}
-                style={styles.segmentBorder}
-                last={isBleeding}
-              >
                 <AppText style={styles.title}>{group.title}</AppText>
                 <SelectTabGroup
                   activeButton={data[group.key]}
@@ -159,12 +141,8 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
               </Segment>
             )
           })}
-
-        {/*for bleeding, we want to move the "exclude" toggle up between the tab and box groups, all other symptoms should still have it at the bottom*/}
-        {isBleeding && excludeToggle}
-
         {shouldShow(symptomConfig.selectBoxGroups) &&
-          symptomPage[symptom].selectBoxGroups.map((group) => {
+          symtomPage[symptom].selectBoxGroups.map((group) => {
             const isOtherSelected =
               data['other'] !== null &&
               data['other'] !== false &&
@@ -189,21 +167,18 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
               </Segment>
             )
           })}
-        {/* show exclude AppSwitch for bleeding, mucus, cervix, temperature */}
+        {shouldShow(symptomConfig.excludeText) && (
-        {/* but if fertility is off only for bleeding */}
+          <Segment style={styles.segmentBorder}>
-        {shouldShow(symptomConfig.excludeText) &&
+            <AppSwitch
-          (symptom === 'bleeding' || isFertilityTrackingEnabled) && (
+              onToggle={onExcludeToggle}
-            <Segment style={styles.segmentBorder}>
+              text={symtomPage[symptom].excludeText}
-              <AppSwitch
+              value={data.exclude}
-                onToggle={onExcludeToggle}
+            />
-                text={symtomPage[symptom].excludeText}
+          </Segment>
-                value={data.exclude}
+        )}
-              />
-            </Segment>
-          )}
         {shouldShow(symptomConfig.note) && (
           <Segment style={styles.segmentBorder}>
-            <AppText>{symptomPage[symptom].note}</AppText>
+            <AppText>{symtomPage[symptom].note}</AppText>
             <AppTextInput
               {...inputProps}
               onChangeText={onEditNote}

components/helpers/chart.js

@@ -1,10 +1,6 @@
 import { LocalDate } from '@js-joda/core'
 
-import {
+import { scaleObservable, unitObservable } from '../../local-storage'
-  fertilityTrackingObservable,
-  scaleObservable,
-  unitObservable,
-} from '../../local-storage'
 import { getCycleStatusForDay } from '../../lib/sympto-adapter'
 import { getCycleDay, getAmountOfCycleDays } from '../../db'
 
@@ -274,8 +270,7 @@ export function nfpLines() {
     if (dateString < cycle.startDate) updateCurrentCycle(dateString)
     if (cycle.noMoreCycles) return ret
 
-    const tempShift =
+    const tempShift = cycle.status.temperatureShift
-      fertilityTrackingObservable.value && cycle.status.temperatureShift
 
     if (tempShift) {
       if (tempShift.firstHighMeasurementDay.date === dateString) {

components/helpers/cycle-day.js

@@ -23,7 +23,6 @@ const noteDescription = labels.noteExplainer
 const painLabels = labels.pain.categories
 const sexLabels = labels.sex.categories
 const temperatureLabels = labels.temperature
-const productLabels = labels.products.categories
 
 const minutes = ChronoUnit.MINUTES
 
@@ -61,15 +60,6 @@ export const blank = {
   bleeding: {
     exclude: false,
     value: null,
-    pad: null,
-    tampon: null,
-    underwear: null,
-    cup: null,
-    softTampon: null,
-    disk: null,
-    none: null,
-    other: null,
-    note: null,
   },
   cervix: {
     exclude: false,
@@ -135,10 +125,11 @@ export const blank = {
   },
 }
 
-export const symptomPage = {
+export const symtomPage = {
   bleeding: {
     excludeText: labels.bleeding.exclude.explainer,
     note: null,
+    selectBoxGroups: null,
     selectTabGroups: [
       {
         key: 'value',
@@ -146,13 +137,6 @@ export const symptomPage = {
         title: labels.bleeding.heaviness.explainer,
       },
     ],
-    selectBoxGroups: [
-      {
-        key: 'products',
-        options: productLabels,
-        title: labels.products.explainer,
-      },
-    ],
   },
   cervix: {
     excludeText: cervixLabels.excludeExplainer,
@@ -262,7 +246,12 @@ export const symptomPage = {
 
 export const save = {
   bleeding: (data, date, shouldDeleteData) => {
-    saveBoxSymptom(data, date, shouldDeleteData, 'bleeding')
+    const { exclude, value } = data
+    const isDataEntered = isNumber(value)
+    const valuesToSave =
+      shouldDeleteData || !isDataEntered ? null : { value, exclude }
+
+    saveSymptom('bleeding', date, valuesToSave)
   },
   cervix: (data, date, shouldDeleteData) => {
     const { opening, firmness, position, exclude } = data
@@ -340,36 +329,10 @@ const saveBoxSymptom = (data, date, shouldDeleteData, symptom) => {
 }
 
 const label = {
-  bleeding: (bleeding) => {
+  bleeding: ({ value, exclude }) => {
-    bleeding = mapRealmObjToJsObj(bleeding)
+    if (isNumber(value)) {
-    const bleedingLabel = []
+      const bleedingLabel = bleedingLabels[value]
-    if (bleeding && Object.values({ ...bleeding }).some((val) => val)) {
+      return exclude ? `(${bleedingLabel})` : bleedingLabel
-      Object.keys(bleeding).forEach((key) => {
-        if (bleeding[key] != null && key === 'value') {
-          bleedingLabel.push(
-            bleeding.exclude
-              ? `(${bleedingLabels[bleeding[key]]})`
-              : bleedingLabels[bleeding[key]]
-          )
-        }
-        if (
-          bleeding[key] &&
-          key !== 'other' &&
-          key !== 'note' &&
-          key !== 'value' &&
-          key !== 'exclude'
-        ) {
-          bleedingLabel.push(bleedingLabels[key] || productLabels[key])
-        }
-        if (key === 'other' && bleeding.other) {
-          let label = productLabels[key]
-          if (bleeding.note) {
-            label = `${label} (${bleeding.note})`
-          }
-          bleedingLabel.push(label)
-        }
-      })
-      return bleedingLabel.join(', ')
     }
   },
   temperature: ({ value, time, exclude }) => {

components/settings/customization/index.js

@@ -1,65 +1,39 @@
-import React, { useEffect, useState } from 'react'
+import React, { useState } from 'react'
-import { Alert, Pressable, StyleSheet, View } from 'react-native'
-import { useTranslation } from 'react-i18next'
 
-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 {
   desireTrackingCategoryObservable,
-  fertilityTrackingObservable,
   moodTrackingCategoryObservable,
   noteTrackingCategoryObservable,
   painTrackingCategoryObservable,
   sexTrackingCategoryObservable,
-  temperatureTrackingCategoryObservable,
-  mucusTrackingCategoryObservable,
-  cervixTrackingCategoryObservable,
-  periodPredictionObservable,
-  useCervixAsSecondarySymptomObservable,
   saveDesireTrackingCategory,
-  saveFertilityTrackingEnabled,
   saveMoodTrackingCategory,
   saveNoteTrackingCategory,
   savePainTrackingCategory,
-  saveMucusTrackingCategory,
-  saveCervixTrackingCategory,
   savePeriodPrediction,
   saveSexTrackingCategory,
-  saveTemperatureTrackingCategory,
+  saveUseCervix,
-  saveUseCervixAsSecondarySymptom,
+  periodPredictionObservable,
+  useCervixObservable,
 } from '../../../local-storage'
+import { Colors } from '../../../styles'
 import labels from '../../../i18n/en/settings'
-import { SYMPTOMS } from '../../../config'
 
 const Settings = () => {
-  const { t } = useTranslation(null, { keyPrefix: 'symptoms' })
+  const [shouldUseCervix, setShouldUseCervix] = useState(
-
+    useCervixObservable.value
-  const [useCervixAsSecondarySymptom, setUseCervixAsSecondarySymptom] =
+  )
-    useState(useCervixAsSecondarySymptomObservable.value)
 
   const [isPeriodPredictionEnabled, setPeriodPrediction] = useState(
     periodPredictionObservable.value
   )
 
-  const [isTemperatureTrackingCategoryEnabled, setTemperatureTrackingCategory] =
-    useState(temperatureTrackingCategoryObservable.value)
-
-  const [isMucusTrackingCategoryEnabled, setMucusTrackingCategory] = useState(
-    mucusTrackingCategoryObservable.value
-  )
-
-  const [isCervixTrackingCategoryEnabled, setCervixTrackingCategory] = useState(
-    cervixTrackingCategoryObservable.value
-  )
-
   const [isSexTrackingCategoryEnabled, setSexTrackingCategory] = useState(
     sexTrackingCategoryObservable.value
   )
@@ -80,33 +54,14 @@ const Settings = () => {
     noteTrackingCategoryObservable.value
   )
 
-  const [isFertilityTrackingEnabled, setFertilityTrackingEnabled] = useState(
+  const [isEnabled, setIsEnabled] = useState(false)
-    fertilityTrackingObservable.value
+  const toggleSwitch = () => setIsEnabled((previousState) => !previousState)
-  )
 
-  const fertilityTrackingToggle = (value) => {
-    setFertilityTrackingEnabled(value)
-    saveFertilityTrackingEnabled(value)
-  }
-
-  const temperatureTrackingCategoryToggle = (value) => {
-    setTemperatureTrackingCategory(value)
-    saveTemperatureTrackingCategory(value)
-    if (!value) {
-      setFertilityTrackingEnabled(false)
-      saveFertilityTrackingEnabled(false)
-    }
-  }
-  const mucusTrackingCategoryToggle = (value) => {
-    manageSecondarySymptom(cervixTrackingCategoryObservable.value, value)
-  }
-  const cervixTrackingCategoryToggle = (value) => {
-    manageSecondarySymptom(value, mucusTrackingCategoryObservable.value)
-  }
   const sexTrackingCategoryToggle = (value) => {
     setSexTrackingCategory(value)
     saveSexTrackingCategory(value)
   }
+
   const desireTrackingCategoryToggle = (value) => {
     setDesireTrackingCategory(value)
     saveDesireTrackingCategory(value)
@@ -123,229 +78,93 @@ const Settings = () => {
     setNoteTrackingCategory(value)
     saveNoteTrackingCategory(value)
   }
+
   const onPeriodPredictionToggle = (value) => {
     setPeriodPrediction(value)
     savePeriodPrediction(value)
   }
 
-  const fertilityTrackingText = isFertilityTrackingEnabled
-    ? labels.fertilityTracking.on
-    : labels.fertilityTracking.off
-
   const periodPredictionText = isPeriodPredictionEnabled
     ? labels.periodPrediction.on
     : labels.periodPrediction.off
 
-  const secondarySymptomButtons = [
+  const onCervixToggle = (value) => {
-    {
+    setShouldUseCervix(value)
-      label: labels.secondarySymptom.mucus,
+    saveUseCervix(value)
-      value: 0,
-    },
-    {
-      label: labels.secondarySymptom.cervix,
-      value: 1,
-    },
-  ]
-
-  const onSelectTab = (value) => {
-    if (isMucusTrackingCategoryEnabled && isCervixTrackingCategoryEnabled) {
-      setUseCervixAsSecondarySymptom(value)
-      saveUseCervixAsSecondarySymptom(value)
-    } else {
-      secondarySymptomDisabledPrompt()
-    }
   }
 
-  // is needed so secondary symptom is set correct on load
+  const cervixText = shouldUseCervix
-  useEffect(() => {
+    ? labels.useCervix.cervixModeOn
-    manageSecondarySymptom(
+    : labels.useCervix.cervixModeOff
-      cervixTrackingCategoryObservable.value,
-      mucusTrackingCategoryObservable.value
-    )
-  }, [])
-
-  const manageSecondarySymptom = (cervix, mucus) => {
-    if (!cervix && mucus) {
-      setUseCervixAsSecondarySymptom(0)
-      saveUseCervixAsSecondarySymptom(0)
-    } else if (cervix && !mucus) {
-      setUseCervixAsSecondarySymptom(1)
-      saveUseCervixAsSecondarySymptom(1)
-    } else if (!cervix && !mucus) {
-      setFertilityTrackingEnabled(false)
-      saveFertilityTrackingEnabled(false)
-    }
-    setMucusTrackingCategory(mucus)
-    saveMucusTrackingCategory(mucus)
-    setCervixTrackingCategory(cervix)
-    saveCervixTrackingCategory(cervix)
-  }
-
-  const secondarySymptomDisabledPrompt = () => {
-    if (!isFertilityTrackingEnabled) {
-      Alert.alert(
-        labels.secondarySymptom.disabled.title,
-        labels.secondarySymptom.disabled.message
-      )
-    } else if (
-      !isMucusTrackingCategoryEnabled == isCervixTrackingCategoryEnabled
-    ) {
-      Alert.alert(
-        labels.secondarySymptom.disabled.title,
-        labels.secondarySymptom.disabled.noSecondaryEnabled
-      )
-    }
-  }
-
-  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
-      )
-    }
-  }
 
   return (
-    <AppPage title={labels.customization.title}>
+    <AppPage title={'Customization'}>
-      <Segment title={labels.customization.trackingCategories}>
+      <Segment title={'Tracking categories'}>
-        <TrackingCategorySwitch
+        <AppSwitch
-          onToggle={temperatureTrackingCategoryToggle}
-          text={t(SYMPTOMS[1])}
-          value={isTemperatureTrackingCategoryEnabled}
-          symptom={SYMPTOMS[1]}
-        />
-        <TrackingCategorySwitch
-          onToggle={(enabled) => {
-            mucusTrackingCategoryToggle(enabled)
-          }}
-          text={t(SYMPTOMS[2])}
-          value={isMucusTrackingCategoryEnabled}
-          symptom={SYMPTOMS[2]}
-        />
-        <TrackingCategorySwitch
-          onToggle={(enabled) => {
-            cervixTrackingCategoryToggle(enabled)
-          }}
-          text={t(SYMPTOMS[3])}
-          value={isCervixTrackingCategoryEnabled}
-          symptom={SYMPTOMS[3]}
-        />
-        <TrackingCategorySwitch
           onToggle={sexTrackingCategoryToggle}
-          text={t(SYMPTOMS[4])}
+          text={"sex: when turned off it won't show"}
           value={isSexTrackingCategoryEnabled}
-          symptom={SYMPTOMS[4]}
+          trackColor={{ true: Colors.turquoiseDark }}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={desireTrackingCategoryToggle}
-          text={t(SYMPTOMS[5])}
+          text={"desire: when turned off it won't show"}
           value={isDesireTrackingCategoryEnabled}
-          symptom={SYMPTOMS[5]}
+          trackColor={{ true: Colors.turquoiseDark }}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={painTrackingCategoryToggle}
-          text={t(SYMPTOMS[6])}
+          text={"pain: when turned off it won't show"}
           value={isPainTrackingCategoryEnabled}
-          symptom={SYMPTOMS[6]}
+          trackColor={{ true: Colors.turquoiseDark }}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={moodTrackingCategoryToggle}
-          text={t(SYMPTOMS[7])}
+          text={"mood: when turned off it won't show"}
           value={isMoodTrackingCategoryEnabled}
-          symptom={SYMPTOMS[7]}
+          trackColor={{ true: Colors.turquoiseDark }}
         />
-        <TrackingCategorySwitch
+        <AppSwitch
           onToggle={noteTrackingCategoryToggle}
-          text={t(SYMPTOMS[8])}
+          text={"note: when turned off it won't show"}
           value={isNoteTrackingCategoryEnabled}
-          symptom={SYMPTOMS[8]}
+          trackColor={{ true: Colors.turquoiseDark }}
         />
       </Segment>
 
-      <Pressable onPress={fertilityDisabledPrompt}>
+      <Segment title={'Fertility feature'}>
-        <Segment title={labels.fertilityTracking.title}>
+        <AppSwitch
-          <AppText>{labels.fertilityTracking.message}</AppText>
+          onToggle={toggleSwitch}
-          <AppSwitch
+          text={'If turned on ...'}
-            onToggle={fertilityTrackingToggle}
+          value={isEnabled}
-            text={fertilityTrackingText}
+          trackColor={{ true: Colors.turquoiseDark }}
-            value={isFertilityTrackingEnabled}
+        />
-            disabled={!manageFertilityFeature}
+      </Segment>
-          />
-        </Segment>
-      </Pressable>
 
-      <Segment title={labels.periodPrediction.title}>
+      <Segment title={labels.tempScale.segmentTitle}>
+        <AppText>{labels.tempScale.segmentExplainer}</AppText>
+        <TemperatureSlider />
+      </Segment>
+
+      <Segment title={labels.useCervix.title}>
+        <AppSwitch
+          onToggle={onCervixToggle}
+          text={cervixText}
+          value={shouldUseCervix}
+          trackColor={{ true: Colors.turquoiseDark }}
+        />
+      </Segment>
+
+      <Segment title={labels.periodPrediction.title} last>
         <AppSwitch
           onToggle={onPeriodPredictionToggle}
           text={periodPredictionText}
           value={isPeriodPredictionEnabled}
+          trackColor={{ true: Colors.turquoiseDark }}
         />
       </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/menu-item.js

@@ -20,15 +20,11 @@ const MenuItem = ({ item, last, navigate }) => {
         key={item.label}
         onPress={() => navigate(item.componentName)}
       >
-        <View style={styles.textContainer}>
+        <View>
           <AppText style={styles.title}>{t(`${item.label}.name`)}</AppText>
           {!!item.label && <AppText>{t(`${item.label}.text`)}</AppText>}
         </View>
-        <AppIcon
+        <AppIcon name="chevron-right" color={Colors.orange} />
-          style={styles.chevronContainer}
-          name="chevron-right"
-          color={Colors.orange}
-        />
       </TouchableOpacity>
     </Segment>
   )
@@ -48,13 +44,6 @@ 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,7 +9,6 @@ import {
   periodReminderObservable,
   savePeriodReminder,
   periodPredictionObservable,
-  temperatureTrackingCategoryObservable,
 } from '../../../local-storage'
 
 import labels from '../../../i18n/en/settings'
@@ -35,14 +34,6 @@ const Reminders = () => {
     }
   }
 
-  const tempReminderDisabledPrompt = () => {
-    if (!temperatureTrackingCategoryObservable.value) {
-      Alert.alert(
-        labels.tempReminder.alertNoTempReminder.title,
-        labels.tempReminder.alertNoTempReminder.message
-      )
-    }
-  }
   return (
     <AppPage>
       <Pressable onPress={reminderDisabledPrompt}>
@@ -55,11 +46,9 @@ const Reminders = () => {
           />
         </Segment>
       </Pressable>
-      <Pressable onPress={tempReminderDisabledPrompt}>
+      <Segment title={labels.tempReminder.title} last>
-        <Segment title={labels.tempReminder.title} last>
+        <TemperatureReminder />
-          <TemperatureReminder />
+      </Segment>
-        </Segment>
-      </Pressable>
     </AppPage>
   )
 }

components/settings/reminders/temperature-reminder.js

@@ -7,7 +7,6 @@ import AppSwitch from '../../common/app-switch'
 import {
   saveTempReminder,
   tempReminderObservable,
-  temperatureTrackingCategoryObservable,
 } from '../../../local-storage'
 import padWithZeros from '../../helpers/pad-time-with-zeros'
 
@@ -52,7 +51,6 @@ const TemperatureReminder = () => {
         onToggle={temperatureReminderToggle}
         text={tempReminderText}
         value={isEnabled}
-        disabled={!temperatureTrackingCategoryObservable.value}
       />
       <DateTimePicker
         isVisible={isTimePickerVisible}

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 }) => {

db/index.js

@@ -65,7 +65,6 @@ export function getBleedingDaysSortedByDate() {
   return db
     .objects('CycleDay')
     .filtered('bleeding != null')
-    .filtered('bleeding.value != null')
     .sorted('date', true)
 }
 export function getTemperatureDaysSortedByDate() {
@@ -89,8 +88,9 @@ export function getCycleStartsSortedByDate() {
 export function saveSymptom(symptom, date, val) {
   let cycleDay = getCycleDay(date)
   if (!cycleDay) cycleDay = createCycleDay(date)
+
   db.write(() => {
-    if (symptom === 'bleeding' && val != null && val.value != null) {
+    if (symptom === 'bleeding') {
       const mensesDaysAfter = getMensesDaysRightAfter(cycleDay)
       maybeSetNewCycleStart({
         val,

db/schemas/5.js

@@ -1,195 +0,0 @@
-const TemperatureSchema = {
-  name: 'Temperature',
-  properties: {
-    value: 'double',
-    exclude: 'bool',
-    time: {
-      type: 'string',
-      optional: true,
-    },
-    note: {
-      type: 'string',
-      optional: true,
-    },
-  },
-}
-
-const BleedingSchema = {
-  name: 'Bleeding',
-  properties: {
-    value: { type: 'int', optional: true },
-    exclude: 'bool',
-    pad: { type: 'bool', optional: true },
-    tampon: { type: 'bool', optional: true },
-    underwear: { type: 'bool', optional: true },
-    cup: { type: 'bool', optional: true },
-    softTampon: { type: 'bool', optional: true },
-    disk: { type: 'bool', optional: true },
-    none: { type: 'bool', optional: true },
-    other: { type: 'bool', optional: true },
-    note: { type: 'string', optional: true },
-  },
-}
-
-const MucusSchema = {
-  name: 'Mucus',
-  properties: {
-    feeling: { type: 'int', optional: true },
-    texture: { type: 'int', optional: true },
-    value: { type: 'int', optional: true },
-    exclude: 'bool',
-  },
-}
-
-const CervixSchema = {
-  name: 'Cervix',
-  properties: {
-    opening: { type: 'int', optional: true },
-    firmness: { type: 'int', optional: true },
-    position: { type: 'int', optional: true },
-    exclude: 'bool',
-  },
-}
-
-const NoteSchema = {
-  name: 'Note',
-  properties: {
-    value: 'string',
-  },
-}
-
-const DesireSchema = {
-  name: 'Desire',
-  properties: {
-    value: 'int',
-  },
-}
-
-const SexSchema = {
-  name: 'Sex',
-  properties: {
-    solo: { type: 'bool', optional: true },
-    partner: { type: 'bool', optional: true },
-    condom: { type: 'bool', optional: true },
-    pill: { type: 'bool', optional: true },
-    iud: { type: 'bool', optional: true },
-    patch: { type: 'bool', optional: true },
-    ring: { type: 'bool', optional: true },
-    implant: { type: 'bool', optional: true },
-    diaphragm: { type: 'bool', optional: true },
-    none: { type: 'bool', optional: true },
-    other: { type: 'bool', optional: true },
-    note: { type: 'string', optional: true },
-  },
-}
-
-const PainSchema = {
-  name: 'Pain',
-  properties: {
-    cramps: { type: 'bool', optional: true },
-    ovulationPain: { type: 'bool', optional: true },
-    headache: { type: 'bool', optional: true },
-    backache: { type: 'bool', optional: true },
-    nausea: { type: 'bool', optional: true },
-    tenderBreasts: { type: 'bool', optional: true },
-    migraine: { type: 'bool', optional: true },
-    other: { type: 'bool', optional: true },
-    note: { type: 'string', optional: true },
-  },
-}
-
-const MoodSchema = {
-  name: 'Mood',
-  properties: {
-    happy: { type: 'bool', optional: true },
-    sad: { type: 'bool', optional: true },
-    stressed: { type: 'bool', optional: true },
-    balanced: { type: 'bool', optional: true },
-    fine: { type: 'bool', optional: true },
-    anxious: { type: 'bool', optional: true },
-    energetic: { type: 'bool', optional: true },
-    fatigue: { type: 'bool', optional: true },
-    angry: { type: 'bool', optional: true },
-    other: { type: 'bool', optional: true },
-    note: { type: 'string', optional: true },
-  },
-}
-
-const CycleDaySchema = {
-  name: 'CycleDay',
-  primaryKey: 'date',
-  properties: {
-    date: 'string',
-    temperature: {
-      type: 'Temperature',
-      optional: true,
-    },
-    isCycleStart: 'bool',
-    bleeding: {
-      type: 'Bleeding',
-      optional: true,
-    },
-    mucus: {
-      type: 'Mucus',
-      optional: true,
-    },
-    cervix: {
-      type: 'Cervix',
-      optional: true,
-    },
-    note: {
-      type: 'Note',
-      optional: true,
-    },
-    desire: {
-      type: 'Desire',
-      optional: true,
-    },
-    sex: {
-      type: 'Sex',
-      optional: true,
-    },
-    pain: {
-      type: 'Pain',
-      optional: true,
-    },
-    mood: {
-      type: 'Mood',
-      optional: true,
-    },
-  },
-}
-
-export default {
-  schema: [
-    CycleDaySchema,
-    TemperatureSchema,
-    BleedingSchema,
-    MucusSchema,
-    CervixSchema,
-    NoteSchema,
-    DesireSchema,
-    SexSchema,
-    PainSchema,
-    MoodSchema,
-  ],
-  schemaVersion: 5,
-  migration: (oldRealm, newRealm) => {
-    if (oldRealm.schemaVersion < 5) {
-      const newObjects = newRealm.objects('Bleeding')
-
-      // loop through all objects and assign a default value for new properties
-      for (let i = 0; i < newObjects.length; i++) {
-        newObjects[i].pad = false
-        newObjects[i].tampon = false
-        newObjects[i].underwear = false
-        newObjects[i].cup = false
-        newObjects[i].softTampon = false
-        newObjects[i].disk = false
-        newObjects[i].none = false
-        newObjects[i].other = false
-        newObjects[i].note = null
-      }
-    }
-  },
-}

db/schemas/index.js

@@ -3,6 +3,5 @@ import schema1 from './1.js'
 import schema2 from './2.js'
 import schema3 from './3.js'
 import schema4 from './4.js'
-import schema5 from './5.js'
 
-export default [schema0, schema1, schema2, schema3, schema4, schema5]
+export default [schema0, schema1, schema2, schema3, schema4]

i18n/en.json

@@ -7,16 +7,18 @@
   "chart": {
     "tutorial": "You can swipe the chart to view more dates."
   },
-  "symptoms": {
+  "cycleDay": {
-    "bleeding": "bleeding",
+    "symptomBox": {
-    "temperature": "temperature",
+      "bleeding": "bleeding",
-    "mucus": "cervical mucus",
+      "temperature": "temperature",
-    "cervix": "cervix",
+      "mucus": "cervical mucus",
-    "note": "note",
+      "cervix": "cervix",
-    "desire": "desire",
+      "note": "note",
-    "sex": "sex",
+      "desire": "desire",
-    "pain": "pain",
+      "sex": "sex",
-    "mood": "mood"
+      "pain": "pain",
+      "mood": "mood"
+    }
   },
   "labels": {
     "bleedingPrediction": {
@@ -49,7 +51,7 @@
       },
       "philosophy": {
         "title": "Remember to think for yourself",
-        "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."
+        "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."
       },
       "title": "About",
       "version": {
@@ -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": ""
         },
         "reminders": {
           "name": "Reminders",
-          "text": "Turn on/off reminders"
+          "text": "turn on/off reminders"
         },
         "info": {
           "name": "Info",

i18n/en/cycle-day.js

@@ -4,86 +4,70 @@ export const intensity = ['low', 'medium', 'high']
 export const bleeding = {
   labels: ['spotting', 'light', 'medium', 'heavy'],
   heaviness: {
-    header: 'Heaviness',
+    header: "Heaviness",
-    explainer: 'How heavy is the bleeding?',
+    explainer: "How heavy is the bleeding?",
   },
   exclude: {
-    header: 'Exclude',
+    header: "Exclude",
-    explainer: "You can exclude this value if it's not menstrual bleeding",
+    explainer: "You can exclude this value if it's not menstrual bleeding"
-  },
+  }
-}
-
-export const products = {
-  categories: {
-    pad: 'pad',
-    tampon: 'tampon',
-    underwear: 'underwear',
-    cup: 'cup',
-    softTampon: 'soft tampon',
-    disk: 'disk',
-    none: 'none',
-    other: 'other',
-  },
-  header: 'period products',
-  explainer: 'Did you use period products?',
 }
 
 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:
+  excludeExplainer: "You can exclude this value if you don't want to use it for fertility detection.",
-    "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:
+    explainer: "Looking at and touching your cervical mucus, which describes it best?"
-      'Looking at and touching your cervical mucus, which describes it best?',
   },
-  excludeExplainer:
+  excludeExplainer: "You can exclude this value if you don't want to use it for fertility detection",
-    "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',
@@ -94,8 +78,8 @@ export const contraceptives = {
     none: 'none',
     other: 'other',
   },
-  header: 'Contraceptives',
+  header: "Contraceptives",
-  explainer: 'Did you use contraceptives?',
+  explainer: 'Did you use contraceptives?'
 }
 
 export const pain = {
@@ -107,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 = {
@@ -123,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:
+  outOfRangeWarning: 'This temperature value is out of the current range for the temperature chart. You can change the range in the settings.',
-    '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.',
-  outOfAbsoluteRangeWarning:
-    'This temperature value is too high or low to be shown on the temperature chart.',
   temperature: {
-    header: 'Temperature',
+    header: "Temperature",
-    explainer:
+    explainer: 'Take your temperature right after waking up, before getting out of bed'
-      'Take your temperature right after waking up, before getting out of bed',
   },
-  time: 'Time',
+  time: "Time",
   note: {
-    header: 'Note',
+    header: "Note",
-    explainer:
+    explainer: 'Is there anything that could have influenced this value, such as bad sleep or alcohol consumption?'
-      'Is there anything that could have influenced this value, such as bad sleep or alcohol consumption?',
   },
   exclude: {
-    header: 'Exclude',
+    header: "Exclude",
-    explainer:
+    explainer: "You can exclude this value if you don't want to use it for fertility detection"
-      "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 ',
+  cycleDayNumber: "Cycle day ",
-  today: 'Today',
+  today: "Today"
 }
 
 export const sharedDialogs = {
@@ -165,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/labels.js

@@ -70,14 +70,14 @@ export const fertilityStatus = {
   unknown:
     'We cannot show any cycle information because no period data has been added.',
   preOvuText:
-    "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.",
+    "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.",
   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 the sympto-thermal method. In the evening today you may assume infertility, but ' +
+      ' temperature rule), as well as a cervical mucus/cervix shift according to NFP rules. 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 the sympto-thermal method. You may assume infertility, but always remember to ' +
+      ' temperature rule), as well as a cervical mucus/cervix shift according to NFP rules. You may assume infertility, but always remember to ' +
       'double-check for yourself. Make sure the data makes sense to you.'
     )
   },

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,26 +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.',
   },
-
   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',
@@ -70,36 +56,17 @@ export default {
         'To use the period reminder please first enable period predictions in the customization settings.',
     },
   },
-  fertilityTracking: {
+  useCervix: {
-    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.',
-    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.',
-      noSecondaryEnabled:
-        '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 statistics if you previously tracked at least 3 complete cycles.',
+    on: 'drip predicts your 3 next menstrual bleedings based on the statistics of your previously tracked cycles, min 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 +109,6 @@ Making any changes to your password setting will keep your data as it was before
   },
   preOvu: {
     title: 'Infertile days at cycle start',
-    note: `drip. applies 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 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.`,
   },
 }

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 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.
+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.
 
 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.`,
@@ -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.
 
@@ -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 the sympto-thermal method is cervical mucus, but you can change it to cervix in "Settings" -> "Customization".
+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".
 
 · 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 the sympto-thermal method is cervical mucus. You can change this in the customization settings.
+By default the secondary symptom the app uses for NFP evaluation 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.
+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.
 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 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.
+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.
 
 ${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" -> "Customization".
+By default the secondary symptom is cervical mucus, but you can change it to cervix in "Settings" -> "NFP Settings".
 
 · 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,5 +32,6 @@ target 'drip' do
 
   post_install do |installer|
     react_native_post_install(installer)
-  end  
+    __apply_Xcode_12_5_M1_post_install_workaround(installer)
+  end
 end

ios/drip.xcodeproj/project.pbxproj

@@ -35,7 +35,7 @@
 		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 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
+		54E1D49923E7588F003FA37B /* (null) 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 */; };
@@ -118,7 +118,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				54E1D49923E7588F003FA37B /* BuildFile in Frameworks */,
+				54E1D49923E7588F003FA37B /* (null) in Frameworks */,
 				62F2A4645AC84CDC9506FF27 /* libc++.tbd in Frameworks */,
 				D91133DCE120440893E2FD2E /* libz.tbd in Frameworks */,
 				BD7041F2826E4A2CBE6CB87D /* RealmJSTests.xctest in Frameworks */,

ios/drip/Info.plist

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

lib/nfp-mucus.js

@@ -1,4 +1,4 @@
-export default function getNfpMucus(feeling, texture) {
+export default function getSensiplanMucus(feeling, texture) {
   if (typeof feeling != 'number' || typeof texture != 'number') return null
 
   const feelingMapping = {

lib/sympto-adapter.js

@@ -1,15 +1,9 @@
 import getFertilityStatus from 'sympto'
 import cycleModule from './cycle'
-import { fertilityTrackingObservable, useCervixAsSecondarySymptomObservable } from '../local-storage'
+import { useCervixObservable } from '../local-storage'
 import { fertilityStatus as labels } from '../i18n/en/labels'
 
-const isFertilityTrackingEnabled = fertilityTrackingObservable.value
-
 export function getFertilityStatusForDay(dateString) {
-  if (!isFertilityTrackingEnabled) {
-    return
-  }
-
   const status = getCycleStatusForDay(dateString)
   if (!status) return {
     status: labels.fertile,
@@ -40,10 +34,6 @@ export function getFertilityStatusForDay(dateString) {
 }
 
 export function getCycleStatusForDay(dateString, opts = {}) {
-  if (!isFertilityTrackingEnabled) {
-    return
-  }
-  
   const {
     getCycleForDay,
     getCyclesBefore,
@@ -67,7 +57,7 @@ export function getCycleStatusForDay(dateString, opts = {}) {
     }
   }
 
-  cycleInfo.secondarySymptom = useCervixAsSecondarySymptomObservable.value ? 'cervix' : 'mucus'
+  cycleInfo.secondarySymptom = useCervixObservable.value ? 'cervix' : 'mucus'
 
   return getFertilityStatus(cycleInfo)
 }

local-storage.js

@@ -59,19 +59,12 @@ export async function savePeriodPrediction(bool) {
   }
 }
 
-export const useCervixAsSecondarySymptomObservable = Observable()
+export const useCervixObservable = Observable()
-setObvWithInitValue(
+setObvWithInitValue('useCervix', useCervixObservable, false)
-  'useCervixAsSecondarySymptom',
-  useCervixAsSecondarySymptomObservable,
-  0
-)
 
-export async function saveUseCervixAsSecondarySymptom(value) {
+export async function saveUseCervix(bool) {
-  await AsyncStorage.setItem(
+  await AsyncStorage.setItem('useCervix', JSON.stringify(bool))
-    'useCervixAsSecondarySymptom',
+  useCervixObservable.set(bool)
-    JSON.stringify(value)
-  )
-  useCervixAsSecondarySymptomObservable.set(value)
 }
 
 export const hasEncryptionObservable = Observable()
@@ -99,38 +92,6 @@ 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) {
-    // if temperature tracking is turned off, the temperature reminder gets disabled
-    const tempReminderResult = await AsyncStorage.getItem('tempReminder')
-     if (tempReminderResult && JSON.parse(tempReminderResult).enabled) {
-      tempReminderObservable.set(false)
-    }
-  }
-}
-
-export const mucusTrackingCategoryObservable = Observable()
-setObvWithInitValue('mucus', mucusTrackingCategoryObservable, true)
-
-export async function saveMucusTrackingCategory(bool) {
-  await AsyncStorage.setItem('mucus', JSON.stringify(bool))
-  mucusTrackingCategoryObservable.set(bool)
-}
-
-export const cervixTrackingCategoryObservable = Observable()
-setObvWithInitValue('cervix', cervixTrackingCategoryObservable, true)
-
-export async function saveCervixTrackingCategory(bool) {
-  await AsyncStorage.setItem('cervix', JSON.stringify(bool))
-  cervixTrackingCategoryObservable.set(bool)
-}
-
 export const sexTrackingCategoryObservable = Observable()
 setObvWithInitValue('sex', sexTrackingCategoryObservable, true)
 
@@ -171,14 +132,6 @@ export async function saveNoteTrackingCategory(bool) {
   noteTrackingCategoryObservable.set(bool)
 }
 
-export const fertilityTrackingObservable = Observable()
-setObvWithInitValue('fertilityTracking', fertilityTrackingObservable, true)
-
-export async function saveFertilityTrackingEnabled(bool) {
-  await AsyncStorage.setItem('fertilityTracking', JSON.stringify(bool))
-  fertilityTrackingObservable.set(bool)
-}
-
 async function setObvWithInitValue(key, obv, defaultValue) {
   const result = await AsyncStorage.getItem(key)
   let value

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drip.",
-  "version": "1.2403.19",
+  "version": "1.2401.17",
   "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 15\"",
+    "ios": "react-native run-ios --simulator=\"iPhone 8 Plus\"",
-    "iosSE": "react-native run-ios --simulator=\"iPhone SE (2nd generation)\"",
+    "ios14": "react-native run-ios --simulator=\"iPhone 14 Plus\"",
     "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.18.2",
+    "@react-native-async-storage/async-storage": "^1.17.9",
     "@react-native-community/art": "^1.2.0",
-    "@react-native-community/datetimepicker": "^7.2.0",
+    "@react-native-community/datetimepicker": "^6.3.1",
     "@react-native-community/push-notification-ios": "^1.11.0",
     "csvtojson": "^2.0.8",
     "i18next": "^22.0.2",

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%'
 }

test/nfp-mucus.spec.js

@@ -1,79 +0,0 @@
-import getNfpMucus from '../lib/nfp-mucus'
-
-describe('getNfpMucus', () => {
-  test('returns null if there is no value for feeling or texture', () => {
-    expect(getNfpMucus()).toBeNull()
-    expect(getNfpMucus(undefined, 3)).toBeNull()
-    expect(getNfpMucus(2, undefined)).toBeNull()
-  })
-
-  describe('results in t for:', () => {
-    test('dry feeling and no texture', function () {
-      const nfpValue = getNfpMucus(0, 0)
-      expect(nfpValue).toEqual(0)
-    })
-  })
-
-  describe('results in Ø for:', () => {
-    test('no feeling and no texture', function () {
-      const nfpValue = getNfpMucus(1, 0)
-      expect(nfpValue).toEqual(1)
-    })
-  })
-
-  describe('results in f for:', () => {
-    test('wet feeling and no texture', function () {
-      const nfpValue = getNfpMucus(2, 0)
-      expect(nfpValue).toEqual(2)
-    })
-  })
-
-  describe('results in S for:', () => {
-    test('dry feeling and creamy texture', function () {
-      const nfpValue = getNfpMucus(0, 1)
-      expect(nfpValue).toEqual(3)
-    })
-
-    test('no feeling and creamy texture', function () {
-      const nfpValue = getNfpMucus(1, 1)
-      expect(nfpValue).toEqual(3)
-    })
-
-    test('wet feeling and creamy texture', function () {
-      const nfpValue = getNfpMucus(2, 1)
-      expect(nfpValue).toEqual(3)
-    })
-  })
-
-  describe('results in +S for:', () => {
-    test('dry feeling and egg white texture', function () {
-      const nfpValue = getNfpMucus(0, 2)
-      expect(nfpValue).toEqual(4)
-    })
-
-    test('no feeling and egg white texture', function () {
-      const nfpValue = getNfpMucus(1, 2)
-      expect(nfpValue).toEqual(4)
-    })
-
-    test('wet feeling and egg white texture', function () {
-      const nfpValue = getNfpMucus(2, 2)
-      expect(nfpValue).toEqual(4)
-    })
-
-    test('slippery feeling and egg white texture', function () {
-      const nfpValue = getNfpMucus(3, 2)
-      expect(nfpValue).toEqual(4)
-    })
-
-    test('slippery feeling and creamy texture', function () {
-      const nfpValue = getNfpMucus(3, 1)
-      expect(nfpValue).toEqual(4)
-    })
-
-    test('slippery feeling and no texture', function () {
-      const nfpValue = getNfpMucus(3, 0)
-      expect(nfpValue).toEqual(4)
-    })
-  })
-})

test/sensiplan-mucus.spec.js

@@ -0,0 +1,79 @@
+import getSensiplanMucus from '../lib/nfp-mucus'
+
+describe('getSensiplanMucus', () => {
+  test('returns null if there is no value for feeling or texture', () => {
+    expect(getSensiplanMucus()).toBeNull()
+    expect(getSensiplanMucus(undefined, 3)).toBeNull()
+    expect(getSensiplanMucus(2, undefined)).toBeNull()
+  })
+
+  describe('results in t for:', () => {
+    test('dry feeling and no texture', function () {
+      const sensiplanValue = getSensiplanMucus(0, 0)
+      expect(sensiplanValue).toEqual(0)
+    })
+  })
+
+  describe('results in Ø for:', () => {
+    test('no feeling and no texture', function () {
+      const sensiplanValue = getSensiplanMucus(1, 0)
+      expect(sensiplanValue).toEqual(1)
+    })
+  })
+
+  describe('results in f for:', () => {
+    test('wet feeling and no texture', function () {
+      const sensiplanValue = getSensiplanMucus(2, 0)
+      expect(sensiplanValue).toEqual(2)
+    })
+  })
+
+  describe('results in S for:', () => {
+    test('dry feeling and creamy texture', function () {
+      const sensiplanValue = getSensiplanMucus(0, 1)
+      expect(sensiplanValue).toEqual(3)
+    })
+
+    test('no feeling and creamy texture', function () {
+      const sensiplanValue = getSensiplanMucus(1, 1)
+      expect(sensiplanValue).toEqual(3)
+    })
+
+    test('wet feeling and creamy texture', function () {
+      const sensiplanValue = getSensiplanMucus(2, 1)
+      expect(sensiplanValue).toEqual(3)
+    })
+  })
+
+  describe('results in +S for:', () => {
+    test('dry feeling and egg white texture', function () {
+      const sensiplanValue = getSensiplanMucus(0, 2)
+      expect(sensiplanValue).toEqual(4)
+    })
+
+    test('no feeling and egg white texture', function () {
+      const sensiplanValue = getSensiplanMucus(1, 2)
+      expect(sensiplanValue).toEqual(4)
+    })
+
+    test('wet feeling and egg white texture', function () {
+      const sensiplanValue = getSensiplanMucus(2, 2)
+      expect(sensiplanValue).toEqual(4)
+    })
+
+    test('slippery feeling and egg white texture', function () {
+      const sensiplanValue = getSensiplanMucus(3, 2)
+      expect(sensiplanValue).toEqual(4)
+    })
+
+    test('slippery feeling and creamy texture', function () {
+      const sensiplanValue = getSensiplanMucus(3, 1)
+      expect(sensiplanValue).toEqual(4)
+    })
+
+    test('slippery feeling and no texture', function () {
+      const sensiplanValue = getSensiplanMucus(3, 0)
+      expect(sensiplanValue).toEqual(4)
+    })
+  })
+})

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