Release: iOS-1.2401.17

Change formatting of decimals in stats

Closes #669

See merge request bloodyhealth/drip!633

.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": ["module:metro-react-native-babel-preset"],
-}

.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

.eslintrc.js

@@ -3,7 +3,7 @@ module.exports = {
   extends: ['eslint:recommended', 'plugin:react/recommended'],
   env: {
     node: true,
-    mocha: true,
+    jest: true,
     es6: true,
   },
   parser: '@babel/eslint-parser',

.gitignore

@@ -23,7 +23,6 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-xcshareddata
 ios/Index/DataStore
 
 # Android/IntelliJ
@@ -33,12 +32,12 @@ build/
 .gradle
 local.properties
 *.iml
+*.hprof
 
 # node.js
 #
 node_modules/
 npm-debug.log
-yarn-error.log
 
 # BUCK
 buck-out/
@@ -74,7 +73,6 @@ ios/Podfile.lock
 android/app/src/main/res/drawable-*
 android/app/src/main/assets/*
 
-# nodejs-mobile creates these with every npm install
+# yarn
-nodejs-assets/nodejs-project/sample-*
+.yarn/*
-nodejs-assets/build-native-modules-MacOS-helper-script-node.sh
+yarn-error.log
-nodejs-assets/build-native-modules-MacOS-helper-script-npm.sh

.gitlab-ci.yml

@@ -8,5 +8,31 @@ cache:
 
 test_async:
   script:
-    - npm install
+    - npm install npm@7.0.1 -g
     - npm test
+
+variables:
+  DEPENDABOT_IMAGE: docker.io/andrcuns/dependabot-gitlab:0.23.0
+
+.dependabot-gitlab:
+  image:
+    name: $DEPENDABOT_IMAGE
+    entrypoint: ['']
+  variables:
+    GIT_STRATEGY: none
+    RAILS_ENV: production
+    SECRET_KEY_BASE: key
+    PACKAGE_MANAGER: npm
+    SETTINGS__GITLAB_URL: $CI_SERVER_URL
+    SETTINGS__STANDALONE: 'true'
+    SETTINGS__LOG_COLOR: 'true'
+  script:
+    - cd /home/dependabot/app
+    - bundle exec rake "dependabot:update[$PROJECT_PATH,$PACKAGE_MANAGER,$DIRECTORY]"
+
+dependabot:
+  extends: .dependabot-gitlab
+  rules:
+    - if: $DEPENDENCY_UPDATES_DISABLED
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/'

.gitlab/dependabot.yml

@@ -1,16 +1,17 @@
+# Configuration taken from this article:
+# https://paperless.blog/dependabot-on-gitlab
 version: 2
 updates:
-  - package-ecosystem: "npm"
+  - package-ecosystem: npm
-    directory: "/"
+    directory: /
     schedule:
-      interval: "monthly"
+      interval: daily
     open-pull-requests-limit: 3
-    reviewers:
+    ignore:
-      - "bl00dymarie"
+      - dependency-name: '*'
-      - "mariyaz"
+        update-types: ['version-update:semver-patch']
-      - "sdvig"
+      - dependency-name: 'realm'
-      - "LisaHill"
+      - dependency-name: 'react'
-    allow:
+      - dependency-name: 'react-native'
-      - dependency-type: direct
+      - dependency-name: 'react-native-push-notifications'
-      - dependency-type: production
+      - dependency-name: '@babel/core'
-    rebase-strategy: "auto"

.gitlab/issue_templates/bug-template.md

@@ -0,0 +1,26 @@
+## oh no a bug 🐛
+
+### Description what has happened
+
+Short overview how the bug manifests.
+
+### which OS + version is your device
+
+- [ ] Android _number_
+- [ ] iOS _number_
+
+### which drip version number are you using
+
+_On your phone go to ➞ menu on the top right ➞ about, scroll to the very bottom and find the version number_
+
+### how did it happen
+
+_what triggered the bug/behavior, always/sometimes, is it reproducible(how)?_
+
+### describe how it looks or add screenshot
+
+feel free to attach a file 📎
+
+### any idea to solve it
+
+💡

.gitlab/issue_templates/chore-template.md

@@ -0,0 +1,22 @@
+## This has to be done 🪠
+
+### Description what has to be done
+
+Short overview
+
+### is it urgent? ⏳
+
+- [ ] Yes
+- [ ] No
+- [ ] something in between
+
+_Explain the urgency if possible, e.g. is it a security vulnerability for potentially everyone?_
+
+### which OS
+
+- [ ] Android
+- [ ] iOS
+
+### what shall be the ideal outcome 🎆
+
+_You can e.g. specify here the version number for a library update_

.gitlab/issue_templates/feature-template.md

@@ -0,0 +1,19 @@
+## Yeah a feature idea 🧩
+
+### 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?
+
+Do you have certain user groups in mind?
+
+### Any idea where it shall be placed in the app?
+
+### is it connected with or dependent on some other feature?
+
+### any idea how it shall look (sketch?)
+
+feel free to attach a file 📎
+
+### what could be difficulties (with other components) 🪆

.gitlab/merge_request_templates/Default.md

@@ -0,0 +1,30 @@
+## Why this change?
+
+## Description
+
+I have tested this MR:
+
+- [ ] tested this PR on iOS simulator/physical device,
+- [ ] tested this PR on Android simulator/physical device,
+- [ ] ran e2e tests.
+
+A few sentences describing the overall goals of the pull request's commits.
+
+## Steps to Test or Reproduce
+
+Outline the steps to test or reproduce the MR here.
+
+## Reviewing
+
+Here's what I am looking for feedback on in particular:
+
+- additional testing on specific type of the devices,
+- feedback on specific part of the code,
+- etc.
+
+## In addition:
+
+- Screenshots
+- Links to the additional info
+- Migrations
+- Follow-up tickets

.ruby-version

@@ -0,0 +1 @@
+2.7.4

CHANGELOG.md

@@ -2,18 +2,132 @@
 
 All notable changes to this project will be documented in this file.
 
-## v1.2102.28
+## 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
+
+- Make the app compatible with Android 13
+  - Update Android's targetSdkVersion to 33
+  - Update buildToolsVersion to 33.0.2
+  - Update Android Gradle plugin to 7.0.3
+  - Update Gradle to 7.3.3
+  - Update kotlinVersion to 1.3.40
+- 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
+- Reminders:
+  - Use new fork of react-native-push-notification: <https://github.com/github:bl00dymarie/react-native-push-notification> without google services
+  - Adding channels after breaking changes in react-native-push-notification
+- Homescreen: date displayed in new format
+- Minor changes in "about" section
+- Updated dependencies:
+  - moment ^2.29.4,
+  - prop-types ^15.8.1,
+  - react v17.0.2,
+  - react-native v0.67.4,
+  - react-native-calendars ^1.1287.0,
+  - react-native-document-picker ^8.1.1,
+  - react-native-fs ^2.20.0,
+  - react-native-modal-datetime-picker v14.0.0,
+  - react-native-share ^7.9.0,
+  - react-native-vector-icons ^9.2.0,
+  - realm ^10.16.0,
+  - sympto v3.0.1
+
+### Adds
+
+- Stats: Show period details, including cycle start, cycle length and amount of days with bleeding
+- Stats: Explainer text for standard deviation
+- Settings: Privacy Policy
+- App asks for permissions for notifications right at the start, which allows you to set reminders (this is a new requirement for Android 13)
+- Buttons can now be displayed as row
+
+- Added dependencies:
+  - @js-joda/core ^5.3.0,
+  - @react-native-async-storage/async-storage ^1.17.9,
+  - @react-native-community/art ^1.2.0,
+  - @react-native-community/datetimepicker ^6.3.1,
+  - @react-native-community/push-notification-ios ^1.11.0,
+  - i18next ^22.0.2,
+  - react-i18next ^12.0.0,
+  - jshashes ^1.0.8,
+  - react-native-permissions ^3.10.0,
+  - react-native-push-notification: github:bl00dymarie/react-native-push-notification,
+  - react-native-simple-toast ^1.1.3,
+  - react-native-size-matters ^0.4.0,
+
+### Fixed
+
+- Password: Disable setting empty passwords
+- After updating the password the app will do a full restart
+- Chart: Grid for symptoms
+- Chart: Horizontal lines in temperature chart
+
+### Unreleased
+
+- Partially implemented translations with react-i18next
+
+## 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
+
 - Temperature range is now between 35 - 39°C and its default values are now set to 35.5 - 37.5°C
 
 ### Fixed
+
 - Blocks invalid input of temperature value
 - Error message for incorrect password on login screen
 - Phase text on home screen for last fertile day
 - Styling improvements
 
-## v1.2101.9
+## v1.2101.9 Android
 
 ### Adds
 
@@ -56,12 +170,12 @@ 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
 
 - Allows chart not to show temperature part, when temperature is not tracked and corresponding refactoring
-- Detox support for e2e testing and addition of the e2e tests 
+- Detox support for e2e testing and addition of the e2e tests
 - Introduces Redux global state (date and navigation are stored locally now)
 - Introduces clear.sh script to the project automising clearing project caches and packages reinstallation
 
@@ -80,7 +194,7 @@ All notable changes to this project will be documented in this file.
 
 - Fixed adding notes to the future dates
 - Fixed app exiting with error when hitting back button on device
-- Fixed Sex symptom showing on y axis of chart even though the contraception method was deleted 
+- Fixed Sex symptom showing on y axis of chart even though the contraception method was deleted
 - Fixed of the clear.sh file name in package.json
 - Fixed of navigation from chart to the cycle day overview
 - Bug fix for maximum value of mucus not showing on chart
@@ -91,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
@@ -191,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
 
@@ -212,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
@@ -287,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
@@ -312,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
 
@@ -322,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
 
@@ -338,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)
 

CONTRIBUTING.md

@@ -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.
+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: !
+[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).
+- 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.)
-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`.
+- 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.
-This allows us to keep track of the issues that are related to an existing branch and tells everyone "somebody is working on it".
+- 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
+  
+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.
 
-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.
+### Reporting Bugs or Making Suggestions
-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.
 
-### Reporting Bugs
+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.
 
-You found a bug :bug:? Please feel free to investigate and save logs for more specific details.
+### Your First Condripution
 
-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?
+- 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.
 
-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.
-
-### 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:

Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.7.4'
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'

README.md

@@ -3,99 +3,127 @@
 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)
+     height="55">](https://dripapp.org/release/v1.2311.14.apk)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+[<img src="https://dripapp.org/assets/badge_google-play.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"
      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
 
-#### 1. Android Studio
+### 1. Get this repository
-
-Install [Android Studio](https://developer.android.com/studio/) - you'll need it to install some dependencies.
-
-#### 2. Node & npm version
-
-Make sure you are running Node 14 and npm 6.14.17. It's easiest to switch Node versions using `nvm`, here's how to do it:
-
-    $ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
-    $ nvm install v14.19.3
-
-#### 3. Get this repository
 
 Clone it with SSH
 
-    $ git clone git@gitlab.com:bloodyhealth/drip.git
+    git clone git@gitlab.com:bloodyhealth/drip.git
 
 or clone it with HTTPS
 
-    $ git clone https://gitlab.com/bloodyhealth/drip.git
+    git clone https://gitlab.com/bloodyhealth/drip.git
 
-and run
+### 2. Node & yarn version
 
-    $ cd drip
+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.
-    $ npm install
+Once you have nvm running you can install node 14:
 
-#### 4. More requirements from Android Studio
+    nvm install v14.19.3
 
-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. Also see the [nodejs-mobile repository](https://github.com/janeasystems/nodejs-mobile) for the necessary prerequisites for your system.
+use npm to install yarn:
 
-#### 5. Run the app on Android
+    npm install --global yarn
 
-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.
+## for Android
 
-1. Open a terminal and run
+### 3.1 Android Studio
 
-   ```
+Install [Android Studio](https://developer.android.com/studio/) - you'll need it to install some dependencies.
-   $ npm run android
-   ```
 
-2. To see logging output, run the following command in another tab:
+### 3.2 More requirements from Android Studio
 
-   ```
+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:
-   $ npm run log
-   ```
 
-3. Run the following command and select enable hot reloading (see https://facebook.github.io/react-native/docs/debugging.html):
+    export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
 
-   ```
+Check by typing in your terminal:
-   $ adb shell input keyevent 82
-   ```
 
-4. We recommend installing an [ESLint plugin in your editor](https://eslint.org/docs/user-guide/integrations#editors). There's an `.eslintrc` file in this project which will be used by the plugin to check your code for style errors and potential bugs.
+    echo $ANDROID_SDK_ROOT
 
-#### 6. Run app on iOS
+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 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, 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
+
+ii. To see logging output, run the following command in another tab:
+
+    yarn log
+
+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
+
+iv. We recommend installing an [ESLint plugin in your editor](https://eslint.org/docs/user-guide/integrations#editors). There's an `.eslintrc` file in this project which will be used by the plugin to check your code for style errors and potential bugs.
+
+## for iOS
+
+### 4.1 Install Cocoapods
+
+"CocoaPods manages library dependencies for your Xcode projects"
+
+    brew install cocoapods
+
+### 4.2 Run app on iOS
 
 Minimum system requirements to run iOS app are as follows:
 
 - MacOS 10.15.7 for Mac users
-- Xcode 12.3 (I assume, that only command line tools might be enough)
+- Xcode 13 (command line tools only might be enough)
 
-1. Install XCode dependencies by running the following command from the root project directory:
+i. Install XCode dependencies by running the following command from the root project directory:
 
-```
+    cd ios && pod install && cd ..
-$ cd ios && pod install && cd ..
-```
 
-2. To run app either open drip workspace ('drip.xcworkspace' file) with XCode and run "Build" or run the following command:
+ii. To run app either open drip workspace ('drip.xcworkspace' file) with XCode and run "Build" or run the following command:
 
-```
+    yarn ios
-$ npm run ios
-```
 
-3. If you are building the app with XCode make sure you are running this as well:
+iii. If you are building the app with XCode make sure you are running this as well:
-   `$ npm start`
+
+    yarn start
 
 ### Troubleshooting
 
@@ -110,31 +138,24 @@ Now, `which java` should output `/Applications/Android Studio.app/Contents/jre/j
 
 #### [MacOS] Ninja
 
-If `npm` says `CMake was unable to find a build program corresponding to "Ninja".`:
+If `yarn` says `CMake was unable to find a build program corresponding to "Ninja".`:
-`$ brew install ninja`
+
+    brew install ninja
 
 ### [MacOS] adb not on the path
 
 If you get error messages about `adb` not being found on your path:
-`$ ln -s ~/Library/Android/sdk/platform-tools/adb /usr/local/bin/adb`
 
-### [MacOS] and XCode 12.5
+    ln -s ~/Library/Android/sdk/platform-tools/adb /usr/local/bin/adb
-
-If you run XCode 12.5, more likely you'll have problems building app for iOS. Please use the following fix: https://stackoverflow.com/a/67320887.
-
-If you experience any further issues, please feel free to check out the following threads:
-
-- [react-native run-ios build failure on XCode 12.5 beta](https://github.com/react-native-community/cli/issues/1365)
-- [Xcode 12.5 troubleshooting guide (RN 0.61/0.62/0.63/0.64)](https://github.com/facebook/react-native/issues/31480)
 
 ### Clearing project cache
 
 If you would like to clear project cache and/or re-install project libraries, you can run clear script as follows:
 
-    $ npm run clear
+    yarn clear
 
 Script accepts the following options:
-"none" - script will delete all caches and re-install project libraries,
+"all" - script will delete all caches and re-install project libraries,
 "ios" - script will delete ios-related cache
 "android" - script will delete android-related cache
 "cache" - script will purge Watchman, Metrobundler, Pachager and React caches
@@ -142,18 +163,19 @@ Script accepts the following options:
 
 For example, if you would like to clear android part of the project and re-install project libraries, you can run the following command:
 
-    $ npm run clear android npm
+    yarn clear android npm
 
 ## Tests
 
 ### Unit tests
 
 You can run the tests with:
-`$ npm test`
+
+    yarn test
 
 ### 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":
@@ -170,18 +192,29 @@ You can run the tests with:
 5. For the first time you need to get the app on the phone or if you run into this error:
    `'app-debug-androidTest.apk' could not be found`
    --> open a new 2nd tab and run (in your drip folder): `cd android and ./gradlew assembleAndroidTest`
-   Otherwise just open a new 2nd tab to run (in your drip folder) `npm run android`
+   Otherwise just open a new 2nd tab to run (in your drip folder) `yarn android`
 6. Open a new 3rd tab to run `./node_modules/.bin/detox test -c android.emu.debug`
 
 Hopefully you see the magic happening clicking through the app and happy test results on your console :sun_with_face: !
 
+### Manual testing
+
+To ensure that core app functionality is working, we developed a [test protocol](https://gitlab.com/bloodyhealth/drip/-/snippets/2283405).
+
 ## Debugging
 
-In order to see logging output from the app, run `npm run log` in a separate terminal. You can output specific code you want to see, with:
+In order to see logging output from the app, run `yarn log` in a separate terminal. You can output specific code you want to see, with:
 `console.log(theVariableIWantToSeeHere)`
 or just a random string to check if this piece of code is actually running:
 `console.log("HELLO")`.
 
+## Known issues
+
+### Android emulator
+
+- Import/export to the local drive don't work.
+- Email button on the Hamburger menu > About doesn't work - throws a yellow error message "Possible unhandled promise rejection...".
+
 ## NFP rules
 
 More information about how the app calculates fertility status and bleeding predictions in the [wiki on Gitlab](https://gitlab.com/bloodyhealth/drip/wikis/home).
@@ -192,11 +225,7 @@ More information about how the app calculates fertility status and bleeding pred
 2.  Download webfont from fontello.
 3.  Copy both the content of `config.json` and `font.tff` into `assets/fonts`, replacing it with the current content of `config-drip-icon-font.json` and `drip-icon-font.tff`.
 4.  Now run the following command in your console:
-    ```
+
-    $ react-native link
+        react-native link
-    ```
+
 5.  You should be able to use the icon now within drip, e.g. in Cycle Day Overview and on the chart.
-
-## Translation
-
-We are using [Weblate](https://weblate.org/) as translation software.

RELEASE.md

@@ -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
+yarn 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
 ```
 
-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

android/app/build.gradle

@@ -15,10 +15,12 @@ import com.android.build.OutputFile
  *   // the name of the generated asset file containing your JS bundle
  *   bundleAssetName: "index.android.bundle",
  *
- *   // the entry file for bundle generation
+ *   // the entry file for bundle generation. If none specified and
+ *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
+ *   // default. Can be overridden with ENTRY_FILE environment variable.
  *   entryFile: "index.android.js",
  *
-*   // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
+ *   // https://reactnative.dev/docs/performance#enable-the-ram-format
  *   bundleCommand: "ram-bundle",
  *
  *   // whether to bundle JS and assets in debug mode
@@ -76,7 +78,6 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    entryFile: "index.js",
     enableHermes: false,  // clean and rebuild if changing
 ]
 
@@ -113,29 +114,30 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 /**
  * Whether to enable the Hermes VM.
  *
- * This should be set on project.ext.react and mirrored here.  If it is not set
+ * This should be set on project.ext.react and that value will be read here. If it is not set
  * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
  * and the benefits of using Hermes will therefore be sharply reduced.
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+/**
+ * Architectures to build native code for in debug.
+ */
+def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+
 android {
+    ndkVersion rootProject.ext.ndkVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     defaultConfig {
         applicationId "com.drip"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 8
+        versionCode 25
-        versionName "1.2102.28"
+        versionName "1.2311.14"
         ndk {
-            abiFilters "armeabi-v7a", "x86"
+            abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
         testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -167,26 +169,40 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
+            if (nativeArchitectures) {
+                ndk {
+                    abiFilters nativeArchitectures.split(',')
+                }
+            }            
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
-            // see https://facebook.github.io/react-native/docs/signed-apk-android.
+            // see https://reactnative.dev/docs/signed-apk-android.
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             signingConfig signingConfigs.release
         }
     }
+
+    packagingOptions {
+        pickFirst "lib/armeabi-v7a/libc++_shared.so"
+        pickFirst "lib/arm64-v8a/libc++_shared.so"
+        pickFirst "lib/x86/libc++_shared.so"
+        pickFirst "lib/x86_64/libc++_shared.so"
+    }
+
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
-            def versionCodes = ["armeabi-v7a": 1, "x86": 2]
+            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
+            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
-                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+                        defaultConfig.versionCode * 1000 + versionCodes.get(abi)
             }
         }
     }
@@ -194,9 +210,23 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.0.0'
+    //noinspection GradleDynamicVersion
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation "androidx.appcompat:appcompat:1.0.0"
+    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.work:work-runtime-ktx:2.7.1"
     implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+      exclude group:'com.facebook.fbjni'
+    }
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
+    }
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";
@@ -213,7 +243,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 

android/app/src/debug/AndroidManifest.xml

@@ -4,5 +4,10 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+    <application
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>    
 </manifest>

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

@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.rndiffapp;
+import android.content.Context;
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.android.utils.FlipperUtils;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+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.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.network.NetworkingModule;
+import okhttp3.OkHttpClient;
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    if (FlipperUtils.shouldEnableFlipper(context)) {
+      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new ReactFlipperPlugin());
+      client.addPlugin(new DatabasesFlipperPlugin(context));
+      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+      client.addPlugin(CrashReporterPlugin.getInstance());
+      NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+      NetworkingModule.setCustomClientBuilder(
+          new NetworkingModule.CustomClientBuilder() {
+            @Override
+            public void apply(OkHttpClient.Builder builder) {
+              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+            }
+          });
+      client.addPlugin(networkFlipperPlugin);
+      client.start();
+      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+      // Hence we run if after all native modules have been initialized
+      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+      if (reactContext == null) {
+        reactInstanceManager.addReactInstanceEventListener(
+            new ReactInstanceManager.ReactInstanceEventListener() {
+              @Override
+              public void onReactContextInitialized(ReactContext reactContext) {
+                reactInstanceManager.removeReactInstanceEventListener(this);
+                reactContext.runOnNativeModulesQueueThread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
+              }
+            });
+      } else {
+        client.addPlugin(new FrescoFlipperPlugin());
+      }
+    }
+  }
+}

android/app/src/main/AndroidManifest.xml

@@ -5,75 +5,81 @@
 >
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission tools:node="remove" android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission tools:node="remove" android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission tools:node="remove" android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
     <permission
         android:name="${applicationId}.permission.C2D_MESSAGE"
         android:protectionLevel="signature" />
 
-    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-
-
     <application
