specify tracking category cervical mucus

fixing issue import and empty statement
changes in customization texts and small changes to styling
2024-02-26 15:29:32 +01:00 · 2024-02-26 15:28:11 +01:00 · 2024-02-26 13:28:43 +01:00 · 2024-02-23 17:02:57 +01:00 · 2024-02-23 16:53:00 +01:00 · 2024-02-23 16:50:30 +01:00
100 changed files with 2362 additions and 1488 deletions
@@ -59,8 +59,9 @@ buck-out/
 # Bundle artifact
 *.jsbundle

-# CocoaPods
+# Ruby / CocoaPods
 /ios/Pods/
+/vendor/bundle/

 # RN android release
 android/app/bin/
@@ -8,6 +8,7 @@ cache:

 test_async:
  script:
+    - npm install npm@7.0.1 -g
    - npm install
    - npm test

@@ -1,26 +1,29 @@
-## oh no a bug 🐛
+## 🐛 Oh no, a bug 🐛

-### Description what has happened
+### What happened?

-Short overview how the bug manifests.
+Short overview of how the bug manifests.

-### which OS + version is your device
+### What is the expected behaviour?

-[ ] Android _number_
-[ ] iOS _number_
+_It's supposed to show ... and not ..._

-### which drip version number are you using
+### Which OS + version is your device?

-_On your phone go to ➞ menu on the top right ➞ about, scroll to the very bottom and find the version number_
+- [ ] Android _number_
+- [ ] iOS _number_
+- [ ] Simulator _number_

-### how did it happen
+### Which drip version number are you using?

-_what triggered the bug/behavior, always/sometimes, is it reproducible(how)?_
+_On your phone, go to ➞ menu on the top right ➞ about, scroll to the very bottom, and find the version number_

-### describe how it looks or add screenshot
+### How did it happen?

-feel free to attach a file 📎
+_What triggered the bug/behavior, always/sometimes, is it reproducible(how)?_

-### any idea to solve it
+### Describe how it looks or add a screenshot

-💡
+Feel free to attach a file 📎
+
+### Any ideas on how to solve it? 💡
@@ -1,22 +1,23 @@
-## This has to be done 🪠
+## 🪠 This has to be done 🪠

-### Description what has to be done
+### What has to be done?

 Short overview

-### is it urgent? ⏳
+### Is it urgent? ⏳

-[ ] Yes
-[ ] No
-[ ] something in between
+- [ ] Yes
+- [ ] No
+- [ ] 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
+- [ ] Android
+- [ ] iOS

-### what shall be the ideal outcome 🎆
+### What should the ideal outcome be? 🎆

-_You can e.g. specify here the version number for a library update_
+_You can, e.g., specify the version number for a library update_
@@ -1,19 +1,26 @@
-## Yeah a feature idea 🧩
+## 🧩 Yeah, a feature idea! 🧩

-### what should this feature do or solve? 🪄
+### This feature is a ...
+
+- [ ] period tracking feature (add more data points etc.)
+- [ ] technological feature (password, design, settings, etc.)
+
+### What should this feature do or solve? 🪄

 Please give a short overview so as many people as possible would be able to understand.

-### what is particularly important to the people who would use this feature?
+### Who is this feature for?

-Do you have certain user groups in mind?
+### What is particularly important to the people who would use this feature?

-### Any idea where it shall be placed in the app?
+### Where in the app should the feature be added?

-### is it connected with or dependent on some other feature?
+### Is it connected with or dependent on some other feature?

-### any idea how it shall look (sketch?)
+### How should the feature look (sketch or mock-up)?

-feel free to attach a file 📎
+Feel free to attach a file 📎

-### what could be difficulties (with other components) 🪆
+### What could be difficulties (esp. integrating with other components)? 🪆
+
+### Do you want to work on this yourself?
@@ -1,7 +1,5 @@
 ## Why this change?

-Closes #
-
 ## Description

 I have tested this MR:
@@ -2,7 +2,42 @@

 All notable changes to this project will be documented in this file.

-## v1.2311.14
+## v1.2401.17 iOS
+
+### Changes
+
+- Updating React Native to 0.68.3
+- Minor changes in temperature chart
+
+### Adds
+
+- Temperature scale slider
+- out of range warning messages for temperature values
+
+### Fixed
+
+- Order of import buttons
+
+## v1.2312.11 iOS
+
+### Changes
+
+- Chart: Improved readability
+  - Finer temperature lines and dots
+  - Enlarge screen space for temperature chart
+  - A very light grey background color for weekend days on the whole chart screen
+- Homescreen: date displayed in new format
+- Minor changes in "about" section
+
+See more under v1.2311.14 Android
+
+### Adds
+
+- Stats: Show period details, including cycle start, cycle length and amount of days with bleeding
+- Stats: Explainer text for standard deviation
+- App asks for permissions for notifications right at the start, which allows you to set reminders (this is a new requirement for Android 13)
+
+## v1.2311.14 Android

 ### Changes

@@ -64,11 +99,22 @@ All notable changes to this project will be documented in this file.
 - Chart: Grid for symptoms
 - Chart: Horizontal lines in temperature chart

-## Unreleased
+### Unreleased

 - Partially implemented translations with react-i18next

-## v1.2102.28
+## v1.2208.11 iOS
+
+### Adds
+
+- first iOS Release
+
+### Unreleased
+
+- Temperature scale slider
+- Warning message for out of scope temperature values
+
+## v1.2102.28 Android

 ### Changes

@@ -81,7 +127,7 @@ All notable changes to this project will be documented in this file.
 - Phase text on home screen for last fertile day
 - Styling improvements

-## v1.2101.9
+## v1.2101.9 Android

 ### Adds

@@ -124,7 +170,7 @@ All notable changes to this project will be documented in this file.
 - Fixed react-native-vector-icon
 - Fixed AppLoadingView component centering

-## v0.2007-12.beta
+## v0.2007-12.beta Android

 ### Adds

@@ -159,7 +205,7 @@ All notable changes to this project will be documented in this file.

 - Updates of node.js to fix security issue

-## v0.2005.3-beta
+## v0.2005.3-beta Android

 - Adds arm64-v8a and x86_64 for supporting 64-bit architecture
 - Adds Mariya & Sofiya as contributors &lt;3
@@ -259,7 +305,7 @@ All notable changes to this project will be documented in this file.
 - Adds release wizard
 - Updates nodejs-mobile to fix security issue

-## v0.1905.29-beta
+## v0.1905.29-beta Android

 ### Changes

@@ -280,7 +326,7 @@ All notable changes to this project will be documented in this file.
 - Line width in chart
 - Prediction range in drop on homescreen

-## v0.1905.28-beta
+## v0.1905.28-beta Android

 - Displays all the text for Home Elements; Shortens margin btw Home Elements; Adds missing "visit" to text
 - Adds donation section to about
@@ -355,7 +401,7 @@ All notable changes to this project will be documented in this file.
 - Nicer formatting for past bleeding prediction
 - Fixed prediction range in drop on homescreen

-## v0.1905.10-beta
+## v0.1905.10-beta Android

 - Filter release commits from changelog
 - Adds update-changelog script
@@ -380,7 +426,7 @@ All notable changes to this project will be documented in this file.
 - Delete password button bug fix
 - temperature screen styling update

-## v0.0.3 - 2019-04-17
+## v0.0.3 - 2019-04-17 Android

 ### Changes

@@ -390,9 +436,9 @@ All notable changes to this project will be documented in this file.

 - Button functionality in settings for password

-## v0.0.2 - 2019-04-09
+## v0.0.2 - 2019-04-09 Android

-## Second updated beta release version
+## Second updated beta release version Android

 ### Changes

@@ -406,9 +452,9 @@ All notable changes to this project will be documented in this file.
 - Delete button for sex, pain and mood
 - Dates on chart

-## v0.0.1 - 2019-02-15
+## v0.0.1 - 2019-02-15 Android

-## First beta release version
+## First beta release version Android

 ### Added (list of core functionality)

@@ -1,10 +1,10 @@
 # Contributing to drip aka CONDRIPUTING
-So good to see you here, hello :wave\_tone1: :wave\_tone2: :wave\_tone3: :wave\_tone4: :wave\_tone5:

+So good to see you here, hello :wave_tone1: :wave_tone2: :wave_tone3: :wave_tone4: :wave_tone5:

 ## Table Of Contents