-      android:name=".MainApplication"
+        android:name=".MainApplication"
-      android:label="@string/app_name"
-      android:icon="@mipmap/ic_launcher"
-      android:roundIcon="@mipmap/ic_launcher_round"
-      android:allowBackup="false"
-      android:theme="@style/AppTheme">
-      <activity
-        android:name=".MainActivity"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+        android:icon="@mipmap/ic_launcher"
-        android:windowSoftInputMode="adjustResize"
+        android:roundIcon="@mipmap/ic_launcher_round"
-        android:screenOrientation="sensorPortrait">
+        android:allowBackup="false"
-        <intent-filter>
+        android:theme="@style/AppTheme">
-            <action android:name="android.intent.action.MAIN" />
+
-            <category android:name="android.intent.category.LAUNCHER" />
+        <meta-data
-        </intent-filter>
+            android:name="com.dieam.reactnativepushnotification.notification_foreground"
-      </activity>
+            android:value="false" />
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        <meta-data
-      <provider
+            android:name="com.dieam.reactnativepushnotification.notification_color"
+            android:resource="@color/purple" /> 
+        <meta-data
+            android:name="com.dieam.reactnativepushnotification.default_notification_channel_id"
+            android:value="..." />
+
+        <receiver 
+            android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions"
+            android:exported="false"
+            tools:ignore="MissingClass" />
+        <receiver 
+            android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher"
+            android:exported="false" />
+        <receiver
+            android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+            </intent-filter>
+        </receiver>
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustPan"
+            android:screenOrientation="sensorPortrait">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.drip.provider"
             android:grantUriPermissions="true"
-            android:exported="false">
+            android:exported="false" >
             <meta-data
                 tools:replace="android:resource"
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/filepaths" />
-      </provider>
+        </provider>
 
-        <meta-data  android:name="com.dieam.reactnativepushnotification.notification_foreground"
-                    android:value="false"/>
-        <!-- Change the resource name to your App's accent color - or any other color you want -->
-        <meta-data  android:name="com.dieam.reactnativepushnotification.notification_color"
-                    android:resource="@android:color/white"/> <!-- or @android:color/{name} to use a standard color -->
-
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"
-            android:exported="false" >
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
     </application>
-
 </manifest>

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

@@ -4,6 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactInstanceManager;
 import cl.json.ShareApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
@@ -44,22 +45,27 @@ public class MainApplication extends Application implements ReactApplication, Sh
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
-    initializeFlipper(this); // Remove this line if you don't want Flipper enabled
+    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
   }
   /**
-   * Loads Flipper in React Native templates.
+   * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+   * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    *
    * @param context
+   * @param reactInstanceManager   
    */
-  private static void initializeFlipper(Context context) {
+  private static void initializeFlipper(
+      Context context, ReactInstanceManager reactInstanceManager) {
     if (BuildConfig.DEBUG) {
       try {
         /*
          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.facebook.flipper.ReactNativeFlipper");
+        Class<?> aClass = Class.forName("com.rndiffapp.ReactNativeFlipper");
-        aClass.getMethod("initializeFlipper", Context.class).invoke(null, context);
+        aClass
+            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+            .invoke(null, context, reactInstanceManager);
       } catch (ClassNotFoundException e) {
         e.printStackTrace();
       } catch (NoSuchMethodException e) {

android/app/src/main/res/drawable/rn_edit_text_material.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetTop="@dimen/abc_edit_text_inset_top_material"
+       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
+    <selector>
+        <!-- 
+          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
+          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
+          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
+          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
+        -->
+        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
+    </selector>
+</inset>

android/app/src/main/res/values/colors.xml

@@ -14,4 +14,5 @@
     <color name="grey">#A5A5A5</color>
     <color name="orange">#F38337</color>
     <color name="purple">#3A2671</color>
+    <color name="turquoiseDark">#69CBC1</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,9 +1,9 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:textColor">#000000</item>
+        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>

android/build.gradle

@@ -2,22 +2,21 @@
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
-    ext.kotlinVersion = '1.3.10'
+    ext.kotlinVersion = '1.3.40'
     dependencies {
-        classpath("com.android.tools.build:gradle:3.4.2")
+        classpath('com.android.tools.build:gradle:7.0.3')
 
         // 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"
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 
 allprojects {
     repositories {
-        mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url("$rootDir/../node_modules/react-native/android")
@@ -26,9 +25,15 @@ allprojects {
             // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
+        mavenCentral {
+            // We don't want to fetch react-native from Maven Central as there are
+            // older versions over there.
+            content {
+                excludeGroup "com.facebook.react"
+            }
+        }        
         google()
-        jcenter()
+        maven { url 'https://www.jitpack.io' }
-        maven { url 'https://jitpack.io' }
         maven {
             url 'https://maven.google.com/'
             name 'Google'
@@ -41,22 +46,9 @@ allprojects {
 }
 
 ext {
-    googlePlayServicesVersion = "+" // default: "+"
+    buildToolsVersion = "33.0.2"
-    firebaseMessagingVersion = "21.1.0" // default: "+"
+    minSdkVersion = 21
-
+    compileSdkVersion = 33
-    buildToolsVersion = "29.0.3"
+    targetSdkVersion = 33
-    minSdkVersion = 23
+    ndkVersion = "21.4.7075529"
-    compileSdkVersion = 29
-    targetSdkVersion = 29
-}
-
-subprojects {
-    afterEvaluate {project ->
-        if (project.hasProperty("android")) {
-            android {
-                compileSdkVersion 29
-                buildToolsVersion '29.0.3'
-            }
-        }
-    }
 }

android/gradle.properties

@@ -9,12 +9,23 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-android.useAndroidX=true
+
+# Version of flipper SDK to use with React Native
+FLIPPER_VERSION=0.99.0
+
+# https://github.com/facebook/react-native/issues/30729
+org.gradle.jvmargs=-Xmx4g

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

android/gradlew

@@ -1,13 +1,13 @@
-#!/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.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,79 +17,113 @@
 #
 
 ##############################################################################
-##
+#
-##  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
+nonstop=false
-  CYGWIN* )
+case "$( uname )" in                #(
-    cygwin=true
+  CYGWIN* )         cygwin=true  ;; #(
-    ;;
+  Darwin* )         darwin=true  ;; #(
-  Darwin* )
+  MSYS* | MINGW* )  msys=true    ;; #(
-    darwin=true
+  NONSTOP* )        nonstop=true ;;
-    ;;
-  MINGW* )
-    msys=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
 
+
 # Determine the Java command to use to start the JVM.
 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
@@ -98,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
@@ -106,75 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        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, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # 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=$((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" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Collect all arguments for the java command, stacking in reverse order:
-function splitJvmOpts() {
+#   * args from the command line
-    JVM_OPTS=("$@")
+#   * the main class name
-}
+#   * -classpath
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+#   * -D...appname settings
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"

android/gradlew.bat

@@ -32,12 +32,15 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,34 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

android/settings.gradle

@@ -1,4 +1,12 @@
 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')
+}

babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['module:metro-react-native-babel-preset'],
+}

components/AcceptLicense.js

@@ -0,0 +1,43 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { BackHandler, StyleSheet, View } from 'react-native'
+import { useTranslation } from 'react-i18next'
+
+import License from './settings/License'
+import Button from './common/button'
+
+import { saveLicenseFlag } from '../local-storage'
+
+import { Containers } from '../styles'
+
+export default function AcceptLicense({ setLicense }) {
+  const onAcceptLicense = async () => {
+    await saveLicenseFlag()
+    setLicense()
+  }
+
+  const { t } = useTranslation()
+
+  return (
+    <License>
+      <View style={styles.container}>
+        <Button onPress={BackHandler.exitApp} testID="licenseCancelButton">
+          {t('labels.shared.cancel')}
+        </Button>
+        <Button isCTA onPress={onAcceptLicense} testID="licenseOkButton">
+          {t('labels.shared.ok')}
+        </Button>
+      </View>
+    </License>
+  )
+}
+
+AcceptLicense.propTypes = {
+  setLicense: PropTypes.func.isRequired,
+}
+
+const styles = StyleSheet.create({
+  container: {
+    ...Containers.rowContainer,
+  },
+})

components/Home.js

@@ -3,23 +3,24 @@ import { ScrollView, StyleSheet, View } from 'react-native'
 import PropTypes from 'prop-types'
 import moment from 'moment'
 
-import { connect } from 'react-redux'
-import { navigate } from '../slices/navigation'
-import { getDate, setDate } from '../slices/date'
-
 import AppText from './common/app-text'
+import Asterisk from './common/Asterisk'
 import Button from './common/button'
+import Footnote from './common/Footnote'
 
 import cycleModule from '../lib/cycle'
 import { getFertilityStatusForDay } from '../lib/sympto-adapter'
-import { determinePredictionText, formatWithOrdinalSuffix } from './helpers/home'
+import {
+  determinePredictionText,
+  formatWithOrdinalSuffix,
+} from './helpers/home'
+import { periodPredictionObservable } from '../local-storage'
 
 import { Colors, Fonts, Sizes, Spacing } from '../styles'
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 import { useTranslation } from 'react-i18next'
 
 const Home = ({ navigate, setDate }) => {
-
   const { t } = useTranslation()
 
   function navigateToCycleDayView() {
@@ -32,24 +33,29 @@ const Home = ({ navigate, setDate }) => {
   const cycleDayNumber = getCycleDayNumber(todayDateString)
   const { status, phase, statusText } =
     getFertilityStatusForDay(todayDateString)
+  const isPeriodPredictionEnabled = periodPredictionObservable.value
   const prediction = determinePredictionText(getPredictedMenses(), t)
 
-  const cycleDayText = cycleDayNumber ? formatWithOrdinalSuffix(cycleDayNumber) : ''
+  const cycleDayText = cycleDayNumber
+    ? formatWithOrdinalSuffix(cycleDayNumber)
+    : ''
 
   return (
     <ScrollView
       style={styles.container}
       contentContainerStyle={styles.contentContainer}
     >
-      <AppText style={styles.title}>{moment().format("MMM Do YYYY")}</AppText>
+      <AppText style={styles.title}>{moment().format('MMM Do YYYY')}</AppText>
 
-      {cycleDayNumber &&
+      {cycleDayNumber && (
         <View style={styles.line}>
           <AppText style={styles.whiteSubtitle}>{cycleDayText}</AppText>
-          <AppText style={styles.turquoiseText}>{t('labels.home.cycleDay')}</AppText>
+          <AppText style={styles.turquoiseText}>
+            {t('labels.home.cycleDay')}
+          </AppText>
         </View>
-      }
+      )}
-      {phase &&
+      {phase && (
         <View style={styles.line}>
           <AppText style={styles.whiteSubtitle}>
             {formatWithOrdinalSuffix(phase)}
@@ -60,33 +66,21 @@ const Home = ({ navigate, setDate }) => {
           <AppText style={styles.turquoiseText}>{status}</AppText>
           <Asterisk />
         </View>
-      }
+      )}
-      <View style={styles.line}>
+      {isPeriodPredictionEnabled && (
-        <AppText style={styles.turquoiseText}>{prediction}</AppText>
+        <View style={styles.line}>
-      </View>
+          <AppText style={styles.turquoiseText}>{prediction}</AppText>
+        </View>
+      )}
       <Button isCTA isSmall={false} onPress={navigateToCycleDayView}>
         {t('labels.home.addDataForToday')}
       </Button>
-      {phase && (
+      {phase && <Footnote colorLabel="greyLight">{statusText}</Footnote>}
-        <View style={styles.asteriskLine}>
-          <Asterisk />
-          <AppText linkStyle={styles.whiteText} style={styles.greyText}>
-            {statusText}
-          </AppText>
-        </View>
-      )}
     </ScrollView>
   )
 }
 
-const Asterisk = () => {
-  return <AppText style={styles.asterisk}>*</AppText>
-}
-
 const styles = StyleSheet.create({
-  asterisk: {
-    color: Colors.orange,
-  },
   container: {
     backgroundColor: Colors.purple,
     flex: 1,
@@ -102,12 +96,6 @@ const styles = StyleSheet.create({
     marginBottom: Spacing.tiny,
     marginTop: Spacing.small,
   },
-  asteriskLine: {
-    flexDirection: 'row',
-    alignContent: 'flex-start',
-    marginBottom: Spacing.tiny,
-    marginTop: Spacing.small,
-  },
   title: {
     color: Colors.purpleLight,
     fontFamily: Fonts.bold,
@@ -122,34 +110,11 @@ const styles = StyleSheet.create({
     color: 'white',
     fontSize: Sizes.subtitle,
   },
-  whiteText: {
-    color: 'white',
-  },
-  greyText: {
-    color: Colors.greyLight,
-    paddingLeft: Spacing.base,
-  }
 })
 
-const mapStateToProps = (state) => {
-  return ({
-    date: getDate(state),
-  })
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return ({
-    navigate: (page) => dispatch(navigate(page)),
-    setDate: (date) => dispatch(setDate(date)),
-  })
-}
-
 Home.propTypes = {
   navigate: PropTypes.func,
-  setDate: PropTypes.func
+  setDate: PropTypes.func,
 }
 
-export default connect(
+export default Home
-  mapStateToProps,
-  mapDispatchToProps,
-)(Home)

components/License.js

@@ -1,49 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import { BackHandler, StyleSheet, View } from 'react-native'
-import { useTranslation } from 'react-i18next'
-
-import AppPage from './common/app-page'
-import AppText from './common/app-text'
-import Button from './common/button'
-import Segment from './common/segment'
-
-import { saveLicenseFlag } from '../local-storage'
-
-import { Containers } from '../styles'
-
-export default function License({ setLicense }) {
-  const onAcceptLicense = async () => {
-    await saveLicenseFlag()
-    setLicense()
-  }
-
-  const { t } = useTranslation()
-  const currentYear = new Date().getFullYear()
-
-  return (
-    <AppPage testID="licensePage">
-      <Segment last testID="test" title={t("settings.license.title")}>
-        <AppText testID="test">{t("settings.license.text", { currentYear })}</AppText>
-        <View style={styles.container}>
-          <Button onPress={BackHandler.exitApp} testID="licenseCancelButton">
-            {t("labels.shared.cancel")}
-          </Button>
-          <Button isCTA onPress={onAcceptLicense} testID="licenseOkButton">
-            {t("labels.shared.ok")}
-          </Button>
-        </View>
-      </Segment>
-    </AppPage>
-  )
-}
-
-License.propTypes = {
-  setLicense: PropTypes.func.isRequired
-}
-
-const styles = StyleSheet.create({
-  container: {
-    ...Containers.rowContainer
-  }
-})

components/app-wrapper.js

@@ -1,7 +1,4 @@
-import React, { Component } from 'react'
+import React, { useState, useEffect } from 'react'
-import { StyleSheet, View } from 'react-native'
-import { Provider } from 'react-redux'
-import nodejs from 'nodejs-mobile-react-native'
 
 import { getLicenseFlag, saveEncryptionFlag } from '../local-storage'
 import { openDb } from '../db'
@@ -9,96 +6,47 @@ import { openDb } from '../db'
 import App from './app'
 import AppLoadingView from './common/app-loading'
 import AppStatusBar from './common/app-status-bar'
-import License from './License'
+import AcceptLicense from './AcceptLicense'
 import PasswordPrompt from './password-prompt'
 
-import store from "../store"
+export default function AppWrapper() {
+  const [isLoading, setIsLoading] = useState(true)
+  const [isLicenseAccepted, setIsLicenseAccepted] = useState(false)
+  const [isDbEncrypted, setIsDbEncrypted] = useState(false)
 
-export default class AppWrapper extends Component {
+  const checkIsLicenseAccepted = async () => {
-  constructor() {
-    super()
-    this.state = {
-      isCheckingLicenseAgreement: true,
-      shouldShowLicenseAgreement: false,
-      shouldShowPasswordPrompt: false,
-      shouldShowApp: false,
-    }
-    nodejs.start('main.js')
-    this.checkLicenseAgreement()
-    this.checkDbPasswordSet()
-  }
-
-  async checkLicenseAgreement() {
     const isLicenseFlagSet = await getLicenseFlag()
-    if (!isLicenseFlagSet) {
+    setIsLicenseAccepted(isLicenseFlagSet)
-      this.enableShowLicenseAgreement()
+    setIsLoading(false)
-    } else {
-      this.setState({ isCheckingLicenseAgreement: false })
-    }
   }
 
-  async checkDbPasswordSet() {
+  const checkIsDbEncrypted = async () => {
-    const canConnectToDb = await openDb()
+    const isEncrypted = !(await openDb())
-    if (canConnectToDb) {
+    if (isEncrypted) setIsDbEncrypted(true)
-      this.enableShowApp()
+    await saveEncryptionFlag(isEncrypted)
-      await saveEncryptionFlag(false)
-      return false
-    }
-    this.setState({ shouldShowPasswordPrompt: true })
-    await saveEncryptionFlag(true)
   }
 
-  enableShowLicenseAgreement = () => {
+  useEffect(() => {
-    this.setState({
+    checkIsLicenseAccepted()
-      shouldShowLicenseAgreement: true,
+    checkIsDbEncrypted()
-      isCheckingLicenseAgreement: false
+  }, [])
-    })
+
+  if (isLoading) {
+    return <AppLoadingView />
   }
 
-  disableShowLicenseAgreement = () => {
+  if (!isLicenseAccepted) {
-    this.setState({ shouldShowLicenseAgreement: false })
+    return <AcceptLicense setLicense={() => setIsLicenseAccepted(true)} />
   }
 
-  enableShowApp = () => {
+  return (
-    this.setState({
+    <>
-      shouldShowApp: true,
+      <AppStatusBar />
-      shouldShowPasswordPrompt: false
+      {isDbEncrypted ? (
-    })
+        <PasswordPrompt enableShowApp={() => setIsDbEncrypted(false)} />
-  }
+      ) : (
-
+        <App restartApp={() => checkIsDbEncrypted()} />
-  render() {
+      )}
-    const {
+    </>
-      isCheckingLicenseAgreement,
+  )
-      shouldShowLicenseAgreement,
-      shouldShowPasswordPrompt,
-      shouldShowApp,
-    } = this.state
-
-    let initialView = null
-
-    if (isCheckingLicenseAgreement) {
-      initialView = <AppLoadingView />
-    } else if (shouldShowLicenseAgreement) {
-      initialView = <License setLicense={this.disableShowLicenseAgreement}/>
-    } else if (shouldShowPasswordPrompt) {
-      initialView = <PasswordPrompt enableShowApp={this.enableShowApp} />
-    } else if (shouldShowApp) {
-      initialView = <App />
-    }
-
-    return (
-      <Provider store={store}>
-        <View style={styles.container}>
-          <AppStatusBar />
-          {initialView}
-        </View>
-      </Provider>
-    )
-  }
 }
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-  }
-})

components/app.js

@@ -1,114 +1,71 @@
-import React, { Component } from 'react'
+import React, { useState, useEffect } from 'react'
 import { BackHandler, StyleSheet, View } from 'react-native'
 import PropTypes from 'prop-types'
 
-import { connect } from 'react-redux'
+import { LocalDate } from '@js-joda/core'
-
-import { getDate } from '../slices/date'
-import { getNavigation, navigate, goBack } from '../slices/navigation'
 
 import Header from './header'
 import Menu from './menu'
 import { viewsList } from './views'
-import { isSettingsView } from './pages'
+import { pages } from './pages'
 
-import { headerTitles } from '../i18n/en/labels'
 import setupNotifications from '../lib/notifications'
-import { getCycleDay, closeDb } from '../db'
+import { closeDb } from '../db'
-
-class App extends Component {
-
-  static propTypes = {
-    date: PropTypes.string,
-    navigation: PropTypes.object.isRequired,
-    navigate: PropTypes.func,
-    goBack: PropTypes.func,
-  }
-
-  constructor(props) {
-    super(props)
-
-    this.backHandler = BackHandler.addEventListener(
-      'hardwareBackPress',
-      this.goBack
-    )
-
-    setupNotifications(this.props.navigate)
-  }
-
-  goBack = () => {
-    const { currentPage } = this.props.navigation
 
+const App = ({ restartApp }) => {
+  const [date, setDate] = useState(LocalDate.now().toString())
+  const [currentPage, setCurrentPage] = useState('Home')
+  const goBack = () => {
     if (currentPage === 'Home') {
       closeDb()
       BackHandler.exitApp()
     } else {
-      this.props.goBack()
+      const { parent } = pages.find((p) => p.component === currentPage)
+
+      setCurrentPage(parent)
     }
 
     return true
   }
 
-  componentWillUnmount() {
+  useEffect(() => {
-    this.backHandler.remove()
+    const backHandler = BackHandler.addEventListener(
-  }
+      'hardwareBackPress',
-
+      goBack
-  render() {
-    const { date, navigation, goBack } = this.props
-    const { currentPage } = navigation
-
-    if (!currentPage) {
-      return false
-    }
-
-    const Page = viewsList[currentPage]
-    const title = headerTitles[currentPage]
-
-    const isSettingsSubView = isSettingsView(currentPage)
-    const isTemperatureEditView = currentPage === 'TemperatureEditView'
-
-    const headerProps = {
-      title,
-      handleBack: isSettingsSubView ? goBack : null,
-    }
-
-    const pageProps = {
-      cycleDay: date && getCycleDay(date),
-      date,
-      isTemperatureEditView,
-    }
-
-    return (
-      <View style={styles.container}>
-        <Header { ...headerProps } />
-        <Page { ...pageProps } />
-        <Menu />
-      </View>
     )
+
+    return () => backHandler.remove()
+  })
+
+  useEffect(() => setupNotifications(setCurrentPage, setDate), [])
+
+  const Page = viewsList[currentPage]
+  const isTemperatureEditView = currentPage === 'TemperatureEditView'
+  const headerProps = { navigate: setCurrentPage }
+  const pageProps = {
+    date,
+    setDate,
+    isTemperatureEditView,
+    navigate: setCurrentPage,
   }
+
+  return (
+    <View style={styles.container}>
+      <Header {...headerProps} />
+      <Page {...pageProps} restartApp={restartApp} />
+      <Menu currentPage={currentPage} navigate={setCurrentPage} />
+    </View>
+  )
+}
+
+App.propTypes = {
+  restartApp: PropTypes.func,
 }
 
 const styles = StyleSheet.create({
   container: {
-    flex: 1
+    flex: 1,
-  }
+  },
 })
 
-const mapStateToProps = (state) => {
+export default App
-  return({
-    date: getDate(state),
-    navigation: getNavigation(state)
-  })
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return({
-    navigate: (page) => dispatch(navigate(page)),
-    goBack: () => dispatch(goBack()),
-  })
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(App)

components/calendar.js

@@ -1,15 +1,10 @@
-import React, { Component } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
 import { StyleSheet, View } from 'react-native'
 import { CalendarList } from 'react-native-calendars'
 
-import { connect } from 'react-redux'
-import { setDate } from '../slices/date'
-import { navigate } from '../slices/navigation'
-
 import { getBleedingDaysSortedByDate } from '../db'
 import cycleModule from '../lib/cycle'
-import nothingChanged from '../db/db-unchanged'
 import {
   calendarTheme,
   predictionToCalFormat,
@@ -17,83 +12,45 @@ import {
   todayToCalFormat,
 } from './helpers/calendar'
 
-class CalendarView extends Component {
+const CalendarView = ({ setDate, navigate }) => {
-  static propTypes = {
+  const bleedingDays = getBleedingDaysSortedByDate()
-    setDate: PropTypes.func.isRequired,
+  const predictedMenses = cycleModule().getPredictedMenses()
-    navigate: PropTypes.func.isRequired,
+
+  const passDateToDayView = ({ dateString }) => {
+    setDate(dateString)
+    navigate('CycleDay')
   }
 
-  constructor(props) {
+  const markedDates = Object.assign(
-    super(props)
+    {},
-    this.bleedingDays = getBleedingDaysSortedByDate()
+    todayToCalFormat(),
-    const predictedMenses = cycleModule().getPredictedMenses()
+    toCalFormat(bleedingDays),
-    this.state = {
+    predictionToCalFormat(predictedMenses)
-      bleedingDaysInCalFormat: toCalFormat(this.bleedingDays),
+  )
-      predictedBleedingDaysInCalFormat: predictionToCalFormat(predictedMenses),
-      todayInCalFormat: todayToCalFormat(),
-    }
 
-    this.bleedingDays.addListener(this.setStateWithCalFormattedDays)
+  return (
-  }
+    <View style={styles.container}>
-
+      <CalendarList
-  setStateWithCalFormattedDays = (_, changes) => {
+        // If firstDay=1 week starts from Monday. Note that dayNames and dayNamesShort should still start from Sunday.
-    if (nothingChanged(changes)) return
+        firstDay={1}
-    const predictedMenses = cycleModule().getPredictedMenses()
+        onDayPress={passDateToDayView}
-    this.setState({
+        markedDates={markedDates}
-      bleedingDaysInCalFormat: toCalFormat(this.bleedingDays),
+        markingType="custom"
-      predictedBleedingDaysInCalFormat: predictionToCalFormat(predictedMenses),
+        theme={calendarTheme}
-      todayInCalFormat: todayToCalFormat(),
+        // Max amount of months allowed to scroll to the past.
-    })
+        pastScrollRange={120}
-  }
+      />
-
+    </View>
-  componentWillUnmount() {
+  )
-    this.bleedingDays.removeListener(this.setStateWithCalFormattedDays)
-  }
-
-  passDateToDayView = (result) => {
-    this.props.setDate(result.dateString)
-    this.props.navigate('CycleDay')
-  }
-
-  render() {
-    const {
-      todayInCalFormat,
-      bleedingDaysInCalFormat,
-      predictedBleedingDaysInCalFormat,
-    } = this.state
-    const markedDates = Object.assign(
-      {},
-      todayInCalFormat,
-      bleedingDaysInCalFormat,
-      predictedBleedingDaysInCalFormat
-    )
-
-    return (
-      <View style={styles.container}>
-        <CalendarList
-          // If firstDay=1 week starts from Monday. Note that dayNames and dayNamesShort should still start from Sunday.
-          firstDay={1}
-          onDayPress={this.passDateToDayView.bind(this)}
-          markedDates={markedDates}
-          markingType='custom'
-          theme={calendarTheme}
-          // Max amount of months allowed to scroll to the past.
-          pastScrollRange={120}
-        />
-      </View>
-    )
-  }
 }
 
 const styles = StyleSheet.create({
   container: { flex: 1 },
 })
 
-const mapDispatchToProps = (dispatch) => {
+CalendarView.propTypes = {
-  return {
+  setDate: PropTypes.func.isRequired,
-    setDate: (date) => dispatch(setDate(date)),
+  navigate: PropTypes.func.isRequired,
-    navigate: (page) => dispatch(navigate(page)),
-  }
 }
 
-export default connect(null, mapDispatchToProps)(CalendarView)
+export default CalendarView

components/chart/Tutorial.js

@@ -6,16 +6,17 @@ import AppText from '../common/app-text'
 import CloseIcon from '../common/close-icon'
 
 import { Containers, Spacing } from '../../styles'
-import { chart } from '../../i18n/en/labels'
+import { useTranslation } from 'react-i18next'
 
 const image = require('../../assets/swipe.png')
 
 const Tutorial = ({ onClose }) => {
+  const { t } = useTranslation()
   return (
     <View style={styles.container}>
-      <Image resizeMode='contain' source={image} style={styles.image} />
+      <Image resizeMode="contain" source={image} style={styles.image} />
       <View style={styles.textContainer}>
-        <AppText>{chart.tutorial}</AppText>
+        <AppText>{t('chart.tutorial')}</AppText>
       </View>
       <CloseIcon onClose={onClose} />
     </View>
@@ -23,20 +24,20 @@ const Tutorial = ({ onClose }) => {
 }
 
 Tutorial.propTypes = {
-  onClose: PropTypes.func.isRequired
+  onClose: PropTypes.func.isRequired,
 }
 
 const styles = StyleSheet.create({
   container: {
     ...Containers.rowContainer,
-    padding: Spacing.large
+    padding: Spacing.large,
   },
   image: {
-    height: 40
+    height: 40,
   },
   textContainer: {
-    width: '70%'
+    width: '70%',
-  }
+  },
 })
 
-export default Tutorial
+export default Tutorial

components/chart/chart-legend.js

@@ -4,35 +4,44 @@ import { StyleSheet, View } from 'react-native'
 
 import AppText from '../common/app-text'
 
-import { Typography } from '../../styles'
+import { Sizes, Typography } from '../../styles'
 import { CHART_YAXIS_WIDTH } from '../../config'
 import { shared as labels } from '../../i18n/en/labels'
 
 const ChartLegend = ({ height }) => {
   return (
     <View style={[styles.container, { height }]}>
-      <AppText style={styles.textBold}>#</AppText>
+      <View style={[styles.singleLabelContainer, { height: height / 2 }]}>
-      <AppText style={styles.text}>{labels.date}</AppText>
+        <AppText style={styles.textBold}>#</AppText>
+      </View>
+      <View style={[styles.singleLabelContainer, { height: height / 2 }]}>
+        <AppText style={styles.text}>{labels.date}</AppText>
+      </View>
     </View>
   )
 }
 
 ChartLegend.propTypes = {
-  height: PropTypes.number.isRequired
+  height: PropTypes.number.isRequired,
 }
 
 const styles = StyleSheet.create({
   container: {
     alignItems: 'center',
     justifyContent: 'flex-end',
-    width: CHART_YAXIS_WIDTH
+    width: CHART_YAXIS_WIDTH,
+  },
+  singleLabelContainer: {
+    justifyContent: 'space-around',
+    alignItems: 'center',
   },
   text: {
     ...Typography.label,
+    fontSize: Sizes.footnote,
   },
   textBold: {
-    ...Typography.labelBold
+    ...Typography.labelBold,
-  }
+  },
 })
 
 export default ChartLegend

components/chart/chart-line.js

@@ -1,19 +1,21 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { Shape } from 'react-native/Libraries/ART/ReactNativeART'
+import { Shape } from '@react-native-community/art'
 
 import { Colors } from '../../styles'
-import { CHART_STROKE_WIDTH, CHART_GRID_LINE_HORIZONTAL_WIDTH } from '../../config'
+import {
+  CHART_STROKE_WIDTH,
+  CHART_GRID_LINE_HORIZONTAL_WIDTH,
+} from '../../config'
 
 const ChartLine = ({ path, isNfpLine }) => {
   const color = isNfpLine ? Colors.orange : Colors.grey
   const width = isNfpLine
-    ? CHART_STROKE_WIDTH : CHART_GRID_LINE_HORIZONTAL_WIDTH * 2.5
+    ? CHART_STROKE_WIDTH
+    : CHART_GRID_LINE_HORIZONTAL_WIDTH * 2.5
 
-  return (
+  return <Shape d={path} stroke={color} strokeWidth={width} />
-    <Shape d={path} stroke={color} strokeWidth={width} />
-  )
 }
 
 ChartLine.propTypes = {
@@ -22,7 +24,7 @@ ChartLine.propTypes = {
 }
 
 ChartLine.defaultProps = {
-  isNfpLine: false
+  isNfpLine: false,
 }
 
 export default ChartLine

components/chart/chart.js

@@ -1,267 +1,182 @@
-import React, { Component } from 'react'
+import React, { useEffect, useState } from 'react'
 import PropTypes from 'prop-types'
-import {
+import { Dimensions, PixelRatio, StyleSheet, View } from 'react-native'
-  ActivityIndicator,
-  Dimensions,
-  FlatList,
-  PixelRatio,
-  StyleSheet,
-  View
-} from 'react-native'
 
-import AppLoadingView from '../common/app-loading'
 import AppPage from '../common/app-page'
-import AppText from '../common/app-text'
 
 import DayColumn from './day-column'
 import HorizontalGrid from './horizontal-grid'
+import MainGrid from './main-grid'
 import NoData from './no-data'
-import Tutorial from './tutorial'
+import NoTemperature from './no-temperature'
+import Tutorial from './Tutorial'
 import YAxis from './y-axis'
 
-import { connect } from 'react-redux'
-import { navigate } from '../../slices/navigation'
-
 import { getCycleDaysSortedByDate } from '../../db'
-import nothingChanged from '../../db/db-unchanged'
+import {
-import { getChartFlag, scaleObservable, setChartFlag } from '../../local-storage'
+  getChartFlag,
-import { makeColumnInfo, nfpLines } from '../helpers/chart'
+  setChartFlag,
+  desireTrackingCategoryObservable,
+  moodTrackingCategoryObservable,
+  noteTrackingCategoryObservable,
+  painTrackingCategoryObservable,
+  sexTrackingCategoryObservable,
+} from '../../local-storage'
+import { makeColumnInfo } from '../helpers/chart'
 
 import {
   CHART_COLUMN_WIDTH,
   CHART_GRID_LINE_HORIZONTAL_WIDTH,
   CHART_SYMPTOM_HEIGHT_RATIO,
   CHART_XAXIS_HEIGHT_RATIO,
-  SYMPTOMS
+  SYMPTOMS,
 } from '../../config'
-import { shared } from '../../i18n/en/labels'
+import { Spacing } from '../../styles'
-import { Colors, Spacing } from '../../styles'
 
-class CycleChart extends Component {
+const getSymptomsFromCycleDays = (cycleDays) =>
-  static propTypes = {
+  SYMPTOMS.filter((symptom) => cycleDays.some((cycleDay) => cycleDay[symptom]))
-    navigate: PropTypes.func,
-    end: PropTypes.bool
-  }
 
-  constructor(props) {
+const CycleChart = ({ navigate, setDate }) => {
-    super(props)
+  const [shouldShowHint, setShouldShowHint] = useState(false)
 
-    this.state = {}
+  useEffect(() => {
-    this.cycleDaysSortedByDate = getCycleDaysSortedByDate()
+    let isMounted = true
-    this.getFhmAndLtlInfo = nfpLines()
-    this.shouldShowTemperatureColumn = false
 
-    this.checkShouldShowHint()
+    async function checkShouldShowHint() {
-    this.prepareSymptomData()
+      const flag = await getChartFlag()
-  }
+      if (isMounted) {
-
+        setShouldShowHint(flag === 'true')
-  componentWillUnmount() {
+      }
-    this.cycleDaysSortedByDate.removeListener(this.handleDbChange)
-    this.removeObvListener()
-  }
-
-  checkShouldShowHint = async () => {
-    const flag = await getChartFlag()
-    const shouldShowHint = flag === 'true' ? true : false
-    this.setState({ shouldShowHint })
-  }
-
-  setShouldShowHint = async () => {
-    await setChartFlag()
-    this.setState({ shouldShowHint: false })
-  }
-
-  onLayout = () => {
-    if (this.state.chartHeight) return false
-
-    this.reCalculateChartInfo()
-    this.updateListeners(this.reCalculateChartInfo)
-  }
-
-  prepareSymptomData = () => {
-    this.symptomRowSymptoms = SYMPTOMS.filter((symptomName) => {
-      return this.cycleDaysSortedByDate.some(cycleDay => {
-        return (symptomName !== 'temperature') && cycleDay[symptomName]
-      })
-    })
-    this.chartSymptoms = [...this.symptomRowSymptoms]
-    if (this.cycleDaysSortedByDate.some(day => day.temperature)) {
-      this.chartSymptoms.push('temperature')
-      this.shouldShowTemperatureColumn = true
     }
+
+    checkShouldShowHint()
+
+    return () => {
+      isMounted = false
+    }
+  }, [])
+
+  const hideHint = () => {
+    setShouldShowHint(false)
+    setChartFlag()
   }
 
-  renderColumn = ({ item, index }) => {
+  const cycleDaysSortedByDate = getCycleDaysSortedByDate()
+
+  const chartSymptoms = getSymptomsFromCycleDays(cycleDaysSortedByDate)
+  const symptomRowSymptoms = chartSymptoms.filter(
+    (symptom) => symptom !== 'temperature'
+  )
+
+  const symptomRowEnabledSymptoms = symptomRowSymptoms.filter((symptom) => {
+    if (symptom === 'sex') {
+      return sexTrackingCategoryObservable.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 shouldShowTemperatureColumn = chartSymptoms.indexOf('temperature') > -1
+
+  const { width, height } = Dimensions.get('window')
+  const numberOfColumnsToRender = Math.round(width / CHART_COLUMN_WIDTH)
+
+  const xAxisHeight = height * 0.7 * CHART_XAXIS_HEIGHT_RATIO
+  const remainingHeight = height * 0.7 - xAxisHeight
+  const symptomHeight = PixelRatio.roundToNearestPixel(
+    remainingHeight * CHART_SYMPTOM_HEIGHT_RATIO
+  )
+  const symptomRowHeight =
+    PixelRatio.roundToNearestPixel(
+      symptomRowEnabledSymptoms.length * symptomHeight
+    ) + CHART_GRID_LINE_HORIZONTAL_WIDTH
+  const columnHeight = remainingHeight - symptomRowHeight
+
+  const chartHeight = shouldShowTemperatureColumn
+    ? height * 0.7
+    : symptomRowHeight + xAxisHeight
+
+  const columns = makeColumnInfo()
+
+  const renderColumn = ({ item }) => {
     return (
       <DayColumn
+        setDate={setDate}
         dateString={item}
-        index={index}
+        navigate={navigate}
-        navigate={this.props.navigate}
+        symptomHeight={symptomHeight}
-        symptomHeight={this.symptomHeight}
+        columnHeight={columnHeight}
-        columnHeight={this.columnHeight}
+        symptomRowSymptoms={symptomRowEnabledSymptoms}
-        symptomRowSymptoms={this.symptomRowSymptoms}
+        chartSymptoms={chartSymptoms}
-        chartSymptoms={this.chartSymptoms}
+        shouldShowTemperatureColumn={shouldShowTemperatureColumn}
-        shouldShowTemperatureColumn={this.shouldShowTemperatureColumn}
+        xAxisHeight={xAxisHeight}
-        getFhmAndLtlInfo={this.getFhmAndLtlInfo}
-        xAxisHeight={this.xAxisHeight}
       />
     )
   }
 
-  reCalculateChartInfo = () => {
+  const hasDataToDisplay = chartSymptoms.length > 0
-    const { width, height } = Dimensions.get('window')
 
-    this.xAxisHeight = height * 0.7 * CHART_XAXIS_HEIGHT_RATIO
+  if (!hasDataToDisplay) {
-    const remainingHeight = height * 0.7 - this.xAxisHeight
+    return <NoData navigate={navigate} />
-    this.symptomHeight = PixelRatio.roundToNearestPixel(
-      remainingHeight
-      * CHART_SYMPTOM_HEIGHT_RATIO
-    )
-    this.symptomRowHeight = PixelRatio.roundToNearestPixel(
-      this.symptomRowSymptoms.length * this.symptomHeight
-    ) + CHART_GRID_LINE_HORIZONTAL_WIDTH
-    this.columnHeight = remainingHeight - this.symptomRowHeight
-    const chartHeight = this.shouldShowTemperatureColumn ?
-      height * 0.7 : (this.symptomRowHeight + this.xAxisHeight)
-    const numberOfColumnsToRender = Math.round(width / CHART_COLUMN_WIDTH)
-    const columns = makeColumnInfo()
-
-    this.setState({ columns, chartHeight, numberOfColumnsToRender })
   }
 
-  updateListeners(dataUpdateHandler) {
+  return (
-    // remove existing listeners
+    <AppPage
-    if(this.handleDbChange) {
+      contentContainerStyle={styles.pageContainer}
-      this.cycleDaysSortedByDate.removeListener(this.handleDbChange)
+      scrollViewStyle={styles.page}
-    }
+    >
-    if (this.removeObvListener) this.removeObvListener()
+      <View style={styles.chartContainer}>
-
+        {shouldShowHint && <Tutorial onClose={hideHint} />}
-    this.handleDbChange = (_, changes) => {
+        {!shouldShowTemperatureColumn && <NoTemperature />}
-      if (nothingChanged(changes)) return
+        <View style={styles.chartArea}>
-      dataUpdateHandler()
+          <YAxis
-    }
+            height={columnHeight}
-
+            symptomsToDisplay={symptomRowEnabledSymptoms}
-    this.cycleDaysSortedByDate.addListener(this.handleDbChange)
+            symptomsSectionHeight={symptomRowHeight}
-    this.removeObvListener = scaleObservable(dataUpdateHandler, false)
+            shouldShowTemperatureColumn={shouldShowTemperatureColumn}
-  }
+            xAxisHeight={xAxisHeight}
-
+          />
-  render() {
+          <MainGrid
-    const {
+            data={columns}
-      chartHeight,
+            renderItem={renderColumn}
-      chartLoaded,
+            initialNumToRender={numberOfColumnsToRender}
-      shouldShowHint,
+            contentContainerStyle={{ height: chartHeight }}
-      numberOfColumnsToRender
+          />
-    } = this.state
+          {shouldShowTemperatureColumn && (
-    const hasDataToDisplay = this.chartSymptoms.length > 0
+            <HorizontalGrid height={columnHeight} />
-
-    return (
-      <AppPage
-        contentContainerStyle={styles.pageContainer}
-        onLayout={this.onLayout}
-        scrollViewStyle={styles.page}
-      >
-        {!hasDataToDisplay && <NoData />}
-        {hasDataToDisplay && !chartHeight && !chartLoaded && <AppLoadingView />}
-        <View style={styles.chartContainer}>
-          {shouldShowHint && chartLoaded &&
-            <Tutorial onClose={this.setShouldShowHint} />
-          }
-          {hasDataToDisplay && chartLoaded &&
-            !this.shouldShowTemperatureColumn &&
-            <View style={styles.centerItem}>
-              <AppText style={styles.warning}>
-                {shared.noTemperatureWarning}
-              </AppText>
-            </View>
-          }
-          {hasDataToDisplay && (
-            <View style={styles.chartArea}>
-
-              {chartHeight && chartLoaded && (
-                <YAxis
-                  height={this.columnHeight}
-                  symptomsToDisplay={this.symptomRowSymptoms}
-                  symptomsSectionHeight={this.symptomRowHeight}
-                  shouldShowTemperatureColumn=
-                    {this.shouldShowTemperatureColumn}
-                  xAxisHeight={this.xAxisHeight}
-                />
-              )}
-
-              {chartHeight &&
-               <FlatList
-                 horizontal={true}
-                 inverted={true}
-                 showsHorizontalScrollIndicator={false}
-                 data={this.state.columns}
-                 renderItem={this.renderColumn}
-                 keyExtractor={item => item}
-                 initialNumToRender={numberOfColumnsToRender}
-                 windowSize={30}
-                 onLayout={() => this.setState({chartLoaded: true})}
-                 onEndReached={() => this.setState({end: true})}
-                 ListFooterComponent={<LoadingMoreView end={this.state.end}/>}
-                 updateCellsBatchingPeriod={800}
-                 contentContainerStyle={{ height: chartHeight }}
-               />
-              }
-              {chartHeight && chartLoaded && (
-                <React.Fragment>
-                  {this.shouldShowTemperatureColumn &&
-                    <HorizontalGrid height={this.columnHeight} />
-                  }
-                </React.Fragment>
-              )}
-            </View>
           )}
         </View>
-      </AppPage>
+      </View>
-    )
+    </AppPage>
-  }
-}
-
-function LoadingMoreView({ end }) {
-  return (
-    <View style={styles.loadingContainer}>
-      {!end && <ActivityIndicator size={'large'} color={Colors.orange}/>}
-    </View>
   )
 }
 
-LoadingMoreView.propTypes = {
+CycleChart.propTypes = {
-  end: PropTypes.bool
+  navigate: PropTypes.func,
+  setDate: PropTypes.func,
 }
 
 const styles = StyleSheet.create({
   chartArea: {
-    flexDirection: 'row'
+    flexDirection: 'row',
   },
   chartContainer: {
-    flexDirection: 'column'
+    flexDirection: 'column',
-  },
-  loadingContainer: {
-    height: '100%',
-    backgroundColor: Colors.turquoiseLight,
-    justifyContent: 'center'
   },
   page: {
-    marginVertical: Spacing.small
+    marginVertical: Spacing.small,
   },
   pageContainer: {
-    paddingHorizontal: Spacing.base
+    paddingHorizontal: Spacing.base,
   },
-  warning: {
-    padding: Spacing.large
-  }
 })
 
-const mapDispatchToProps = (dispatch) => {
+export default CycleChart
-  return({
-    navigate: (page) => dispatch(navigate(page)),
-  })
-}
-
-export default connect(
-  null,
-  mapDispatchToProps,
-)(CycleChart)

components/chart/cycle-day-label.js

@@ -19,11 +19,20 @@ const CycleDayLabel = ({ height, date }) => {
 
   return (
     <View style={[styles.container, { height }]}>
-      <AppText style={styles.textBold}>{cycleDayLabel}</AppText>
+      <View style={{ ...styles.labelRow, height: height / 2 }}>
-      <View style={styles.dateLabel}>
+        <AppText style={styles.textBold}>{cycleDayLabel}</AppText>
-        <AppText style={styles.text}>
+      </View>
-          {isFirstDayOfMonth ? momentDate.format('MMM') : dayOfMonth}
+
-        </AppText>
+      <View style={{ ...styles.labelRow, height: height / 2 }}>
+        {isFirstDayOfMonth && (
+          <AppText style={styles.textFootnote}>
+            {momentDate.format('MMM')}
+          </AppText>
+        )}
+
+        {!isFirstDayOfMonth && (
+          <AppText style={styles.textSmall}>{dayOfMonth}</AppText>
+        )}
         {!isFirstDayOfMonth && (
           <AppText style={styles.textLight}>
             {getOrdinalSuffix(dayOfMonth)}
@@ -45,17 +54,21 @@ const styles = StyleSheet.create({
     justifyContent: 'flex-end',
     left: 4,
   },
-  text: {
+  textSmall: {
     ...Typography.label,
     fontSize: Sizes.small,
   },
+  textFootnote: {
+    ...Typography.label,
+    fontSize: Sizes.footnote,
+  },
   textBold: {
     ...Typography.labelBold,
   },
   textLight: {
     ...Typography.labelLight,
   },
-  dateLabel: {
+  labelRow: {
     flexDirection: 'row',
     justifyContent: 'space-around',
     alignItems: 'center',

components/chart/day-column.js

@@ -1,10 +1,7 @@
-import React, { Component } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
 import { TouchableOpacity } from 'react-native'
-import { connect } from 'react-redux'
+import moment from 'moment'
-
-import { setDate } from '../../slices/date'
-import { navigate } from '../../slices/navigation'
 
 import { getCycleDay } from '../../db'
 
@@ -15,125 +12,109 @@ import CycleDayLabel from './cycle-day-label'
 import {
   symptomColorMethods,
   getTemperatureProps,
-  isSymptomDataComplete
+  isSymptomDataComplete,
+  nfpLines,
 } from '../helpers/chart'
 
-class DayColumn extends Component {
+const DayColumn = ({
-  static propTypes = {
+  dateString,
-    dateString: PropTypes.string.isRequired,
+  chartSymptoms,
-    chartSymptoms: PropTypes.array,
+  columnHeight,
-    columnHeight: PropTypes.number.isRequired,
+  setDate,
-    getFhmAndLtlInfo: PropTypes.func.isRequired,
+  navigate,
-    navigate: PropTypes.func.isRequired,
+  shouldShowTemperatureColumn,
-    setDate: PropTypes.func.isRequired,
+  symptomHeight,
-    shouldShowTemperatureColumn: PropTypes.bool,
+  symptomRowSymptoms,
-    symptomHeight: PropTypes.number.isRequired,
+  xAxisHeight,
-    symptomRowSymptoms: PropTypes.array,
+}) => {
-    xAxisHeight: PropTypes.number,
+  const momentDate = moment(dateString)
-  }
+  const isWeekend = momentDate.day() == 0 || momentDate.day() == 6
+  const cycleDayData = getCycleDay(dateString)
+  let data = {}
 
-  constructor(props) {
+  if (cycleDayData) {
-    super()
+    data = chartSymptoms.reduce((symptomDataToDisplay, symptom) => {
+      const symptomData = cycleDayData[symptom]
 
-    const { dateString, chartSymptoms, columnHeight } = props
+      if (symptomData && symptom === 'temperature') {
-    const cycleDayData = getCycleDay(dateString)
+        symptomDataToDisplay[symptom] = getTemperatureProps(
-    this.data = {}
+          symptomData,
+          columnHeight,
+          dateString
+        )
+      } else {
+        if (symptomData && !symptomData.exclude) {
+          // if symptomColorMethods entry doesn't exist for given symptom,
+          // use 'default'
+          const getSymptomColorIndex =
+            symptomColorMethods[symptom] || symptomColorMethods['default']
 
-    if (cycleDayData) {
+          symptomDataToDisplay[symptom] = getSymptomColorIndex(symptomData)
-      this.data = chartSymptoms.reduce((symptomDataToDisplay, symptom, ) => {
-        const symptomData = cycleDayData[symptom]
-
-        if (symptomData && symptom === 'temperature') {
-          symptomDataToDisplay[symptom] =
-           getTemperatureProps(symptomData, columnHeight, dateString)
-        } else {
-          if (symptomData && ! symptomData.exclude) {
-            // if symptomColorMethods entry doesn't exist for given symptom,
-            // use 'default'
-            const getSymptomColorIndex =
-              symptomColorMethods[symptom] || symptomColorMethods['default']
-
-            symptomDataToDisplay[symptom] = getSymptomColorIndex(symptomData)
-          }
         }
+      }
 
-        return symptomDataToDisplay
+      return symptomDataToDisplay
-      }, this.data)
+    }, data)
-    }
-
-    this.fhmAndLtl = props.getFhmAndLtlInfo(
-      props.dateString,
-      this.data.temperature ? this.data.temperature.value : null,
-      props.columnHeight
-    )
   }
 
-  onDaySelect = (date) => {
+  const fhmAndLtl = nfpLines()(
-    this.props.setDate(date)
+    dateString,
-    this.props.navigate('CycleDay')
+    data.temperature ? data.temperature.value : null,
+    columnHeight
+  )
+
+  const onDaySelect = (date) => {
+    setDate(date)
+    navigate('CycleDay')
   }
 
-  shouldComponentUpdate() {
+  return (
-    return false
+    <TouchableOpacity onPress={() => onDaySelect(dateString)} activeOpacity={1}>
-  }
+      {shouldShowTemperatureColumn && (
-
+        <TemperatureColumn
-  render() {
+          horizontalLinePosition={fhmAndLtl.drawLtlAt}
-    const { columnHeight,
+          isVerticalLine={fhmAndLtl.drawFhmLine}
-      dateString,
+          data={data && data.temperature}
-      shouldShowTemperatureColumn,
-      symptomHeight,
-      symptomRowSymptoms,
-      xAxisHeight
-    } = this.props
-
-    return (
-      <TouchableOpacity
-        onPress={() => this.onDaySelect(dateString)}
-        activeOpacity={1}
-      >
-
-        {shouldShowTemperatureColumn && <TemperatureColumn
-          horizontalLinePosition={this.fhmAndLtl.drawLtlAt}
-          isVerticalLine={this.fhmAndLtl.drawFhmLine}
-          data={this.data && this.data.temperature}
           columnHeight={columnHeight}
-        />}
+          isWeekend={isWeekend}
-
-        <CycleDayLabel
-          height={xAxisHeight}
-          date={dateString}
         />
+      )}
 
-        { symptomRowSymptoms.map((symptom, i) => {
+      <CycleDayLabel height={xAxisHeight} date={dateString} />
-          const hasSymptomData =
-            Object.prototype.hasOwnProperty.call(this.data, symptom)
-          return (
-            <SymptomCell
-              index={i}
-              key={symptom}
-              symptom={symptom}
-              symptomValue={hasSymptomData && this.data[symptom]}
-              isSymptomDataComplete={
-                hasSymptomData && isSymptomDataComplete(symptom, dateString)
-              }
-              height={symptomHeight}
-            />)
-        }
-        )}
 
-      </TouchableOpacity>
+      {symptomRowSymptoms.map((symptom, i) => {
-    )
+        const hasSymptomData = Object.prototype.hasOwnProperty.call(
-  }
+          data,
+          symptom
+        )
+        return (
+          <SymptomCell
+            index={i}
+            key={symptom}
+            symptom={symptom}
+            symptomValue={hasSymptomData && data[symptom]}
+            isSymptomDataComplete={
+              hasSymptomData && isSymptomDataComplete(symptom, dateString)
+            }
+            isWeekend={isWeekend}
+            height={symptomHeight}
+          />
+        )
+      })}
+    </TouchableOpacity>
+  )
 }
 
-const mapDispatchToProps = (dispatch) => {
+DayColumn.propTypes = {
-  return({
+  dateString: PropTypes.string.isRequired,
-    setDate: (date) => dispatch(setDate(date)),
+  chartSymptoms: PropTypes.array,
-    navigate: (page) => dispatch(navigate(page)),
+  columnHeight: PropTypes.number.isRequired,
-  })
+  navigate: PropTypes.func.isRequired,
+  setDate: PropTypes.func.isRequired,
+  shouldShowTemperatureColumn: PropTypes.bool,
+  symptomHeight: PropTypes.number.isRequired,
+  symptomRowSymptoms: PropTypes.array,
+  xAxisHeight: PropTypes.number,
 }
 
-export default connect(
+export default DayColumn
-  null,
-  mapDispatchToProps,
-)(DayColumn)

components/chart/dot-and-line.js

@@ -1,87 +1,84 @@
-import React, { Component } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
-import { Path, Shape } from 'react-native/Libraries/ART/ReactNativeART'
+import { Path, Shape } from '@react-native-community/art'
 
 import { Colors } from '../../styles'
 
 import {
   CHART_COLUMN_WIDTH,
   CHART_COLUMN_MIDDLE,
-  CHART_DOT_RADIUS,
+  CHART_DOT_RADIUS_SYMPTOM,
-  CHART_STROKE_WIDTH
+  CHART_DOT_RADIUS_TEMPERATURE,
+  CHART_STROKE_WIDTH,
 } from '../../config'
 
-export default class DotAndLine extends Component {
+const DotAndLine = ({
-  static propTypes = {
+  exclude,
-    exclude: PropTypes.bool,
+  leftTemperatureExclude,
-    leftY: PropTypes.number,
+  leftY,
-    leftTemperatureExclude: PropTypes.bool,
+  rightTemperatureExclude,
-    rightY: PropTypes.number,
+  rightY,
-    rightTemperatureExclude: PropTypes.bool,
+  y,
-    y: PropTypes.number.isRequired
+}) => {
+  let excludeLeftLine, excludeRightLine, lineLeft, lineRight
+
+  if (leftY) {
+    const middleY = (leftY - y) / 2 + y
+    excludeLeftLine = leftTemperatureExclude || exclude
+    lineLeft = new Path().moveTo(CHART_COLUMN_MIDDLE, y).lineTo(0, middleY)
+  }
+  if (rightY) {
+    const middleY = (y - rightY) / 2 + rightY
+    excludeRightLine = rightTemperatureExclude || exclude
+    lineRight = new Path()
+      .moveTo(CHART_COLUMN_MIDDLE, y)
+      .lineTo(CHART_COLUMN_WIDTH, middleY)
   }
 
-  shouldComponentUpdate(newProps) {
+  const dot = new Path()
-    return Object.keys(newProps).some(key => newProps[key] != this.props[key])
+    .moveTo(CHART_COLUMN_MIDDLE, y - CHART_DOT_RADIUS_TEMPERATURE)
-  }
+    .arc(0, CHART_DOT_RADIUS_TEMPERATURE * 2, CHART_DOT_RADIUS_TEMPERATURE)
+    .arc(0, CHART_DOT_RADIUS_TEMPERATURE * -2, CHART_DOT_RADIUS_TEMPERATURE)
+  const dotColor = exclude ? Colors.turquoise : Colors.turquoiseDark
+  const lineColorLeft = excludeLeftLine
+    ? Colors.turquoise
+    : Colors.turquoiseDark
+  const lineColorRight = excludeRightLine
+    ? Colors.turquoise
+    : Colors.turquoiseDark
 
-  render() {
+  return (
-    const {
+    <React.Fragment>
-      exclude,
+      <Shape
-      leftTemperatureExclude,
+        d={lineLeft}
-      leftY,
+        stroke={lineColorLeft}
-      rightTemperatureExclude,
+        strokeWidth={CHART_STROKE_WIDTH}
-      rightY,
+        key={y}
-      y
+      />
-    } = this.props
+      <Shape
-    let excludeLeftLine, excludeRightLine, lineLeft, lineRight
+        d={lineRight}
-
+        stroke={lineColorRight}
-    if (leftY) {
+        strokeWidth={CHART_STROKE_WIDTH}
-      const middleY = ((leftY - y) / 2) + y
+        key={y + CHART_DOT_RADIUS_SYMPTOM}
-      excludeLeftLine = leftTemperatureExclude || exclude
+      />
-      lineLeft = new Path()
+      <Shape
-        .moveTo(CHART_COLUMN_MIDDLE, y)
+        d={dot}
-        .lineTo(0, middleY)
+        stroke={dotColor}
-    }
+        strokeWidth={CHART_STROKE_WIDTH}
-    if (rightY) {
+        fill={dotColor}
-      const middleY = ((y - rightY) / 2) + rightY
+        key="dot"
-      excludeRightLine = rightTemperatureExclude || exclude
+      />
-      lineRight = new Path()
+    </React.Fragment>
-        .moveTo(CHART_COLUMN_MIDDLE, y)
+  )
-        .lineTo(CHART_COLUMN_WIDTH, middleY)
-    }
-
-    const dot = new Path().moveTo(CHART_COLUMN_MIDDLE , y - CHART_DOT_RADIUS)
-      .arc(0, CHART_DOT_RADIUS * 2, CHART_DOT_RADIUS)
-      .arc(0, CHART_DOT_RADIUS * -2, CHART_DOT_RADIUS)
-    const dotColor = exclude ? Colors.turquoise : Colors.turquoiseDark
-    const lineColorLeft = excludeLeftLine ?
-      Colors.turquoise : Colors.turquoiseDark
-    const lineColorRight = excludeRightLine ?
-      Colors.turquoise : Colors.turquoiseDark
-
-    return(
-      <React.Fragment>
-        <Shape
-          d={lineLeft}
-          stroke={lineColorLeft}
-          strokeWidth={CHART_STROKE_WIDTH}
-          key={y}
-        />
-        <Shape
-          d={lineRight}
-          stroke={lineColorRight}
-          strokeWidth={CHART_STROKE_WIDTH}
-          key={y + CHART_DOT_RADIUS}
-        />
-        <Shape
-          d={dot}
-          stroke={dotColor}
-          strokeWidth={CHART_STROKE_WIDTH}
-          fill="white"
-          key='dot'
-        />
-      </React.Fragment>
-    )
-  }
 }
+
+DotAndLine.propTypes = {
+  exclude: PropTypes.bool,
+  leftY: PropTypes.number,
+  leftTemperatureExclude: PropTypes.bool,
+  rightY: PropTypes.number,
+  rightTemperatureExclude: PropTypes.bool,
+  y: PropTypes.number.isRequired,
+}
+
+export default DotAndLine

components/chart/horizontal-grid.js

@@ -5,18 +5,19 @@ import { StyleSheet, View } from 'react-native'
 import { getTickPositions } from '../helpers/chart'
 
 import { Colors } from '../../styles'
-import { CHART_GRID_LINE_HORIZONTAL_WIDTH, CHART_YAXIS_WIDTH } from '../../config'
+import {
+  CHART_GRID_LINE_HORIZONTAL_WIDTH,
+  CHART_YAXIS_WIDTH,
+} from '../../config'
 
 const HorizontalGrid = ({ height }) => {
-  return getTickPositions(height).map(tick => {
+  return getTickPositions(height).map((tick) => {
-    return (
+    return <View key={tick} top={tick} {...styles.line} />
-      <View key={tick} top={tick} {...styles.line}/>
-    )
   })
 }
 
 HorizontalGrid.propTypes = {
-  height: PropTypes.number
+  height: PropTypes.number,
 }
 
 const styles = StyleSheet.create({
@@ -25,9 +26,9 @@ const styles = StyleSheet.create({
     borderBottomColor: Colors.grey,
     borderBottomWidth: CHART_GRID_LINE_HORIZONTAL_WIDTH,
     left: CHART_YAXIS_WIDTH,
-    position:'absolute',
+    position: 'absolute',
-    right: 0
+    right: 0,
-  }
+  },
 })
 
 export default HorizontalGrid

components/chart/loading-more.js

@@ -0,0 +1,27 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { ActivityIndicator, StyleSheet, View } from 'react-native'
+
+import { Colors } from '../../styles'
+
+function LoadingMoreView({ end }) {
+  return (
+    <View style={styles.loadingContainer}>
+      {!end && <ActivityIndicator size={'large'} color={Colors.orange} />}
+    </View>
+  )
+}
+
+LoadingMoreView.propTypes = {
+  end: PropTypes.bool,
+}
+
+const styles = StyleSheet.create({
+  loadingContainer: {
+    height: '100%',
+    backgroundColor: Colors.turquoiseLight,
+    justifyContent: 'center',
+  },
+})
+
+export default LoadingMoreView

components/chart/main-grid.js

@@ -0,0 +1,32 @@
+import React, { useState } from 'react'
+import PropTypes from 'prop-types'
+import { FlatList } from 'react-native'
+
+import LoadingMoreView from './loading-more'
+
+const MainGrid = (props) => {
+  const [endReached, setEndReached] = useState(false)
+  return (
+    <FlatList
+      horizontal={true}
+      inverted={true}
+      showsHorizontalScrollIndicator={false}
+      keyExtractor={(item) => item}
+      windowSize={30}
+      onEndReached={() => setEndReached(true)}
+      ListFooterComponent={<LoadingMoreView end={endReached} />}
+      updateCellsBatchingPeriod={800}
+      {...props}
+    />
+  )
+}
+
+MainGrid.propTypes = {
+  height: PropTypes.number,
+  data: PropTypes.array,
+  renderItem: PropTypes.func,
+  initialNumToRender: PropTypes.number,
+  contentContainerStyle: PropTypes.object,
+}
+
+export default MainGrid

components/chart/no-data.js

@@ -5,9 +5,6 @@ import PropTypes from 'prop-types'
 import AppText from '../common/app-text'
 import Button from '../common/button'
 
-import { connect } from 'react-redux'
-import { navigate } from '../../slices/navigation'
-
 import { Containers } from '../../styles'
 import { shared } from '../../i18n/en/labels'
 
@@ -15,7 +12,12 @@ const NoData = ({ navigate }) => {
   return (
     <View style={styles.container}>
       <AppText>{shared.noDataWarning}</AppText>
-      <Button isCTA onPress={() => {navigate('CycleDay')}}>
+      <Button
+        isCTA
+        onPress={() => {
+          navigate('CycleDay')
+        }}
+      >
         {shared.noDataButtonText}
       </Button>
     </View>
@@ -28,17 +30,8 @@ NoData.propTypes = {
 
 const styles = StyleSheet.create({
   container: {
-    ...Containers.centerItems
+    ...Containers.centerItems,
-  }
+  },
 })
 
-const mapDispatchToProps = (dispatch) => {
+export default NoData
-  return({
-    navigate: (page) => dispatch(navigate(page)),
-  })
-}
-
-export default connect(
-  null,
-  mapDispatchToProps,
-)(NoData)

components/chart/no-temperature.js

@@ -0,0 +1,19 @@
+import React from 'react'
+import { StyleSheet } from 'react-native'
+import AppText from '../common/app-text'
+
+import { shared } from '../../i18n/en/labels'
+
+import { Spacing } from '../../styles'
+
+function NoTemperature() {
+  return <AppText style={styles.warning}>{shared.noTemperatureWarning}</AppText>
+}
+
+const styles = StyleSheet.create({
+  warning: {
+    padding: Spacing.large,
+  },
+})
+
+export default NoTemperature

components/chart/symptom-cell.js

@@ -5,8 +5,8 @@ import { StyleSheet, View } from 'react-native'
 import { Colors, Containers } from '../../styles'
 import {
   CHART_COLUMN_WIDTH,
-  CHART_DOT_RADIUS,
+  CHART_DOT_RADIUS_SYMPTOM,
-  CHART_GRID_LINE_HORIZONTAL_WIDTH
+  CHART_GRID_LINE_HORIZONTAL_WIDTH,
 } from '../../config'
 
 const SymptomCell = ({
@@ -14,22 +14,39 @@ const SymptomCell = ({
   index,
   symptom,
   symptomValue,
-  isSymptomDataComplete
+  isSymptomDataComplete,
+  isWeekend,
 }) => {
-
   const shouldDrawDot = symptomValue !== false
-  const styleCell = index !== 0
+  // Determine the background color based on isWeekend prop
-    ? [styles.cell, { height, width: CHART_COLUMN_WIDTH }]
+  const backgroundColor = isWeekend ? Colors.greyVeryLight : 'white'
-    : [styles.cell, { height, width: CHART_COLUMN_WIDTH }, styles.topBorder]
+  const styleCell =
+    index !== 0
+      ? [
+          styles.cell,
+          {
+            height,
+            width: CHART_COLUMN_WIDTH,
+            backgroundColor: backgroundColor,
+          },
+        ]
+      : [
+          styles.cell,
+          {
+            height,
+            width: CHART_COLUMN_WIDTH,
+            backgroundColor: backgroundColor,
+          },
+          styles.topBorder,
+        ]
   let styleDot
-
   if (shouldDrawDot) {
     const styleSymptom = Colors.iconColors[symptom]
     const symptomColor = styleSymptom.shades[symptomValue]
-    const isMucusOrCervix = (symptom === 'mucus') || (symptom === 'cervix')
+    const isMucusOrCervix = symptom === 'mucus' || symptom === 'cervix'
-    const backgroundColor = (isMucusOrCervix && !isSymptomDataComplete) ?
+    const backgroundColor =
-      'white' : symptomColor
+      isMucusOrCervix && !isSymptomDataComplete ? 'white' : symptomColor
-    const borderWidth = (isMucusOrCervix && !isSymptomDataComplete) ? 2 : 0
+    const borderWidth = isMucusOrCervix && !isSymptomDataComplete ? 2 : 0
     const borderColor = symptomColor
     styleDot = [styles.dot, { backgroundColor, borderColor, borderWidth }]
   }
@@ -45,30 +62,27 @@ SymptomCell.propTypes = {
   height: PropTypes.number,
   index: PropTypes.number.isRequired,
   symptom: PropTypes.string,
-  symptomValue: PropTypes.oneOfType([
+  symptomValue: PropTypes.oneOfType([PropTypes.bool, PropTypes.number]),
-    PropTypes.bool,
-    PropTypes.number,
-  ]),
   isSymptomDataComplete: PropTypes.bool,
+  isWeekend: PropTypes.bool,
 }
 
 const styles = StyleSheet.create({
   cell: {
-    backgroundColor: 'white',
     borderBottomColor: Colors.grey,
     borderBottomWidth: CHART_GRID_LINE_HORIZONTAL_WIDTH,
     borderLeftColor: Colors.grey,
     borderLeftWidth: CHART_GRID_LINE_HORIZONTAL_WIDTH,
-    ...Containers.centerItems
+    ...Containers.centerItems,
   },
   topBorder: {
     borderTopColor: Colors.grey,
     borderTopWidth: CHART_GRID_LINE_HORIZONTAL_WIDTH,
   },
   dot: {
-    width: CHART_DOT_RADIUS * 2,
+    width: CHART_DOT_RADIUS_SYMPTOM * 2,
-    height: CHART_DOT_RADIUS * 2,
+    height: CHART_DOT_RADIUS_SYMPTOM * 2,
-    borderRadius: 50
+    borderRadius: 50,
-  }
+  },
 })
 export default SymptomCell

components/chart/symptom-icon.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { StyleSheet , View } from 'react-native'
+import { StyleSheet, View } from 'react-native'
 
 import DripIcon from '../../assets/drip-icons'
 
@@ -26,8 +26,8 @@ SymptomIcon.propTypes = {
 
 const styles = StyleSheet.create({
   container: {
-    ...Containers.centerItems
+    ...Containers.centerItems,
-  }
+  },
 })
 
 export default SymptomIcon

components/chart/temperature-column.js

@@ -1,8 +1,8 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { StyleSheet } from 'react-native'
+import { Colors } from '../../styles'
 
-import { Surface , Path } from 'react-native/Libraries/ART/ReactNativeART'
+import { Surface, Path } from '@react-native-community/art'
 
 import ChartLine from './chart-line'
 import DotAndLine from './dot-and-line'
@@ -13,44 +13,49 @@ const TemperatureColumn = ({
   horizontalLinePosition,
   isVerticalLine,
   data,
-  columnHeight
+  columnHeight,
+  isWeekend,
 }) => {
   const x = CHART_STROKE_WIDTH / 2
 
+  const backgroundColor = isWeekend ? Colors.greyVeryLight : 'white'
   return (
     <Surface
       width={CHART_COLUMN_WIDTH}
       height={columnHeight}
-      style={styles.container}
+      style={{ backgroundColor: backgroundColor }}
     >
+      <ChartLine path={new Path().lineTo(0, columnHeight)} />
 
-      <ChartLine path={new Path().lineTo(0, columnHeight)}/>
+      {horizontalLinePosition && (
+        <ChartLine
+          path={new Path()
+            .moveTo(0, horizontalLinePosition)
+            .lineTo(CHART_COLUMN_WIDTH, horizontalLinePosition)}
+          isNfpLine={true}
+          key="ltl"
+        />
+      )}
 
-      {horizontalLinePosition && <ChartLine
+      {isVerticalLine && (
-        path={new Path()
+        <ChartLine
-          .moveTo(0, horizontalLinePosition)
+          path={new Path().moveTo(x, x).lineTo(x, columnHeight)}
-          .lineTo(CHART_COLUMN_WIDTH, horizontalLinePosition)
+          isNfpLine={true}
-        }
+          key="fhm"
-        isNfpLine={true}
+        />
-        key='ltl'
+      )}
-      />}
-
-      {isVerticalLine && <ChartLine
-        path={new Path().moveTo(x, x).lineTo(x, columnHeight)}
-        isNfpLine={true}
-        key='fhm'
-      />}
-
-      {data && typeof(data.y) !== 'undefined' && <DotAndLine
-        y={data.y}
-        exclude={data.temperatureExclude}
-        rightY={data.rightY}
-        rightTemperatureExclude={data.rightTemperatureExclude}
-        leftY={data.leftY}
-        leftTemperatureExclude={data.leftTemperatureExclude}
-        key='dotandline'
-      />}
 
+      {data && typeof data.y !== 'undefined' && (
+        <DotAndLine
+          y={data.y}
+          exclude={data.temperatureExclude}
+          rightY={data.rightY}
+          rightTemperatureExclude={data.rightTemperatureExclude}
+          leftY={data.leftY}
+          leftTemperatureExclude={data.leftTemperatureExclude}
+          key="dotandline"
+        />
+      )}
     </Surface>
   )
 }
@@ -60,12 +65,7 @@ TemperatureColumn.propTypes = {
   isVerticalLine: PropTypes.bool,
   data: PropTypes.object,
   columnHeight: PropTypes.number,
+  isWeekend: PropTypes.bool,
 }
 
-const styles = StyleSheet.create({
-  container: {
-    backgroundColor: 'white'
-  }
-})
-
 export default TemperatureColumn

components/chart/tick-list.js

@@ -7,24 +7,22 @@ import Tick from './tick'
 import { getTickList } from '../helpers/chart'
 
 const TickList = ({ height }) => {
-
   return (
     <View style={[styles.container, height]}>
-      {
+      {getTickList(height).map(
-        getTickList(height)
+        ({ isBold, label, position, shouldShowLabel, tickHeight }) => {
-          .map(({ isBold, label, position, shouldShowLabel, tickHeight}) => {
+          return (
-            return (
+            <Tick
-              <Tick
+              height={tickHeight}
-                height={tickHeight}
+              isBold={isBold}
-                isBold={isBold}
+              key={label}
-                key={label}
+              label={label}
-                label={label}
+              shouldShowLabel={shouldShowLabel}
-                shouldShowLabel={shouldShowLabel}
+              yPosition={position}
-                yPosition={position}
+            />
-              />
+          )
-            )
+        }
-          })
+      )}
-      }
     </View>
   )
 }
@@ -35,8 +33,8 @@ TickList.propTypes = {
 
 const styles = StyleSheet.create({
   container: {
-    flex: 1
+    flex: 1,
-  }
+  },
 })
 
 export default TickList

components/chart/tick.js

@@ -8,13 +8,15 @@ import { Sizes } from '../../styles'
 import { CHART_TICK_WIDTH } from '../../config'
 
 const Tick = ({ yPosition, height, isBold, shouldShowLabel, label }) => {
-  const top = yPosition - height / 2
+  const top = yPosition - height / 2 - 4
-  const containerStyle = [ styles.container, { flexBasis: height, height, top }]
+  const containerStyle = [styles.container, { flexBasis: height, height, top }]
   const textStyle = isBold ? styles.textBold : styles.textNormal
 
-  return(
+  if (!shouldShowLabel) return null
+
+  return (
     <View style={containerStyle}>
-      <AppText style={textStyle}>{shouldShowLabel && label}</AppText>
+      <AppText style={textStyle}>{label}</AppText>
     </View>
   )
 }
@@ -27,7 +29,6 @@ Tick.propTypes = {
   label: PropTypes.string,
 }
 
-
 const text = {
   textAlign: 'right',
 }
@@ -36,17 +37,18 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     position: 'absolute',
     right: 0,
-    width: CHART_TICK_WIDTH
+    width: CHART_TICK_WIDTH,
+    minHeight: Sizes.base + 2,
   },
   textBold: {
     fontSize: Sizes.base,
     fontWeight: 'bold',
-    ...text
+    ...text,
   },
   textNormal: {
     fontSize: Sizes.small,
-    ...text
+    ...text,
-  }
+  },
 })
 
 export default Tick

components/chart/y-axis.js

@@ -13,7 +13,7 @@ const YAxis = ({
   symptomsToDisplay,
   symptomsSectionHeight,
   shouldShowTemperatureColumn,
-  xAxisHeight
+  xAxisHeight,
 }) => {
   const symptomIconHeight = symptomsSectionHeight / symptomsToDisplay.length
 
@@ -21,15 +21,14 @@ const YAxis = ({
     <View>
       {shouldShowTemperatureColumn && <TickList height={height} />}
       <ChartLegend height={xAxisHeight} />
-      <View style={[styles.yAxis, {height: symptomsSectionHeight}]}>
+      <View style={[styles.yAxis, { height: symptomsSectionHeight }]}>
-        {symptomsToDisplay.map(symptom => (
+        {symptomsToDisplay.map((symptom) => (
           <SymptomIcon
             key={symptom}
             symptom={symptom}
             height={symptomIconHeight}
           />
-        )
+        ))}
-        )}
       </View>
     </View>
   )
@@ -40,13 +39,13 @@ YAxis.propTypes = {
   symptomsToDisplay: PropTypes.array,
   symptomsSectionHeight: PropTypes.number,
   shouldShowTemperatureColumn: PropTypes.bool,
-  xAxisHeight: PropTypes.number.isRequired
+  xAxisHeight: PropTypes.number.isRequired,
 }
 
 const styles = StyleSheet.create({
   yAxis: {
-    width: CHART_YAXIS_WIDTH
+    width: CHART_YAXIS_WIDTH,
-  }
+  },
 })
 
 export default YAxis

components/common/AppLink.js

@@ -0,0 +1,28 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { StyleSheet, Text, Linking } from 'react-native'
+
+import { Colors, Typography } from '../../styles'
+
+const AppLink = ({ children, url, ...props }) => {
+  return (
+    <Text style={styles.link} {...props} onPress={() => Linking.openURL(url)}>
+      {children}
+    </Text>
+  )
+}
+
+AppLink.propTypes = {
+  children: PropTypes.node,
+  url: PropTypes.string,
+}
+
+const styles = StyleSheet.create({
+  link: {
+    ...Typography.mainText,
+    color: Colors.purple,
+    textDecorationLine: 'underline',
+  },
+})
+
+export default AppLink

components/common/Asterisk.js

@@ -0,0 +1,16 @@
+import React from 'react'
+import { StyleSheet } from 'react-native'
+
+import AppText from './app-text'
+
+import { Colors } from '../../styles'
+
+const Asterisk = () => <AppText style={styles.asterisk}>*</AppText>
+
+const styles = StyleSheet.create({
+  asterisk: {
+    color: Colors.orange,
+  },
+})
+
+export default Asterisk

components/common/Footnote.js

@@ -0,0 +1,50 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { StyleSheet, View } from 'react-native'
+
+import AppText from '../common/app-text'
+import Asterisk from '../common/Asterisk'
+
+import { Colors, Spacing } from '../../styles'
+
+const Footnote = ({ children, colorLabel }) => {
+  if (!children) return false
+
+  return (
+    <View style={styles.container}>
+      <Asterisk />
+      <AppText
+        linkStyle={styles.link}
+        style={{ ...styles.text, color: Colors[colorLabel] }}
+      >
+        {children}
+      </AppText>
+    </View>
+  )
+}
+
+Footnote.propTypes = {
+  children: PropTypes.node,
+  colorLabel: PropTypes.string,
+}
+
+Footnote.defaultProps = {
+  colorLabel: 'greyDark',
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flexDirection: 'row',
+    alignContent: 'flex-start',
+    marginBottom: Spacing.tiny,
+    marginTop: Spacing.base,
+  },
+  link: {
+    color: 'white',
+  },
+  text: {
+    paddingLeft: Spacing.small,
+  },
+})
+
+export default Footnote

components/common/app-icon.js

@@ -14,17 +14,17 @@ const AppIcon = ({ color, name, style, ...props }) => {
 AppIcon.propTypes = {
   color: PropTypes.string,
   name: PropTypes.string.isRequired,
-  style: PropTypes.object
+  style: PropTypes.object,
 }
 
 AppIcon.defaultProps = {
-  color: 'black'
+  color: 'black',
 }
 
 const styles = StyleSheet.create({
   icon: {
-    fontSize: Sizes.subtitle
+    fontSize: Sizes.subtitle,
-  }
+  },
 })
 
-export default AppIcon
+export default AppIcon

components/common/app-loading.js

@@ -17,8 +17,8 @@ const AppLoadingView = () => {
 
 const styles = StyleSheet.create({
   container: {
-    ...Containers.centerItems
+    ...Containers.centerItems,
-  }
+  },
 })
 
 export default AppLoadingView

components/common/app-modal.js

@@ -1,24 +1,37 @@
 import React from 'react'
-import { Modal, StyleSheet, TouchableOpacity } from 'react-native'
+import {
+  Dimensions,
+  Modal,
+  StyleSheet,
+  TouchableOpacity,
+  View,
+} from 'react-native'
 import PropTypes from 'prop-types'
 
-const AppModal = ({ children, onClose }) => {
+import CloseIcon from './close-icon'
-  return(
+
-    <Modal
+import { Sizes, Spacing } from '../../styles'
-      animationType='fade'
+
-      onRequestClose={onClose}
+const AppModal = ({ children, onClose }) => (
-      transparent={true}
+  <Modal
-      visible={true}
+    animationType="fade"
-    >
+    onRequestClose={onClose}
-      <TouchableOpacity onPress={onClose} style={styles.blackBackground} />
+    transparent={true}
+    visible={true}
+  >
+    <TouchableOpacity onPress={onClose} style={styles.blackBackground} />
+    <View style={styles.modalWindow}>
+      <View style={styles.headerContainer}>
+        <CloseIcon onClose={onClose} />
+      </View>
       {children}
-    </Modal>
+    </View>
-  )
+  </Modal>
-}
+)
 
 AppModal.propTypes = {
   children: PropTypes.node,
-  onClose: PropTypes.func
+  onClose: PropTypes.func,
 }
 
 const styles = StyleSheet.create({
@@ -26,7 +39,29 @@ const styles = StyleSheet.create({
     backgroundColor: 'black',
     flex: 1,
     opacity: 0.5,
-  }
+  },
+  headerContainer: {
+    flexDirection: 'row',
+    justifyContent: 'flex-end',
+    paddingTop: Spacing.base,
+    paddingHorizontal: Spacing.base,
+    position: 'absolute',
+    width: '100%',
+    zIndex: 3, // works on ios
+    elevation: 3, // works on android
+  },
+  modalWindow: {
+    alignSelf: 'center',
+    backgroundColor: 'white',
+    borderRadius: 10,
+    marginTop: Sizes.huge * 2,
+    paddingVertical: Spacing.large * 2,
+    position: 'absolute',
+    maxHeight: Dimensions.get('window').height * 0.7,
+    zIndex: 2, // works on ios
+    elevation: 2, // works on android
+    minWidth: '80%',
+  },
 })
 
 export default AppModal

components/common/app-page.js

@@ -4,7 +4,7 @@ import { ScrollView, StyleSheet, View } from 'react-native'
 
 import AppText from '../common/app-text'
 
-import { Colors, Typography } from '../../styles'
+import { Colors, Containers, Typography } from '../../styles'
 
 const AppPage = ({
   children,
@@ -13,7 +13,7 @@ const AppPage = ({
   title,
   ...props
 }) => {
-  return(
+  return (
     <View style={styles.container}>
       <ScrollView
         contentContainerStyle={[styles.scrollView, contentContainerStyle]}
@@ -31,21 +31,18 @@ AppPage.propTypes = {
   children: PropTypes.node,
   contentContainerStyle: PropTypes.object,
   scrollViewStyle: PropTypes.object,
-  title: PropTypes.string
+  title: PropTypes.string,
 }
 
 const styles = StyleSheet.create({
-  container: {
+  container: { ...Containers.pageContainer },
-    backgroundColor: Colors.turquoiseLight,
-    flex: 1
-  },
   scrollView: {
     backgroundColor: Colors.turquoiseLight,
-    flexGrow: 1
+    flexGrow: 1,
   },
   title: {
-    ...Typography.title
+    ...Typography.title,
-  }
+  },
 })
 
-export default AppPage
+export default AppPage

components/common/app-status-bar.js

@@ -23,7 +23,7 @@ const styles = StyleSheet.create({
   statusBar: {
     backgroundColor: Colors.purple,
     height: STATUSBAR_HEIGHT,
-  }
+  },
 })
 
 export default AppStatusBar

components/common/app-switch.js

@@ -6,13 +6,19 @@ import AppText from './app-text'
 
 import { Containers } from '../../styles'
 
-const AppSwitch = ({ onToggle, text, value }) => {
+const AppSwitch = ({ onToggle, text, value, trackColor, disabled }) => {
   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>
   )
 }
@@ -20,19 +26,21 @@ const AppSwitch = ({ onToggle, text, value }) => {
 AppSwitch.propTypes = {
   onToggle: PropTypes.func.isRequired,
   text: PropTypes.string,
-  value: PropTypes.bool
+  value: PropTypes.bool,
+  trackColor: PropTypes.string,
+  disabled: PropTypes.bool,
 }
 
 const styles = StyleSheet.create({
   container: {
-    ...Containers.rowContainer
+    ...Containers.rowContainer,
   },
   switch: {
     flex: 1,
   },
   textContainer: {
     flex: 4,
-  }
+  },
 })
 
-export default AppSwitch
+export default AppSwitch

components/common/app-text-input.js

@@ -1,30 +1,15 @@
 import React from 'react'
-import { KeyboardAvoidingView, StyleSheet, TextInput } from 'react-native'
+import { StyleSheet, TextInput } from 'react-native'
 import PropTypes from 'prop-types'
 
 import { Colors, Spacing, Typography } from '../../styles'
 
-const AppTextInput = ({ style, isKeyboardOffset, ...props }) => {
+const AppTextInput = ({ style, ...props }) => (
-  const behavior = isKeyboardOffset ? "padding" : "height"
+  <TextInput style={[styles.input, style]} {...props} />
-  const keyboardVerticalOffset = isKeyboardOffset ? 300 : 0
+)
-
-  return (
-    <KeyboardAvoidingView
-      behavior={behavior}
-      keyboardVerticalOffset={keyboardVerticalOffset}
-    >
-      <TextInput style={[styles.input, style]} {...props} />
-    </KeyboardAvoidingView>
-  )
-}
 
 AppTextInput.propTypes = {
   style: PropTypes.object,
-  isKeyboardOffset: PropTypes.bool,
-}
-
-AppTextInput.defultProps = {
-  isKeyboardOffset: true,
 }
 
 const styles = StyleSheet.create({
@@ -39,8 +24,8 @@ const styles = StyleSheet.create({
     minWidth: '80%',
     paddingHorizontal: Spacing.base,
     paddingVertical: Spacing.tiny,
-    ...Typography.mainText
+    ...Typography.mainText,
-  }
+  },
 })
 
 export default AppTextInput

components/common/app-text.js

@@ -2,32 +2,26 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { StyleSheet, Text } from 'react-native'
 
-import Link from './link'
-
 import { Colors, Typography } from '../../styles'
 
-const AppText = ({ children, linkStyle, style, ...props }) => {
+const AppText = ({ children, style, ...props }) => {
-  // we parse for links in case the text contains any
   return (
-    <Link style={linkStyle}>
+    <Text style={[styles.text, style]} {...props}>
-      <Text style={[styles.text, style]} {...props}>
+      {children}
-        {children}
+    </Text>
-      </Text>
-    </Link>
   )
 }
 
 AppText.propTypes = {
   children: PropTypes.node,
-  linkStyle: PropTypes.object,
   style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
 }
 
 const styles = StyleSheet.create({
   text: {
     color: Colors.greyDark,
-    ...Typography.mainText
+    ...Typography.mainText,
-  }
+  },
 })
 
-export default AppText
+export default AppText

components/common/close-icon.js

@@ -4,7 +4,7 @@ import { StyleSheet, TouchableOpacity } from 'react-native'
 
 import AppIcon from './app-icon'
 
-import { HIT_SLOP} from '../../config'
+import { HIT_SLOP } from '../../config'
 import { Colors, Sizes } from '../../styles'
 
 const CloseIcon = ({ onClose, color, ...props }) => {
@@ -15,21 +15,21 @@ const CloseIcon = ({ onClose, color, ...props }) => {
       style={styles.container}
       {...props}
     >
-      <AppIcon name='cross' color={color ? color : Colors.orange} />
+      <AppIcon name="cross" color={color ? color : Colors.orange} />
     </TouchableOpacity>
   )
 }
 
 CloseIcon.propTypes = {
   onClose: PropTypes.func.isRequired,
-  color: PropTypes.string
+  color: PropTypes.string,
 }
 
 const styles = StyleSheet.create({
   container: {
     alignSelf: 'flex-start',
     marginBottom: Sizes.base,
-  }
+  },
 })
 
 export default CloseIcon

components/common/link.js

@@ -1,40 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-import Hyperlink from 'react-native-hyperlink'
-import { StyleSheet } from 'react-native'
-
-import { Colors, Typography } from '../../styles'
-
-import links from '../../i18n/en/links'
-
-const Link = ({ children, style }) => {
-  return (
-    <Hyperlink
-      linkStyle={[styles.link, style]}
-      linkText={replaceUrlWithText}
-      linkDefault
-    >
-      {children}
-    </Hyperlink>
-  )
-}
-
-Link.propTypes = {
-  children: PropTypes.node,
-  style: PropTypes.object
-}
-
-const styles = StyleSheet.create({
-  link: {
-    color: Colors.purple,
-    textDecorationLine: 'underline',
-    ...Typography.mainText,
-  }
-})
-
-function replaceUrlWithText(url) {
-  const link = Object.values(links).find(l => l.url === url)
-  return (link && link.text) || url
-}
-
-export default Link

components/common/menu-icon.js

@@ -15,7 +15,7 @@ const MenuIcon = ({ isActive, name }) => {
 
 MenuIcon.propTypes = {
   isActive: PropTypes.bool,
-  name: PropTypes.string.isRequired
+  name: PropTypes.string.isRequired,
 }
 
-export default MenuIcon
+export default MenuIcon

components/common/segment.js

@@ -4,7 +4,7 @@ import { StyleSheet, View } from 'react-native'
 
 import AppText from './app-text'
 
-import { Colors, Spacing, Typography } from '../../styles'
+import { Colors, Containers, Spacing, Typography } from '../../styles'
 
 const Segment = ({ children, last, title }) => {
   const containerStyle = last ? styles.containerLast : styles.container
@@ -25,25 +25,20 @@ Segment.propTypes = {
   title: PropTypes.string,
 }
 
-const segmentContainer = {
-  marginHorizontal: Spacing.base,
-  marginBottom: Spacing.base,
-}
-
 const styles = StyleSheet.create({
   container: {
     borderStyle: 'solid',
     borderBottomWidth: 1,
     borderBottomColor: Colors.greyLight,
     paddingBottom: Spacing.base,
-    ...segmentContainer,
+    ...Containers.segmentContainer,
   },
   containerLast: {
-    ...segmentContainer,
+    ...Containers.segmentContainer,
   },
   title: {
     ...Typography.subtitle,
-  }
+  },
 })
 
-export default Segment
+export default Segment

components/cycle-day/cycle-day-overview.js

@@ -1,87 +1,90 @@
-import React, { Component } from 'react'
+import React, { useState } from 'react'
 import { StyleSheet, View } from 'react-native'
 import PropTypes from 'prop-types'
-import { LocalDate } from 'js-joda'
 
 import AppPage from '../common/app-page'
 import SymptomBox from './symptom-box'
 import SymptomPageTitle from './symptom-page-title'
 
-import { connect } from 'react-redux'
-import { getDate, setDate } from '../../slices/date'
-import { navigate } from '../../slices/navigation'
-
-import cycleModule from '../../lib/cycle'
-import { dateToTitle } from '../helpers/format-date'
 import { getCycleDay } from '../../db'
-import { getData } from '../helpers/cycle-day'
+import { getData, nextDate, prevDate } from '../helpers/cycle-day'
 
-import { general as labels} from '../../i18n/en/cycle-day'
+import {
+  desireTrackingCategoryObservable,
+  moodTrackingCategoryObservable,
+  noteTrackingCategoryObservable,
+  painTrackingCategoryObservable,
+  sexTrackingCategoryObservable,
+} from '../../local-storage'
 import { Spacing } from '../../styles'
 import { SYMPTOMS } from '../../config'
 
-class CycleDayOverView extends Component {
+const CycleDayOverView = ({ date, setDate, isTemperatureEditView }) => {
+  const cycleDay = getCycleDay(date)
 
-  static propTypes = {
+  const [editedSymptom, setEditedSymptom] = useState(
-    navigate: PropTypes.func,
+    isTemperatureEditView ? 'temperature' : ''
-    setDate: PropTypes.func,
+  )
-    cycleDay: PropTypes.object,
+
-    date: PropTypes.string,
+  const showNextCycleDay = () => {
-    isTemperatureEditView: PropTypes.bool,
+    setDate(nextDate(date))
   }
 
-  constructor(props) {
+  const showPrevCycleDay = () => {
-    super(props)
+    setDate(prevDate(date))
+  }
 
-    this.state = { cycleDay: getCycleDay(props.date), data: null }
+  const allEnabledSymptoms = SYMPTOMS.map((symptom) => {
-    if (props.isTemperatureEditView) {
+    if (symptom === 'sex') {
-      const todayDateString = LocalDate.now().toString()
+      return sexTrackingCategoryObservable.value ? symptom : null
-      props.setDate(todayDateString)
+    } 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)
 
-  updateCycleDay = (date) => {
+  return (
-    this.props.setDate(date)
+    <AppPage>
-    this.setState({ cycleDay: getCycleDay(date) })
+      <SymptomPageTitle
-  }
+        date={date}
+        onNextCycleDay={showNextCycleDay}
+        onPrevCycleDay={showPrevCycleDay}
+      />
+      <View style={styles.container}>
+        {cleanSymptoms.map((symptom) => {
+          const symptomData =
+            cycleDay && cycleDay[symptom] ? cycleDay[symptom] : null
 
-  render() {
+          return (
-    const { cycleDay } = this.state
+            <SymptomBox
-    const { date, isTemperatureEditView } = this.props
+              date={date}
+              key={symptom}
+              symptom={symptom}
+              symptomData={symptomData}
+              symptomDataToDisplay={getData(symptom, symptomData)}
+              editedSymptom={editedSymptom}
+              setEditedSymptom={setEditedSymptom}
+            />
+          )
+        })}
+      </View>
+    </AppPage>
+  )
+}
 
-    const { getCycleDayNumber } = cycleModule()
+CycleDayOverView.propTypes = {
-    const cycleDayNumber = getCycleDayNumber(date)
+  cycleDay: PropTypes.object,
-    const subtitle = cycleDayNumber && `${labels.cycleDayNumber}${cycleDayNumber}`
+  date: PropTypes.string,
-
+  setDate: PropTypes.func,
-    return (
+  isTemperatureEditView: PropTypes.bool,
-      <AppPage>
-        <SymptomPageTitle
-          reloadSymptomData={this.updateCycleDay}
-          subtitle={subtitle}
-          title={dateToTitle(date)}
-        />
-        <View style={styles.container}>
-          {SYMPTOMS.map(symptom => {
-            const symptomData = cycleDay && cycleDay[symptom]
-              ? cycleDay[symptom] : null
-
-            const isSymptomEdited = isTemperatureEditView && symptom === 'temperature'
-
-            return(
-              <SymptomBox
-                key={symptom}
-                symptom={symptom}
-                symptomData={symptomData}
-                symptomDataToDisplay={getData(symptom, symptomData)}
-                updateCycleDayData={this.updateCycleDay}
-                isSymptomEdited={isSymptomEdited}
-              />
-            )
-          })}
-        </View>
-      </AppPage>
-    )
-  }
 }
 
 const styles = StyleSheet.create({
@@ -89,24 +92,8 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     flexWrap: 'wrap',
     justifyContent: 'space-between',
-    padding: Spacing.base
+    padding: Spacing.base,
-  }
+  },
 })
 
-const mapStateToProps = (state) => {
+export default CycleDayOverView
-  return({
-    date: getDate(state),
-  })
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return({
-    setDate: (date) => dispatch(setDate(date)),
-    navigate: (page) => dispatch(navigate(page)),
-  })
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(CycleDayOverView)

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

@@ -9,7 +9,7 @@ import { Colors, Containers } from '../../styles'
 const SelectBoxGroup = ({ labels, optionsState, onSelect }) => {
   return (
     <View style={styles.container}>
-      {Object.keys(labels).map(key => {
+      {Object.keys(labels).map((key) => {
         const isActive = optionsState[key]
         const boxStyle = [styles.box, isActive && styles.boxActive]
         const textStyle = [styles.text, isActive && styles.textActive]
@@ -31,25 +31,25 @@ const SelectBoxGroup = ({ labels, optionsState, onSelect }) => {
 SelectBoxGroup.propTypes = {
   labels: PropTypes.object.isRequired,
   onSelect: PropTypes.func.isRequired,
-  optionsState: PropTypes.object.isRequired
+  optionsState: PropTypes.object.isRequired,
 }
 
 const styles = StyleSheet.create({
   box: {
-    ...Containers.box
+    ...Containers.box,
   },
   boxActive: {
-    ...Containers.boxActive
+    ...Containers.boxActive,
   },
   container: {
-    ...Containers.selectGroupContainer
+    ...Containers.selectGroupContainer,
   },
   text: {
-    color: Colors.orange
+    color: Colors.orange,
   },
   textActive: {
-    color: 'white'
+    color: 'white',
-  }
+  },
 })
 
 export default SelectBoxGroup

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

@@ -9,23 +9,21 @@ import { Colors, Containers } from '../../styles'
 export default function SelectTabGroup({ activeButton, buttons, onSelect }) {
   return (
     <View style={styles.container}>
-      {
+      {buttons.map(({ label, value }, i) => {
-        buttons.map(({ label, value }, i) => {
+        const isActive = value === activeButton
-          const isActive = value === activeButton
+        const boxStyle = [styles.box, isActive && styles.boxActive]
-          const boxStyle = [styles.box, isActive && styles.boxActive]
+        const textStyle = [styles.text, isActive && styles.textActive]
-          const textStyle = [styles.text, isActive && styles.textActive]
 
-          return (
+        return (
-            <TouchableOpacity
+          <TouchableOpacity
-              onPress={() => onSelect(value)}
+            onPress={() => onSelect(value)}
-              key={i}
+            key={i}
-              style={boxStyle}
+            style={boxStyle}
-            >
+          >
-              <AppText style={textStyle}>{label}</AppText>
+            <AppText style={textStyle}>{label}</AppText>
-            </TouchableOpacity>
+          </TouchableOpacity>
-          )
+        )
-        })
+      })}
-      }
     </View>
   )
 }
@@ -33,23 +31,23 @@ export default function SelectTabGroup({ activeButton, buttons, onSelect }) {
 SelectTabGroup.propTypes = {
   activeButton: PropTypes.number,
   buttons: PropTypes.array.isRequired,
-  onSelect: PropTypes.func.isRequired
+  onSelect: PropTypes.func.isRequired,
 }
 
 const styles = StyleSheet.create({
   box: {
-    ...Containers.box
+    ...Containers.box,
   },
   boxActive: {
-    ...Containers.boxActive
+    ...Containers.boxActive,
   },
   container: {
-    ...Containers.selectGroupContainer
+    ...Containers.selectGroupContainer,
   },
   text: {
-    color: Colors.orange
+    color: Colors.orange,
   },
   textActive: {
-    color: 'white'
+    color: 'white',
-  }
+  },
-})
+})

components/cycle-day/symptom-box.js

@@ -1,4 +1,4 @@
-import React, { Component } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
 import { StyleSheet, View, TouchableOpacity } from 'react-native'
 import { scale } from 'react-native-size-matters'
@@ -7,101 +7,80 @@ import AppText from '../common/app-text'
 import DripIcon from '../../assets/drip-icons'
 import SymptomEditView from './symptom-edit-view'
 
-import { connect } from 'react-redux'
-import { getDate } from '../../slices/date'
 import { isDateInFuture } from '../helpers/cycle-day'
 
 import { Colors, Sizes, Spacing } from '../../styles'
-import { headerTitles as symptomTitles } from '../../i18n/en/labels'
+import { useTranslation } from 'react-i18next'
 
-class SymptomBox extends Component {
+const SymptomBox = ({
-  static propTypes = {
+  date,
-    date: PropTypes.string.isRequired,
+  symptom,
-    isSymptomEdited: PropTypes.bool,
+  symptomData,
-    symptom: PropTypes.string.isRequired,
+  symptomDataToDisplay,
-    symptomData: PropTypes.object,
+  editedSymptom,
-    symptomDataToDisplay: PropTypes.string,
+  setEditedSymptom,
-    updateCycleDayData: PropTypes.func.isRequired,
+}) => {
-  }
+  const { t } = useTranslation(null, { keyPrefix: 'cycleDay.symptomBox' })
+  const isSymptomEdited = editedSymptom === symptom
+  const isSymptomDisabled = isDateInFuture(date) && symptom !== 'note'
+  const isExcluded = symptomData !== null ? symptomData.exclude : false
 
-  static defaultProps = {
+  const iconColor = isSymptomDisabled ? Colors.greyLight : Colors.grey
-    isSymptomEdited: false,
+  const iconName = `drip-icon-${symptom}`
-  }
+  const symptomNameStyle = [
+    styles.symptomName,
+    isSymptomDisabled && styles.symptomNameDisabled,
+    isExcluded && styles.symptomNameExcluded,
+  ]
+  const textStyle = [
+    styles.text,
+    isSymptomDisabled && styles.textDisabled,
+    isExcluded && styles.textExcluded,
+  ]
 
-  constructor(props) {
+  return (
-    super(props)
+    <>
+      {isSymptomEdited && (
+        <SymptomEditView
+          date={date}
+          symptom={symptom}
+          symptomData={symptomData}
+          onClose={() => setEditedSymptom('')}
+        />
+      )}
 
-    this.state = {
+      <TouchableOpacity
-      isSymptomEdited: props.isSymptomEdited,
+        disabled={isSymptomDisabled}
-    }
+        onPress={() => setEditedSymptom(symptom)}
-  }
+        style={styles.container}
-
+        testID={iconName}
-  onFinishEditing = () => {
+      >
-    const { date, updateCycleDayData } = this.props
+        <DripIcon
-
+          color={iconColor}
-    updateCycleDayData(date)
+          isActive={!isSymptomDisabled}
-    this.setState({ isSymptomEdited: false })
+          name={iconName}
-  }
+          size={Sizes.icon}
-
+        />
-  onEditSymptom = () => {
+        <View style={styles.textContainer}>
-    this.setState({ isSymptomEdited: true })
+          <AppText style={symptomNameStyle}>{t(symptom)}</AppText>
-  }
+          {symptomDataToDisplay && (
-
+            <AppText style={textStyle} numberOfLines={4}>
-  render() {
+              {symptomDataToDisplay}
-    const { date, symptom, symptomData, symptomDataToDisplay } = this.props
-    const { isSymptomEdited } = this.state
-    const isSymptomDisabled = isDateInFuture(date) && symptom !== 'note'
-    const isExcluded = symptomData !== null ? symptomData.exclude : false
-
-    const iconColor = isSymptomDisabled ? Colors.greyLight : Colors.grey
-    const iconName = `drip-icon-${symptom}`
-    const symptomNameStyle = [
-      styles.symptomName,
-      isSymptomDisabled && styles.symptomNameDisabled,
-      isExcluded && styles.symptomNameExcluded,
-    ]
-    const textStyle = [
-      styles.text,
-      isSymptomDisabled && styles.textDisabled,
-      isExcluded && styles.textExcluded,
-    ]
-
-    return (
-      <React.Fragment>
-        {isSymptomEdited && (
-          <SymptomEditView
-            symptom={symptom}
-            symptomData={symptomData}
-            onClose={this.onFinishEditing}
-          />
-        )}
-
-        <TouchableOpacity
-          disabled={isSymptomDisabled}
-          onPress={this.onEditSymptom}
-          style={styles.container}
-          testID={iconName}
-        >
-          <DripIcon
-            color={iconColor}
-            isActive={!isSymptomDisabled}
-            name={iconName}
-            size={Sizes.icon}
-          />
-          <View style={styles.textContainer}>
-            <AppText style={symptomNameStyle}>
-              {symptomTitles[symptom].toLowerCase()}
             </AppText>
-            {symptomDataToDisplay && (
+          )}
-              <AppText style={textStyle} numberOfLines={4}>
+        </View>
-                {symptomDataToDisplay}
+      </TouchableOpacity>
-              </AppText>
+    </>
-            )}
+  )
-          </View>
+}
-        </TouchableOpacity>
+
-      </React.Fragment>
+SymptomBox.propTypes = {
-    )
+  date: PropTypes.string.isRequired,
-  }
+  symptom: PropTypes.string.isRequired,
+  symptomData: PropTypes.object,
+  symptomDataToDisplay: PropTypes.string,
+  editedSymptom: PropTypes.string.isRequired,
+  setEditedSymptom: PropTypes.func.isRequired,
 }
 
 const styles = StyleSheet.create({
@@ -147,10 +126,4 @@ const styles = StyleSheet.create({
   },
 })
 
-const mapStateToProps = (state) => {
+export default SymptomBox
-  return {
-    date: getDate(state),
-  }
-}
-
-export default connect(mapStateToProps, null)(SymptomBox)

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

@@ -1,20 +1,17 @@
-import React, { Component } from 'react'
+import React, { useState } from 'react'
 import PropTypes from 'prop-types'
-import { Dimensions, ScrollView, StyleSheet, View } from 'react-native'
+import { ScrollView, StyleSheet, View } from 'react-native'
-import { connect } from 'react-redux'
 
 import AppModal from '../common/app-modal'
 import AppSwitch from '../common/app-switch'
 import AppText from '../common/app-text'
 import AppTextInput from '../common/app-text-input'
 import Button from '../common/button'
-import CloseIcon from '../common/close-icon'
 import Segment from '../common/segment'
 import SelectBoxGroup from './select-box-group'
 import SelectTabGroup from './select-tab-group'
 import Temperature from './temperature'
 
-import { getDate } from '../../slices/date'
 import { blank, save, shouldShow, symtomPage } from '../helpers/cycle-day'
 import { showToast } from '../helpers/general'
 
@@ -22,260 +19,214 @@ import { shared as sharedLabels } from '../../i18n/en/labels'
 import info from '../../i18n/en/symptom-info'
 import { Colors, Containers, Sizes, Spacing } from '../../styles'
 
-class SymptomEditView extends Component {
+const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
-  static propTypes = {
+  const symptomConfig = symtomPage[symptom]
-    date: PropTypes.string.isRequired,
+  const [data, setData] = useState(symptomData ? symptomData : blank[symptom])
-    onClose: PropTypes.func.isRequired,
+  const [shouldShowInfo, setShouldShowInfo] = useState(false)
-    symptom: PropTypes.string.isRequired,
+  const getParsedData = () => JSON.parse(JSON.stringify(data))
-    symptomData: PropTypes.object,
+  const onPressLearnMore = () => setShouldShowInfo(!shouldShowInfo)
-  }
 
-  constructor(props) {
+  const onEditNote = (note) => {
-    super(props)
+    const parsedData = getParsedData()
-
-    const { symptomData, symptom } = this.props
-    const data = symptomData ? symptomData : blank[symptom]
-
-    const symptomConfig = symtomPage[symptom]
-    const shouldShowExclude = shouldShow(symptomConfig.excludeText)
-    const shouldShowNote = shouldShow(symptomConfig.note)
-    const shouldBoxGroup = shouldShow(symptomConfig.selectBoxGroups)
-    const shouldTabGroup = shouldShow(symptomConfig.selectTabGroups)
-
-    this.state = {
-      data,
-      shouldShowExclude,
-      shouldShowInfo: false,
-      shouldShowNote,
-      shouldBoxGroup,
-      shouldTabGroup,
-    }
-  }
-
-  componentDidUpdate() {
-    this.saveData()
-  }
-
-  getParsedData = () => JSON.parse(JSON.stringify(this.state.data))
-
-  onEditNote = (note) => {
-    const data = this.getParsedData()
-    const { symptom } = this.props
 
     if (symptom === 'note') {
-      Object.assign(data, { value: note })
+      Object.assign(parsedData, { value: note })
     } else {
-      data['note'] = note
+      parsedData['note'] = note
     }
 
-    this.setState({ data })
+    setData(parsedData)
   }
 
-  onExcludeToggle = () => {
+  const onExcludeToggle = () => {
-    const data = this.getParsedData()
+    const parsedData = getParsedData()
-    Object.assign(data, { exclude: !data.exclude })
 
-    this.setState({ data })
+    Object.assign(parsedData, { exclude: !parsedData.exclude })
+
+    setData(parsedData)
   }
 
-  onPressLearnMore = () => {
+  const onRemove = () => {
-    this.setState({ shouldShowInfo: !this.state.shouldShowInfo })
+    save[symptom](data, date, true)
-  }
-
-  onRemove = () => {
-    this.saveData(true)
     showToast(sharedLabels.dataDeleted)
-    this.props.onClose()
-  }
-
-  onSave = () => {
-    this.saveData()
-    showToast(sharedLabels.dataSaved)
-    this.props.onClose()
-  }
-
-  onSaveTemperature = (value, field) => {
-    const data = this.getParsedData()
-    const dataToSave =
-      field === 'value' ? { [field]: Number(value) } : { [field]: value }
-    Object.assign(data, { ...dataToSave })
-
-    this.setState({ data })
-  }
-
-  onSelectBox = (key) => {
-    const data = this.getParsedData()
-    if (key === 'other') {
-      Object.assign(data, {
-        note: null,
-        [key]: !this.state.data[key],
-      })
-    } else {
-      Object.assign(data, { [key]: !this.state.data[key] })
-    }
-
-    this.setState({ data })
-  }
-
-  onSelectBoxNote = (value) => {
-    const data = this.getParsedData()
-    Object.assign(data, { note: value !== '' ? value : null })
-
-    this.setState({ data })
-  }
-
-  onSelectTab = (group, value) => {
-    const data = this.getParsedData()
-    Object.assign(data, { [group.key]: value })
-
-    this.setState({ data })
-  }
-
-  saveData = (shouldDeleteData) => {
-    const { date, symptom } = this.props
-    const { data } = this.state
-    save[symptom](data, date, shouldDeleteData)
-  }
-
-  closeView = () => {
-    const { onClose } = this.props
-
-    showToast(sharedLabels.dataSaved)
     onClose()
   }
 
-  render() {
+  const onSave = () => {
-    const { symptom } = this.props
+    const hasDataChanged = () => {
-    const {
+      const initialData = symptomData ? symptomData : blank[symptom]
-      data,
-      shouldShowExclude,
-      shouldShowInfo,
-      shouldShowNote,
-      shouldBoxGroup,
-      shouldTabGroup,
-    } = this.state
-    const iconName = shouldShowInfo ? 'chevron-up' : 'chevron-down'
-    const noteText = symptom === 'note' ? data.value : data.note
 
-    return (
+      return JSON.stringify(data) !== JSON.stringify(initialData)
-      <AppModal onClose={this.closeView}>
+    }
-        <ScrollView
-          contentContainerStyle={styles.modalContainer}
-          style={styles.modalWindow}
-        >
-          <View style={styles.headerContainer}>
-            <CloseIcon onClose={this.closeView} />
-          </View>
-          {symptom === 'temperature' && (
-            <Temperature
-              data={data}
-              save={(value, field) => this.onSaveTemperature(value, field)}
-            />
-          )}
-          {shouldTabGroup &&
-            symtomPage[symptom].selectTabGroups.map((group) => {
-              return (
-                <Segment key={group.key} style={styles.segmentBorder}>
-                  <AppText style={styles.title}>{group.title}</AppText>
-                  <SelectTabGroup
-                    activeButton={data[group.key]}
-                    buttons={group.options}
-                    onSelect={(value) => this.onSelectTab(group, value)}
-                  />
-                </Segment>
-              )
-            })}
-          {shouldBoxGroup &&
-            symtomPage[symptom].selectBoxGroups.map((group) => {
-              const isOtherSelected =
-                data['other'] !== null &&
-                data['other'] !== false &&
-                Object.keys(group.options).includes('other')
 
-              return (
+    if (hasDataChanged()) {
-                <Segment key={group.key} style={styles.segmentBorder}>
+      save[symptom](data, date, false)
-                  <AppText style={styles.title}>{group.title}</AppText>
+      showToast(sharedLabels.dataSaved)
-                  <SelectBoxGroup
+    }
-                    labels={group.options}
+
-                    onSelect={(value) => this.onSelectBox(value)}
+    onClose()
-                    optionsState={data}
-                  />
-                  {isOtherSelected && (
-                    <AppTextInput
-                      multiline={true}
-                      placeholder={sharedLabels.enter}
-                      value={data.note}
-                      onChangeText={(value) => this.onSelectBoxNote(value)}
-                    />
-                  )}
-                </Segment>
-              )
-            })}
-          {shouldShowExclude && (
-            <Segment style={styles.segmentBorder}>
-              <AppSwitch
-                onToggle={this.onExcludeToggle}
-                text={symtomPage[symptom].excludeText}
-                value={data.exclude}
-              />
-            </Segment>
-          )}
-          {shouldShowNote && (
-            <Segment style={styles.segmentBorder}>
-              <AppText>{symtomPage[symptom].note}</AppText>
-              <AppTextInput
-                multiline={true}
-                numberOfLines={3}
-                onChangeText={this.onEditNote}
-                placeholder={sharedLabels.enter}
-                testID="noteInput"
-                value={noteText !== null ? noteText : ''}
-              />
-            </Segment>
-          )}
-          <View style={styles.buttonsContainer}>
-            <Button iconName={iconName} isSmall onPress={this.onPressLearnMore}>
-              {sharedLabels.learnMore}
-            </Button>
-            <Button isSmall onPress={this.onRemove}>
-              {sharedLabels.remove}
-            </Button>
-            <Button isCTA isSmall onPress={this.onSave}>
-              {sharedLabels.save}
-            </Button>
-          </View>
-          {shouldShowInfo && (
-            <Segment last style={styles.segmentBorder}>
-              <AppText>{info[symptom].text}</AppText>
-            </Segment>
-          )}
-        </ScrollView>
-      </AppModal>
-    )
   }
+
+  const onSaveTemperature = (value, field) => {
+    const parsedData = getParsedData()
+    const dataToSave =
+      field === 'value' ? { [field]: Number(value) } : { [field]: value }
+
+    Object.assign(parsedData, { ...dataToSave })
+
+    setData(parsedData)
+  }
+
+  const onSelectBox = (key) => {
+    const parsedData = getParsedData()
+    if (key === 'other') {
+      Object.assign(parsedData, {
+        note: null,
+        [key]: !data[key],
+      })
+    } else {
+      Object.assign(parsedData, { [key]: !data[key] })
+    }
+
+    setData(parsedData)
+  }
+
+  const onSelectBoxNote = (value) => {
+    const parsedData = getParsedData()
+
+    Object.assign(parsedData, { note: value !== '' ? value : null })
+
+    setData(parsedData)
+  }
+
+  const onSelectTab = (group, value) => {
+    const parsedData = getParsedData()
+
+    parsedData[group.key] = parsedData[group.key] !== value ? value : null
+    setData(parsedData)
+  }
+  const iconName = shouldShowInfo ? 'chevron-up' : 'chevron-down'
+  const noteText = symptom === 'note' ? data.value : data.note
+  const inputProps = {
+    multiline: true,
+    numberOfLines: 3,
+    scrollEnabled: false,
+    style: styles.input,
+    textAlignVertical: 'top',
+  }
+
+  return (
+    <AppModal onClose={onSave}>
+      <ScrollView
+        contentContainerStyle={styles.modalContainer}
+        keyboardDismissMode="on-drag"
+      >
+        {symptom === 'temperature' && (
+          <Temperature
+            date={date}
+            data={data}
+            save={(value, field) => onSaveTemperature(value, field)}
+          />
+        )}
+        {shouldShow(symptomConfig.selectTabGroups) &&
+          symtomPage[symptom].selectTabGroups.map((group) => {
+            return (
+              <Segment key={group.key} style={styles.segmentBorder}>
+                <AppText style={styles.title}>{group.title}</AppText>
+                <SelectTabGroup
+                  activeButton={data[group.key]}
+                  buttons={group.options}
+                  onSelect={(value) => onSelectTab(group, value)}
+                />
+              </Segment>
+            )
+          })}
+        {shouldShow(symptomConfig.selectBoxGroups) &&
+          symtomPage[symptom].selectBoxGroups.map((group) => {
+            const isOtherSelected =
+              data['other'] !== null &&
+              data['other'] !== false &&
+              Object.keys(group.options).includes('other')
+
+            return (
+              <Segment key={group.key} style={styles.segmentBorder}>
+                <AppText style={styles.title}>{group.title}</AppText>
+                <SelectBoxGroup
+                  labels={group.options}
+                  onSelect={(value) => onSelectBox(value)}
+                  optionsState={data}
+                />
+                {isOtherSelected && (
+                  <AppTextInput
+                    {...inputProps}
+                    placeholder={sharedLabels.enter}
+                    value={data.note}
+                    onChangeText={(value) => onSelectBoxNote(value)}
+                  />
+                )}
+              </Segment>
+            )
+          })}
+        {shouldShow(symptomConfig.excludeText) && (
+          <Segment style={styles.segmentBorder}>
+            <AppSwitch
+              onToggle={onExcludeToggle}
+              text={symtomPage[symptom].excludeText}
+              value={data.exclude}
+            />
+          </Segment>
+        )}
+        {shouldShow(symptomConfig.note) && (
+          <Segment style={styles.segmentBorder}>
+            <AppText>{symtomPage[symptom].note}</AppText>
+            <AppTextInput
+              {...inputProps}
+              onChangeText={onEditNote}
+              placeholder={sharedLabels.enter}
+              testID="noteInput"
+              value={noteText !== null ? noteText : ''}
+            />
+          </Segment>
+        )}
+        <View style={styles.buttonsContainer}>
+          <Button iconName={iconName} isSmall onPress={onPressLearnMore}>
+            {sharedLabels.learnMore}
+          </Button>
+          <Button isSmall onPress={onRemove}>
+            {sharedLabels.remove}
+          </Button>
+          <Button isCTA isSmall onPress={onSave}>
+            {sharedLabels.save}
+          </Button>
+        </View>
+        {shouldShowInfo && (
+          <Segment last style={styles.segmentBorder}>
+            <AppText>{info[symptom].text}</AppText>
+          </Segment>
+        )}
+      </ScrollView>
+    </AppModal>
+  )
+}
+
+SymptomEditView.propTypes = {
+  date: PropTypes.string.isRequired,
+  onClose: PropTypes.func.isRequired,
+  symptom: PropTypes.string.isRequired,
+  symptomData: PropTypes.object,
 }
 
 const styles = StyleSheet.create({
   buttonsContainer: {
     ...Containers.rowContainer,
+    paddingHorizontal: Spacing.base,
+    paddingBottom: Spacing.base,
   },
-  headerContainer: {
+  input: {
-    flexDirection: 'row',
+    height: Sizes.base * 5,
-    justifyContent: 'flex-end',
-    paddingVertical: Spacing.tiny,
   },
   modalContainer: {
-    flex: 1,
+    paddingHorizontal: Spacing.base,
-    padding: Spacing.base,
-  },
-  modalWindow: {
-    alignSelf: 'center',
-    backgroundColor: 'white',
-    borderRadius: 10,
-    marginVertical: Sizes.huge * 2,
-    position: 'absolute',
-    minHeight: '40%',
-    maxHeight: Dimensions.get('window').height * 0.7,
   },
   segmentBorder: {
     borderBottomColor: Colors.greyLight,
@@ -285,10 +236,4 @@ const styles = StyleSheet.create({
   },
 })
 
-const mapStateToProps = (state) => {
+export default SymptomEditView
-  return {
-    date: getDate(state),
-  }
-}
-
-export default connect(mapStateToProps, null)(SymptomEditView)

components/cycle-day/symptom-page-title.js

@@ -5,40 +5,34 @@ import { StyleSheet, TouchableOpacity, View } from 'react-native'
 import AppIcon from '../common/app-icon'
 import AppText from '../common/app-text'
 
-import { connect } from 'react-redux'
+import cycleModule from '../../lib/cycle'
-import { getDate, setDate } from '../../slices/date'
+import { dateToTitle } from '../helpers/format-date'
 
-import { nextDate, prevDate } from '../helpers/cycle-day'
+import { general as labels } from '../../i18n/en/cycle-day'
 import { Colors, Containers, Spacing, Typography } from '../../styles'
 import { HIT_SLOP } from '../../config'
 
-const SymptomPageTitle = ({
+const SymptomPageTitle = ({ date, onNextCycleDay, onPrevCycleDay }) => {
-  date,
+  const title = dateToTitle(date)
-  reloadSymptomData,
+
-  setDate,
+  const { getCycleDayNumber } = cycleModule()
-  subtitle,
+  const cycleDayNumber = getCycleDayNumber(date)
-  title,
+  const subtitle = cycleDayNumber && `${labels.cycleDayNumber}${cycleDayNumber}`
-}) => {
+
-  const navigate = (isForward) => {
+  const formattedTitle =
-    const nextDay = isForward ? nextDate(date) : prevDate(date)
+    title.length > 21 ? title.substring(0, 18) + '...' : title
-    reloadSymptomData(nextDay)
-    setDate(nextDay)
-  }
-  const formattedTitle = title.length > 21
-    ? title.substring(0, 18) + '...'
-    : title
 
   return (
     <View style={styles.container}>
-      <TouchableOpacity onPress={() => navigate(false)} hitSlop={HIT_SLOP}>
+      <TouchableOpacity onPress={onPrevCycleDay} hitSlop={HIT_SLOP}>
-        <AppIcon name='chevron-left' color={Colors.orange}/>
+        <AppIcon name="chevron-left" color={Colors.orange} />
       </TouchableOpacity>
       <View style={styles.textContainer}>
         <AppText style={styles.title}>{formattedTitle}</AppText>
         {subtitle && <AppText style={styles.subtitle}>{subtitle}</AppText>}
       </View>
-      <TouchableOpacity onPress={() => navigate(true)} hitSlop={HIT_SLOP}>
+      <TouchableOpacity onPress={onNextCycleDay} hitSlop={HIT_SLOP}>
-        <AppIcon name='chevron-right' color={Colors.orange}/>
+        <AppIcon name="chevron-right" color={Colors.orange} />
       </TouchableOpacity>
     </View>
   )
@@ -46,10 +40,8 @@ const SymptomPageTitle = ({
 
 SymptomPageTitle.propTypes = {
   date: PropTypes.string.isRequired,
-  reloadSymptomData: PropTypes.func.isRequired,
+  onNextCycleDay: PropTypes.func.isRequired,
-  setDate: PropTypes.func.isRequired,
+  onPrevCycleDay: PropTypes.func.isRequired,
-  subtitle: PropTypes.string,
-  title: PropTypes.string,
 }
 
 const styles = StyleSheet.create({
@@ -67,16 +59,4 @@ const styles = StyleSheet.create({
   },
 })
 
-const mapStateToProps = (state) => {
+export default SymptomPageTitle
-  return {
-    date: getDate(state),
-  }
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    setDate: (date) => dispatch(setDate(date)),
-  }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(SymptomPageTitle)

components/cycle-day/temperature.js

@@ -10,8 +10,6 @@ import AppText from '../common/app-text'
 import AppTextInput from '../common/app-text-input'
 import Segment from '../common/segment'
 
-import { connect } from 'react-redux'
-import { getDate } from '../../slices/date'
 import {
   getTemperatureOutOfRangeMessage,
   getPreviousTemperature,
@@ -110,6 +108,7 @@ const styles = StyleSheet.create({
   hint: {
     fontStyle: 'italic',
     fontSize: Sizes.small,
+    color: Colors.orange,
   },
   hintContainer: {
     marginVertical: Spacing.tiny,
@@ -125,10 +124,4 @@ Temperature.propTypes = {
   save: PropTypes.func.isRequired,
 }
 
-const mapStateToProps = (state) => {
+export default Temperature
-  return {
-    date: getDate(state),
-  }
-}
-
-export default connect(mapStateToProps, null)(Temperature)

components/header/hamburger-menu.js

@@ -1,4 +1,4 @@
-import React, { Component } from 'react'
+import React, { useState } from 'react'
 import {
   Modal,
   Platform,
@@ -6,73 +6,65 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native'
+import PropTypes from 'prop-types'
+import AppText from '../common/app-text'
 
 import AppIcon from '../common/app-icon'
 import CloseIcon from '../common/close-icon'
-import MenuItem from './menu-item'
 
-import { Colors, Sizes } from '../../styles'
+import { Colors, Sizes, Typography } from '../../styles'
-import settingsLabels from '../../i18n/en/settings'
 import { HIT_SLOP } from '../../config'
-
+import { useTranslation } from 'react-i18next'
-const { menuItems } = settingsLabels
 
 const settingsMenuItems = [
-  { name: menuItems.settings, component: 'SettingsMenu' },
+  { labelKey: 'settings', componentName: 'SettingsMenu' },
-  { name: menuItems.about, component: 'About' },
+  { labelKey: 'about', componentName: 'About' },
-  { name: menuItems.license, component: 'License' },
+  { labelKey: 'license', componentName: 'License' },
-  { name: menuItems.privacyPolicy, component: 'PrivacyPolicy' },
+  { labelKey: 'privacyPolicy', componentName: 'PrivacyPolicy' },
 ]
 
-export default class HamburgerMenu extends Component {
+const HamburgerMenu = ({ navigate }) => {
-  constructor(props) {
+  const [isOpen, setIsOpen] = useState(false)
-    super(props)
+  const closeMenu = () => setIsOpen(false)
 
-    this.state = { shouldShowMenu: false }
+  const { t } = useTranslation(null, { keyPrefix: 'hamburgerMenu.menuMain' })
-  }
-
-  toggleMenu = () => {
-    this.setState({ shouldShowMenu: !this.state.shouldShowMenu })
-  }
-
-  render() {
-    const { shouldShowMenu } = this.state
 
+  if (!isOpen)
     return (
-      <React.Fragment>
+      <TouchableOpacity onPress={() => setIsOpen(true)} hitSlop={HIT_SLOP}>
-        {!shouldShowMenu && (
+        <AppIcon name="dots-three-vertical" color={Colors.orange} />
-          <TouchableOpacity onPress={this.toggleMenu} hitSlop={HIT_SLOP}>
+      </TouchableOpacity>
-            <AppIcon name="dots-three-vertical" color={Colors.orange} />
-          </TouchableOpacity>
-        )}
-        {shouldShowMenu && (
-          <Modal
-            animationType="fade"
-            onRequestClose={this.toggleMenu}
-            transparent={true}
-            visible={shouldShowMenu}
-          >
-            <TouchableOpacity
-              onPress={this.toggleMenu}
-              style={styles.blackBackground}
-            ></TouchableOpacity>
-            <View style={styles.menu}>
-              <View style={styles.iconContainer}>
-                <CloseIcon color={'black'} onClose={() => this.toggleMenu()} />
-              </View>
-              {settingsMenuItems.map((item) => (
-                <MenuItem
-                  item={item}
-                  key={item.name}
-                  closeMenu={this.toggleMenu}
-                />
-              ))}
-            </View>
-          </Modal>
-        )}
-      </React.Fragment>
     )
+
+  function onPress(componentName) {
+    closeMenu()
+    navigate(componentName)
   }
+
+  return (
+    <Modal animationType="fade" onRequestClose={closeMenu} transparent>
+      <TouchableOpacity onPress={closeMenu} style={styles.blackBackground} />
+      <View style={styles.menu}>
+        <View style={styles.iconContainer}>
+          <CloseIcon color={'black'} onClose={closeMenu} />
+        </View>
+        {settingsMenuItems.map(({ labelKey, componentName }) => (
+          <TouchableOpacity
+            onPress={() => onPress(componentName)}
+            key={labelKey}
+          >
+            <AppText style={styles.menuItem}>{t(labelKey)}</AppText>
+          </TouchableOpacity>
+        ))}
+      </View>
+    </Modal>
+  )
+}
+
+export default HamburgerMenu
+
+HamburgerMenu.propTypes = {
+  navigate: PropTypes.func,
 }
 
 const styles = StyleSheet.create({
@@ -94,4 +86,5 @@ const styles = StyleSheet.create({
     position: 'absolute',
     width: '60%',
   },
+  menuItem: Typography.subtitle,
 })

components/header/index.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { StyleSheet, View } from 'react-native'
+import { StyleSheet, TouchableOpacity, View } from 'react-native'
 import PropTypes from 'prop-types'
 
 import Logo from './logo'
@@ -7,30 +7,38 @@ import HamburgerMenu from './hamburger-menu'
 
 import { Colors, Containers, Sizes } from '../../styles'
 
-const Header = ({ isSideMenuEnabled }) => {
+const Header = ({ isStatic, navigate }) => {
-
   return (
     <View style={styles.header}>
-      <Logo />
+      {isStatic ? (
-      {isSideMenuEnabled && <HamburgerMenu />}
+        <Logo />
-    </View >
+      ) : (
+        <>
+          <TouchableOpacity onPress={() => navigate('Home')}>
+            <Logo />
+          </TouchableOpacity>
+          <HamburgerMenu navigate={navigate} />
+        </>
+      )}
+    </View>
   )
 }
 
 Header.propTypes = {
-  isSideMenuEnabled: PropTypes.bool
+  isStatic: PropTypes.bool,
+  navigate: PropTypes.func,
 }
 
 Header.defaultProps = {
-  isSideMenuEnabled: true
+  isStatic: false,
 }
 
 const styles = StyleSheet.create({
   header: {
     backgroundColor: Colors.purple,
     padding: Sizes.base,
-    ...Containers.rowContainer
+    ...Containers.rowContainer,
-  }
+  },
 })
 
-export default Header
+export default Header

components/header/logo.js

@@ -1,41 +1,20 @@
 import React from 'react'
-import { StyleSheet, TouchableOpacity } from 'react-native'
+import { StyleSheet } from 'react-native'
-import PropTypes from 'prop-types'
 
 import AppText from '../common/app-text'
 
-import { connect } from 'react-redux'
-import { navigate } from '../../slices/navigation'
-
 import { Colors, Fonts, Sizes } from '../../styles'
 
-const Logo = ({ navigate }) => {
+const Logo = () => {
-  return(
+  return <AppText style={styles.logo}>drip.</AppText>
-    <TouchableOpacity onPress={() => navigate('Home')}>
-      <AppText style={styles.logo}>drip.</AppText>
-    </TouchableOpacity>
-  )
-}
-
-Logo.propTypes = {
-  navigate: PropTypes.func.isRequired
 }
 
 const styles = StyleSheet.create({
   logo: {
     color: Colors.turquoiseDark,
     fontFamily: Fonts.bold,
-    fontSize: Sizes.title
+    fontSize: Sizes.title,
-  }
+  },
 })
 
-const mapDispatchToProps = (dispatch) => {
+export default Logo
-  return({
-    navigate: (page) => dispatch(navigate(page)),
-  })
-}
-
-export default connect(
-  null,
-  mapDispatchToProps,
-)(Logo)

components/header/menu-item.js

@@ -1,47 +0,0 @@
-import React from 'react'
-import { StyleSheet, TouchableOpacity } from 'react-native'
-import PropTypes from 'prop-types'
-
-import AppText from '../common/app-text'
-
-import { connect } from 'react-redux'
-import { navigate } from '../../slices/navigation'
-
-import { Typography } from '../../styles'
-
-const MenuItem = ({ item, navigate, closeMenu }) => {
-  const { component, name } = item
-  const onPress = () => {
-    closeMenu()
-    navigate(component)
-  }
-
-  return(
-    <TouchableOpacity onPress={onPress}>
-      <AppText style={styles.text}>{name}</AppText>
-    </TouchableOpacity>
-  )
-}
-
-MenuItem.propTypes = {
-  item: PropTypes.object.isRequired,
-  navigate: PropTypes.func.isRequired,
-  closeMenu: PropTypes.func.isRequired
-}
-
-const styles = StyleSheet.create({
-  text: {
-    ...Typography.subtitle
-  }
-})
-
-const mapDispatchToProps = (dispatch) => {
-  return({
-    navigate: (page) => dispatch(navigate(page)),
-  })
-}
-
-export default connect(
-  null,
-  mapDispatchToProps,
-)(MenuItem)

components/helpers/calendar.js

@@ -1,7 +1,8 @@
-import { LocalDate } from 'js-joda'
+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
@@ -65,7 +67,7 @@ const styles = {
   calendarToday: {
     fontFamily: 'Jost-Bold',
     fontWeight: 'bold',
-    color: Colors.purple
+    color: Colors.purple,
   },
 }
 

components/helpers/chart.js

@@ -1,4 +1,4 @@
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 
 import { scaleObservable, unitObservable } from '../../local-storage'
 import { getCycleStatusForDay } from '../../lib/sympto-adapter'
@@ -45,7 +45,6 @@ export function getTickList(columnHeight) {
   const tickHeight = columnHeight / numberOfTicks
 
   return getTickPositions(columnHeight).map((tickPosition, i) => {
-
     const tick = scaleMax - i * unit
     const isBold = Number.isInteger(tick) ? true : false
     const label = tick.toFixed(1)
@@ -56,14 +55,14 @@ export function getTickList(columnHeight) {
 
     if (unit === 0.1) {
       // show label with step 0.2
-      shouldShowLabel = !(label * 10 % 2)
+      shouldShowLabel = !((label * 10) % 2)
     } else {
       // show label with step 0.5
-      shouldShowLabel = !(label * 10 % 5)
+      shouldShowLabel = !((label * 10) % 5)
     }
 
     // don't show label, if first or last tick
-    if ( i === 0 || i === (numberOfTicks - 1) ) {
+    if (i === 0 || i === numberOfTicks - 1) {
       shouldShowLabel = false
     }
 
@@ -72,7 +71,7 @@ export function getTickList(columnHeight) {
       label,
       isBold,
       shouldShowLabel,
-      tickHeight
+      tickHeight,
     }
   })
 }
@@ -84,17 +83,17 @@ export function isSymptomDataComplete(symptom, dateString) {
   const symptomData = cycleDayData[symptom]
 
   const dataCompletenessCheck = {
-    'cervix': () => {
+    cervix: () => {
       const { opening, firmness } = symptomData
-      return (opening !== null) && (firmness !== null)
+      return opening !== null && firmness !== null
     },
-    'mucus': () => {
+    mucus: () => {
       const { feeling, texture } = symptomData
-      return (feeling !== null) && (texture !== null)
+      return feeling !== null && texture !== null
     },
-    'default': () => {
+    default: () => {
       return true
-    }
+    },
   }
   return (dataCompletenessCheck[symptom] || dataCompletenessCheck['default'])()
 }
@@ -104,7 +103,7 @@ function getInfoForNeighborColumns(dateString, columnHeight) {
     rightY: null,
     rightTemperatureExclude: null,
     leftY: null,
-    leftTemperatureExclude: null
+    leftTemperatureExclude: null,
   }
   const target = LocalDate.parse(dateString)
   const dayBefore = target.minusDays(1).toString()
@@ -127,53 +126,57 @@ function getInfoForNeighborColumns(dateString, columnHeight) {
 export function getTemperatureProps(symptomData, columnHeight, dateString) {
   const extractedData = {}
   const { value, exclude } = symptomData
-  const neighborTemperatureGraphPoints =
+  const neighborTemperatureGraphPoints = getInfoForNeighborColumns(
-    getInfoForNeighborColumns(dateString, columnHeight)
+    dateString,
+    columnHeight
+  )
 
   for (const key in neighborTemperatureGraphPoints) {
     extractedData[key] = neighborTemperatureGraphPoints[key]
   }
-  return Object.assign({
+  return Object.assign(
-    value,
+    {
-    y: normalizeToScale(value, columnHeight),
+      value,
-    temperatureExclude: exclude,
+      y: normalizeToScale(value, columnHeight),
-  }, extractedData)
+      temperatureExclude: exclude,
+    },
+    extractedData
+  )
 }
 
 export const symptomColorMethods = {
-  'mucus': (symptomData) => {
+  mucus: (symptomData) => {
     const { feeling, texture } = symptomData
     const colorIndex = feeling + texture
     return colorIndex
   },
-  'cervix': (symptomData) => {
+  cervix: (symptomData) => {
     const { opening, firmness } = symptomData
     const isDataComplete = opening !== null && firmness !== null
-    const isClosedAndHard =
+    const isClosedAndHard = isDataComplete && opening === 0 && firmness === 0
-      isDataComplete &&
-      (opening === 0 && firmness === 0)
     const colorIndex = isClosedAndHard ? 0 : 2
     return colorIndex
   },
-  'sex': (symptomData) => {
+  sex: (symptomData) => {
     const { solo, partner } = symptomData
-    const colorIndex = (solo !== null && partner !== null) ?
+    const colorIndex =
-      (solo + 2 * partner - 1) : 0
+      solo !== null && partner !== null ? solo + 2 * partner - 1 : 0
     return colorIndex
   },
-  'bleeding': (symptomData) => {
+  bleeding: (symptomData) => {
     const { value } = symptomData
     const colorIndex = value
     return colorIndex
   },
-  'desire': (symptomData) => {
+  desire: (symptomData) => {
     const { value } = symptomData
     const colorIndex = value
     return colorIndex
   },
-  'default': () => { //pain, mood, note
+  default: () => {
+    //pain, mood, note
     return 0
-  }
+  },
 }
 
 // Chart helpers
@@ -188,7 +191,7 @@ export function makeColumnInfo() {
     amountOfCycleDays += 5
   }
   const localDates = getTodayAndPreviousDays(amountOfCycleDays)
-  return localDates.map(localDate => localDate.toString())
+  return localDates.map((localDate) => localDate.toString())
 }
 
 function getTodayAndPreviousDays(n) {
@@ -210,17 +213,17 @@ function getTodayAndPreviousDays(n) {
 
 export function nfpLines() {
   const cycle = {
-    status: null
+    status: null,
   }
 
   function updateCurrentCycle(dateString) {
     // for the NFP lines, we don't care about potentially extending the
     // preOvu phase, so we don't include all earlier cycles, as that is
     // an expensive db operation at the moment
-    cycle.status = getCycleStatusForDay(
+    cycle.status = getCycleStatusForDay(dateString, {
-      dateString, { excludeEarlierCycles: true }
+      excludeEarlierCycles: true,
-    )
+    })
-    if(!cycle.status) {
+    if (!cycle.status) {
       cycle.noMoreCycles = true
       return
     }
@@ -232,39 +235,34 @@ export function nfpLines() {
   }
 
   function dateIsInPeriOrPostPhase(dateString) {
-    return (
+    return dateString >= cycle.status.phases.periOvulatory.start.date
-      dateString >= cycle.status.phases.periOvulatory.start.date
-    )
   }
 
   function precededByAnotherTempValue(dateString) {
     return (
       // we are only interested in days that have a preceding
       // temp
-      Object.keys(cycle.status.phases).some(phaseName => {
+      Object.keys(cycle.status.phases).some((phaseName) => {
-        return cycle.status.phases[phaseName].cycleDays.some(day => {
+        return cycle.status.phases[phaseName].cycleDays.some((day) => {
           return day.temperature && day.date < dateString
         })
-      })
+      }) &&
       // and also a following temp, so we don't draw the line
       // longer than necessary
-      &&
+      cycle.status.phases.postOvulatory.cycleDays.some((day) => {
-      cycle.status.phases.postOvulatory.cycleDays.some(day => {
         return day.temperature && day.date > dateString
       })
     )
   }
 
   function isInTempMeasuringPhase(temperature, dateString) {
-    return (
+    return temperature || precededByAnotherTempValue(dateString)
-      temperature || precededByAnotherTempValue(dateString)
-    )
   }
 
-  return function(dateString, temperature, columnHeight) {
+  return function (dateString, temperature, columnHeight) {
     const ret = {
       drawLtlAt: null,
-      drawFhmLine: false
+      drawFhmLine: false,
     }
     if (!cycle.status && !cycle.noMoreCycles) updateCurrentCycle(dateString)
     if (cycle.noMoreCycles) return ret

components/helpers/cycle-day.js

@@ -1,4 +1,4 @@
-import { ChronoUnit, LocalDate, LocalTime } from 'js-joda'
+import { ChronoUnit, LocalDate, LocalTime } from '@js-joda/core'
 
 import {
   getPreviousTemperatureForDate,
@@ -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)

components/helpers/format-date.js

@@ -1,4 +1,4 @@
-import { LocalDate } from 'js-joda'
+import { LocalDate } from '@js-joda/core'
 import moment from 'moment'
 
 import { general as labels } from '../../i18n/en/cycle-day'
@@ -22,3 +22,18 @@ export function dateToTitle(dateString) {
     ? labels.today
     : moment(dateString).format('ddd DD. MMM YY')
 }
+
+export function humanizeDate(dateString) {
+  if (!dateString) return ''
+
+  const today = LocalDate.now()
+
+  try {
+    const dateToDisplay = LocalDate.parse(dateString)
+    return today.equals(dateToDisplay)
+      ? labels.today
+      : moment(dateString).format('DD. MMM YY')
+  } catch (e) {
+    return ''
+  }
+}

components/helpers/general.js

@@ -1,5 +1,7 @@
 import Toast from 'react-native-simple-toast'
 
-export const showToast = (text) => Toast.show(
+export const showToast = (text) =>
-  text, Toast.SHORT, ['RCTModalHostViewController', 'UIAlertController']
+  Toast.show(text, Toast.SHORT, [
-)
+    'RCTModalHostViewController',
+    'UIAlertController',
+  ])

components/helpers/home.js

@@ -1,4 +1,4 @@
-import { ChronoUnit, LocalDate } from 'js-joda'
+import { ChronoUnit, LocalDate } from '@js-joda/core'
 
 import { formatDateForShortText } from './format-date'
 
@@ -11,20 +11,18 @@ function getTimes(prediction) {
   const todayDate = LocalDate.now()
   const predictedBleedingStart = LocalDate.parse(prediction[0][0])
   /* the range of predicted bleeding days can be either 3 or 5 */
-  const predictedBleedingEnd =
+  const predictedBleedingEnd = LocalDate.parse(
-    LocalDate.parse(prediction[0][prediction[0].length - 1])
+    prediction[0][prediction[0].length - 1]
+  )
   const daysToEnd = todayDate.until(predictedBleedingEnd, ChronoUnit.DAYS)
   return { todayDate, predictedBleedingStart, predictedBleedingEnd, daysToEnd }
 }
 
 export function determinePredictionText(bleedingPrediction, t) {
-  if (!bleedingPrediction.length) return t('labels.bleedingPrediction.noPrediction')
+  if (!bleedingPrediction.length)
-  const {
+    return t('labels.bleedingPrediction.noPrediction')
-    todayDate,
+  const { todayDate, predictedBleedingStart, predictedBleedingEnd, daysToEnd } =
-    predictedBleedingStart,
+    getTimes(bleedingPrediction)
-    predictedBleedingEnd,
-    daysToEnd
-  } = getTimes(bleedingPrediction)
   if (todayDate.isBefore(predictedBleedingStart)) {
     return predictLabels.predictionInFuture(
       todayDate.until(predictedBleedingStart, ChronoUnit.DAYS),
@@ -48,19 +46,18 @@ export function determinePredictionText(bleedingPrediction, t) {
 
 export function getBleedingPredictionRange(prediction) {
   if (!prediction.length) return labels.unknown
-  const {
+  const { todayDate, predictedBleedingStart, predictedBleedingEnd, daysToEnd } =
-    todayDate,
+    getTimes(prediction)
-    predictedBleedingStart,
-    predictedBleedingEnd,
-    daysToEnd
-  } = getTimes(prediction)
   if (todayDate.isBefore(predictedBleedingStart)) {
-    return `${todayDate.until(predictedBleedingStart, ChronoUnit.DAYS)}-${todayDate.until(predictedBleedingEnd, ChronoUnit.DAYS)}`
+    return `${todayDate.until(
+      predictedBleedingStart,
+      ChronoUnit.DAYS
+    )}-${todayDate.until(predictedBleedingEnd, ChronoUnit.DAYS)}`
   }
   if (todayDate.isAfter(predictedBleedingEnd)) {
     return labels.unknown
   }
-  return (daysToEnd === 0 ? '0' : `0 - ${daysToEnd}`)
+  return daysToEnd === 0 ? '0' : `0 - ${daysToEnd}`
 }
 
 export function getOrdinalSuffix(num) {

components/helpers/labels.js

@@ -1,2 +1,2 @@
-export const getLabelsList =
+export const getLabelsList = (categories) =>
-  (categories) => categories.map((label, i) => ({ label, value: i }))
+  categories.map((label, i) => ({ label, value: i }))

components/helpers/pad-time-with-zeros.js

@@ -1,10 +1,11 @@
-
 export default function (jsDate) {
   const vals = [jsDate.getHours(), jsDate.getMinutes()]
-  return vals.map(val => {
+  return vals
-    if (parseInt(val) < 10) {
+    .map((val) => {
-      val = `0${val}`
+      if (parseInt(val) < 10) {
-    }
+        val = `0${val}`
-    return val
+      }
-  }).join(':')
+      return val
-}
+    })
+    .join(':')
+}

components/menu/index.js

@@ -1,35 +1,45 @@
 import React from 'react'
 import { StyleSheet, View } from 'react-native'
+import PropTypes from 'prop-types'
 
 import MenuItem from './menu-item'
 
 import { Containers } from '../../styles'
 import { pages } from '../pages'
+import { useTranslation } from 'react-i18next'
 
-const Menu = () => {
+const Menu = ({ currentPage, navigate }) => {
-  const menuItems = pages.filter(page => page.isInMenu)
+  const menuItems = pages.filter((page) => page.isInMenu)
+
+  const { t } = useTranslation(null, { keyPrefix: 'bottomMenu' })
 
   return (
     <View style={styles.container}>
-      { menuItems.map(({ icon, label, component }) => {
+      {menuItems.map(({ icon, labelKey, component }) => {
         return (
           <MenuItem
-            component={component}
+            isActive={component === currentPage}
+            onPress={() => navigate(component)}
             icon={icon}
-            key={label}
+            key={labelKey}
-            label={label}
+            label={t(labelKey)}
           />
-        )}
+        )
-      )}
+      })}
-    </View >
+    </View>
   )
 }
 
+Menu.propTypes = {
+  currentPage: PropTypes.string,
+  navigate: PropTypes.func,
+}
+
 const styles = StyleSheet.create({
   container: {
     backgroundColor: 'white',
-    ...Containers.rowContainer
+    ...Containers.rowContainer,
-  }
+  },
 })
 
-export default Menu
+export default Menu

components/menu/menu-item.js

@@ -4,69 +4,48 @@ import { StyleSheet, Text, TouchableOpacity } from 'react-native'
 
 import Icon from '../common/menu-icon'
 
-import { connect } from 'react-redux'
-import { getNavigation, navigate } from '../../slices/navigation'
-
 import { Colors, Containers, Fonts, Sizes, Spacing } from '../../styles'
 
-const MenuItem = ({ component, icon, label, navigate, navigation }) => {
+const MenuItem = ({ isActive, icon, label, onPress }) => {
-  const isActive = (component === navigation.currentPage)
   const textStyle = isActive ? styles.menuTextActive : styles.menuText
   const testID = isActive ? 'activeMenuItem' : `menuItem${label}`
 
   return (
-    <TouchableOpacity
+    <TouchableOpacity style={styles.button} onPress={onPress}>
-      style={styles.button}
+      <Icon name={icon} isActive={isActive} />
-      onPress={() => navigate(component)}
+      <Text testID={testID} style={textStyle}>
-    >
+        {label}
-      <Icon name={icon} isActive={isActive}/>
+      </Text>
-      <Text testID={testID} style={textStyle} >{label}</Text>
     </TouchableOpacity>
   )
 }
 
 MenuItem.propTypes = {
-  component: PropTypes.string.isRequired,
+  isActive: PropTypes.bool.isRequired,
   icon: PropTypes.string.isRequired,
   label: PropTypes.string.isRequired,
-  navigation: PropTypes.object,
+  onPress: PropTypes.func.isRequired,
-  navigate: PropTypes.func,
 }
 
 const text = {
   fontFamily: Fonts.bold,
   fontSize: Sizes.small,
-  textTransform: 'uppercase'
+  textTransform: 'uppercase',
 }
 
 const styles = StyleSheet.create({
   button: {
     padding: Spacing.base,
-    ...Containers.centerItems
+    ...Containers.centerItems,
   },
   menuText: {
     color: Colors.grey,
-    ...text
+    ...text,
   },
   menuTextActive: {
     color: Colors.orange,
-    ...text
+    ...text,
-  }
+  },
 })
 
-const mapStateToProps = (state) => {
+export default MenuItem
-  return({
-    navigation: getNavigation(state),
-  })
-}
-
-const mapDispatchToProps = (dispatch) => {
-  return({
-    navigate: (page) => dispatch(navigate(page)),
-  })
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-)(MenuItem)

components/pages.js

@@ -1,78 +1,67 @@
 import settingsViews from './settings'
 
-import settingsLabels from '../i18n/en/settings'
-const labels = settingsLabels.menuItems
-
-export const isSettingsView = (page) =>
-  Object.keys(settingsViews).includes(page)
-
 export const pages = [
   {
     component: 'Home',
     icon: 'home',
-    label: 'Home',
   },
   {
     component: 'Calendar',
     icon: 'calendar',
     isInMenu: true,
-    label: 'Calendar',
+    labelKey: 'calendar',
     parent: 'Home',
   },
   {
     component: 'Chart',
     icon: 'chart',
     isInMenu: true,
-    label: 'Chart',
+    labelKey: 'chart',
     parent: 'Home',
   },
   {
     component: 'Stats',
     icon: 'statistics',
     isInMenu: true,
-    label: 'Stats',
+    labelKey: 'stats',
     parent: 'Home',
   },
   {
     children: Object.keys(settingsViews),
     component: 'SettingsMenu',
     icon: 'settings',
-    label: 'Settings',
     parent: 'Home',
   },
   {
     component: 'Reminders',
-    label: labels.reminders.name,
     parent: 'SettingsMenu',
   },
   {
-    component: 'NfpSettings',
+    component: 'Customization',
-    label: labels.nfpSettings.name,
     parent: 'SettingsMenu',
   },
   {
     component: 'DataManagement',
-    label: labels.dataManagement.name,
+    parent: 'SettingsMenu',
+  },
+  {
+    component: 'Info',
     parent: 'SettingsMenu',
   },
   {
     component: 'Password',
-    label: labels.password.name,
     parent: 'SettingsMenu',
   },
   {
     component: 'About',
-    label: 'About',
     parent: 'SettingsMenu',
   },
   {
     component: 'License',
-    label: 'License',
     parent: 'SettingsMenu',
   },
   {
     component: 'PrivacyPolicy',
-    label: 'PrivacyPolicy',
     parent: 'SettingsMenu',
   },
   {

components/password-prompt.js

@@ -1,7 +1,7 @@
-import React, { Component } from 'react'
+import React, { useState } from 'react'
 import PropTypes from 'prop-types'
-import { Alert, StyleSheet, View } from 'react-native'
+import { Alert, KeyboardAvoidingView, StyleSheet, View } from 'react-native'
-import nodejs from 'nodejs-mobile-react-native'
+import { SHA512 } from 'jshashes'
 
 import AppPage from './common/app-page'
 import AppTextInput from './common/app-text-input'
@@ -9,117 +9,95 @@ import Button from './common/button'
 import Header from './header'
 
 import { saveEncryptionFlag } from '../local-storage'
-import { requestHash, deleteDbAndOpenNew, openDb } from '../db'
+import { deleteDbAndOpenNew, openDb } from '../db'
 import { passwordPrompt as labels, shared } from '../i18n/en/labels'
 import { Containers, Spacing } from '../styles'
 
 const cancelButton = { text: shared.cancel, style: 'cancel' }
 
-export default class PasswordPrompt extends Component {
+const PasswordPrompt = ({ enableShowApp }) => {
-  static propTypes = {
+  const [password, setPassword] = useState(null)
-    enableShowApp: PropTypes.func.isRequired
+  const isPasswordEntered = Boolean(password)
-  }
 
-  constructor(props) {
+  const unlockApp = async () => {
-    super(props)
+    const hash = new SHA512().hex(password)
-    this.state = { password: null }
-
-    nodejs.channel.addListener('check-pw', this.passHashToDb, this)
-  }
-
-  componentWillUnmount() {
-    nodejs.channel.removeListener('check-pw', this.passHashToDb)
-  }
-
-  onConfirmDeletion = async () => {
-    Alert.alert(
-      labels.deleteDatabaseTitle,
-      labels.deleteDatabaseExplainer,
-      [cancelButton, { text: labels.deleteData, onPress: this.onDeleteData}]
-    )
-  }
-
-  onDeleteData = () => {
-    Alert.alert(
-      labels.areYouSureTitle,
-      labels.areYouSure,
-      [cancelButton, {
-        text: labels.reallyDeleteData,
-        onPress: this.onDeleteDataConfirmation
-      }]
-    )
-  }
-
-  onDeleteDataConfirmation = async () => {
-    await deleteDbAndOpenNew()
-    await saveEncryptionFlag(false)
-    this.props.enableShowApp()
-  }
-
-  passHashToDb = async hash => {
     const connected = await openDb(hash)
+
     if (!connected) {
-      Alert.alert(
+      Alert.alert(shared.incorrectPassword, shared.incorrectPasswordMessage, [
-        shared.incorrectPassword,
+        {
-        shared.incorrectPasswordMessage,
-        [{
           text: shared.tryAgain,
-          onPress: () => this.setState({ password: null })
+          onPress: () => setPassword(null),
-        }]
+        },
-      )
+      ])
       return
     }
-    this.props.enableShowApp()
+    enableShowApp()
   }
 
-  unlockApp = () => {
+  const onDeleteDataConfirmation = async () => {
-    requestHash('check-pw', this.state.password)
+    await deleteDbAndOpenNew()
+    await saveEncryptionFlag(false)
+    enableShowApp()
   }
 
-  setPassword = (password) => {
+  const onDeleteData = () => {
-    this.setState({ password })
+    Alert.alert(labels.areYouSureTitle, labels.areYouSure, [
+      cancelButton,
+      {
+        text: labels.reallyDeleteData,
+        onPress: onDeleteDataConfirmation,
+      },
+    ])
   }
 
-  render() {
+  const onConfirmDeletion = async () => {
-    const { password } = this.state
+    Alert.alert(labels.deleteDatabaseTitle, labels.deleteDatabaseExplainer, [
-    const isPasswordEntered = Boolean(password)
+      cancelButton,
+      { text: labels.deleteData, onPress: onDeleteData },
+    ])
+  }
 
-    return (
+  return (
-      <React.Fragment>
+    <>
-        <Header isSideMenuEnabled={false} />
+      <Header isStatic />
-        <AppPage contentContainerStyle={styles.contentContainer}>
+      <AppPage contentContainerStyle={styles.contentContainer}>
+        <KeyboardAvoidingView behavior="padding" keyboardVerticalOffset={150}>
           <AppTextInput
-            isKeyboardOffset={false}
+            onChangeText={setPassword}
-            onChangeText={this.setPassword}
             secureTextEntry={true}
             placeholder={labels.enterPassword}
           />
           <View style={styles.containerButtons}>
-            <Button onPress={this.onConfirmDeletion}>
+            <Button onPress={onConfirmDeletion}>{labels.forgotPassword}</Button>
-              {labels.forgotPassword}
-            </Button>
             <Button
               disabled={!isPasswordEntered}
               isCTA={isPasswordEntered}
-              onPress={this.unlockApp}
+              onPress={unlockApp}
             >
               {labels.title}
             </Button>
           </View>
-        </AppPage>
+        </KeyboardAvoidingView>
-      </React.Fragment>
+      </AppPage>
-    )
+    </>
-  }
+  )
+}
+
+PasswordPrompt.propTypes = {
+  enableShowApp: PropTypes.func.isRequired,
 }
 
 const styles = StyleSheet.create({
   contentContainer: {
     flex: 1,
     justifyContent: 'center',
-    marginHorizontal: Spacing.base
+    marginHorizontal: Spacing.base,
   },
   containerButtons: {
     ...Containers.rowContainer,
-    justifyContent: 'space-around'
+    justifyContent: 'space-around',
-  }
+  },
 })
+
+export default PasswordPrompt

components/settings/About.js

@@ -3,18 +3,21 @@ import { Platform, Linking } 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 Button from '../common/button'
 import ButtonRow from '../common/button-row'
 
-import labels from '../../i18n/en/settings'
 import links from '../../i18n/en/links'
+import { useTranslation } from 'react-i18next'
 
 const AboutSection = () => {
+  const { t } = useTranslation(null, { keyPrefix: 'hamburgerMenu.about' })
+
   return (
-    <AppPage title={labels.aboutSection.title}>
+    <AppPage title={t('title')}>
       <Segment>
-        <AppText>{labels.aboutSection.text}</AppText>
+        <AppText>{t('intro.text')}</AppText>
         <ButtonRow>
           {[links.email, links.gitlab, links.website].map((link) => (
             <Button
@@ -28,25 +31,35 @@ const AboutSection = () => {
           ))}
         </ButtonRow>
       </Segment>
-      <Segment title={labels.philosophy.title}>
+      <Segment title={t('philosophy.title')}>
-        <AppText>{labels.philosophy.text}</AppText>
+        <AppText>{t('philosophy.text')}</AppText>
       </Segment>
-      <Segment title={labels.credits.title}>
+      <Segment title={t('credits.title')}>
-        <AppText>{labels.credits.note}</AppText>
+        <AppText>
+          {t('credits.text')}{' '}
+          <AppLink url={links.flaticon.url}>flaticon</AppLink>.{' '}
+        </AppText>
+        <AppText>
+          {t('credits.madeBy')}{' '}
+          <AppLink url={links.smashicons.url}>smashicons</AppLink>,{' '}
+          <AppLink url={links.pause08.url}>pause08</AppLink>,{' '}
+          <AppLink url={links.kazachek.url}>kazachek</AppLink>,{' '}
+          <AppLink url={links.freepik.url}>freepik</AppLink>.
+        </AppText>
       </Segment>
-      <Segment title={labels.donate.title}>
+      <Segment title={t('donate.title')}>
-        <AppText>{labels.donate.note}</AppText>
+        <AppText>{t('donate.text')}</AppText>
         {Platform.OS !== 'ios' && (
           <Button
             isCTA
             isSmall
             onPress={() => Linking.openURL(links.donate.url)}
           >
-            {links.donate.text}
+            {t('donate.button')}
           </Button>
         )}
       </Segment>
-      <Segment title={labels.version.title} last>
+      <Segment title={t('version.title')} last>
         <AppText>{require('../../package.json').version}</AppText>
       </Segment>
     </AppPage>

components/settings/Info.js

@@ -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,
+  },
+})

components/settings/License.js

@@ -0,0 +1,37 @@
+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')} contentContainerStyle={styles.contentContainer}>
+      <Segment last>
+        <AppText>{t('text', { currentYear })}</AppText>
+        <AppLink url={link}>{link}</AppLink>
+        {children}
+      </Segment>
+    </AppPage>
+  )
+}
+
+License.propTypes = {
+  children: PropTypes.node,
+}
+
+const styles = StyleSheet.create({
+  contentContainer: {
+    marginTop: Spacing.large,
+  },
+})
+
+export default License

components/settings/common/alert-error.js

@@ -3,4 +3,4 @@ import { shared as sharedLabels } from '../../../i18n/en/labels'
 
 export default function alertError(msg) {
   Alert.alert(sharedLabels.errorTitle, msg)
-}
+}

components/settings/common/confirm-with-password.js

@@ -1,102 +1,76 @@
-import React, { Component } from 'react'
+import React, { useState } from 'react'
 import PropTypes from 'prop-types'
-import { Alert, StyleSheet, View } from 'react-native'
+import { Alert, KeyboardAvoidingView, StyleSheet, View } from 'react-native'
-import nodejs from 'nodejs-mobile-react-native'
+import { SHA512 } from 'jshashes'
 
 import AppTextInput from '../../common/app-text-input'
 import Button from '../../common/button'
 
-import { requestHash, openDb } from '../../../db'
+import { openDb } from '../../../db'
 import { Containers } from '../../../styles'
 import settings from '../../../i18n/en/settings'
 import { shared } from '../../../i18n/en/labels'
 
-export default class ConfirmWithPassword extends Component {
+const ConfirmWithPassword = ({ onSuccess, onCancel }) => {
-  constructor() {
+  const [password, setPassword] = useState(null)
-    super()
 
-    this.state = { password: null }
+  const checkPassword = async () => {
-    nodejs.channel.addListener('password-check', this.checkPassword, this)
+    const hash = new SHA512().hex(password)
-  }
-
-  componentWillUnmount() {
-    nodejs.channel.removeListener('password-check', this.checkPassword)
-  }
-
-  resetPasswordInput = () => {
-    this.setState({ password: null })
-  }
-
-
-  onIncorrectPassword = () => {
-    Alert.alert(
-      shared.incorrectPassword,
-      shared.incorrectPasswordMessage,
-      [{
-        text: shared.cancel,
-        onPress: this.props.onCancel
-      }, {
-        text: shared.tryAgain,
-        onPress: this.resetPasswordInput
-      }]
-    )
-  }
-
-  checkPassword = async hash => {
     try {
       await openDb(hash)
-      this.props.onSuccess()
+      onSuccess()
     } catch (err) {
-      this.onIncorrectPassword()
+      onIncorrectPassword()
     }
   }
 
-  handlePasswordInput = (password) => {
+  const onIncorrectPassword = () => {
-    this.setState({ password })
+    Alert.alert(shared.incorrectPassword, shared.incorrectPasswordMessage, [
+      {
+        text: shared.cancel,
+        onPress: onCancel,
+      },
+      {
+        text: shared.tryAgain,
+        onPress: () => setPassword(null),
+      },
+    ])
   }
 
-  initPasswordCheck = () => {
+  const labels = settings.passwordSettings
-    requestHash('password-check', this.state.password)
+  const isPassword = password !== null
-  }
 
-  render() {
+  return (
-    const { password } = this.state
+    <KeyboardAvoidingView behavior="padding" keyboardVerticalOffset={150}>
-    const labels = settings.passwordSettings
+      <AppTextInput
-    const isPassword = password !== null
+        onChangeText={setPassword}
-
+        placeholder={labels.enterCurrent}
-    return (
+        value={password}
-      <React.Fragment>
+        secureTextEntry
-        <AppTextInput
+      />
-          onChangeText={this.handlePasswordInput}
+      <View style={styles.container}>
-          placeholder={labels.enterCurrent}
+        <Button onPress={onCancel}>{shared.cancel}</Button>
-          value={password}
+        <Button
-          secureTextEntry={true}
+          disabled={!isPassword}
-        />
+          isCTA={isPassword}
-        <View style={styles.container}>
+          onPress={checkPassword}
-          <Button onPress={this.props.onCancel}>
+        >
-            {shared.cancel}
+          {shared.confirmToProceed}
-          </Button>
+        </Button>
-          <Button
+      </View>
-            disabled={!isPassword}
+    </KeyboardAvoidingView>
-            isCTA={isPassword}
+  )
-            onPress={this.initPasswordCheck}
-          >
-            {shared.confirmToProceed}
-          </Button>
-        </View>
-      </React.Fragment>
-    )
-
-  }
 }
 
 ConfirmWithPassword.propTypes = {
   onSuccess: PropTypes.func,
-  onCancel: PropTypes.func
+  onCancel: PropTypes.func,
 }
 
 const styles = StyleSheet.create({
   container: {
-    ...Containers.rowContainer
+    ...Containers.rowContainer,
-  }
+  },
-})
+})
+
+export default ConfirmWithPassword