-[TL;DR](#tl-dr)
+[TL;DR](#tldr)

 [What should I know before I get started?](#what-should-i-know-before-i-get-started)

@@ -14,45 +14,44 @@ So good to see you here, hello :wave\_tone1: :wave\_tone2: :wave\_tone3: :wave\_

 ## TL;DR

-You just want to say hello? Send us a [nice email](mailto:drip@mailbox.org?Subject=Nice%20incoming%20mail) :postbox:, ask to [join our Slack](mailto:drip@mailbox.org?Subject=Join%20Slack) or tweet :bird: at us [@dripberlin](https://twitter.com/dripberlin).
+You just want to say hello? Send us a [nice email](mailto:drip@mailbox.org?Subject=Nice%20incoming%20mail) :postbox:, toot :mammoth: [@dripapp@mastodon.social](https://mastodon.social/@dripapp) or tweet :bird: at us [@dripberlin](https://twitter.com/dripberlin).

 ## What should I know before I get started?

-We have prepared something for **you**: check out our [README](https://gitlab.com/bloodyhealth/drip/blob/master/README.md) for more information on how to set up and install everything you'll need.
-[Ping us](mailto:drip@mailbox.org) if you could need some help :helmet\_with\_cross: !
+We have prepared something for **you**: check out our [README](https://gitlab.com/bloodyhealth/drip/blob/main/README.md) for more information on how to set up and install everything you'll need.
+[Ping us](mailto:drip@mailbox.org) if you could need some help :helmet_with_cross: !

 Let us know if you want to suggest improvements for the README and open a merge request (which is just like Github's pull request)

 ## How can I condripute?

-### Your First Code Condripution
+We are an open source project and we highly appreciate contributions. At the same time please keep some things in mind: :heart:

-We are fans of labels, at least for our issues. You can find a list of `newbie` issues [here](https://gitlab.com/bloodyhealth/drip/issues?label_name%5B%5D=Newbie).
-If you decide to work on an issue, please click on `Create branch` based on that issue. You can find this as a dropdown option right under `Create merge request`.
-This allows us to keep track of the issues that are related to an existing branch and tells everyone "somebody is working on it".
+- The drip maintainers are usually around 2-3 people and are responsible for everything from developing new features to answering press inquiries or fixing bugs. Most of this work is done unpaid. (If you write a nice email your chances to get an answer are much higher than if you behave like a tech bro.)
+- We have a plan for the direction in which drip should evolve. This means that even if it isn't always transparent on gitlab, we have a list of features that we are building and more importantly, which bugs need to be fixed and which dependencies need to be updated.
+- drips core values are:
+  - 🔮 open source
+  - 🩸 feminist and gender inclusive
+  - 🔒 secure: data entered stays with that person/on their device
+  - 🔬 science based: we implemented the symptothermal method
  
-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.
+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
+### Reporting Bugs or Making Suggestions

-You found a bug :bug:? Please feel free to investigate and save logs for more specific details.
+If you found a bug or have suggestions, please :one: first review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure the bug/suggestion is unknown; :two: after that, take time to investigate and write a detailed issue report. Best you use our [templates for bug /chore/ feature](https://gitlab.com/bloodyhealth/drip/-/tree/main/.gitlab/issue_templates) (you can choose when creating a new issue) in gitlab or send us an email to our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with a description text taken from the body of your email. Please attach screenshots or other helpful things.

-Before creating a new issue, please review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure the bug is unknown. You are invited to describe the bug in all its details e.g. in what context/settings has it occurred?
+### Your First Condripution

-To send us a new issue you can also use our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with a description text taken from the body of your email.
+- If you want to contribute to drip's code or translation, please get in touch with us. We can tell you if someone is already working on something similar, if your idea does (not) match drip's core values, etc. Of course, you can always create a drip version for your private use with anything you want, but please don't expect us to review and merge code that has not been discussed before.
+- 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.

-### Suggesting Enhancements
-
-Do you have suggestions for enhancing the app or for cleaning up some code? Fantastic!
-
-Before creating a new issue, please review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure nobody else had the same idea before you! You are then invited to open a new issue with a somewhat extensive description, you can use emojis or GIFs if it helps :)!
-
-To send us a new issue you can also use our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with the title taken from the subject line and the description text for the issue taken from the body of your email.

 ### Thank you

 ![](https://media.giphy.com/media/kPA88elN9kYco/giphy.gif)

 Thank you for condriputing to open source, thank you for condriputing to drip!
-Much love from Bloody Health :heart\_exclamation:
+Much love from Bloody Health :heart_exclamation:
@@ -1,96 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.5)
-      rexml
-    activesupport (6.1.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.5)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
-    atomos (0.1.3)
-    claide (1.1.0)
-    cocoapods (1.11.3)
-      addressable (~> 2.8)
-      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.3)
-      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
-      cocoapods-plugins (>= 1.0.0, < 2.0)
-      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
-      cocoapods-try (>= 1.1.0, < 2.0)
-      colored2 (~> 3.1)
-      escape (~> 0.0.4)
-      fourflusher (>= 2.3.0, < 3.0)
-      gh_inspector (~> 1.0)
-      molinillo (~> 0.8.0)
-      nap (~> 1.0)
-      ruby-macho (>= 1.0, < 3.0)
-      xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.3)
-      activesupport (>= 5.0, < 7)
-      addressable (~> 2.8)
-      algoliasearch (~> 1.0)
-      concurrent-ruby (~> 1.1)
-      fuzzy_match (~> 2.0.4)
-      nap (~> 1.0)
-      netrc (~> 0.11)
-      public_suffix (~> 4.0)
-      typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.5.1)
-    cocoapods-plugins (1.0.0)
-      nap
-    cocoapods-search (1.0.1)
-    cocoapods-trunk (1.6.0)
-      nap (>= 0.8, < 2.0)
-      netrc (~> 0.11)
-    cocoapods-try (1.2.0)
-    colored2 (3.1.2)
-    concurrent-ruby (1.1.9)
-    escape (0.0.4)
-    ethon (0.15.0)
-      ffi (>= 1.15.0)
-    ffi (1.15.5)
-    fourflusher (2.3.1)
-    fuzzy_match (2.0.4)
-    gh_inspector (1.1.3)
-    httpclient (2.8.3)
-    i18n (1.10.0)
-      concurrent-ruby (~> 1.0)
-    json (2.6.1)
-    minitest (5.15.0)
-    molinillo (0.8.0)
-    nanaimo (0.3.0)
-    nap (1.1.0)
-    netrc (0.11.0)
-    public_suffix (4.0.6)
-    rexml (3.2.5)
-    ruby-macho (2.5.1)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    xcodeproj (1.21.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    zeitwerk (2.5.4)
-PLATFORMS
-  ruby
-DEPENDENCIES
-  cocoapods (~> 1.11, >= 1.11.2)
-RUBY VERSION
-   ruby 2.7.4p191
-BUNDLED WITH
-   2.2.27
@@ -3,21 +3,24 @@
 A menstrual cycle tracking app that's open-source and leaves your data on your phone. Use it to track your menstrual cycle and/or for fertility awareness!
 Find more information on [our website](https://dripapp.org/).

-[<img src="https://dripapp.org/assets/get.png"
+ [<img src="https://dripapp.org/assets/get.png"
     alt="Get it here"
-     height="55">](https://dripapp.org/release/8.apk)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-     alt="Get it on F-Droid"
-     height="80">](https://f-droid.org/packages/com.drip/)
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     height="55">](https://dripapp.org/release/v1.2311.14.apk)
+[<img src="https://dripapp.org/assets/badge_google-play.png"
     alt="Get it on Google Play"
-     height="80">](https://play.google.com/store/apps/details?id=com.drip)
+     height="55">](https://dripapp.org/android)
+[<img src="https://dripapp.org/assets/badge_app-store.png"
+    alt="Get drip on the App Store"
+    height="55">](https://dripapp.org/ios)
+[<img src="https://dripapp.org/assets/badge_f-droid.png"
+     alt="Get it on F-Droid"
+     height="55">](https://dripapp.org/fdroid)

-The app is built in React Native and currently developed for Android.
+The app is built in React Native and developed for Android and iOS.

-▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/master/CONTRIBUTING.md)
+▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/main/CONTRIBUTING.md)

-▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/master/RELEASE.md)
+▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/main/RELEASE.md)

 ## Development setup

@@ -33,14 +36,14 @@ or clone it with HTTPS

 ### 2. Node & yarn version

-Make sure you are running Node 14 and classic yarn (v.1). It's easiest to switch Node versions using `nvm`, here's how to install NVM: https://github.com/nvm-sh/nvm#installing-and-updating. Once you have nvm you can install node 14:
+Make sure you are running Node 14 and classic yarn (v.1). It's easiest to switch Node versions using `nvm`, here's how to install NVM: https://github.com/nvm-sh/nvm#installing-and-updating. After installing nvm close the terminal and open it again to be able to use nvm.
+Once you have nvm running you can install node 14:

    nvm install v14.19.3

-and then run
+use npm to install yarn:

-    cd drip
-    yarn install
+    npm install --global yarn

 ## for Android

@@ -50,13 +53,34 @@ Install [Android Studio](https://developer.android.com/studio/) - you'll need it

 ### 3.2 More requirements from Android Studio

-Open Android Studio and click on "Open an existing Android Studio project". Navigate to the drip repository you cloned and double click the android folder. It detects, downloads and cofigures requirements that might be missing, like the NDK and CMake to build the native code part of the project.
+Open Android Studio. If the message "SDK location not found" appears when you try to start it, edit `.bashrc` in your home directory by adding:
+
+    export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
+
+Check by typing in your terminal:
+
+    echo $ANDROID_SDK_ROOT
+
+You should see the path of Sdk.
+If you haven't installed [adb tools](https://developer.android.com/tools/adb) before, you will also have to do so and add to the .bashrc
+
+    PATH="$PATH:$HOME/Android/Sdk/platform-tools"
+
+In Android Studio click on "Open an existing Android Studio project". Navigate to the drip repository you cloned and double click the android folder. It detects, downloads and cofigures requirements that might be missing, like the NDK and CMake to build the native code part of the project.

 ### 3.3 Run the app on Android

-Either start a [virtual device in Android Studio](https://developer.android.com/studio/run/emulator) or [set your physical device like your Android phone up](https://developer.android.com/training/basics/firstapp/running-app) to run the app.
+Either create and start a [virtual device in Android Studio](https://developer.android.com/studio/run/emulator) or [set your physical device like your Android phone up](https://developer.android.com/training/basics/firstapp/running-app) to run the app.

-i. Open a terminal and run
+i. Open a terminal, navigate to the drip folder and run
+
+    yarn install
+
+In a separate tab, that needs to keep running as long as you want to keep the app connected, run
+   
+    yarn start
+
+Also run in a new tab
    
    yarn android

@@ -64,7 +88,11 @@ ii. To see logging output, run the following command in another tab:

    yarn log

-iii. Run the following command and select enable hot reloading (see https://facebook.github.io/react-native/docs/debugging.html):
+iii. If you had an older version of drip before and you are now trying to run a new drip version, clear cache by running
+
+    yarn clear
+
+iv. Run the following command and select enable hot reloading (see https://facebook.github.io/react-native/docs/debugging.html):

    adb shell input keyevent 82

@@ -147,7 +175,7 @@ You can run the tests with:

 ### End to end tests

-1. Check what testing device is specified in [package.json](https://gitlab.com/bloodyhealth/drip/blob/master/package.json) under:
+1. Check what testing device is specified in [package.json](https://gitlab.com/bloodyhealth/drip/blob/main/package.json) under:
   ```
   {"detox":
     {"configurations":
@@ -1,33 +1,108 @@
-# How to release a new version
+# How to release a new app version for Android

-Note: You need the release-key to bundle a release that can be uploaded to Google Play Store.
+_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._

-Run the release wizard that takes you through all the steps necessary to prepare a new release:
+# Table of Contents
+
+1. [version updating](#Version-updating)
+2. [android building](#Building-in-Android)
+    - [APK](#APK)
+    - [AAB](#AAB)
+3. [release sharing](#Share-the-release)
+
+## Version updating
+
+When you are done with a chore, a feature or a bugfix, you may want to share it with testers and eventually publish a release. In order to identify a specific app version we can update the version name, which is created based on the following format: `1.yymm.d` e.g. `1.2311.7`. If you want to upload a new app version to Google Play you also need to update the version code.
+
+The following command will:
+
+- create a new versionName and a new higher versionCode (+1)
+- create a commit including a tag named after the new release version name.

 ```
-npm run release
-```
-This will trigger the following:
-* update version number
-* create a new tag for the release
-* update the changelog
-* make a release commit
-
-To then bundle a release run the following command on your branch:
-
-```
-cd android && ./gradlew bundleRelease
+yarn release
 ```

-This command creates an `app.aab` file in the folder `/android/app/build/outputs/bundle/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).

-[More on Android App Bundle](https://blog.swmansion.com/make-your-react-native-app-3x-smaller-44c993eda2c9)
+## Building in Android

-You need to manually push the created tag to Gitlab:
+APK versus AAB
+
+> Android App Bundles (AAB) include all your app’s compiled code and resources, but defer APK generation and signing to Google Play. Unlike an APK, you can't deploy an app bundle directly to a device. So, if you want to quickly test or share an APK with someone else, you should instead build an APK.
+
+(https://developer.android.com/build/building-cmdline)
+
+### APK
+
+To build a release apk file, run the following command:

 ```
-git push origin <tagname>
+yarn build-android-apk-release
 ```
-Also don't forget to push your branch to Gitlab and review and merge it if ready!

-Yay, done (have a scoop of ice cream, I suggest coconut 🍦)!
+_which is a shortcut for:_ `cd android && ./gradlew clean && ./gradlew assembleRelease && cd ..`
+
+This will create a new apk file named `app-release.apk` under `./android/app/build/outputs/apk/release/`.
+
+For signing an apk you can run this command:
+
+```
+yarn sign-android-apk-release
+```
+
+_which is a shortcut for:_ `zipalign -v -p 4 ./android/app/build/outputs/apk/release/app-release.apk ./android/app/build/outputs/apk/release/app-release_signed.apk`
+
+It adds a file name `app-release_signed.apk` in the same folder in `./android/app/build/outputs/apk/release/`
+
+### AAB
+
+To build a release aab file, run:
+
+```
+yarn build-android-aab-release
+```
+
+_which is a shortcut for:_ `cd android && ./gradlew clean && ./gradlew :app:bundleRelease && cd ..`
+
+It creates a new aab file named `app-release.aab` under `./android/app/build/outputs/bundle/release`
+
+For signing an aab you first need to configure the base module’s build.gradle file with your app’s signing information. You can then run this command:
+
+```
+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`
+
+## Share the release
+
+### Gitlab repository
+
+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).
+
+### 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.
+
+#### Phone screenshots
+
+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/) and adapt the name and link on /index.html.
+Last time I checked it was [here](f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L114).
+
+#### 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:
+
+- [Twitter](twitter.com/dripberlin)
+- [Mastodon](mastodon.social/@dripapp)
+- [Ko-fi](https://ko-fi.com/dripapp)
+- [Linkedin](https://www.linkedin.com/company/34899684/)
+- Different tech, privacy, feminist oriented slacks
@@ -134,8 +134,8 @@ android {
        applicationId "com.drip"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 25
-        versionName "1.2311.14"
+        versionCode 29
+        versionName "1.2402.23"
        ndk {
            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
        }
@@ -8,6 +8,6 @@
        android:usesCleartextTraffic="true"
        tools:targetApi="28"
        tools:ignore="GoogleAppIndexingWarning">
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
    </application>    
 </manifest>
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and 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.rndiffapp;
+package com.drip;
 import android.content.Context;
 import com.facebook.flipper.android.AndroidFlipperClient;
 import com.facebook.flipper.android.utils.FlipperUtils;
@@ -18,6 +18,7 @@ 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;
@@ -46,7 +47,7 @@ public class ReactNativeFlipper {
      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
      if (reactContext == null) {
        reactInstanceManager.addReactInstanceEventListener(
-            new ReactInstanceManager.ReactInstanceEventListener() {
+            new ReactInstanceEventListener() {
              @Override
              public void onReactContextInitialized(ReactContext reactContext) {
                reactInstanceManager.removeReactInstanceEventListener(this);
@@ -57,12 +57,12 @@

        <activity
            android:name=".MainActivity"
-            android:exported="true"
            android:label="@string/app_name"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|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" />
@@ -1,6 +1,8 @@
 package com.drip;

 import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;

 public class MainActivity extends ReactActivity {

@@ -12,4 +14,27 @@ 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;
+    }
+  }
 }
+
@@ -8,6 +8,7 @@ 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;
@@ -62,7 +63,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.rndiffapp.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.drip.ReactNativeFlipper");
        aClass
            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
            .invoke(null, context, reactInstanceManager);
@@ -1,3 +1,5 @@
+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 {
@@ -7,8 +9,9 @@ buildscript {
    }
    ext.kotlinVersion = '1.3.40'
    dependencies {
-        classpath('com.android.tools.build:gradle:7.0.3')
-
+        classpath('com.android.tools.build:gradle:7.0.4')
+        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")
@@ -50,5 +53,12 @@ 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"
+    }
 }
@@ -9,8 +9,8 @@

 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m

 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
@@ -25,7 +25,16 @@ android.useAndroidX=true
 android.enableJetifier=true

 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.99.0
+FLIPPER_VERSION=0.125.0

-# https://github.com/facebook/react-native/issues/30729
-org.gradle.jvmargs=-Xmx4g
+# Use this property to specify which architecture you want to build.
+# You can also override it from the CLI using
+# ./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
@@ -1,6 +1,5 @@
-#Wed Oct 11 14:45:21 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
@@ -1,7 +1,7 @@
-#!/usr/bin/env bash
+#!/bin/sh

 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,70 +17,103 @@
 #

 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################

+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum

-warn ( ) {
+warn () {
    echo "$*"
-}
+} >&2

-die ( ) {
+die () {
    echo
    echo "$*"
    echo
    exit 1
-}
+} >&2

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac

-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


@@ -88,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
    else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -99,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    JAVACMD=java
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -107,80 +140,95 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;        
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'

 exec "$JAVACMD" "$@"
@@ -3,3 +3,10 @@ rootProject.name = 'drip'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)

 include ':app'
+
+includeBuild('../node_modules/react-native-gradle-plugin')
+
+if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
+    include(":ReactAndroid")
+    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
+}
@@ -14,6 +14,10 @@ import {
  determinePredictionText,
  formatWithOrdinalSuffix,
 } from './helpers/home'
+import {
+  fertilityTrackingObservable,
+  periodPredictionObservable,
+} from '../local-storage'

 import { Colors, Fonts, Sizes, Spacing } from '../styles'
 import { LocalDate } from '@js-joda/core'
@@ -27,11 +31,13 @@ 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 } =
-    getFertilityStatusForDay(todayDateString)
+    isFertilityTrackingEnabled && getFertilityStatusForDay(todayDateString)
+  const isPeriodPredictionEnabled = periodPredictionObservable.value
  const prediction = determinePredictionText(getPredictedMenses(), t)

  const cycleDayText = cycleDayNumber
@@ -53,7 +59,7 @@ const Home = ({ navigate, setDate }) => {
          </AppText>
        </View>
      )}
-      {phase && (
+      {isFertilityTrackingEnabled && phase && (
        <View style={styles.line}>
          <AppText style={styles.whiteSubtitle}>
            {formatWithOrdinalSuffix(phase)}
@@ -65,9 +71,11 @@ const Home = ({ navigate, setDate }) => {
          <Asterisk />
        </View>
      )}
-      <View style={styles.line}>
-        <AppText style={styles.turquoiseText}>{prediction}</AppText>
-      </View>
+      {isPeriodPredictionEnabled && (
+        <View style={styles.line}>
+          <AppText style={styles.turquoiseText}>{prediction}</AppText>
+        </View>
+      )}
      <Button isCTA isSmall={false} onPress={navigateToCycleDayView}>
        {t('labels.home.addDataForToday')}
      </Button>
@@ -13,7 +13,18 @@ import Tutorial from './Tutorial'
 import YAxis from './y-axis'

 import { getCycleDaysSortedByDate } from '../../db'
-import { getChartFlag, setChartFlag } from '../../local-storage'
+import {
+  getChartFlag,
+  setChartFlag,
+  desireTrackingCategoryObservable,
+  moodTrackingCategoryObservable,
+  noteTrackingCategoryObservable,
+  painTrackingCategoryObservable,
+  sexTrackingCategoryObservable,
+  temperatureTrackingCategoryObservable,
+  mucusTrackingCategoryObservable,
+  cervixTrackingCategoryObservable,
+} from '../../local-storage'
 import { makeColumnInfo } from '../helpers/chart'

 import {
@@ -60,7 +71,31 @@ const CycleChart = ({ navigate, setDate }) => {
    (symptom) => symptom !== 'temperature'
  )

-  const shouldShowTemperatureColumn = chartSymptoms.indexOf('temperature') > -1
+  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') {
+      return painTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'mood') {
+      return moodTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'note') {
+      return noteTrackingCategoryObservable.value ? symptom : null
+    } else {
+      return symptom
+    }
+  })
+
+  const isTemperatureEnabled = temperatureTrackingCategoryObservable.value
+  const shouldShowTemperatureColumn =
+    isTemperatureEnabled && chartSymptoms.indexOf('temperature') > -1
+  const shouldShowNoDataWarning =
+    isTemperatureEnabled && chartSymptoms.indexOf('temperature') <= -1

  const { width, height } = Dimensions.get('window')
  const numberOfColumnsToRender = Math.round(width / CHART_COLUMN_WIDTH)
@@ -71,8 +106,9 @@ const CycleChart = ({ navigate, setDate }) => {
    remainingHeight * CHART_SYMPTOM_HEIGHT_RATIO
  )
  const symptomRowHeight =
-    PixelRatio.roundToNearestPixel(symptomRowSymptoms.length * symptomHeight) +
-    CHART_GRID_LINE_HORIZONTAL_WIDTH
+    PixelRatio.roundToNearestPixel(
+      symptomRowEnabledSymptoms.length * symptomHeight
+    ) + CHART_GRID_LINE_HORIZONTAL_WIDTH
  const columnHeight = remainingHeight - symptomRowHeight

  const chartHeight = shouldShowTemperatureColumn
@@ -89,7 +125,7 @@ const CycleChart = ({ navigate, setDate }) => {
        navigate={navigate}
        symptomHeight={symptomHeight}
        columnHeight={columnHeight}
-        symptomRowSymptoms={symptomRowSymptoms}
+        symptomRowSymptoms={symptomRowEnabledSymptoms}
        chartSymptoms={chartSymptoms}
        shouldShowTemperatureColumn={shouldShowTemperatureColumn}
        xAxisHeight={xAxisHeight}
@@ -110,11 +146,11 @@ const CycleChart = ({ navigate, setDate }) => {
    >
      <View style={styles.chartContainer}>
        {shouldShowHint && <Tutorial onClose={hideHint} />}
-        {!shouldShowTemperatureColumn && <NoTemperature />}
+        {shouldShowNoDataWarning && <NoTemperature />}
        <View style={styles.chartArea}>
          <YAxis
            height={columnHeight}
-            symptomsToDisplay={symptomRowSymptoms}
+            symptomsToDisplay={symptomRowEnabledSymptoms}
            symptomsSectionHeight={symptomRowHeight}
            shouldShowTemperatureColumn={shouldShowTemperatureColumn}
            xAxisHeight={xAxisHeight}
@@ -65,7 +65,7 @@ const DotAndLine = ({
        d={dot}
        stroke={dotColor}
        strokeWidth={CHART_STROKE_WIDTH}
-        fill={Colors.turquoiseDark}
+        fill={dotColor}
        key="dot"
      />
    </React.Fragment>
@@ -1,18 +1,25 @@
 import React from 'react'
-import { StyleSheet, Switch, View } from 'react-native'
+import { Platform, StyleSheet, Switch, View } from 'react-native'
 import PropTypes from 'prop-types'

 import AppText from './app-text'

-import { Containers } from '../../styles'
+import { Colors, Containers, Spacing } from '../../styles'

-const AppSwitch = ({ onToggle, text, value }) => {
+const AppSwitch = ({ onToggle, text, value, disabled }) => {
+  const trackColor = { true: Colors.turquoiseDark }
  return (
    <View style={styles.container}>
      <View style={styles.textContainer}>
        <AppText>{text}</AppText>
      </View>
-      <Switch onValueChange={onToggle} style={styles.switch} value={value} />
+      <Switch
+        onValueChange={onToggle}
+        style={styles.switch}
+        value={value}
+        trackColor={trackColor}
+        disabled={disabled}
+      />
    </View>
  )
 }
@@ -21,14 +28,20 @@ AppSwitch.propTypes = {
  onToggle: PropTypes.func.isRequired,
  text: PropTypes.string,
  value: PropTypes.bool,
+  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,
@@ -9,6 +9,16 @@ import SymptomPageTitle from './symptom-page-title'
 import { getCycleDay } from '../../db'
 import { getData, nextDate, prevDate } from '../helpers/cycle-day'

+import {
+  desireTrackingCategoryObservable,
+  moodTrackingCategoryObservable,
+  noteTrackingCategoryObservable,
+  painTrackingCategoryObservable,
+  sexTrackingCategoryObservable,
+  temperatureTrackingCategoryObservable,
+  mucusTrackingCategoryObservable,
+  cervixTrackingCategoryObservable,
+} from '../../local-storage'
 import { Spacing } from '../../styles'
 import { SYMPTOMS } from '../../config'

@@ -27,6 +37,29 @@ const CycleDayOverView = ({ date, setDate, isTemperatureEditView }) => {
    setDate(prevDate(date))
  }

+  const allEnabledSymptoms = SYMPTOMS.map((symptom) => {
+    if (symptom === 'temperature') {
+      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') {
+      return painTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'mood') {
+      return moodTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'note') {
+      return noteTrackingCategoryObservable.value ? symptom : null
+    } else {
+      return symptom
+    }
+  })
+  const cleanSymptoms = allEnabledSymptoms.filter(Boolean)
+
  return (
    <AppPage>
      <SymptomPageTitle
@@ -35,7 +68,7 @@ const CycleDayOverView = ({ date, setDate, isTemperatureEditView }) => {
        onPrevCycleDay={showPrevCycleDay}
      />
      <View style={styles.container}>
-        {SYMPTOMS.map((symptom) => {
+        {cleanSymptoms.map((symptom) => {
          const symptomData =
            cycleDay && cycleDay[symptom] ? cycleDay[symptom] : null

@@ -5,14 +5,29 @@ 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 }) {
+  const oneTimeTransformIntoNumber =
+    typeof activeButton === 'boolean' && Number(activeButton)
+  const isSecondarySymptomSwitch =
+    buttons[0]['label'] === labels.secondarySymptom.mucus
  return (
    <View style={styles.container}>
      {buttons.map(({ label, value }, i) => {
-        const isActive = value === activeButton
-        const boxStyle = [styles.box, isActive && styles.boxActive]
-        const textStyle = [styles.text, isActive && styles.textActive]
+        const isActive =
+          value === activeButton || value === oneTimeTransformIntoNumber
+        const boxStyle = [
+          styles.box,
+          isActive && styles.boxActive,
+          isSecondarySymptomSwitch && styles.purpleBox,
+          isSecondarySymptomSwitch && isActive && styles.activePurpleBox,
+        ]
+        const textStyle = [
+          styles.text,
+          isSecondarySymptomSwitch && styles.purpleText,
+          isActive && styles.textActive,
+        ]

        return (
          <TouchableOpacity
@@ -50,4 +65,13 @@ const styles = StyleSheet.create({
  textActive: {
    color: 'white',
  },
+  purpleBox: {
+    borderColor: Colors.purple,
+  },
+  activePurpleBox: {
+    backgroundColor: Colors.purple,
+  },
+  purpleText: {
+    color: Colors.purple,
+  },
 })
@@ -102,8 +102,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
  const onSelectTab = (group, value) => {
    const parsedData = getParsedData()

-    Object.assign(parsedData, { [group.key]: value })
-
+    parsedData[group.key] = parsedData[group.key] !== value ? value : null
    setData(parsedData)
  }
  const iconName = shouldShowInfo ? 'chevron-up' : 'chevron-down'
@@ -108,6 +108,7 @@ const styles = StyleSheet.create({
  hint: {
    fontStyle: 'italic',
    fontSize: Sizes.small,
+    color: Colors.orange,
  },
  hintContainer: {
    marginVertical: Spacing.tiny,
@@ -2,6 +2,7 @@ import { LocalDate } from '@js-joda/core'
 import { verticalScale } from 'react-native-size-matters'

 import { Colors, Fonts, Sizes } from '../../styles'
+import { periodPredictionObservable } from '../../local-storage'

 const { shades } = Colors.iconColors.bleeding

@@ -26,6 +27,7 @@ export const toCalFormat = (bleedingDaysSortedByDate) => {
 }

 export const predictionToCalFormat = (predictedDays) => {
+  if (!periodPredictionObservable.value) return {}
  if (!predictedDays.length) return {}
  const todayDateString = LocalDate.now().toString()
  const middleIndex = (predictedDays[0].length - 1) / 2
@@ -1,6 +1,10 @@
 import { LocalDate } from '@js-joda/core'

-import { scaleObservable, unitObservable } from '../../local-storage'
+import {
+  fertilityTrackingObservable,
+  scaleObservable,
+  unitObservable,
+} from '../../local-storage'
 import { getCycleStatusForDay } from '../../lib/sympto-adapter'
 import { getCycleDay, getAmountOfCycleDays } from '../../db'

@@ -270,7 +274,8 @@ export function nfpLines() {
    if (dateString < cycle.startDate) updateCurrentCycle(dateString)
    if (cycle.noMoreCycles) return ret

-    const tempShift = cycle.status.temperatureShift
+    const tempShift =
+      fertilityTrackingObservable.value && cycle.status.temperatureShift

    if (tempShift) {
      if (tempShift.firstHighMeasurementDay.date === dateString) {
@@ -34,6 +34,10 @@ export const formatTemperature = (temperature) =>
    ? temperature
    : Number.parseFloat(temperature.toString()).toFixed(2)

+//maximum of precision digits after decimal point, but no x.0
+export const formatDecimal = (num, precision) =>
+  +parseFloat(Number.parseFloat(num).toFixed(precision))
+
 export const getPreviousTemperature = (date) => {
  const previousTemperature = getPreviousTemperatureForDate(date)
  return formatTemperature(previousTemperature)
@@ -37,13 +37,17 @@ export const pages = [
    parent: 'SettingsMenu',
  },
  {
-    component: 'NfpSettings',
+    component: 'Customization',
    parent: 'SettingsMenu',
  },
  {
    component: 'DataManagement',
    parent: 'SettingsMenu',
  },
+  {
+    component: 'Info',
+    parent: 'SettingsMenu',
+  },
  {
    component: 'Password',
    parent: 'SettingsMenu',
@@ -0,0 +1,50 @@
+import React from 'react'
+import { StyleSheet, View } from 'react-native'
+import PropTypes from 'prop-types'
+import { useTranslation } from 'react-i18next'
+
+import AppIcon from '../common/app-icon'
+import AppPage from '../common/app-page'
+import AppText from '../common/app-text'
+import Segment from '../common/segment'
+
+import { Colors, Spacing, Typography } from '../../styles'
+import labels from '../../i18n/en/settings'
+
+const Info = () => {
+  const { t } = useTranslation(null, { keyPrefix: 'hamburgerMenu.info' })
+  return (
+    <AppPage title={t('title')}>
+      <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>
+  )
+}
+
+Info.propTypes = {
+  children: PropTypes.node,
+}
+
+export default Info
+
+const styles = StyleSheet.create({
+  icon: {
+    marginRight: Spacing.base,
+  },
+  line: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  title: {
+    ...Typography.subtitle,
+  },
+})
@@ -1,18 +1,20 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { useTranslation } from 'react-i18next'
+import { StyleSheet } from 'react-native'

 import AppPage from '../common/app-page'
 import AppText from '../common/app-text'
 import AppLink from '../common/AppLink'
 import Segment from '../common/segment'
+import { Spacing } from '../../styles'

 const License = ({ children }) => {
  const { t } = useTranslation(null, { keyPrefix: 'hamburgerMenu.license' })
  const currentYear = new Date().getFullYear()
  const link = 'https://www.gnu.org/licenses/gpl-3.0.html'
  return (
-    <AppPage title={t('title')}>
+    <AppPage title={t('title')} contentContainerStyle={styles.contentContainer}>
      <Segment last>
        <AppText>{t('text', { currentYear })}</AppText>
        <AppLink url={link}>{link}</AppLink>
@@ -26,4 +28,10 @@ License.propTypes = {
  children: PropTypes.node,
 }

+const styles = StyleSheet.create({
+  contentContainer: {
+    marginTop: Spacing.large,
+  },
+})
+
 export default License
@@ -0,0 +1,305 @@
+import React, { useEffect, useState } from 'react'
+import { Alert, Pressable } from 'react-native'
+
+import AppPage from '../../common/app-page'
+import AppSwitch from '../../common/app-switch'
+import AppText from '../../common/app-text'
+import TemperatureSlider from './temperature-slider'
+import Segment from '../../common/segment'
+import SelectTabGroup from '../../cycle-day/select-tab-group'
+
+import {
+  desireTrackingCategoryObservable,
+  fertilityTrackingObservable,
+  moodTrackingCategoryObservable,
+  noteTrackingCategoryObservable,
+  painTrackingCategoryObservable,
+  sexTrackingCategoryObservable,
+  temperatureTrackingCategoryObservable,
+  mucusTrackingCategoryObservable,
+  cervixTrackingCategoryObservable,
+  saveDesireTrackingCategory,
+  saveFertilityTrackingEnabled,
+  saveMoodTrackingCategory,
+  saveNoteTrackingCategory,
+  savePainTrackingCategory,
+  saveMucusTrackingCategory,
+  saveCervixTrackingCategory,
+  savePeriodPrediction,
+  saveSexTrackingCategory,
+  saveTemperatureTrackingCategory,
+  saveUseCervixAsSecondarySymptom,
+  periodPredictionObservable,
+  useCervixAsSecondarySymptomObservable,
+} from '../../../local-storage'
+import labels from '../../../i18n/en/settings'
+import { SYMPTOMS } from '../../../config'
+
+const Settings = () => {
+  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
+  )
+
+  const [isDesireTrackingCategoryEnabled, setDesireTrackingCategory] = useState(
+    desireTrackingCategoryObservable.value
+  )
+
+  const [isPainTrackingCategoryEnabled, setPainTrackingCategory] = useState(
+    painTrackingCategoryObservable.value
+  )
+
+  const [isMoodTrackingCategoryEnabled, setMoodTrackingCategory] = useState(
+    moodTrackingCategoryObservable.value
+  )
+
+  const [isNoteTrackingCategoryEnabled, setNoteTrackingCategory] = useState(
+    noteTrackingCategoryObservable.value
+  )
+
+  const [isFertilityTrackingEnabled, setFertilityTrackingEnabled] = useState(
+    fertilityTrackingObservable.value
+  )
+  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)
+  }
+  const painTrackingCategoryToggle = (value) => {
+    setPainTrackingCategory(value)
+    savePainTrackingCategory(value)
+  }
+  const moodTrackingCategoryToggle = (value) => {
+    setMoodTrackingCategory(value)
+    saveMoodTrackingCategory(value)
+  }
+  const noteTrackingCategoryToggle = (value) => {
+    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 = [
+    {
+      label: labels.secondarySymptom.mucus,
+      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
+  useEffect(() => {
+    manageSecondarySymptom(
+      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 (!isMucusTrackingCategoryEnabled == isCervixTrackingCategoryEnabled) {
+      Alert.alert(
+        labels.secondarySymptom.disabled.title,
+        labels.secondarySymptom.disabled.noSecondaryEnabled
+      )
+    }
+  }
+
+  const cervixText = useCervixAsSecondarySymptom
+    ? labels.secondarySymptom.cervixModeOn
+    : labels.secondarySymptom.cervixModeOff
+
+  const sliderDisabledPrompt = () => {
+    if (!isTemperatureTrackingCategoryEnabled) {
+      Alert.alert(labels.disabled.title, labels.disabled.message)
+    }
+  }
+
+  return (
+    <AppPage title={'Customization'}>
+      <Segment title={'Tracking categories'}>
+        <AppSwitch
+          onToggle={temperatureTrackingCategoryToggle}
+          text={SYMPTOMS[1]}
+          value={isTemperatureTrackingCategoryEnabled}
+        />
+        <AppSwitch
+          onToggle={(enabled) => {
+            mucusTrackingCategoryToggle(enabled)
+          }}
+          text={SYMPTOMS[2]}
+          value={isMucusTrackingCategoryEnabled}
+        />
+        <AppSwitch
+          onToggle={(enabled) => {
+            cervixTrackingCategoryToggle(enabled)
+          }}
+          text={SYMPTOMS[3]}
+          value={isCervixTrackingCategoryEnabled}
+        />
+        <AppSwitch
+          onToggle={sexTrackingCategoryToggle}
+          text={SYMPTOMS[4]}
+          value={isSexTrackingCategoryEnabled}
+        />
+        <AppSwitch
+          onToggle={desireTrackingCategoryToggle}
+          text={SYMPTOMS[5]}
+          value={isDesireTrackingCategoryEnabled}
+        />
+        <AppSwitch
+          onToggle={painTrackingCategoryToggle}
+          text={SYMPTOMS[6]}
+          value={isPainTrackingCategoryEnabled}
+        />
+        <AppSwitch
+          onToggle={moodTrackingCategoryToggle}
+          text={SYMPTOMS[7]}
+          value={isMoodTrackingCategoryEnabled}
+        />
+        <AppSwitch
+          onToggle={noteTrackingCategoryToggle}
+          text={SYMPTOMS[8]}
+          value={isNoteTrackingCategoryEnabled}
+        />
+      </Segment>
+      <Pressable onPress={sliderDisabledPrompt}>
+        <Segment title={labels.fertilityTracking.title}>
+          {isTemperatureTrackingCategoryEnabled &&
+          (isMucusTrackingCategoryEnabled ||
+            isCervixTrackingCategoryEnabled) ? (
+            <>
+              <AppText>{labels.fertilityTracking.message}</AppText>
+              <AppSwitch
+                onToggle={fertilityTrackingToggle}
+                text={fertilityTrackingText}
+                value={isFertilityTrackingEnabled}
+              />
+            </>
+          ) : (
+            <AppText>{labels.disabled.message}</AppText>
+          )}
+        </Segment>
+      </Pressable>
+
+      <Pressable onPress={sliderDisabledPrompt}>
+        <Segment title={labels.tempScale.segmentTitle}>
+          {isTemperatureTrackingCategoryEnabled && (
+            <>
+              <AppText>{labels.tempScale.segmentExplainer}</AppText>
+              <TemperatureSlider />
+            </>
+          )}
+          {!isTemperatureTrackingCategoryEnabled && (
+            <AppText>{labels.disabled.message}</AppText>
+          )}
+        </Segment>
+      </Pressable>
+
+      <Pressable onPress={secondarySymptomDisabledPrompt}>
+        <Segment title={labels.secondarySymptom.title}>
+          {!isFertilityTrackingEnabled ? (
+            <AppText>{labels.secondarySymptom.disabled.message}</AppText>
+          ) : (
+            <>
+              <AppText>{cervixText}</AppText>
+              <SelectTabGroup
+                activeButton={useCervixAsSecondarySymptom}
+                buttons={secondarySymptomButtons}
+                onSelect={(value) => onSelectTab(value)}
+              />
+            </>
+          )}
+        </Segment>
+      </Pressable>
+
+      <Segment title={labels.periodPrediction.title} last>
+        <AppSwitch
+          onToggle={onPeriodPredictionToggle}
+          text={periodPredictionText}
+          value={isPeriodPredictionEnabled}
+        />
+      </Segment>
+    </AppPage>
+  )
+}
+
+export default Settings
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Alert } from 'react-native'
+import { Alert, Platform } from 'react-native'
 import DocumentPicker from 'react-native-document-picker'
 import rnfs from 'react-native-fs'
 import importCsv from '../../../lib/import-export/import-from-csv'
@@ -59,21 +59,28 @@ export default function ImportData({ resetIsDeletingData, setIsLoading }) {

  function openImportDialog() {
    resetIsDeletingData()
-    Alert.alert(t('dialog.title'), t('dialog.message'), [
+
+    let buttons = [
      {
        text: t('dialog.cancel'),
        style: 'cancel',
        onPress: () => {},
      },
-      {
-        text: t('dialog.delete'),
-        onPress: () => startImport(true),
-      },
      {
        text: t('dialog.replace'),
        onPress: () => startImport(false),
      },
-    ])
+      {
+        text: t('dialog.delete'),
+        onPress: () => startImport(true),
+      },
+    ]
+
+    if (Platform.OS === 'android') {
+      buttons = [buttons[0], buttons[2], buttons[1]]
+    }
+
+    Alert.alert(t('dialog.title'), t('dialog.message'), buttons)
  }

  function showImportErrorAlert(message) {
@@ -1,6 +1,7 @@
 import Reminders from './reminders/reminders'
-import NfpSettings from './nfp-settings'
+import Customization from './customization'
 import DataManagement from './data-management/DataManagement'
+import Info from './Info'
 import Password from './password'
 import About from './About'
 import License from './License'
@@ -8,8 +9,9 @@ import PrivacyPolicy from './privacy-policy'

 export default {
  Reminders,
-  NfpSettings,
+  Customization,
  DataManagement,
+  Info,
  Password,
  About,
  License,
@@ -20,11 +20,15 @@ const MenuItem = ({ item, last, navigate }) => {
        key={item.label}
        onPress={() => navigate(item.componentName)}
      >
-        <View>
+        <View style={styles.textContainer}>
          <AppText style={styles.title}>{t(`${item.label}.name`)}</AppText>
          {!!item.label && <AppText>{t(`${item.label}.text`)}</AppText>}
        </View>
-        <AppIcon name="chevron-right" color={Colors.orange} />
+        <AppIcon
+          style={styles.chevronContainer}
+          name="chevron-right"
+          color={Colors.orange}
+        />
      </TouchableOpacity>
    </Segment>
  )
@@ -44,6 +48,13 @@ const styles = StyleSheet.create({
    color: Colors.purple,
    fontSize: Sizes.subtitle,
  },
+  textContainer: {
+    flex: 5,
+  },
+  chevronContainer: {
+    textAlign: 'right',
+    flex: 1,
+  },
 })

 export default MenuItem
@@ -1,73 +0,0 @@
-import React, { useState } from 'react'
-import { Platform, StyleSheet, View } from 'react-native'
-
-import AppIcon from '../../common/app-icon'
-import AppPage from '../../common/app-page'
-import AppSwitch from '../../common/app-switch'
-import AppText from '../../common/app-text'
-import TemperatureSlider from './temperature-slider'
-import Segment from '../../common/segment'
-
-import { useCervixObservable, saveUseCervix } from '../../../local-storage'
-import { Colors, Spacing, Typography } from '../../../styles'
-import labels from '../../../i18n/en/settings'
-
-const Settings = () => {
-  const [shouldUseCervix, setShouldUseCervix] = useState(
-    useCervixObservable.value
-  )
-
-  const onCervixToggle = (value) => {
-    setShouldUseCervix(value)
-    saveUseCervix(value)
-  }
-
-  const cervixText = shouldUseCervix
-    ? labels.useCervix.cervixModeOn
-    : labels.useCervix.cervixModeOff
-
-  return (
-    <AppPage>
-      <Segment title={labels.useCervix.title}>
-        <AppSwitch
-          onToggle={onCervixToggle}
-          text={cervixText}
-          value={shouldUseCervix}
-        />
-      </Segment>
-      {/* for iOS disabled temporarily, TODO https://gitlab.com/bloodyhealth/drip/-/issues/545 */}
-      {Platform.OS !== 'ios' && (
-        <Segment title={labels.tempScale.segmentTitle}>
-          <AppText>{labels.tempScale.segmentExplainer}</AppText>
-          <TemperatureSlider />
-        </Segment>
-      )}
-      <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,
-  },
-})
@@ -8,11 +8,16 @@ import TemperatureReminder from './temperature-reminder'
 import {
  periodReminderObservable,
  savePeriodReminder,
+  periodPredictionObservable,
+  temperatureTrackingCategoryObservable,
 } from '../../../local-storage'

 import labels from '../../../i18n/en/settings'
+import { Alert, Pressable } from 'react-native'

 const Reminders = () => {
+  const isPeriodPredictionDisabled = !periodPredictionObservable.value
+
  const [isPeriodReminderEnabled, setIsPeriodReminderEnabled] = useState(
    periodReminderObservable.value.enabled
  )
@@ -21,18 +26,40 @@ const Reminders = () => {
    savePeriodReminder({ enabled: isEnabled })
  }

+  const reminderDisabledPrompt = () => {
+    if (!periodPredictionObservable.value) {
+      Alert.alert(
+        labels.periodReminder.alertNoPeriodReminder.title,
+        labels.periodReminder.alertNoPeriodReminder.message
+      )
+    }
+  }
+
+  const tempReminderDisabledPrompt = () => {
+    if (!temperatureTrackingCategoryObservable.value) {
+      Alert.alert(
+        labels.tempReminder.alertNoTempReminder.title,
+        labels.tempReminder.alertNoTempReminder.message
+      )
+    }
+  }
  return (
    <AppPage>
-      <Segment title={labels.tempReminder.title}>
-        <TemperatureReminder />
-      </Segment>
-      <Segment title={labels.periodReminder.title} last>
-        <AppSwitch
-          onToggle={periodReminderToggle}
-          text={labels.periodReminder.reminderText}
-          value={isPeriodReminderEnabled}
-        />
-      </Segment>
+      <Pressable onPress={reminderDisabledPrompt}>
+        <Segment title={labels.periodReminder.title}>
+          <AppSwitch
+            onToggle={periodReminderToggle}
+            text={labels.periodReminder.reminderText}
+            value={isPeriodReminderEnabled}
+            disabled={isPeriodPredictionDisabled}
+          />
+        </Segment>
+      </Pressable>
+      <Pressable onPress={tempReminderDisabledPrompt}>
+        <Segment title={labels.tempReminder.title} last>
+          <TemperatureReminder />
+        </Segment>
+      </Pressable>
    </AppPage>
  )
 }
@@ -7,6 +7,7 @@ import AppSwitch from '../../common/app-switch'
 import {
  saveTempReminder,
  tempReminderObservable,
+  temperatureTrackingCategoryObservable,
 } from '../../../local-storage'
 import padWithZeros from '../../helpers/pad-time-with-zeros'

@@ -51,6 +52,7 @@ const TemperatureReminder = () => {
        onToggle={temperatureReminderToggle}
        text={tempReminderText}
        value={isEnabled}
+        disabled={!temperatureTrackingCategoryObservable.value}
      />
      <DateTimePicker
        isVisible={isTimePickerVisible}
@@ -7,10 +7,11 @@ import MenuItem from './menu-item'
 import { useTranslation } from 'react-i18next'

 const menuItems = [
+  { label: 'customization', componentName: 'Customization' },
  { label: 'reminders', componentName: 'Reminders' },
-  { label: 'nfpSettings', componentName: 'NfpSettings' },
  { label: 'dataManagement', componentName: 'DataManagement' },
  { label: 'password', componentName: 'Password' },
+  { label: 'info', componentName: 'Info' },
 ]

 const SettingsMenu = ({ navigate }) => {
@@ -3,7 +3,7 @@ import { StyleSheet, View } from 'react-native'
 import PropTypes from 'prop-types'

 import AppText from '../common/app-text'
-
+import { formatDecimal } from '../helpers/cycle-day'
 import { Sizes, Spacing, Typography } from '../../styles'

 const StatsOverview = ({ data }) => {
@@ -16,7 +16,9 @@ StatsOverview.propTypes = {

 const Row = ({ rowContent }) => {
  const isStandardDeviation = rowContent[1].includes('deviation')
-
+  if (isStandardDeviation && rowContent[0] !== '—') {
+    rowContent[0] = formatDecimal(rowContent[0], 1)
+  }
  return (
    <View style={styles.row}>
      <Cell content={rowContent[0]} isLeft />
@@ -11,6 +11,7 @@ import PeriodDetailsModal from './PeriodDetailsModal'

 import cycleModule from '../../lib/cycle'
 import { getCycleLengthStats as getCycleInfo } from '../../lib/cycle-length'
+import { formatDecimal } from '../helpers/cycle-day'

 import { Containers, Sizes, Spacing, Typography } from '../../styles'

@@ -27,6 +28,7 @@ const Stats = () => {
    numberOfCycles > 0
      ? getCycleInfo(cycleLengths)
      : { minimum: '—', maximum: '—', stdDeviation: '—' }
+
  const standardDeviation = cycleData.stdDeviation
    ? cycleData.stdDeviation
    : '—'
@@ -37,6 +39,10 @@ const Stats = () => {
    [numberOfCycles, t('overview.completedCycles')],
  ]

+  if (cycleData.mean) {
+    cycleData.mean = formatDecimal(cycleData.mean, 1)
+  }
+
  return (
    <SafeAreaView style={styles.pageContainer}>
      <ScrollView contentContainerStyle={styles.overviewContainer}>
@@ -4,7 +4,7 @@ import { scale, verticalScale } from 'react-native-size-matters'
 export const SYMPTOMS = [
  'bleeding',
  'temperature',
-  'mucus',
+  'cervical mucus',
  'cervix',
  'sex',
  'desire',
@@ -51,7 +51,7 @@
      },
      "philosophy": {
        "title": "Remember to think for yourself",
-        "text": "drip. makes period predictions for you and helps you apply NFP fertility awareness rules. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: \"Does this make sense?\" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure."
+        "text": "drip. makes period predictions for you and helps you apply the sympto-thermal method for fertility awareness. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: \"Does this make sense?\" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure."
      },
      "title": "About",
      "version": {
@@ -116,20 +116,27 @@
          "name": "Data",
          "text": "import, export or delete your data"
        },
-        "nfpSettings": {
-          "name": "NFP settings",
-          "text": "define how you want to use NFP"
+        "customization": {
+          "name": "Customization",
+          "text": "define how you want to use drip"
        },
        "password": {
          "name": "Password",
-          "text": ""
+          "text": "set or edit your password"
        },
        "reminders": {
          "name": "Reminders",
          "text": "turn on/off reminders"
+        },
+        "info": {
+          "name": "Info",
+          "text": "Learn more about how drip works"
        }
      },
      "title": "Settings"
+    },
+    "info": {
+      "title": "info"
    }
  },
  "stats": {
@@ -113,11 +113,8 @@ export const mood = {
 }

 export const temperature = {
-  // disabled temporarily, TODO https://gitlab.com/bloodyhealth/drip/-/issues/545 */}
-  // outOfRangeWarning: 'This temperature value is out of the current range for the temperature chart. You can change the range in the settings.',
-  outOfRangeWarning: 'This temperature value is too high or low to be shown on the temperature chart.',
+  outOfRangeWarning: 'This temperature value is out of the current range for the temperature chart. You can change the range in the settings.',
  outOfAbsoluteRangeWarning: 'This temperature value is too high or low to be shown on the temperature chart.',
-  saveAnyway: 'Save anyway',
  temperature: {
    header: "Temperature",
    explainer: 'Take your temperature right after waking up, before getting out of bed'
@@ -70,14 +70,14 @@ export const fertilityStatus = {
  unknown:
    'We cannot show any cycle information because no period data has been added.',
  preOvuText:
-    "With NFP rules, you may assume 5 days of infertility at the beginning of your cycle, provided you don't observe any fertile cervical mucus or cervix values.",
+    "According to the sympto-thermal method, you may assume 5 days of infertility at the beginning of your cycle, provided you don't observe any fertile cervical mucus or cervix values.",
  periOvuText:
    'We were not able to detect both a temperature shift and cervical mucus or cervix shift.',
  periOvuUntilEveningText: (tempRule) => {
    return (
      'We detected a temperature shift (' +
      ['regular', '1st exception', '2nd exception'][tempRule] +
-      ' temperature rule), as well as a cervical mucus/cervix shift according to NFP rules. In the evening today you may assume infertility, but ' +
+      ' temperature rule), as well as a cervical mucus/cervix shift according to the sympto-thermal method. In the evening today you may assume infertility, but ' +
      'always remember to double-check for yourself. Make sure the data makes sense to you.'
    )
  },
@@ -85,7 +85,7 @@ export const fertilityStatus = {
    return (
      'We detected a temperature shift (' +
      ['regular', '1st exception', '2nd exception'][tempRule] +
-      ' temperature rule), as well as a cervical mucus/cervix shift according to NFP rules. You may assume infertility, but always remember to ' +
+      ' temperature rule), as well as a cervical mucus/cervix shift according to the sympto-thermal method. You may assume infertility, but always remember to ' +
      'double-check for yourself. Make sure the data makes sense to you.'
    )
  },
@@ -38,11 +38,21 @@ export default {
    loadError: 'Could not load saved temperature scale settings',
    saveError: 'Could not save temperature scale settings',
  },
+  disabled: {
+    title: 'This feature is turned off',
+    message:
+      'To use the temperature scale please first enable the temperature tracking category above.',
+  },
  tempReminder: {
    title: 'Temperature reminder',
    noTimeSet: 'Set a time for a daily reminder to take your temperature',
    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',
@@ -50,13 +60,39 @@ export default {
      'Get a notification 3 days before your next period is likely to start.',
    notification: (daysToEndOfPrediction) =>
      `Your next period is likely to start in 3 to ${daysToEndOfPrediction} days.`,
+    alertNoPeriodReminder: {
+      title: 'Period predictions turned off',
+      message:
+        'To use the period reminder please first enable period predictions in the customization settings.',
+    },
  },
-  useCervix: {
+  fertilityTracking: {
+    title: 'Fertility phases calculation',
+    message:
+      'If you enter menstrual bleeding, temperature and cervical mucus or cervix data according to the sympto-thermal rules, drip will calculate cycle phases with the provided data.',
+    on: 'If you switch this off, drip will not show fertility related information.',
+    off: 'If you switch this on, drip will show fertility related information.',
+  },
+  secondarySymptom: {
    title: 'Secondary symptom',
    cervixModeOn:
      'Cervix values are being used for symptothermal fertility detection. You can switch here to use cervical mucus values for symptothermal fertility detection',
    cervixModeOff:
      '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 temperature, cervical mucus or cervix tracking category as well as the fertility feature above.',
+      noSecondaryEnabled:
+        'To switch the secondary symptom both cervical mucus and cervix need to be enabled above.',
+    },
+    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.',
+    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',
@@ -99,6 +135,6 @@ Making any changes to your password setting will keep your data as it was before
  },
  preOvu: {
    title: 'Infertile days at cycle start',
-    note: `drip. applies NFP's rules for calculating infertile days at the start of the cycle (see ${links.wiki.url} for more info). However, drip. does not currently apply the so called 20-day-rule, which determines infertile days at the cycle start from past cycle lengths in case no past symptothermal info is available.`,
+    note: `drip. applies the sympto-thermal method for calculating infertile days at the start of the cycle (see ${links.wiki.url} for more info). However, drip. does not currently apply the so called 20-day-rule, which determines infertile days at the cycle start from past cycle lengths in case no past symptothermal info is available.`,
  },
 }
@@ -11,7 +11,7 @@ export const generalInfo = {
  3. and menstrual bleeding
 the app helps you identify in which phase of the menstrual cycle you are.

-drip. makes period predictions for you and helps you apply NFP fertility awareness rules. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: "Does this make sense?" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure.
+drip. makes period predictions for you and helps you apply the sympto-thermal method for fertility awareness. But please remember that this app is made by humans, and humans make mistakes. Always think for yourself: "Does this make sense?" Remember, you don't need an app to understand your cycle! However, drip. wants to support you and make period tracking easier, more transparent and secure.

 Please find more info on the sympto-thermal method in ${links.wiki.url}.`,
  noNfpSymptom: `The app allows you to track this symptom for your information, it is not taken into account for any calculation. On the chart you can check how often you track this symptom.`,
@@ -27,7 +27,7 @@ After tracking at least 3 menstrual cycles, drip. will give you an overview of
 · 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").

-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 prediction for the start of next cycles.
+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.

 Excluding bleeding values is for tracking bleeding when it's not marking the start of a new cycle or the continuation of menstrual bleeding the day(s) before, e.g. bleeding caused by ovulation or a miscarriage.

@@ -39,7 +39,7 @@ ${generalInfo.nfpTfyReminder}`,

 Tracking how open or closed and how firm or soft the cervix feels can help determine in which phase of the menstrual cycle you are.

-By default, the secondary symptom the app uses for NFP evaluation is cervical mucus, but you can change it to cervix in "Settings" -> "NFP Settings".
+By default, the secondary symptom the app uses for the sympto-thermal method is cervical mucus, but you can change it to cervix in "Settings" -> "Customization".

 · How to identify a fertile cervix?
 A fertile cervix is open and feels soft like your earlobes. In contrast, an infertile cervix feels closed and hard, like the tip of your nose. If the cervix feels anything other than closed and hard, drip. takes it as a sign of fertility. On the chart, a fertile cervix is colored in dark yellow, and infertile cervix is colored in light yellow.
@@ -74,10 +74,10 @@ ${generalInfo.curiousNfp}`,
    title: 'Tracking cervical mucus',
    text: `Cervical mucus can help determine in which phase of the menstrual cycle you are.

-By default the secondary symptom the app uses for NFP evaluation is cervical mucus.
+By default the secondary symptom the app uses for the sympto-thermal method is cervical mucus.

 · How to identify fertile cervical mucus?
-Tracking the feeling and the texture of your cervical mucus on a daily basis helps you identify changes of the quality of the cervical mucus. The values you enter for both feeling and texture of your cervical mucus are combined by drip. into one of five NFP-conforming values.
+Tracking the feeling and the texture of your cervical mucus on a daily basis helps you identify changes of the quality of the cervical mucus. The values you enter for both feeling and texture of your cervical mucus are combined by drip. into one of five values following the sympto-thermal method.
 From lowest to best quality:
 · t = (dry feeling + no texture),
 · ∅ = (no feeling + no texture),
@@ -87,7 +87,7 @@ From lowest to best quality:

 On the chart, cervical mucus is colored in blue: the darker the shade of blue the better the quality of your cervical mucus.

-Please note that drip. does not yet support "parenthesis values": According to NFP rules, you can qualify a cervical mucus value by putting parentheses around it, to indicate that it doesn't fully meet the descriptors of one of the five categories, and instead is in between. This functionality will be supported in the future.
+Please note that drip. does not yet support "parenthesis values": According to the sympto-thermal method, you can qualify a cervical mucus value by putting parentheses around it, to indicate that it doesn't fully meet the descriptors of one of the five categories, and instead is in between. This functionality will be supported in the future.

 ${generalInfo.chartNfp}

@@ -125,7 +125,7 @@ ${generalInfo.curiousNfp}`,
    title: 'Tracking body basal temperature',
    text: `One of the body signs you need to track for knowing your fertility status is your body basal temperature. The body temperature changes over the course of a menstrual cycle, it rises after ovulation.

-By default the secondary symptom is cervical mucus, but you can change it to cervix in "Settings" -> "NFP Settings".
+By default the secondary symptom is cervical mucus, but you can change it to cervix in "Settings" -> "Customization".

 · What is body basal temperature?
 It's your temperature after lying still for at least 6 hours. For many, this is when they are waking up in the morning after sleeping at least 6 hours and before getting up.
@@ -2,14 +2,21 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'

 platform :ios, '11.0'
+install! 'cocoapods', :deterministic_uuids => false

 target 'drip' do
  config = use_native_modules!

+  # Flags change depending on the env values.
+  flags = get_default_flags()
+
  use_react_native!(
    :path => config[:reactNativePath],
    # to enable hermes on iOS, change `false` to `true` and then install pods
-    :hermes_enabled => false
+    :hermes_enabled => flags[:hermes_enabled],
+    :fabric_enabled => flags[:fabric_enabled],
+    # An absolute path to your application root.
+    :app_path => "#{Pod::Config.instance.installation_root}/.."
  )

  target 'dripTests' do
@@ -17,8 +24,13 @@ target 'drip' do
    # Pods for testing
  end

+  # Enables Flipper.
+  #
+  # Note that if you have use_frameworks! enabled, Flipper will not work and
+  # you should disable the next line.
+  use_flipper!()
+
  post_install do |installer|
    react_native_post_install(installer)
-    __apply_Xcode_12_5_M1_post_install_workaround(installer)
  end  
 end
@@ -3,12 +3,13 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* dripTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* dripTests.m */; };
-		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
+		0C80B921A6F3F58F76C31292 /* libPods-drip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-drip.a */; };
+		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		540918B325AB726000086AE1 /* OpenSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 540918A325AB725F00086AE1 /* OpenSans-Light.ttf */; };
@@ -30,17 +31,16 @@
 		5472A45A25BB7807005E81DE /* drip-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5472A44925BB7806005E81DE /* drip-icon-font.ttf */; };
 		5472A45B25BB7807005E81DE /* drip-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5472A44925BB7806005E81DE /* drip-icon-font.ttf */; };
 		5472A45E25BB7C43005E81DE /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5472A45C25BB7C42005E81DE /* Entypo.ttf */; };
-		5488D8D728ABF478008DD66D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5488D8D628ABF478008DD66D /* LaunchScreen.storyboard */; };
 		54DFE73A25D94D6E0025C3FC /* swipe.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73925D94D6E0025C3FC /* swipe.png */; };
 		54DFE73B25D94D6E0025C3FC /* swipe.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73925D94D6E0025C3FC /* swipe.png */; };
 		54DFE73D25D94DED0025C3FC /* cycle-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73C25D94DED0025C3FC /* cycle-icon.png */; };
 		54DFE73E25D94DED0025C3FC /* cycle-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73C25D94DED0025C3FC /* cycle-icon.png */; };
-		54E1D49923E7588F003FA37B /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54E1D49823E7588F003FA37B /* JavaScriptCore.framework */; };
+		54E1D49923E7588F003FA37B /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
 		62F2A4645AC84CDC9506FF27 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AEBF0735214455AAEDF56D5 /* libc++.tbd */; };
+		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		BD7041F2826E4A2CBE6CB87D /* RealmJSTests.xctest in Frameworks */ = {isa = PBXBuildFile; fileRef = F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */; };
 		D91133DCE120440893E2FD2E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CD8C8B91E0A747B3883A0D56 /* libz.tbd */; };
-		E545887DBE87912F11770AB9 /* libPods-drip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 699D3B3789FC2E5185CB9894 /* libPods-drip.a */; };
-		FAC423E577F555F66C9891E4 /* libPods-drip-dripTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F33CCAAB670FD0D98C5C72DF /* libPods-drip-dripTests.a */; };
+		DFCB30DF40F45C00CFBBE07E /* libPods-drip-dripTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-drip-dripTests.a */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -54,27 +54,23 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
-		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
 		00E356EE1AD99517003FC87E /* dripTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = dripTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* dripTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = dripTests.m; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* drip.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = drip.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = drip/AppDelegate.h; sourceTree = "<group>"; };
-		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = drip/AppDelegate.m; sourceTree = "<group>"; };
+		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = drip/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = drip/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = drip/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = drip/main.m; sourceTree = "<group>"; };
-		2B1578D5817F46EE9BFC9BAF /* Pods-drip.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.debug.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.debug.xcconfig"; sourceTree = "<group>"; };
+		19F6CBCC0A4E27FBF8BF4A61 /* libPods-drip-dripTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-dripTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		4A9B2D77CAC90DFEB5C4565A /* Pods-dripTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-dripTests.debug.xcconfig"; path = "Target Support Files/Pods-dripTests/Pods-dripTests.debug.xcconfig"; sourceTree = "<group>"; };
-		5409189625AB725F00086AE1 /* OpenSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-LightItalic.ttf"; path = "../../assets/fonts/OpenSans-LightItalic.ttf"; sourceTree = "<group>"; };
-		540918A225AB725F00086AE1 /* Prompt-ExtraLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Prompt-ExtraLight.ttf"; path = "../../assets/fonts/Prompt-ExtraLight.ttf"; sourceTree = "<group>"; };
+		3B4392A12AC88292D35C810B /* Pods-drip.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.debug.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.debug.xcconfig"; sourceTree = "<group>"; };
 		540918A325AB725F00086AE1 /* OpenSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Light.ttf"; path = "../../assets/fonts/OpenSans-Light.ttf"; sourceTree = "<group>"; };
 		540918A425AB725F00086AE1 /* Jost-700-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Jost-700-Bold.otf"; path = "../../assets/fonts/Jost-700-Bold.otf"; sourceTree = "<group>"; };
 		540918A525AB725F00086AE1 /* Menu.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Menu.ttf; path = ../../assets/fonts/Menu.ttf; sourceTree = "<group>"; };
 		540918A625AB726000086AE1 /* drip-home-icons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "drip-home-icons.ttf"; path = "../../assets/fonts/drip-home-icons.ttf"; sourceTree = "<group>"; };
 		540918A725AB726000086AE1 /* Jost-400-Book.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Jost-400-Book.otf"; path = "../../assets/fonts/Jost-400-Book.otf"; sourceTree = "<group>"; };
-		540918A825AB726000086AE1 /* drip-icon-font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "drip-icon-font.ttf"; path = "../../assets/fonts/drip-icon-font.ttf"; sourceTree = "<group>"; };
 		540918A925AB726000086AE1 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-SemiBold.ttf"; path = "../../assets/fonts/OpenSans-SemiBold.ttf"; sourceTree = "<group>"; };
 		5472A44125BB7806005E81DE /* drip-home-icons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "drip-home-icons.ttf"; path = "../assets/fonts/drip-home-icons.ttf"; sourceTree = "<group>"; };
 		5472A44225BB7806005E81DE /* OpenSans-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-Light.ttf"; path = "../assets/fonts/OpenSans-Light.ttf"; sourceTree = "<group>"; };
@@ -86,28 +82,24 @@
 		5472A44825BB7806005E81DE /* OpenSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-LightItalic.ttf"; path = "../assets/fonts/OpenSans-LightItalic.ttf"; sourceTree = "<group>"; };
 		5472A44925BB7806005E81DE /* drip-icon-font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "drip-icon-font.ttf"; path = "../assets/fonts/drip-icon-font.ttf"; sourceTree = "<group>"; };
 		5472A45C25BB7C42005E81DE /* Entypo.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
-		5488D8D628ABF478008DD66D /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = drip/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		548C3D3A2898FB0600013449 /* drip-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "drip-Bridging-Header.h"; sourceTree = "<group>"; };
 		54DFE73925D94D6E0025C3FC /* swipe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = swipe.png; path = ../assets/swipe.png; sourceTree = "<group>"; };
 		54DFE73C25D94DED0025C3FC /* cycle-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cycle-icon.png"; path = "../assets/cycle-icon.png"; sourceTree = "<group>"; };
-		54E1D49823E7588F003FA37B /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
-		5ABC2C1190B4D25AC0398D09 /* Pods-dripTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-dripTests.release.xcconfig"; path = "Target Support Files/Pods-dripTests/Pods-dripTests.release.xcconfig"; sourceTree = "<group>"; };
+		5709B34CF0A7D63546082F79 /* Pods-drip.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.release.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.release.xcconfig"; sourceTree = "<group>"; };
+		5B7EB9410499542E8C5724F5 /* Pods-drip-dripTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.debug.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5C649EDC281151BC005FED46 /* dripRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = dripRelease.entitlements; path = drip/dripRelease.entitlements; sourceTree = "<group>"; };
-		699D3B3789FC2E5185CB9894 /* libPods-drip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		6B7C2A0A7AAA83BBEFBD0B6A /* libPods-drip-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		72DDDE8D34518ED64FD7EBBA /* Pods-drip-dripTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.release.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.release.xcconfig"; sourceTree = "<group>"; };
+		5DCACB8F33CDC322A6C60F78 /* libPods-drip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7A5827160B914D2B99C47381 /* libRealmReact.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRealmReact.a; sourceTree = "<group>"; };
+		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = drip/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		84CCEBD3B2C44758853BC941 /* libRNFS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNFS.a; sourceTree = "<group>"; };
+		89C6BE57DB24E9ADA2F236DE /* Pods-drip-dripTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.release.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.release.xcconfig"; sourceTree = "<group>"; };
 		90224CB4571D41C4969E9722 /* libGCDWebServers.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libGCDWebServers.a; sourceTree = "<group>"; };
 		9AEBF0735214455AAEDF56D5 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		A8B59389C2FC4F19BD30ABC3 /* libRNShare.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNShare.a; sourceTree = "<group>"; };
 		AB636AA0286D45CE9B23B2C3 /* libRCTRestart.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTRestart.a; sourceTree = "<group>"; };
-		B6FD0A300273E09D74C14C19 /* Pods-drip-dripTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.debug.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.debug.xcconfig"; sourceTree = "<group>"; };
 		CD8C8B91E0A747B3883A0D56 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		D211D71BE5A8436A978770A9 /* libRNDocumentPicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDocumentPicker.a; sourceTree = "<group>"; };
-		E086AB579387F878A2CBCFEB /* libPods-drip-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		E1C5175D0AEA2ABCC690D6E2 /* Pods-drip.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.release.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.release.xcconfig"; sourceTree = "<group>"; };
-		F33CCAAB670FD0D98C5C72DF /* libPods-drip-dripTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-dripTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		F5039D0A572B4BBCB7995891 /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
 		F710D85E391D4094816E1B62 /* libRealmJS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRealmJS.a; sourceTree = "<group>"; };
 		F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = RealmJSTests.xctest; sourceTree = "<group>"; };
@@ -118,7 +110,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FAC423E577F555F66C9891E4 /* libPods-drip-dripTests.a in Frameworks */,
+				DFCB30DF40F45C00CFBBE07E /* libPods-drip-dripTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -126,11 +118,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				54E1D49923E7588F003FA37B /* JavaScriptCore.framework in Frameworks */,
+				54E1D49923E7588F003FA37B /* BuildFile in Frameworks */,
 				62F2A4645AC84CDC9506FF27 /* libc++.tbd in Frameworks */,
 				D91133DCE120440893E2FD2E /* libz.tbd in Frameworks */,
 				BD7041F2826E4A2CBE6CB87D /* RealmJSTests.xctest in Frameworks */,
-				E545887DBE87912F11770AB9 /* libPods-drip.a in Frameworks */,
+				0C80B921A6F3F58F76C31292 /* libPods-drip.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -176,13 +168,12 @@
 		13B07FAE1A68108700A75B9A /* drip */ = {
 			isa = PBXGroup;
 			children = (
-				5488D8D628ABF478008DD66D /* LaunchScreen.storyboard */,
 				5C649EDC281151BC005FED46 /* dripRelease.entitlements */,
-				008F07F21AC5B25A0029DE68 /* main.jsbundle */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
-				13B07FB01A68108700A75B9A /* AppDelegate.m */,
+				13B07FB01A68108700A75B9A /* AppDelegate.mm */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
+				81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
 				13B07FB71A68108700A75B9A /* main.m */,
 				548C3D3A2898FB0600013449 /* drip-Bridging-Header.h */,
 			);
@@ -192,14 +183,12 @@
 		2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				54E1D49823E7588F003FA37B /* JavaScriptCore.framework */,
+				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				2D16E6891FA4F8E400B85C8A /* libReact.a */,
 				9AEBF0735214455AAEDF56D5 /* libc++.tbd */,
 				CD8C8B91E0A747B3883A0D56 /* libz.tbd */,
-				6B7C2A0A7AAA83BBEFBD0B6A /* libPods-drip-tvOS.a */,
-				E086AB579387F878A2CBCFEB /* libPods-drip-tvOSTests.a */,
-				699D3B3789FC2E5185CB9894 /* libPods-drip.a */,
-				F33CCAAB670FD0D98C5C72DF /* libPods-drip-dripTests.a */,
+				5DCACB8F33CDC322A6C60F78 /* libPods-drip.a */,
+				19F6CBCC0A4E27FBF8BF4A61 /* libPods-drip-dripTests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -216,32 +205,16 @@
 				90224CB4571D41C4969E9722 /* libGCDWebServers.a */,
 				F710D85E391D4094816E1B62 /* libRealmJS.a */,
 				F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */,
+				540918A325AB725F00086AE1 /* OpenSans-Light.ttf */,
+				540918A925AB726000086AE1 /* OpenSans-SemiBold.ttf */,
+				540918A725AB726000086AE1 /* Jost-400-Book.otf */,
+				540918A525AB725F00086AE1 /* Menu.ttf */,
+				540918A625AB726000086AE1 /* drip-home-icons.ttf */,
+				540918A425AB725F00086AE1 /* Jost-700-Bold.otf */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
 		};
-		6817ABC38854EEB6D3EE933A /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				540918A625AB726000086AE1 /* drip-home-icons.ttf */,
-				540918A825AB726000086AE1 /* drip-icon-font.ttf */,
-				540918A725AB726000086AE1 /* Jost-400-Book.otf */,
-				540918A425AB725F00086AE1 /* Jost-700-Bold.otf */,
-				540918A525AB725F00086AE1 /* Menu.ttf */,
-				540918A325AB725F00086AE1 /* OpenSans-Light.ttf */,
-				5409189625AB725F00086AE1 /* OpenSans-LightItalic.ttf */,
-				540918A925AB726000086AE1 /* OpenSans-SemiBold.ttf */,
-				540918A225AB725F00086AE1 /* Prompt-ExtraLight.ttf */,
-				2B1578D5817F46EE9BFC9BAF /* Pods-drip.debug.xcconfig */,
-				E1C5175D0AEA2ABCC690D6E2 /* Pods-drip.release.xcconfig */,
-				4A9B2D77CAC90DFEB5C4565A /* Pods-dripTests.debug.xcconfig */,
-				5ABC2C1190B4D25AC0398D09 /* Pods-dripTests.release.xcconfig */,
-				B6FD0A300273E09D74C14C19 /* Pods-drip-dripTests.debug.xcconfig */,
-				72DDDE8D34518ED64FD7EBBA /* Pods-drip-dripTests.release.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		832341AE1AAA6A7D00B99B32 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
@@ -258,7 +231,7 @@
 				83CBBA001A601CBA00E9B192 /* Products */,
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
 				42C7F9942202468200F22656 /* Recovered References */,
-				6817ABC38854EEB6D3EE933A /* Pods */,
+				BBD78D7AC51CEA395F1C20DB /* Pods */,
 				006C39A0B9774387BC5ACA43 /* Resources */,
 			);
 			indentWidth = 2;
@@ -275,6 +248,17 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		BBD78D7AC51CEA395F1C20DB /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				3B4392A12AC88292D35C810B /* Pods-drip.debug.xcconfig */,
+				5709B34CF0A7D63546082F79 /* Pods-drip.release.xcconfig */,
+				5B7EB9410499542E8C5724F5 /* Pods-drip-dripTests.debug.xcconfig */,
+				89C6BE57DB24E9ADA2F236DE /* Pods-drip-dripTests.release.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@@ -282,11 +266,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "dripTests" */;
 			buildPhases = (
-				CD68B565C5F4A7A674494D02 /* [CP] Check Pods Manifest.lock */,
+				A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				46313D848A7A3E69E5ED05E7 /* [CP] Copy Pods Resources */,
+				C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */,
+				F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -302,19 +287,21 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "drip" */;
 			buildPhases = (
-				852A2E0CD5D0F561CE2927A3 /* [CP] Check Pods Manifest.lock */,
+				C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */,
+				FD10A7F022414F080027D42C /* Start Packager */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				616E70055A3365D214C7B201 /* [CP] Copy Pods Resources */,
+				00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */,
+				E235C05ADACE081382539298 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = drip;
-			productName = "Hello World";
+			productName = drip;
 			productReference = 13B07F961A680F5B00A75B9A /* drip.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -324,7 +311,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1340;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
@@ -332,13 +319,12 @@
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
-						DevelopmentTeam = 6AD72X6W26;
-						LastSwiftMigration = 1340;
+						LastSwiftMigration = 1120;
 					};
 				};
 			};
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "drip" */;
-			compatibilityVersion = "Xcode 3.2";
+			compatibilityVersion = "Xcode 12.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -383,7 +369,7 @@
 				5472A44C25BB7807005E81DE /* OpenSans-Light.ttf in Resources */,
 				5472A45425BB7807005E81DE /* Menu.ttf in Resources */,
 				5472A45A25BB7807005E81DE /* drip-icon-font.ttf in Resources */,
-				5488D8D728ABF478008DD66D /* LaunchScreen.storyboard in Resources */,
+				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				5472A45825BB7807005E81DE /* OpenSans-LightItalic.ttf in Resources */,
 				5472A45625BB7807005E81DE /* OpenSans-SemiBold.ttf in Resources */,
 				5472A45025BB7807005E81DE /* Jost-400-Book.otf in Resources */,
@@ -405,137 +391,34 @@
 			files = (
 			);
 			inputPaths = (
+				"$(SRCROOT)/.xcode.env.local",
+				"$(SRCROOT)/.xcode.env",
 			);
 			name = "Bundle React Native code and images";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
-		46313D848A7A3E69E5ED05E7 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-resources.sh",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		616E70055A3365D214C7B201 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-resources.sh",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		852A2E0CD5D0F561CE2927A3 /* [CP] Check Pods Manifest.lock */ = {
+		00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
+			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-drip-checkManifestLockResult.txt",
+				"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CD68B565C5F4A7A674494D02 /* [CP] Check Pods Manifest.lock */ = {
+		A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -557,6 +440,98 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-drip-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		E235C05ADACE081382539298 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		FD10A7F022414F080027D42C /* Start Packager */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Start Packager";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "export RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > \"${SRCROOT}/../node_modules/react-native/scripts/.packager.env\"\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n    if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../node_modules/react-native/scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -572,7 +547,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */,
+				13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
 				13B07FC11A68108700A75B9A /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -590,36 +565,20 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = B6FD0A300273E09D74C14C19 /* Pods-drip-dripTests.debug.xcconfig */;
+			baseConfigurationReference = 5B7EB9410499542E8C5724F5 /* Pods-drip-dripTests.debug.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				ENABLE_BITCODE = "$(inherited)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
-				);
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/realm/src/**",
-					"$(SRCROOT)/../node_modules/react-native-share/ios",
-					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
-					"$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker",
-					"$(SRCROOT)/../node_modules/react-native-fs/**",
-					"$(SRCROOT)/../node_modules/react-native-restart/ios/RCTRestart/**",
-					"$(SRCROOT)/../node_modules/realm/src/**",
-				);
 				INFOPLIST_FILE = dripTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -634,33 +593,17 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 72DDDE8D34518ED64FD7EBBA /* Pods-drip-dripTests.release.xcconfig */;
+			baseConfigurationReference = 89C6BE57DB24E9ADA2F236DE /* Pods-drip-dripTests.release.xcconfig */;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
-				ENABLE_BITCODE = "$(inherited)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
-				);
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/realm/src/**",
-					"$(SRCROOT)/../node_modules/react-native-share/ios",
-					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
-					"$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker",
-					"$(SRCROOT)/../node_modules/react-native-fs/**",
-					"$(SRCROOT)/../node_modules/react-native-restart/ios/RCTRestart/**",
-					"$(SRCROOT)/../node_modules/realm/src/**",
-				);
 				INFOPLIST_FILE = dripTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
-					"\"$(SRCROOT)/$(TARGET_NAME)\"",
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
 				);
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -675,77 +618,25 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2B1578D5817F46EE9BFC9BAF /* Pods-drip.debug.xcconfig */;
+			baseConfigurationReference = 3B4392A12AC88292D35C810B /* Pods-drip.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 1;
-				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 6AD72X6W26;
-				ENABLE_BITCODE = "$(inherited)";
-				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=*]" = "";
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"COCOAPODS=1",
-					"$(inherited)",
-				);
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/realm/src/**",
-					"$(SRCROOT)/../node_modules/react-native-share/ios",
-					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
-					"$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker",
-					"$(SRCROOT)/../node_modules/react-native-fs/**",
-					"$(SRCROOT)/../node_modules/react-native-restart/ios/RCTRestart/**",
-					"$(SRCROOT)/../node_modules/@react-native-community/push-notification-ios/ios",
-					"$(SRCROOT)/../node_modules/realm/src/**",
-				);
+				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = drip/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/DoubleConversion\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/FBReactNativeSpec\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/Folly\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RCTTypeSafety\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RNFS\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RNShare\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RNVectorIcons\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Core\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-CoreModules\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTActionSheet\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTAnimation\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTBlob\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTImage\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTLinking\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTNetwork\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTSettings\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTText\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTVibration\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsi\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsiexecutor\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsinspector\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RealmJS\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-document-picker\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-restart\"",
-					"\"${PODS_ROOT}/../../node_modules/realm/vendor/realm-ios\"",
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
+					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2208.11;
 				OTHER_LDFLAGS = (
+					"$(inherited)",
 					"-ObjC",
 					"-lc++",
-					"$(inherited)",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = org.heartofcode.drip.cycle.tracking;
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = drip;
-				SWIFT_OBJC_BRIDGING_HEADER = "drip-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -754,76 +645,24 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E1C5175D0AEA2ABCC690D6E2 /* Pods-drip.release.xcconfig */;
+			baseConfigurationReference = 5709B34CF0A7D63546082F79 /* Pods-drip.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_ENTITLEMENTS = drip/dripRelease.entitlements;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6AD72X6W26;
-				ENABLE_BITCODE = "$(inherited)";
-				EXCLUDED_ARCHS = "";
-				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"COCOAPODS=1",
-					"$(inherited)",
-				);
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)/../node_modules/realm/src/**",
-					"$(SRCROOT)/../node_modules/react-native-share/ios",
-					"$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager",
-					"$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker",
-					"$(SRCROOT)/../node_modules/react-native-fs/**",
-					"$(SRCROOT)/../node_modules/react-native-restart/ios/RCTRestart/**",
-					"$(SRCROOT)/../node_modules/@react-native-community/push-notification-ios/ios",
-					"$(SRCROOT)/../node_modules/realm/src/**",
-				);
 				INFOPLIST_FILE = drip/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/DoubleConversion\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/FBReactNativeSpec\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/Folly\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/GCDWebServer\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RCTTypeSafety\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RNFS\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RNShare\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RNVectorIcons\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-Core\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-CoreModules\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTActionSheet\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTAnimation\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTBlob\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTImage\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTLinking\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTNetwork\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTSettings\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTText\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTVibration\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsi\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsiexecutor\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/React-jsinspector\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/RealmJS\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-document-picker\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-restart\"",
-					"\"${PODS_ROOT}/../../node_modules/realm/vendor/realm-ios\"",
+				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
+					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2208.11;
 				OTHER_LDFLAGS = (
+					"$(inherited)",
 					"-ObjC",
 					"-lc++",
-					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.heartofcode.drip.cycle.tracking;
 				PRODUCT_NAME = drip;
-				SWIFT_OBJC_BRIDGING_HEADER = "drip-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -834,7 +673,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -860,7 +699,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				ENABLE_BITCODE = "$(inherited)";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
@@ -880,15 +718,24 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+				);
 				LIBRARY_SEARCH_PATHS = (
-					"$(SDKROOT)/usr/lib/swift",
-					"\"$(inherited)\"",
+					"\"$(SDKROOT)/usr/lib/swift\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
+					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				SDKROOT = iphoneos;
-				VALIDATE_WORKSPACE = YES;
 			};
 			name = Debug;
 		};
@@ -897,7 +744,7 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -923,7 +770,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				ENABLE_BITCODE = "$(inherited)";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
@@ -936,15 +782,24 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+				);
 				LIBRARY_SEARCH_PATHS = (
-					"$(SDKROOT)/usr/lib/swift",
-					"\"$(inherited)\"",
+					"\"$(SDKROOT)/usr/lib/swift\"",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
+					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-DFOLLY_NO_CONFIG",
+					"-DFOLLY_MOBILE=1",
+					"-DFOLLY_USE_LIBCPP=1",
+				);
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
-				VALIDATE_WORKSPACE = YES;
 			};
 			name = Release;
 		};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1430"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -1,7 +1,8 @@
+#import <React/RCTBridgeDelegate.h>
 #import <UIKit/UIKit.h>
 #import <UserNotifications/UNUserNotificationCenter.h>

-@interface AppDelegate : UIResponder <UIApplicationDelegate, UNUserNotificationCenterDelegate>
+@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate, UNUserNotificationCenterDelegate>

@property (nonatomic, strong) UIWindow *window;

@@ -1,100 +0,0 @@
-#import <AppDelegate.h>
-
-#import <React/RCTBridge.h>
-#import <React/RCTBundleURLProvider.h>
-#import <React/RCTRootView.h>
-#import <UserNotifications/UserNotifications.h>
-#import <RNCPushNotificationIOS.h>
-
-// #ifdef FB_SONARKIT_ENABLED
-// #import <FlipperKit/FlipperClient.h>
-// #import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
-// #import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
-// #import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
-// #import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
-// #import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
-// static void InitializeFlipper(UIApplication *application) {
-//   FlipperClient *client = [FlipperClient sharedClient];
-//   SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
-//   [client addPlugin:[[FlipperKitLayoutPlugin alloc] initWithRootNode:application withDescriptorMapper:layoutDescriptorMapper]];
-//   [client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
-//   [client addPlugin:[FlipperKitReactPlugin new]];
-//   [client addPlugin:[[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
-//   [client start];
-// }
-// #endif
-
-@implementation AppDelegate
-
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-// #ifdef FB_SONARKIT_ENABLED
-//   InitializeFlipper(application);
-// #endif
-
-
-  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
-  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
-                                                   moduleName:@"drip"
-                                            initialProperties:nil];
-
-  if (@available(iOS 13.0, *)) {
-    rootView.backgroundColor = [UIColor systemBackgroundColor];
-  } else {
-    rootView.backgroundColor = [UIColor whiteColor];
-  }
-
-  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [UIViewController new];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
-  [self.window makeKeyAndVisible];
-
-  // Define UNUserNotificationCenter
-  UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-  center.delegate = self;
-
-  return YES;
-}
-
-//Called when a notification is delivered to a foreground app.
-(void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler
-{
-  completionHandler(UNNotificationPresentationOptionSound | UNNotificationPresentationOptionAlert | UNNotificationPresentationOptionBadge);
-}
-
-// Required for the register event.
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
-{
- [RNCPushNotificationIOS didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
-}
-// Required for the notification event. You must call the completion handler after handling the remote notification.
- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo
-fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler
-{
-  [RNCPushNotificationIOS didReceiveRemoteNotification:userInfo fetchCompletionHandler:completionHandler];
-}
-// Required for the registrationError event.
- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
-{
- [RNCPushNotificationIOS didFailToRegisterForRemoteNotificationsWithError:error];
-}
-// Required for localNotification event
- (void)userNotificationCenter:(UNUserNotificationCenter *)center
-didReceiveNotificationResponse:(UNNotificationResponse *)response
-         withCompletionHandler:(void (^)(void))completionHandler
-{
-  [RNCPushNotificationIOS didReceiveNotificationResponse:response];
-}
-
-
- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
-{
-#if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-#else
-  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
-#endif
-}
-
-@end
@@ -0,0 +1,108 @@
+#import "AppDelegate.h"
+
+#import <React/RCTBridge.h>
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTRootView.h>
+
+#import <React/RCTAppSetupUtils.h>
+
+#if RCT_NEW_ARCH_ENABLED
+#import <React/CoreModulesPlugins.h>
+#import <React/RCTCxxBridgeDelegate.h>
+#import <React/RCTFabricSurfaceHostingProxyRootView.h>
+#import <React/RCTSurfacePresenter.h>
+#import <React/RCTSurfacePresenterBridgeAdapter.h>
+#import <ReactCommon/RCTTurboModuleManager.h>
+
+#import <react/config/ReactNativeConfig.h>
+
+@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
+  RCTTurboModuleManager *_turboModuleManager;
+  RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
+  std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
+  facebook::react::ContextContainer::Shared _contextContainer;
+}
+@end
+#endif
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  RCTAppSetupPrepareApp(application);
+
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+
+#if RCT_NEW_ARCH_ENABLED
+  _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
+  _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
+  _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
+  _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
+  bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
+#endif
+
+  UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"drip", nil);
+
+  if (@available(iOS 13.0, *)) {
+    rootView.backgroundColor = [UIColor systemBackgroundColor];
+  } else {
+    rootView.backgroundColor = [UIColor whiteColor];
+  }
+
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  UIViewController *rootViewController = [UIViewController new];
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+  return YES;
+}
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+#if DEBUG
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+#else
+  return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+}
+
+#if RCT_NEW_ARCH_ENABLED
+
+#pragma mark - RCTCxxBridgeDelegate
+
+- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
+{
+  _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+                                                             delegate:self
+                                                            jsInvoker:bridge.jsCallInvoker];
+  return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
+}
+
+#pragma mark RCTTurboModuleManagerDelegate
+
+- (Class)getModuleClassFromName:(const char *)name
+{
+  return RCTCoreModulesClassProvider(name);
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+{
+  return nullptr;
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                     initParams:
+                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+
+- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
+{
+  return RCTAppSetupDefaultModuleFromClass(moduleClass);
+}
+
+#endif
+
+@end
@@ -1,62 +1,62 @@
 {
-  "images" : [
+  "images": [
    {
-      "filename" : "40.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
+      "filename": "40 1.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
    },
    {
-      "filename" : "60.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
+      "filename": "60 1.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
    },
    {
-      "filename" : "58.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
+      "filename": "58 1.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
    },
    {
-      "filename" : "87.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
+      "filename": "87 1.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
    },
    {
-      "filename" : "80.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
+      "filename": "80 1.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
    },
    {
-      "filename" : "120.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
+      "filename": "120 2.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
    },
    {
-      "filename" : "120-1.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
+      "filename": "120 1.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "60x60"
    },
    {
-      "filename" : "180.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
+      "filename": "180 1.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "60x60"
    },
    {
-      "filename" : "appstore.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
+      "filename": "appstore 1.png",
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
    }
  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
+  "info": {
+    "author": "xcode",
+    "version": 1
  }
 }
@@ -8,8 +8,10 @@
 	<string>drip.</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconName</key>
+	<string>AppIcon</string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>org.heartofcode.drip.cycle.tracking</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>1.2402.23</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -2,7 +2,8 @@

 #import "AppDelegate.h"

-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[])
+{
  @autoreleasepool {
    return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
  }
@@ -13,7 +13,7 @@

@implementation dripTests

- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
+- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL (^)(UIView *view))test
 {
  if (test(view)) {
    return YES;
@@ -34,23 +34,25 @@

  __block NSString *redboxError = nil;
  #ifdef DEBUG
-    RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-      if (level >= RCTLogLevelError) {
-        redboxError = message;
-      }
-    });
+    RCTSetLogFunction(
+      ^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+        if (level >= RCTLogLevelError) {
+          redboxError = message;
+        }
+      });
  #endif

  while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {
    [[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
    [[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];

-    foundElement = [self findSubviewInView:vc.view matching:^BOOL(UIView *view) {
-      if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) {
-        return YES;
-      }
-      return NO;
-    }];
+    foundElement = [self findSubviewInView:vc.view
+                                  matching:^BOOL(UIView *view) {
+                                    if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) {
+                                      return YES;
+                                    }
+                                    return NO;
+                                  }];
  }

  #ifdef DEBUG
@@ -61,5 +63,4 @@
  XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS);
 }

-
@end
@@ -14,7 +14,7 @@ import cycleModule from './cycle'
 import nothingChanged from '../db/db-unchanged'

 export default function setupNotifications(navigate, setDate) {
-  requestNotifications()
+  Platform.OS === 'android' ? requestNotifications() : null
  const PushNotification = Platform.OS === 'ios' ? PN : PN.default

  PushNotification.createChannel({
@@ -1,9 +1,15 @@
 import getFertilityStatus from 'sympto'
 import cycleModule from './cycle'
-import { useCervixObservable } from '../local-storage'
+import { fertilityTrackingObservable, useCervixAsSecondarySymptomObservable } 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,
@@ -34,6 +40,10 @@ export function getFertilityStatusForDay(dateString) {
 }

 export function getCycleStatusForDay(dateString, opts = {}) {
+  if (!isFertilityTrackingEnabled) {
+    return
+  }
+  
  const {
    getCycleForDay,
    getCyclesBefore,
@@ -57,7 +67,7 @@ export function getCycleStatusForDay(dateString, opts = {}) {
    }
  }

-  cycleInfo.secondarySymptom = useCervixObservable.value ? 'cervix' : 'mucus'
+  cycleInfo.secondarySymptom = useCervixAsSecondarySymptomObservable.value ? 'cervix' : 'mucus'

  return getFertilityStatus(cycleInfo)
 }
@@ -44,12 +44,34 @@ export async function savePeriodReminder(reminder) {
  periodReminderObservable.set(reminder)
 }

-export const useCervixObservable = Observable()
-setObvWithInitValue('useCervix', useCervixObservable, false)
+export const periodPredictionObservable = Observable()
+setObvWithInitValue('periodPrediction', periodPredictionObservable, true)

-export async function saveUseCervix(bool) {
-  await AsyncStorage.setItem('useCervix', JSON.stringify(bool))
-  useCervixObservable.set(bool)
+export async function savePeriodPrediction(bool) {
+  await AsyncStorage.setItem('periodPrediction', JSON.stringify(bool))
+  periodPredictionObservable.set(bool)
+
+  if (!periodPredictionObservable.value) {
+    const result = await AsyncStorage.getItem('periodReminder')
+    if (JSON.parse(result).enabled) {
+      periodReminderObservable.set(false)
+    }
+  }
+}
+
+export const useCervixAsSecondarySymptomObservable = Observable()
+setObvWithInitValue(
+  'useCervixAsSecondarySymptom',
+  useCervixAsSecondarySymptomObservable,
+  0
+)
+
+export async function saveUseCervixAsSecondarySymptom(value) {
+  await AsyncStorage.setItem(
+    'useCervixAsSecondarySymptom',
+    JSON.stringify(value)
+  )
+  useCervixAsSecondarySymptomObservable.set(value)
 }

 export const hasEncryptionObservable = Observable()
@@ -77,6 +99,86 @@ 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)
+
+export async function saveSexTrackingCategory(bool) {
+  await AsyncStorage.setItem('sex', JSON.stringify(bool))
+  sexTrackingCategoryObservable.set(bool)
+}
+
+export const desireTrackingCategoryObservable = Observable()
+setObvWithInitValue('desire', desireTrackingCategoryObservable, true)
+
+export async function saveDesireTrackingCategory(bool) {
+  await AsyncStorage.setItem('desire', JSON.stringify(bool))
+  desireTrackingCategoryObservable.set(bool)
+}
+
+export const painTrackingCategoryObservable = Observable()
+setObvWithInitValue('pain', painTrackingCategoryObservable, true)
+
+export async function savePainTrackingCategory(bool) {
+  await AsyncStorage.setItem('pain', JSON.stringify(bool))
+  painTrackingCategoryObservable.set(bool)
+}
+
+export const moodTrackingCategoryObservable = Observable()
+setObvWithInitValue('mood', moodTrackingCategoryObservable, true)
+
+export async function saveMoodTrackingCategory(bool) {
+  await AsyncStorage.setItem('mood', JSON.stringify(bool))
+  moodTrackingCategoryObservable.set(bool)
+}
+
+export const noteTrackingCategoryObservable = Observable()
+setObvWithInitValue('note', noteTrackingCategoryObservable, true)
+
+export async function saveNoteTrackingCategory(bool) {
+  await AsyncStorage.setItem('note', JSON.stringify(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
@@ -1,6 +1,6 @@
 {
  "name": "drip.",
-  "version": "1.2311.14",
+  "version": "1.2402.23",
  "contributors": [
    "Julia Friesel <julia.friesel@gmail.com>",
    "Marie Kochsiek",
@@ -12,17 +12,20 @@
  "scripts": {
    "start": "react-native start",
    "android": "react-native run-android",
-    "ios": "react-native run-ios --simulator=\"iPhone 8 Plus\"",
+    "ios": "react-native run-ios --simulator=\"iPhone 15\"",
+    "iosSE": "react-native run-ios --simulator=\"iPhone SE (2nd generation)\"",
    "log": "react-native log-android",
    "test": "jest test && yarn lint",
    "test-watch": "jest --watch test",
    "lint": "eslint components lib test styles db",
    "devtool": "adb shell input keyevent 82",
-    "build-android-release": "cd android && ./gradlew clean && ./gradlew assembleRelease && cd ..",
+    "build-android-apk-release": "cd android && ./gradlew clean && ./gradlew assembleRelease && cd ..",
+    "sign-android-apk-release": "zipalign -v -p 4 ./android/app/build/outputs/apk/release/app-release.apk ./android/app/build/outputs/apk/release/app-release_signed.apk",
+    "build-android-aab-release": "cd android && ./gradlew clean && ./gradlew :app:bundleRelease && cd ..",
+    "sign-android-aab-release": "jarsigner -keystore ./android/app/drip-release-key.keystore ./android/app/build/outputs/bundle/release/app-release.aab drip-release-key",
    "update-version": "node ./tools/bin/update-version.js",
    "commit-release": "node ./tools/bin/commit-release.js",
    "tag-release": "node ./tools/bin/tag-release.js",
-    "update-changelog": "node ./tools/bin/update-changelog.js",
    "release": "node ./tools/release-wizard.js",
    "clear": ". scripts/clear.sh",
    "postinstall": "npx jetify",
@@ -31,9 +34,9 @@
  "dependencies": {
    "@js-joda/core": "^5.3.0",
    "@ptomasroos/react-native-multi-slider": "^2.2.0",
-    "@react-native-async-storage/async-storage": "^1.17.9",
+    "@react-native-async-storage/async-storage": "^1.18.2",
    "@react-native-community/art": "^1.2.0",
-    "@react-native-community/datetimepicker": "^6.3.1",
+    "@react-native-community/datetimepicker": "^7.2.0",
    "@react-native-community/push-notification-ios": "^1.11.0",
    "csvtojson": "^2.0.8",
    "i18next": "^22.0.2",
@@ -44,7 +47,7 @@
    "prop-types": "^15.8.1",
    "react": "17.0.2",
    "react-i18next": "^12.0.0",
-    "react-native": "0.67.4",
+    "react-native": "0.68.3",
    "react-native-calendars": "^1.1287.0",
    "react-native-document-picker": "^8.1.1",
    "react-native-fs": "^2.20.0",
@@ -71,7 +74,7 @@
    "jest": "^29.1.2",
    "jest-watch-typeahead": "^2.2.0",
    "jetifier": "^2.0.0",
-    "metro-react-native-babel-preset": "^0.66.2",
+    "metro-react-native-babel-preset": "^0.67.0",
    "prettier": "2.4.0",
    "pretty-quick": "^3.1.1",
    "react-native-version": "^3.1.0",
@@ -16,7 +16,9 @@ exports[`License screen should match the snapshot 1`] = `
          "backgroundColor": "#E9F2ED",
          "flexGrow": 1,
        },
-        undefined,
+        {
+          "marginTop": 42.857142857142854,
+        },
      ]
    }
  >
@@ -63,7 +65,7 @@ exports[`License screen should match the snapshot 1`] = `
            ]
          }
        >
-          Copyright (C) 2023 Heart of Code e.V.
+          Copyright (C) 2024 Heart of Code e.V.

 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details:
        </Text>
@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-
-const updateChangelog = require('../update-changelog');
-
-(async () => {
-  try {
-    await updateChangelog()
-  } catch(err) {
-    console.error(err)
-    process.exit(1)
-  }
-})()
@@ -1,7 +1,6 @@
 const readline = require('readline')
 const updateVersion = require('./update-version')
 const createTagForRelease = require('./tag-release')
-const updateChangelog = require('./update-changelog')
 const makeCommitRelease = require('./commit-release')

 process.on('unhandledRejection', err => { throw(err) })
@@ -16,24 +15,12 @@ async function leadThroughRelease() {
    input: process.stdin,
    output: process.stdout,
  })
-  const shouldUpdateChangelog = await new Promise(resolve => {
-    rl.question('Would you like to update the changelog (y/n)?', yn => {
-      yn === 'y' || yn === 'Y' ? resolve(true) : resolve(false)
-    })
-  })
-
-  if (shouldUpdateChangelog) {
-    await updateChangelog()
-    await new Promise(resolve => {
-      rl.question("Awesome. We've added all commits for this release to the changelog file. Please review, edit and summarize where necessary so it's useful for the app's users. Then come back here and press enter.", () => resolve())
-    })
-  }

  await makeCommitRelease()

-  console.log(`Groovy. We've created a commit for this release that includes the version and changelog updates, as well as a git tag for the release.
-Please review it, make any necessary changes, and if it's all good, push the commit and the tag up to master by running:
-git push origin master
+  console.log(`Groovy. We've created a commit for this release that includes the version, as well as a git tag for the release.
+Please review it, make any necessary changes, and if it's all good, push the commit and the tag up to 'your-branch' by running:
+git push origin 'your-branch'
 git push origin ${require('../package.json').version}

 Don't forget to also run 'npm run build-android-release' to package the apk and upload it to the app stores!
@@ -1,19 +0,0 @@
-const updateChangelog = require('basic-changelog')
-
-const opts = {
-  filterCommitsStartingWith: ['release:']
-}
-
-module.exports = () => {
-  return new Promise((resolve, reject) => {
-    updateChangelog('./CHANGELOG.md', opts, err => {
-      if (err) {
-        console.error('Something went wrong trying to update the changelog:')
-        reject(err)
-        return
-      }
-      console.log('Changelog successfully updated')
-      resolve()
-    })
-  })
-}
@@ -10,14 +10,16 @@ const fs = require('fs')

 module.exports = () => {
  return new Promise((resolve, reject) => {
-    const currentVersion = JSON.parse(fs.readFileSync('./package.json')).version
+    const currentVersionName = JSON.parse(
+      fs.readFileSync('./package.json')
+    ).version

    const rl = readline.createInterface({
      input: process.stdin,
      output: process.stdout,
    })

-    function createTodaysVersion(attempt) {
+    function createTodaysVersionName(attempt) {
      const today = new Date()
      const yy = today.getFullYear() - 2000 // So it's two digits
      const monthString = (today.getMonth() + 1).toString()
@@ -31,18 +33,20 @@ module.exports = () => {
      }
    }

-    let nextVersion
+    let nextVersionName
    for (let i = 0 /* letter a */; i <= 25 /* letter z */; i++) {
-      nextVersion = createTodaysVersion(i)
-      if (nextVersion !== currentVersion) break
+      nextVersionName = createTodaysVersionName(i)
+      if (nextVersionName !== currentVersionName) break
    }
-    if (nextVersion === currentVersion) {
-      console.error('I dont know what else to generate beyond ' + nextVersion)
+    if (nextVersionName === currentVersionName) {
+      console.error(
+        'I dont know what else to generate beyond ' + nextVersionName
+      )
      process.exit(1)
    }

    rl.question(
-      'Next version will be `' + nextVersion + '`, okay? y/n ',
+      'Next version name will be `' + nextVersionName + '`, okay? y/n ',
      async (yn) => {
        if (yn !== 'y' && yn !== 'Y') {
          reject('Release cancelled.\n')
@@ -50,7 +54,7 @@ module.exports = () => {
        }

        const pkgJSON = JSON.parse(fs.readFileSync('./package.json'))
-        pkgJSON.version = nextVersion
+        pkgJSON.version = nextVersionName
        fs.writeFileSync('./package.json', JSON.stringify(pkgJSON, null, 2))

        await ReactNativeVersion.version(
Author	SHA1	Message	Date
wunderfisch	8f4b208f3e	specify tracking category cervical mucus	2024-02-26 15:29:32 +01:00
wunderfisch	2e24eb2d35	fixing issue import and empty statement	2024-02-26 15:28:11 +01:00
wunderfisch	eac0b81b70	changes in customization texts and small changes to styling	2024-02-26 13:28:43 +01:00
bl00dymarie	7ca8d3c611	Update versionName, versionCode and iOS plist 1.2402.23	2024-02-23 17:02:57 +01:00
wunderfisch	4be8f1aa4e	small changes in styling. more space beween switch lines, smaller switches in iOS (testing please), less bottom margin for segments	2024-02-23 16:53:00 +01:00
bl00dymarie	405e27bdbe	Remove isSecondarySymptomDisabled; because maybe we don't need it anymore with fertilityTracking taking its job	2024-02-23 16:50:30 +01:00
bl00dymarie	1c73509473	Move cervix & mucus off turn fertility off logic out of local storage	2024-02-23 16:38:44 +01:00
bl00dymarie	5855ea0a34	Move temp off turns fertility off logic out of local storage	2024-02-23 16:38:11 +01:00
bl00dymarie	27bb25e6da	Add check for if tempReminder is null	2024-02-23 15:27:44 +01:00
bl00dymarie	8150b791ed	Only check if fertility tracking enabled for display of secondary Symptom	2024-02-23 15:27:44 +01:00
bl00dymarie	3c0ea9b208	Turn fertility tracking off when mucus and cervix tracking are off	2024-02-23 15:27:44 +01:00
bl00dymarie	d0d691c6af	Turn fertility tracking off when temperature tracking is off	2024-02-23 15:27:44 +01:00
bl00dymarie	29c3b9b108	Disable fertility tracking switch depending on temp, mucus or cervix	2024-02-23 15:27:44 +01:00
bl00dymarie	c037c630d3	Check for FertilityTrackingEnabled in sympto-adapter	2024-02-23 15:27:44 +01:00
bl00dymarie	31888c3331	Check for FertilityTrackingEnabled on chart	2024-02-23 15:27:44 +01:00
bl00dymarie	faad51f4f1	Check for FertilityTrackingEnabled on home	2024-02-23 15:27:44 +01:00
bl00dymarie	e395730d98	First step for fertilityTracking Toggle	2024-02-23 15:27:44 +01:00
wunderfisch	092b557396	make second symptom buttons show alert if switched off	2024-02-23 12:39:31 +01:00
wunderfisch	4ebec41a0a	fix saving of secondary symptom	2024-02-23 12:16:32 +01:00
bl00dymarie	e69ca93382	Remove idle code	2024-02-22 13:29:16 +00:00
bl00dymarie	aa440742ca	Merge branch 'main' into '676-feature-customisation-not-display-mucus-cervix' # Conflicts: # components/settings/customization/index.js	2024-02-22 13:22:38 +00:00
bl00dymarie	7fff6cbdf4	Merge branch 'Chore/Bring-back-prettier' into 'main' Bring back prettierrc as before See merge request bloodyhealth/drip!664	2024-02-22 12:56:31 +00:00
bl00dymarie	75dbe8bfde	Merge branch 'Chore/Add-color-to-switch-element' into 'main' Add trackColor to Switch element directly See merge request bloodyhealth/drip!663	2024-02-22 12:43:57 +00:00
bl00dymarie	4921aca3c3	Bring back prettierrc as before	2024-02-22 13:32:58 +01:00
bl00dymarie	cbaf6977f6	Add trackColor to Switch element directly	2024-02-22 13:22:41 +01:00
bl00dymarie	b9ec4c7108	Merge branch 'main' into 676-feature-customisation-not-display-mucus-cervix	2024-02-20 12:29:28 +01:00
bl00dymarie	d66e5f36e5	Rename to secondarySymptomDisabledPrompt	2024-02-19 18:10:57 +01:00
bl00dymarie	69c546f684	Rename shouldUseCervix to useCervixAsSecondarySymptom	2024-02-19 18:05:20 +01:00
bl00dymarie	dc304afe75	Rename labels to more neutral 'secondarySymptom'	2024-02-19 18:01:57 +01:00
bl00dymarie	63bc8a1daf	Rename to useCervixAsSecondarySymptom	2024-02-19 17:51:25 +01:00
bl00dymarie	7fa130f9e1	Rename to useCervixAsSecondarySymptomObservable	2024-02-19 17:13:40 +01:00
bl00dymarie	d338df1460	Merge branch 'Chore/ReactNative-Upgrade-0.68.3-Android' into 'main' Chore: React native upgrade 0.68.3 android See merge request bloodyhealth/drip!660	2024-02-19 16:01:09 +00:00
wunderfisch	5f55500831	small changes on secondary symptom to make it work nicly with the button logic instead of the former switch and to display the correct texts	2024-02-19 12:13:58 +01:00
bl00dymarie	4eedb171a3	Full upgrade to react native v0.68.3 for Android	2024-02-15 14:31:46 +01:00
bl00dymarie	3193fa4f33	Partial update RN to 0.68.3 for android build	2024-02-15 13:14:28 +01:00
bl00dymarie	e24c69977c	Merge branch 'release-ios-fix-1.2401.17' into 'main' Release ios fix 1.2401.17 See merge request bloodyhealth/drip!653	2024-02-15 11:19:05 +00:00
bl00dymarie	6fb0d1fc1e	Merge branch 'main' into 'release-ios-fix-1.2401.17' # Conflicts: # ios/Podfile	2024-02-15 11:16:49 +00:00
bl00dymarie	391cac1bde	Update xcode project	2024-02-15 12:13:19 +01:00
bl00dymarie	fb589815c1	Update iPhone versions in script	2024-02-15 12:12:02 +01:00
bl00dymarie	45fce6485b	Release: iOS-1.2401.17	2024-02-15 11:21:56 +01:00
bl00dymarie	17f74c9c1c	Address xcode error messages	2024-02-15 11:21:56 +01:00
bl00dymarie	5119e6778a	Update project changes according to xCode suggestion	2024-02-15 11:21:56 +01:00
Liv	601d618352	Reorder import buttons depending on OS	2024-02-15 11:21:56 +01:00
bl00dymarie	d23b5fe420	Add oneTimeTransformIntoNumber for secondarySymptom Switch	2024-02-14 16:10:05 +01:00
bl00dymarie	311cee0e17	Adapt color for secondarySymptom Boxes	2024-02-14 16:10:00 +01:00
bl00dymarie	76137fc000	Replace hard coded text	2024-02-14 16:09:47 +01:00
bl00dymarie	09614319e3	Add SelectTabGroup for secondary Symptom Switch	2024-02-14 16:08:07 +01:00
wunderfisch	ebbfd8aba5	merging work on secondary symptom logic and buttons	2024-02-14 10:26:13 +01:00
bl00dymarie	1662bb29f0	Change prop Type to value instead of bool for saveUseCervix	2024-02-13 17:24:29 +01:00
bl00dymarie	a59dfa8336	Add SelectTabGroup for secondary Symptom Switch	2024-02-13 17:24:26 +01:00
wunderfisch	d7f1eb81fb	centralizing code to set the Secondary Symptom from different actions in one function	2024-02-13 15:46:04 +01:00
wunderfisch	82803bbb83	fix: disabling the secondary symptom toggle when not both categories are enabled, didn't work before after new save	2024-02-13 11:52:33 +01:00
wunderfisch	8a8b3217fa	small changes on Secondary Symptom disable function	2024-02-12 16:05:49 +01:00
wunderfisch	e11acbab78	Disable and switch secondary symptom depending on cervical mucus and cervix turned on or off.	2024-02-12 14:49:43 +01:00
bl00dymarie	1db2f3a945	Merge branch 'feature/Customize-tracking-categories-temperature' into 'main' Feature: customize tracking categories temperature See merge request bloodyhealth/drip!650	2024-02-08 17:20:56 +00:00
bl00dymarie	34e672dd31	Merge branch 'fix/Remove-nonfunctional-repair' into 'main' Remove nonfunctional repair See merge request bloodyhealth/drip!657	2024-02-08 15:24:33 +00:00
bl00dymarie	845e42eafc	Remove nonfunctional repair	2024-02-08 16:22:20 +01:00
bl00dymarie	da4d90fded	Merge branch '681-rename-nfp-to-sympto-thermal-method' into 'main' Resolve "Rename nfp to sympto-thermal method" Closes #681 See merge request bloodyhealth/drip!649	2024-02-08 15:10:15 +00:00
bl00dymarie	a0b275d052	Merge branch 'dependabot-npm_and_yarn-react-native-community-datetimepicker-7.2.0' into 'main' Bump @react-native-community/datetimepicker from 6.3.1 to 7.2.0 See merge request bloodyhealth/drip!612	2024-02-08 14:50:25 +00:00
wunderfisch	0adea893f7	Apply 1 suggestion(s) to 1 file(s)	2024-02-08 11:45:20 +00:00
Sofiya Tepikin	318fd7cfee	Bump @react-native-community/datetimepicker from 6.3.1 to 7.2.0 Bumps [@react-native-community/datetimepicker](https://github.com/react-native-community/datetimepicker) from 6.3.1 to 7.2.0. - [Release notes](https://github.com/react-native-community/datetimepicker/releases) - [Changelog](https://github.com/react-native-datetimepicker/datetimepicker/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-community/datetimepicker/compare/v6.3.1...v7.2.0)	2024-02-08 12:37:13 +01:00
bl00dymarie	5e79fdfc4b	Merge branch '698-add-info-text-to-password-section-in-settings' into 'main' Resolve "Add info text to Password Section in Settings" Closes #698 See merge request bloodyhealth/drip!654	2024-02-08 09:54:32 +00:00
wunderfisch	a74b5d58e8	get back npm install in gitlab-ci.yml I believe we actually need this and that line 11 installs that certain npm version while this line installs everything else we need. Without pipeline crashes.	2024-02-06 21:23:48 +01:00
Liv M	3e52275a9f	Merge branch 'feature/template' into 'main' Fix: Update issue templates See merge request bloodyhealth/drip!655	2024-02-06 13:27:55 +00:00
Liv M	edc452381a	Fix: Update issue templates	2024-02-06 13:27:55 +00:00
bl00dymarie	9991260c38	Add pw text in settings and extra container for >	2024-02-06 12:55:29 +01:00
bl00dymarie	a289edb7f1	Add symptom labels from config list	2024-01-29 18:22:08 +01:00
bl00dymarie	080ce0f3d3	Hide SecondarySymptom Switch if temperature category turned off	2024-01-29 18:21:53 +01:00
bl00dymarie	6a4d5c330b	Disable/hide TemperatureSlider if temperature category turned off	2024-01-29 18:20:58 +01:00
bl00dymarie	20af120498	Update RN to 0.68.3 for iOS build	2024-01-29 17:07:42 +01:00
bl00dymarie	91eb7ed29c	Merge branch 'dependabot-npm_and_yarn-react-native-async-storage-async-storage-1.18.2' into 'main' Bump @react-native-async-storage/async-storage from 1.17.9 to 1.18.2 See merge request bloodyhealth/drip!611	2024-01-29 15:44:04 +00:00
Sofiya Tepikin	55b1c5973d	Bump @react-native-async-storage/async-storage from 1.17.9 to 1.18.2 Bumps [@react-native-async-storage/async-storage](https://github.com/react-native-async-storage/async-storage) from 1.17.9 to 1.18.2. - [Release notes](https://github.com/react-native-async-storage/async-storage/releases) - [Changelog](https://github.com/react-native-async-storage/async-storage/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-async-storage/async-storage/compare/v1.17.9...v1.18.2)	2024-01-29 16:08:51 +01:00
bl00dymarie	ec157078b2	Rename to "sympto-thermal method" + nfp settings to "Customization"	2024-01-26 14:23:40 +01:00
Liv M	4e8e92b0d5	Merge branch 'fix/rounding-stats' into 'main' Change formatting of decimals in stats Closes #669 See merge request bloodyhealth/drip!633	2024-01-24 17:45:07 +00:00
Liv M	f337272933	Merge branch 'fix/toggle-tab' into 'main' Fix: Make tab groups (single select) togglable See merge request bloodyhealth/drip!645	2024-01-24 17:41:49 +00:00
Liv M	d7e9bae558	Fix: Make tab groups (single select) togglable	2024-01-24 17:41:49 +00:00
bl00dymarie	fdb892ff6b	Disable tempReminder if temp is turned off	2024-01-23 16:07:21 +01:00
bl00dymarie	a99e6952a1	Turn tempreminder off when temperature turned off	2024-01-23 15:27:33 +01:00
bl00dymarie	3799ff68bd	Remove useless description and show only symptom name	2024-01-23 15:23:19 +01:00
bl00dymarie	7dd01c0c9b	On chart temperature wont be displayed, also warning	2024-01-23 15:21:27 +01:00
bl00dymarie	cd176cf192	On cycle day temp wont show if turned off	2024-01-23 15:20:48 +01:00
bl00dymarie	ae3edb0a15	Add temperature toggle in customization and store value in local storage	2024-01-23 15:20:04 +01:00
bl00dymarie	27274aa994	Merge branch 'feature/Customize-tracking-categories-sex-desire-pain–mood-note' into 'main' Feature: customize tracking categories sex desire pain mood note See merge request bloodyhealth/drip!648	2024-01-23 13:25:20 +00:00
bl00dymarie	28fd610e9d	Make desire, pain, mood and note customizable	2024-01-22 17:43:03 +01:00
bl00dymarie	26d971a8b2	Remove sex from chart if not enabled	2024-01-22 17:43:03 +01:00
bl00dymarie	40af118563	Remove sex from cycle day if not enabled	2024-01-22 17:43:03 +01:00
bl00dymarie	750bfa58c3	Add sexTrackingCategory as toggle	2024-01-22 17:43:03 +01:00
bl00dymarie	c645c48d31	Merge branch '671-feature-customisation-not-display-menstrual-bleeding-prediction' into 'main' Feature: Customizable period prediction Closes #671 See merge request bloodyhealth/drip!647	2024-01-22 14:40:31 +00:00
bl00dymarie	62e3328113	Remove double npm install	2024-01-22 15:38:45 +01:00
bl00dymarie	db93aa74bb	Typo and other text corrections	2024-01-22 15:07:16 +01:00
wunderfisch	b53be31868	functionality that disables the next-periode-reminder-switch if menstrual bleeding shall not be predicted (new customization feature). also an alert pops up when the user still tries to press the disabled toggle or the text area next to it	2024-01-15 18:05:54 +01:00
bl00dymarie	974a9735c5	Improve text for periodPrediction off	2024-01-10 18:00:01 +01:00
bl00dymarie	5787e96e53	set periodReminder to false if periodPrediction is turned off	2024-01-10 17:52:14 +01:00
bl00dymarie	5d62cbfffe	Makes periodPrediction text on Home adjustable	2024-01-08 11:58:21 +01:00
bl00dymarie	791c0d345f	Make periodPrediction on Calendar adjustable	2024-01-08 11:58:15 +01:00
bl00dymarie	c7c905fd5f	Add functionality to turn on/off period predictions	2024-01-08 11:58:02 +01:00
wunderfisch	9800b663fb	Merge branch '683-ui-scaffold-for-customization' into 'main' Resolve "UI scaffold for customization" Closes #683 See merge request bloodyhealth/drip!642	2024-01-08 10:40:19 +00:00
wunderfisch	4d7895b9f2	Toggles set to true by default	2024-01-08 10:35:13 +00:00
wunderfisch	7977be6f3f	Merge branch '682-change-order-of-reminders' into 'main' change order of periode and temperature reminder Closes #682 See merge request bloodyhealth/drip!643	2024-01-05 15:18:32 +00:00
bl00dymarie	bb8338c842	Update license year in snapshot	2024-01-05 16:14:46 +01:00
bl00dymarie	31e87db23f	Update license year snapshot	2024-01-05 15:59:59 +01:00
bl00dymarie	09f0a0f11d	Add WIP for customization section	2024-01-05 15:51:56 +01:00
wunderfisch	dd9ad9e393	switched temperature reminder and periode reminder. now periode reminder is at the top, temperature reminder below	2024-01-05 15:51:46 +01:00
bl00dymarie	e18eedd4e7	Add info section under settings	2024-01-05 15:51:25 +01:00
bl00dymarie	3e50991d12	Rename nfp-settings into customization	2024-01-05 15:50:47 +01:00
wunderfisch	bda09438ee	Merge branch '655-bug-bring-back-outofrangewarning-label-text' into 'main' Chore: Bring back warning hint + orange highlight Closes #655 See merge request bloodyhealth/drip!640	2024-01-05 14:35:11 +00:00
wunderfisch	eb804fe6c8	Merge branch 'Chore/build-for-ios-1.2312.11' into 'main' Chore: build latest android update for ios Closes #673 See merge request bloodyhealth/drip!636	2024-01-04 17:00:18 +00:00
bl00dymarie	f0750cd45f	Remove formatting changes	2023-12-13 14:52:00 +00:00
bl00dymarie	c6662e02bf	Chore: Bring back warning hint + orange highlight	2023-12-13 15:35:17 +01:00
bl00dymarie	f3aa5b4d68	Merge branch 'main' into 'Chore/build-for-ios-1.2312.11' # Conflicts: # package.json	2023-12-13 11:14:43 +00:00
bl00dymarie	b2f277eb12	Merge branch '678-bug-excluded-temp-value-needs-lighter-color' into 'main' Fix: Specify dot fill color for excluded temp value Closes #678 See merge request bloodyhealth/drip!637	2023-12-13 11:05:59 +00:00
bl00dymarie	3bdf660c27	Merge branch '677-fix-license-screen-cut-out-on-top' into 'main' Fix: Give some marginTop on very first License screen Closes #677 See merge request bloodyhealth/drip!638	2023-12-13 11:00:48 +00:00
bl00dymarie	a0ee200149	Add iPhone 14 simulator	2023-12-12 15:58:39 +01:00
bl00dymarie	79ab093584	Update license snapshot for jest	2023-12-12 15:57:46 +01:00
bl00dymarie	7418fc2cce	Give some marginTop on very first License screen	2023-12-12 15:19:59 +01:00
bl00dymarie	e297903468	Specify dot fill color for excluded temp value	2023-12-12 13:11:57 +01:00
bl00dymarie	4f54d19f78	Chore: build latest android update for ios	2023-12-11 17:01:43 +01:00
wunderfisch	31ccb22c82	better readability	2023-12-11 10:20:44 +00:00
wunderfisch	ddfbc4cee8	reentered the merge part	2023-12-11 10:18:40 +00:00
wunderfisch	9d21138da7	Merge branch 'chore/contribution' into 'main' suggestions to rewrite how to contribute See merge request bloodyhealth/drip!634	2023-12-11 10:12:14 +00:00
bl00dymarie	a6fc38ca47	Merge branch '674-chore-update-media-for-fdroid' into 'main' Resolve "Chore: Update media for Fdroid" Closes #674 See merge request bloodyhealth/drip!635	2023-12-05 15:08:28 +00:00
bl00dymarie	2f07b76b6c	improved text how to contribute to drip	2023-12-05 12:28:17 +00:00
bl00dymarie	bb29f29de5	Update file Default.md	2023-12-04 19:36:39 +00:00
bl00dymarie	b39a5681ea	Chore: Add new screenshots (sharepics)	2023-12-04 20:23:30 +01:00
bl00dymarie	38a56b0fbd	Chore: Remove outdated screenshots	2023-12-04 20:22:40 +01:00
bl00dymarie	c5906c2144	Update file RELEASE.md	2023-12-04 15:08:31 +00:00
bl00dymarie	89015abe17	Update file RELEASE.md	2023-12-04 15:07:57 +00:00
bl00dymarie	06fc4f4b6b	Update file RELEASE.md	2023-12-04 15:07:04 +00:00
bl00dymarie	64ed3aba4a	Update file RELEASE.md	2023-12-04 15:03:16 +00:00
wunderfisch	5a18593ab5	improvements of explanation how to run the android app on a virtual device	2023-12-04 11:34:46 +00:00
wunderfisch	3755ac8ac9	suggestions to rewrite how to contribute	2023-11-29 18:15:23 +01:00
Liv	0579897fc1	Change formatting of decimals in stats	2023-11-27 16:45:11 +01:00
bl00dymarie	d6dbea78ac	Merge branch 'Chore/Release-steps' into 'main' Chore: Android release documentation See merge request bloodyhealth/drip!631	2023-11-22 15:29:06 +00:00
wunderfisch	84ff76096b	Implement review feedback	2023-11-22 14:53:57 +00:00
bl00dymarie	e030c4d75e	Update download badges	2023-11-21 13:16:26 +00:00
bl00dymarie	4ed399c50c	Add toc, screenshot info and some more	2023-11-20 18:04:41 +01:00
bl00dymarie	92546362a0	Chore: document release process for android	2023-11-18 00:34:50 +01:00
bl00dymarie	486dd185e2	Remove automatic changelog update	2023-11-18 00:34:44 +01:00
bl00dymarie	e576c5dc7d	Rename master to main in documentation	2023-11-18 00:34:38 +01:00
bl00dymarie	536106f757	Merge branch 'release' into 'main' Keep main up to date with release branch after android v1.2311.14 Google Play Publish See merge request bloodyhealth/drip!630	2023-11-17 23:29:48 +00:00
bl00dymarie	552e63c9ef	Merge branch 'chore/ci-cd' into 'main' Chore: Bump npm version See merge request bloodyhealth/drip!624	2023-11-17 13:13:10 +00:00
Liv M	9dff2808c0	Chore: Bump npm version	2023-11-17 13:13:10 +00:00
tintenfisch	c432edbbaf	Merge branch '645-chore-update-readme-for-android' into 'main' updated readme for android Closes #645 See merge request bloodyhealth/drip!617	2023-11-09 10:04:34 +00:00
bl00dymarie	67d58e3db4	Update 2 files - /.gitlab/issue_templates/bug-template.md - /.gitlab/issue_templates/chore-template.md	2023-11-09 09:55:01 +00:00
wunderfisch	773f1c86c2	added link to adb website	2023-11-07 11:26:00 +01:00
bl00dymarie	3f2af788f3	Apply reviewed suggestions	2023-11-07 10:20:12 +00:00
wunderfisch	4139cba63c	updated readme after checking on two different ubuntu devices	2023-11-06 15:15:05 +01:00