Chore: Store android keystore properties in separate file

adds a button leading to faq on website to about section in the app

Closes #723

See merge request bloodyhealth/drip!684

.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

@@ -1,42 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "mocha": true,
-    "es6": true
-  },
-  "extends": ["eslint:recommended", "plugin:react/recommended"],
-  "parser": "babel-eslint",
-  "parserOptions": {
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "jsx": true
-    },
-    "ecmaVersion": 2018
-  },
-  "plugins": ["react"],
-  "settings": {
-    "react": {
-      "version": require("./package.json").dependencies.react
-    }
-  },
-  "rules": {
-    "indent": ["error", 2],
-    "no-console": ["error", { "allow": ["warn", "error"] }],
-    "space-before-function-paren": 0,
-    "semi": ["warn", "never"],
-    "space-infix-ops": ["warn"],
-    "no-var": "error",
-    "prefer-const": "error",
-    "no-trailing-spaces": "error",
-    "react/prop-types": 2,
-    "max-len": [
-      1,
-      {
-        "ignoreStrings": true,
-        "ignoreComments": true,
-        "ignoreTemplateLiterals": true
-      }
-    ],
-    "no-multi-spaces": 2
-  }
-}

.eslintrc.js

@@ -0,0 +1,33 @@
+module.exports = {
+  root: true,
+  extends: ['eslint:recommended', 'plugin:react/recommended'],
+  env: {
+    node: true,
+    jest: true,
+    es6: true,
+  },
+  parser: '@babel/eslint-parser',
+  parserOptions: {
+    requireConfigFile: false,
+    babelOptions: {
+      presets: ['@babel/preset-react'],
+    },
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+  },
+  plugins: ['react'],
+  settings: {
+    react: {
+      version: require('./package.json').dependencies.react,
+    },
+  },
+  rules: {
+    'no-console': ['error', { allow: ['warn', 'error'] }],
+    'no-var': 'error',
+    'prefer-const': 'error',
+    'react/prop-types': 2,
+  },
+}

.gitignore

@@ -23,7 +23,6 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-project.xcworkspace
 ios/Index/DataStore
 
 # Android/IntelliJ
@@ -31,19 +30,20 @@ ios/Index/DataStore
 build/
 .idea
 .gradle
-local.properties
+*.properties
 *.iml
+*.hprof
 
 # node.js
 #
 node_modules/
 npm-debug.log
-yarn-error.log
 
 # BUCK
 buck-out/
 \.buckd/
 *.keystore
+!debug.keystore
 
 # fastlane
 #
@@ -59,6 +59,10 @@ buck-out/
 # Bundle artifact
 *.jsbundle
 
+# Ruby / CocoaPods
+/ios/Pods/
+/vendor/bundle/
+
 # RN android release
 android/app/bin/
 android/app/release/
@@ -70,7 +74,6 @@ ios/Podfile.lock
 android/app/src/main/res/drawable-*
 android/app/src/main/assets/*
 
-# nodejs-mobile creates these with every npm install
-nodejs-assets/nodejs-project/sample-*
-nodejs-assets/build-native-modules-MacOS-helper-script-node.sh
-nodejs-assets/build-native-modules-MacOS-helper-script-npm.sh
+# yarn
+.yarn/*
+yarn-error.log

.gitlab-ci.yml

@@ -1,12 +1,39 @@
-image: node:8
+image: node:14
 
 # This folder is cached between builds
 # http://docs.gitlab.com/ce/ci/yaml/README.html#cache
 cache:
   paths:
-  - node_modules/
+    - node_modules/
 
 test_async:
   script:
-   - npm install
-   - npm test
+    - npm install npm@7.0.1 -g
+    - npm install
+    - 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

@@ -0,0 +1,17 @@
+# Configuration taken from this article:
+# https://paperless.blog/dependabot-on-gitlab
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 3
+    ignore:
+      - dependency-name: '*'
+        update-types: ['version-update:semver-patch']
+      - dependency-name: 'realm'
+      - dependency-name: 'react'
+      - dependency-name: 'react-native'
+      - dependency-name: 'react-native-push-notifications'
+      - dependency-name: '@babel/core'

.gitlab/issue_templates/bug-template.md

@@ -0,0 +1,29 @@
+## 🐛 Oh no, a bug 🐛
+
+### What happened?
+
+Short overview of how the bug manifests.
+
+### What is the expected behaviour?
+
+_It's supposed to show ... and not ..._
+
+### Which OS + version is your device?
+
+- [ ] Android _number_
+- [ ] iOS _number_
+- [ ] Simulator _number_
+
+### Which drip version number are you using?
+
+_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 a screenshot
+
+Feel free to attach a file 📎
+
+### Any ideas on how to solve it? 💡

.gitlab/issue_templates/chore-template.md

@@ -0,0 +1,23 @@
+## 🪠 This has to be done 🪠
+
+### 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?_
+If it is a security vulnerability for potentially everyone, please reach out ASAP to drip@mailbox.org.
+
+### Which OS?
+
+- [ ] Android
+- [ ] iOS
+
+### What should the ideal outcome be? 🎆
+
+_You can, e.g., specify the version number for a library update_

.gitlab/issue_templates/feature-template.md

@@ -0,0 +1,26 @@
+## 🧩 Yeah, a feature idea! 🧩
+
+### This feature is a ...
+
+- [ ] period tracking feature (add more data points etc.)
+- [ ] technological feature (password, design, settings, etc.)
+
+### What should this feature do or solve? 🪄
+
+Please give a short overview so as many people as possible would be able to understand.
+
+### Who is this feature for?
+
+### What is particularly important to the people who would use this feature?
+
+### Where in the app should the feature be added?
+
+### Is it connected with or dependent on some other feature?
+
+### How should the feature look (sketch or mock-up)?
+
+Feel free to attach a file 📎
+
+### What could be difficulties (esp. integrating with other components)? 🪆
+
+### Do you want to work on this yourself?

.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

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx pretty-quick --staged

.npmrc

@@ -0,0 +1 @@
+engine-strict=true

.nvmrc

@@ -0,0 +1 @@
+v14.19.3

.prettierrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  singleQuote: true,
+  semi: false,
+}

.ruby-version

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

CHANGELOG.md

@@ -2,18 +2,173 @@
 
 All notable changes to this project will be documented in this file.
 
-## v1.2102.28
+## v1.2403.19 Android & iOS
 
 ### Changes
+
+- Disables temperature slider if temperature tracking off
+- Disables secondary symptom if fertility and or cervix/cervical mucus are off
+- Disables temperature reminder if temperature tracking off
+- Disabled period reminder if period predictions off
+- Return from sympto adapter if fertility off
+- Restructure settings menu
+- Unify wording to "sympto-thermal method"
+- Format decimal to x.0 instead of x.00 used for standard deviation and average cycle in stats
+- Use SelectTabGroup for secondary symptom customization
+
+- Android changes after updating React Native to 0.68.3
+- Update Android Gradle plugin from 7.0.3 to 7.0.4
+- Update NDK to "24.0.8215888" only for M1 users which added support for aarch64
+- Update metadata phone screenshots for Fdroid store listing
+- Updated dependencies:
+  - @react-native-community/datetimepicker from 6.3.1 to 7.2.0
+  - @react-native-async-storage/async-storage from ^1.17.9 to ^1.18.2
+  - metro-react-native-babel-preset from ^0.66.2 to ^0.67.0
+
+### Adds
+
+- Customization settings can turn on & off:
+
+  - Tracking categories
+  - Period predictions
+  - Fertility phases calculation
+
+- Home displays text elements depending on customization settings
+- Chart displays tracking category elements depending on customization settings
+- CycleDay displays tracking category elements and exclude switch depending on customization settings
+- Reminder can be disabled depending on customization settings
+- Adds disabled and more styling to AppSwitch
+- Adds TrackingCategorySwitch
+- Adds disabled, more styling and alert to SelectTabGroup
+- Adds more marginTop to License page
+- Adds info text to Password menu item in Settings
+
+## v1.2401.17 iOS
+
+### Changes
+
+- 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 +211,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 +235,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 +246,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 +346,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 +367,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 +442,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 +467,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 +477,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 +493,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: or tweet :bird: at us [@bl00dyhealth](https://twitter.com/bl00dyhealth).
+You just want to say hello? Send us a [nice email](mailto:drip@mailbox.org?Subject=Nice%20incoming%20mail) :postbox:, toot :mammoth: [@dripapp@mastodon.social](https://mastodon.social/@dripapp) or tweet :bird: at us [@dripberlin](https://twitter.com/dripberlin).
 
 ## What should I know before I get started?
 
-We have prepared something for **you**: check out our [README](https://gitlab.com/bloodyhealth/drip/blob/master/README.md) for more information on how to set up and install everything you'll need.
-[Ping us](mailto:drip@mailbox.org) if you could need some help :helmet\_with\_cross: !
+We have prepared something for **you**: check out our [README](https://gitlab.com/bloodyhealth/drip/blob/main/README.md) for more information on how to set up and install everything you'll need.
+[Ping us](mailto:drip@mailbox.org) if you could need some help :helmet_with_cross: !
 
 Let us know if you want to suggest improvements for the README and open a merge request (which is just like Github's pull request)
 
 ## How can I condripute?
 
-### Your First Code Condripution
+We are an open source project and we highly appreciate contributions. At the same time please keep some things in mind: :heart:
 
-We are fans of labels, at least for our issues. You can find a list of `newbie` issues [here](https://gitlab.com/bloodyhealth/drip/issues?label_name%5B%5D=Newbie).
-If you decide to work on an issue, please click on `Create branch` based on that issue. You can find this as a dropdown option right under `Create merge request`.
-This allows us to keep track of the issues that are related to an existing branch and tells everyone "somebody is working on it".
+- The drip maintainers are usually around 2-3 people and are responsible for everything from developing new features to answering press inquiries or fixing bugs. Most of this work is done unpaid. (If you write a nice email your chances to get an answer are much higher than if you behave like a tech bro.)
+- We have a plan for the direction in which drip should evolve. This means that even if it isn't always transparent on gitlab, we have a list of features that we are building and more importantly, which bugs need to be fixed and which dependencies need to be updated.
+- drips core values are:
+  - 🔮 open source
+  - 🩸 feminist and gender inclusive
+  - 🔒 secure: data entered stays with that person/on their device
+  - 🔬 science-based: we implemented the sympto-thermal method
 
-If you want to open a merge request, yeah :tada: exciting! We are using a template for merge requests to make sure we explain what we have done and why.
-Keep in mind that people who will review your merge request are more motivated to do so when the merge request is well explained and ideally not too big.
+This means that we will never implement anything that contradicts these core values. Some examples: We will never build a cloud integration, we will never make an ovulation prediction.
 
-### Reporting Bugs
+- If you would like to make a sustainable contribution to the project, we would be happy to join the game.
 
-You found a bug :bug:? Please feel free to investigate and save logs for more specific details.
+### Reporting Bugs or Making Suggestions
 
-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 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.
 
-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.
+### Your First Condripution
 
-### 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.
+- 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.
 
 ### 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

@@ -1,146 +1,252 @@
 # drip, the open-source cycle tracking app
 
 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://bloodyhealth.gitlab.io/).
+Find more information on [our website](https://dripapp.org/).
 
-[<img src="https://bloodyhealth.gitlab.io/assets/get.png"
+ [<img src="https://dripapp.org/assets/get.png"
      alt="Get it here"
-     height="55">](https://bloodyhealth.gitlab.io/release/5.apk)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-     alt="Get it on F-Droid"
-     height="80">](https://f-droid.org/packages/com.drip/)
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
+     height="55">](https://dripapp.org/release/v1.2311.14.apk)
+[<img src="https://dripapp.org/assets/badge_google-play.png"
      alt="Get it on Google Play"
-     height="80">](https://play.google.com/store/apps/details?id=com.drip)
+     height="55">](https://dripapp.org/android)
+[<img src="https://dripapp.org/assets/badge_app-store.png"
+    alt="Get drip on the App Store"
+    height="55">](https://dripapp.org/ios)
+[<img src="https://dripapp.org/assets/badge_f-droid.png"
+     alt="Get it on F-Droid"
+     height="55">](https://dripapp.org/fdroid)
 
-The app is built in React Native and currently developed for Android.
+The app is built in React Native and developed for Android and iOS.
 
-▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/master/CONTRIBUTING.md) 
+▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/main/CONTRIBUTING.md)
 
-▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/master/RELEASE.md)
+▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/main/RELEASE.md)
 
 ## Development setup
 
-#### 1. Android Studio
-    
-Install [Android Studio](https://developer.android.com/studio/) - you'll need it to install some dependencies.
-
-#### 2. Node version
-
-Make sure you are running Node 10 (newer versions won't work). 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 v10
-
-
-#### 3. Get this repository
+### 1. 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
+
+### 2. Node version
+
+Make sure you are running Node 14 and classic yarn (v.1). It's easiest to switch Node versions using `nvm`, here's how to install NVM: https://github.com/nvm-sh/nvm#installing-and-updating. After installing nvm close the terminal and open it again to be able to use nvm.
+Once you have nvm running you can install node 14:
+
+    nvm install v14.19.3
+
+#### On Apple Silicon M1
+
+NodeJS 14 does not compile on the M1 architecture, so it has to be installed through Rosetta: https://devzilla.io/using-nodejs-14-with-mac-silicon-m1 . 
+To activate Rosetta and switch to intel emulation run: 
+
+    arch -x86_64 zsh
+
+Run 
+
+    arch 
+
+again to verify that it returns "i386".
+Now install node 14:
+
+    nvm install v14.19.3
+
+### 3. Yarn version
+
+use npm to install yarn:
+
+    npm install --global yarn
+
+## for Android
+
+### 3.1 Android Studio
+
+Install [Android Studio](https://developer.android.com/studio/) - you'll need it to install some dependencies.
+
+### 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:
+
+    export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
+
+Check by typing in your terminal:
+
+    echo $ANDROID_SDK_ROOT
+
+You should see the path of Sdk.
+If you haven't installed [adb tools](https://developer.android.com/tools/adb) before, you will also have to do so and add to the .bashrc
+
+    PATH="$PATH:$HOME/Android/Sdk/platform-tools"
+
+In Android Studio click on "Open an existing Android Studio project". Navigate to the drip repository you cloned and double click the android folder. It detects, downloads and cofigures requirements that might be missing, like the NDK and CMake to build the native code part of the project.
+
+### 3.3 Run the app on Android
+
+Either 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
     
-    $ git clone https://gitlab.com/bloodyhealth/drip.git
-    
-and run
-    
-    $ cd drip
-    $ npm install
+    yarn android
 
-#### 4. More requirements from Android Studio
+ii. To see logging output, run the following command in another tab:
 
-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.
+    yarn log
 
-#### 5. Run the app
+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
 
-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.
+    yarn clear
 
-1.  Open a terminal and run
-    ```
-    $ npm run android
-    ```
+iv. Run the following command and select enable hot reloading (see https://facebook.github.io/react-native/docs/debugging.html):
 
-1.  To see logging output, run the following command in another tab: 
-    ```
-    $ npm run log
-    ```
+    adb shell input keyevent 82
 
-1.  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.
 
-1.  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 13 (command line tools only might be enough)
+
+i. Install XCode dependencies by running the following command from the root project directory:
+
+    cd ios && pod install && cd ..
+
+ii. To run app either open drip workspace ('drip.xcworkspace' file) with XCode and run "Build" or run the following command:
+
+    yarn ios
+
+iii. If you are building the app with XCode make sure you are running this as well:
+
+    yarn start
 
 ### Troubleshooting
+
+#### [MacOS M1] Flipper problems
+
+If a bug in the currently used Flipper version prevents building the project, comment out the respective line in the podfile, like so:
+
+    #use_flipper!()
+
+Run 
+
+    pod install 
+
+from the ios directory again to reload the dependencies.
+
 #### [MacOS] Java problems
 
 Make sure that you have Java 1.8 by running `java -version`.
 
 If you don't have Java installed, or your Java version is different, the app may not work. You can try just using Android Studio's Java by prepending it to your `$PATH` in your shell profile:
-
-    ```
-    $ export PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin:${PATH}"
-    ```
+`$ export PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin:${PATH}"`
 
 Now, `which java` should output `/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin/java`, and the correct Java version should be used.
 
 #### [MacOS] Ninja
-If `npm` says `CMake was unable to find a build program corresponding to "Ninja".`:
-    ```
-    $ brew install ninja
-    ```
+
+If `yarn` says `CMake was unable to find a build program corresponding to "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
-    ```
+
+    ln -s ~/Library/Android/sdk/platform-tools/adb /usr/local/bin/adb
+
+### Clearing project cache
+
+If you would like to clear project cache and/or re-install project libraries, you can run clear script as follows:
+
+    yarn clear
+
+Script accepts the following options:
+"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
+"npm" - script will reinstall project libraries.
+
+For example, if you would like to clear android part of the project and re-install project libraries, you can run the following command:
+
+    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:
-    ```
-    {"detox":
-      {"configurations":
-        {"name": "NEXUS_DEVICE_OR_WHATEVER_SPECIFIED_DEVICE"}
-      }
-    }
-    ```
+
+1. Check what testing device is specified in [package.json](https://gitlab.com/bloodyhealth/drip/blob/main/package.json) under:
+   ```
+   {"detox":
+     {"configurations":
+       {"name": "NEXUS_DEVICE_OR_WHATEVER_SPECIFIED_DEVICE"}
+     }
+   }
+   ```
 2. Check if the current device is already installed on your machine. Go to `cd ~/Android/sdk/emulator/` or wherever you have Android installed on your machine. Here you can run `./emulator -list-avds` and compare the devices with the one you found in step 1.
 3. Open Android Studio and go to -> Tools -> AVD manager -> `+Create virtual device` and select the device checked in the previous step
 4. Use the emulator on your machine to run it without heavy Android Studio, e.g. in `~/Android/Sdk/emulator` OR chose to run the emulator within Android Studio
-4.1 Here run: `$ ./emulator -avd NEXUS_DEVICE_OR_WHATEVER_SPECIFIED_DEVICE`
-4.2 You might need to specify the following environment variables in your zsh or bash file according to where you have it installed. You can find exact path in Android Studio (Android Studio Preferences → Appearance and Behavior → System Settings → Android SDK). After adding environment variables, you might need to restart your terminal or source the modified bash profile (i.e. "source ~/.bash_profile"). 
-    ```
-    export ANDROID_HOME="/home/myname/Android/Sdk"
-    export ANDROID_SDK_ROOT="/home/myname/Android/Sdk"
-    export ANDROID_AVD_HOME="/home/myname/.android/avd"
-    ```
+   4.1 Here run: `$ ./emulator -avd NEXUS_DEVICE_OR_WHATEVER_SPECIFIED_DEVICE`
+   4.2 You might need to specify the following environment variables in your zsh or bash file according to where you have it installed. You can find exact path in Android Studio (Android Studio Preferences → Appearance and Behavior → System Settings → Android SDK). After adding environment variables, you might need to restart your terminal or source the modified bash profile (i.e. "source ~/.bash_profile").
+   `export ANDROID_HOME="/home/myname/Android/Sdk" export ANDROID_SDK_ROOT="/home/myname/Android/Sdk" export ANDROID_AVD_HOME="/home/myname/.android/avd"`
 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`
+   `'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) `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).
 
 ## Adding a new tracking icon
@@ -149,7 +255,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.

RELEASE.md

@@ -1,33 +1,208 @@
-# How to release a new version
+# How to release
 
-Note: You need the release-key to bundle a release that can be uploaded to Google Play Store.
+drip is developed in React Native for iOS and Android and is released on 4 different platforms:
 
-Run the release wizard that takes you through all the steps necessary to prepare a new release:
+1. [Google Play Store](https://play.google.com/store/apps/details?id=com.drip)
+2. [Apple App Store](https://apps.apple.com/us/app/drip/id1584564949)
+3. [F-Droid](https://f-droid.org/packages/com.drip/)
+4. [drip Website](https://dripapp.org)
+
+In an ideal world the app version is the same across platforms. In the past this has never been the case. The release v1.2403.19 is the first to be up to date on all 4 platforms!
+
+Releasing a new version is very exciting and brings happy changes like fixing a bug, improving a feature, updating dependencies or adding a new functionality to the app. It is more than just pressing the button "publish new version".
+
+_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.
+
+## Release steps
+
+### 1. [Code](#code)
+- 1.1 [Version updating](#version-updating)
+- 1.2 [Android builds](#android-builds)
+- 1.3 [iOS builds](#ios-builds)
+- 1.4 [User testing](#user-testing)
+- 1.5 [Release tag](#release-tag)
+
+### 2. [Documentation](#documentation)
+- 2.1 [Changelog](#changelog)
+- 2.2 [Release notes](#release-notes)
+- 2.3 [Releases on Gitlab](#releases-on-gitlab)
+- 2.4 [Phone screenshots](#phone-screenshots)
+
+### 3. [Publishing](#publishing)
+- 3.1 [Google Play Console](#google-play-console)
+- 3.2 [Apple App Store Connect](#apple-app-store-connect)
+- 3.3 [F-droid](#f-droid)
+- 3.4 [drip website](#drip-website)
+- 3.5 [Communication](#communication)
+- 3.6 [Self care](#self-care)
+
+## Code
+
+### Version updating
+
+When you are done with a chore, a feature or a bugfix, you may want to share it with testers and eventually publish a release. In order to identify a specific app version we can update the version name, which is created based on the following format: `1.yymm.d` e.g. `1.2311.7`. If you want to upload a new app version to Google Play you also need to update the version code.
+
+The following command will:
+
+- create a new versionName and a new higher versionCode (+1)
+- create a commit including a tag named after the new release version name.
 
 ```
-npm run release
-```
-This will trigger the following:
-* update version number
-* create a new tag for the release
-* update the changelog
-* make a release commit
-
-To then bundle a release run the following command on your branch:
-
-```
-cd android && ./gradlew bundleRelease
+yarn release
 ```
 
-This command creates an `app.aab` file in the folder `/android/app/build/outputs/bundle/release`.
+The versionName and versionCode [are defined here](https://gitlab.com/bloodyhealth/drip/-/blob/5401789c46f4a02915ab900ef284581be420451c/android/app/build.gradle#L137-138) and in [package.json](https://gitlab.com/bloodyhealth/drip/-/blob/5401789c46f4a02915ab900ef284581be420451c/package.json#L3).
 
-[More on Android App Bundle](https://blog.swmansion.com/make-your-react-native-app-3x-smaller-44c993eda2c9)
+**Note for iOS**
 
-You need to manually push the created tag to Gitlab:
+Update the version number for iOS in `ios/drip/Info.plist` under:
 
 ```
-git push origin <tagname>
+<key>CFBundleShortVersionString</key>
+<string>1.2403.19</string>
 ```
-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 🍦)!
+### Android builds
+
+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:
+
+```
+yarn build-android-apk-release
+```
+
+_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`
+
+### iOS builds
+
+To build an .ipa archive file for an upload to the AppStore you need to go to xCode and select Build -> "Any iOS Device" and under "Product" -> "Archive".
+
+Once the archiving process has completed you can chose to do the following:
+
+"Distribute the app"
+
+- TestFlight & App Store for when you want to upload it for external testing and/or production release
+- TestFlight Internal Only for when you want to upload it for internal testing
+
+### User testing
+
+To enable external testing you need to remember that Google Play and Apple App Store might take up to 1 day for their review process. "External testing" for iOS allows testing drip on Testflight anonymously via a public link. "Open testing" for Android allows testing drip on Google Play as beta tester below the normal production listing.
+
+For a quick and easy way to share an apk to testers who are willing to sideload drip onto their Android phones, do this: Upload a signed apk to the Gitlab repository of the drip website under `/release` https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/tree/main/release and maybe adapt the name of the apk with a more specific name than "app-release.apk". Now you can simply share a direct link to download your newly bundled apk, e.g. [a download link for v1.2311.14](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/main/release/v1.2311.14.apk).
+
+### Release tag
+
+[Tags](https://gitlab.com/bloodyhealth/drip/-/tags) can mark a specific point in the coding/commmit history and helps us identify the version status of a released app. They are named "iOS-v1.2401.17" or "Release-v1.yymm.d".
+
+Any tag starting with "Release" or "Android" will be checked by https://gitlab.com/fdroidci
+
+## Documentation
+
+### Changelog
+
+The [changelog](https://gitlab.com/bloodyhealth/drip/-/blob/main/CHANGELOG.md) should reflect the technical / code changes between a previous and the new version. Please update the changelog file with any relevant additions, fixes and changes in the following format:
+
+>**v1.yymm.d**
+>
+>**Changes**
+>
+>Changing the color of funky button
+>Updating a library from 1.2.3 to 2.3.4
+>
+>**Adds**
+>
+>New feature for calendar
+>
+>**Fixed**
+>
+>Small bug in chart
+
+### Release notes
+
+These notes are for the users and curious ones who may want to start using drip. They should be based on the changelog but written in a friendly and easy to understand way. The focus is on the user perspective and the impact of the changes for the user. Behind the scenes and in depth code changes are less relevant.
+
+Google Play limits these notes to 500 characters, whereas Apple's App Store limits these notes to 4.000 characters. In Fdroid there are no release notes.
+
+### Releases on Gitlab
+
+Under [Releases](https://gitlab.com/bloodyhealth/drip/-/releases) we keep track of all drip releases. 
+
+### Phone screenshots
+
+If there are visual changes in the app you may want to update the screenshots for the Google Play Store listing, which allows up to 8 and for Apple's App Store, which allows up to 10 screenshots. Keep in mind that both Google Play and Apple have specific resolution requirements. You'll find Google's in Grow -> Store presence -> Main Store Listing -> Phone screenshots and Apple's on the main App Store Connect site. Here is a link for [Apple's screenshot specifications](https://developer.apple.com/help/app-store-connect/reference/screenshot-specifications).
+
+Please also update [phone screenshots for the website](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/tree/main/assets) and set links on [/index](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L47) and [/media](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/c7f999bb7ad736345321537cbffa3f4c24eeee6d/media.html#L33) that can then also be attached to a social media post.
+
+## Publishing
+
+### Google Play Console
+
+Upload a signed aab to the [Google Play Console for developers](https://play.google.com/console/) and add it to the "App bundle explorer". This requires a higher versionCode and a different version name compared to previously uploaded aab or apk files.
+You can decide if you want the new app version to get released for testing (internal, closed or open) or for production. Keep in mind that any track other than "internal testing" triggers an external review by Google and might take a few hours.
+
+### Apple App Store Connect
+
+Upload a new version and submit it for review, before it can be published.
+
+### F-droid
+
+This account runs automated checks for drip looking at new `Release` or `Android` [tags](https://gitlab.com/bloodyhealth/drip/-/tags/) and updates the app's metadata yaml file in Fdroid without further ado.
+
+However this is not the full story. Please have a look at previous commits to see what necessary changes got pushed, [see here](https://gitlab.com/fdroid/fdroiddata/-/commits/master/metadata/com.drip.yml).
+
+### drip website
+
+After a new version has been published on Google Play (or F-Droid) the apk version that is downloadable directly from the [drip website](https://dripapp.org) needs to get updated as well. Therefore you upload a signed apk to the [repository](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/) as [we did in this commit](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/commit/f8c0f90c1ae9f23bf8e1bc311790b85443149a4d), and adapt the name and link on /index.html [as we did in this commit](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/commit2f8850ff5fa78615a4f335b625ea4a67d4acf03a) and [this commit](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/commit/f3da9776b1943ffa32458e74ef86eeca98c1891c). Last time I checked it was [here](f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L114).
+
+### Communication
+
+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
+
+### Self care
+
+Congratulations. Take a break, eat some chocolate, go see a live show of your favorite band, masturbate <3!

android/app/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: "com.android.application"
 
 import com.android.build.OutputFile
+import java.util.Properties
+import java.io.FileInputStream
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -15,9 +17,14 @@ 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://reactnative.dev/docs/performance#enable-the-ram-format
+ *   bundleCommand: "ram-bundle",
+ *
  *   // whether to bundle JS and assets in debug mode
  *   bundleInDebug: false,
  *
@@ -73,7 +80,7 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-    entryFile: "index.js"
+    enableHermes: false,  // clean and rebuild if changing
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -94,21 +101,53 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
+/**
+ * The preferred build flavor of JavaScriptCore.
+ *
+ * For example, to use the international variant, you can use:
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ *
+ * The international variant includes ICU i18n library and necessary data
+ * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
+ * give correct results when using with locales other than en-US.  Note that
+ * this variant is about 6MiB larger per architecture than default.
+ */
+def jscFlavor = 'org.webkit:android-jsc:+'
+/**
+ * Whether to enable the Hermes VM.
+ *
+ * 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")
+
+// Create a variable called keystorePropertiesFile, and initialize it to your
+// keystore.properties file, in the rootProject folder.
+def keystorePropertiesFile = rootProject.file("keystore.properties")
+
+// Initialize a new Properties() object called keystoreProperties.
+def keystoreProperties = new Properties()
+
+// Load your keystore.properties file into the keystoreProperties object.
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
 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
-        versionName "1.2102.28"
+        versionCode 33
+        versionName "1.2403.19"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
@@ -116,7 +155,17 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     signingConfigs {
+	    debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
         release {
+            storeFile file('drip-release-key.keystore')
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storePassword keystoreProperties['storePassword']
             if (project.hasProperty('DRIP_RELEASE_STORE_FILE')) {
                 storeFile file(DRIP_RELEASE_STORE_FILE)
                 storePassword DRIP_RELEASE_STORE_PASSWORD
@@ -134,40 +183,75 @@ 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://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:
-            // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a":3, "x86_64":4]
+            // https://developer.android.com/studio/build/configure-apk-splits.html
+            // 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)
             }
         }
     }
 }
 
 dependencies {
-    implementation project(':realm')
-    implementation project(':react-native-vector-icons')
-    implementation project(':react-native-share')
-    implementation project(':react-native-restart')
-    implementation project(':react-native-push-notification')
-    implementation project(':react-native-fs')
-    implementation project(':react-native-document-picker')
-    implementation project(':nodejs-mobile-react-native')
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.annotation:annotation:1.1.0'
+    //noinspection GradleDynamicVersion
+    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/";
+        debugImplementation files(hermesPath + "hermes-debug.aar")
+        releaseImplementation files(hermesPath + "hermes-release.aar")
+    } else {
+        implementation jscFlavor
+    }
+
     androidTestImplementation('com.wix:detox:+') { transitive = true }
     androidTestImplementation 'junit:junit:4.12'
 }
@@ -175,6 +259,8 @@ 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'
 }
+
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

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" android:exported="false" />
+    </application>    
 </manifest>

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

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.drip;
+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.ReactInstanceEventListener;
+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 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,8 +5,13 @@
 >
 
     <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" />
@@ -15,54 +20,66 @@
         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: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:name=".MainApplication"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustResize"
-        android:screenOrientation="sensorPortrait">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-      </activity>
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-      <provider
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:allowBackup="false"
+        android:theme="@style/AppTheme">
+
+        <meta-data
+            android:name="com.dieam.reactnativepushnotification.notification_foreground"
+            android:value="false" />
+        <meta-data
+            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:label="@string/app_name"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustPan"
+            android:screenOrientation="sensorPortrait"
+            android:exported="true">
+
+            <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_channel_name"
-                android:value="drip-notification"/>
-        <meta-data  android:name="com.dieam.reactnativepushnotification.notification_channel_description"
-                    android:value="notifications from drip"/>
-        <!-- 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"/>
-
-        <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" />
-            </intent-filter>
-        </receiver>
     </application>
-
 </manifest>

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

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

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

@@ -1,53 +1,41 @@
 package com.drip;
 
 import android.app.Application;
-
+import android.content.Context;
+import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
-import com.janeasystems.rn_nodejs_mobile.RNNodeJsMobilePackage;
-import com.avishayil.rnrestart.ReactNativeRestartPackage;
-import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
-import com.oblador.vectoricons.VectorIconsPackage;
-import com.rnfs.RNFSPackage;
-import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
-import cl.json.RNSharePackage;
+import com.facebook.react.ReactInstanceManager;
 import cl.json.ShareApplication;
-import io.realm.react.RealmReactPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.soloader.SoLoader;
-
-import java.util.Arrays;
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 public class MainApplication extends Application implements ReactApplication, ShareApplication {
 
-  private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
-    @Override
-    public boolean getUseDeveloperSupport() {
-      return BuildConfig.DEBUG;
-    }
+  private final ReactNativeHost mReactNativeHost =
+    new ReactNativeHost(this) {
+      @Override
+      public boolean getUseDeveloperSupport() {
+        return BuildConfig.DEBUG;
+      }
 
-    @Override
-    protected List<ReactPackage> getPackages() {
-      return Arrays.<ReactPackage>asList(
-          new MainReactPackage(),
-            new RNNodeJsMobilePackage(),
-            new ReactNativeRestartPackage(),
-            new ReactNativePushNotificationPackage(),
-            new VectorIconsPackage(),
-            new RNFSPackage(),
-            new ReactNativeDocumentPicker(),
-            new RNSharePackage(),
-            new RealmReactPackage()
-      );
-    }
+      @Override
+      protected List<ReactPackage> getPackages() {
+        @SuppressWarnings("UnnecessaryLocalVariable")
+        List<ReactPackage> packages = new PackageList(this).getPackages();
+        // Packages that cannot be autolinked yet can be added manually here, for example:
+        // packages.add(new MyReactNativePackage());
+        return packages;
+      }
 
-    @Override
-    protected String getJSMainModuleName() {
-      return "index";
-    }
-  };
+        @Override
+        protected String getJSMainModuleName() {
+          return "index";
+        }
+      };
 
   @Override
   public ReactNativeHost getReactNativeHost() {
@@ -58,6 +46,37 @@ public class MainApplication extends Application implements ReactApplication, Sh
   public void onCreate() {
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
+    initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+  }
+  /**
+   * 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, 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.drip.ReactNativeFlipper");
+        aClass
+            .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+            .invoke(null, context, reactInstanceManager);
+      } catch (ClassNotFoundException e) {
+        e.printStackTrace();
+      } catch (NoSuchMethodException e) {
+        e.printStackTrace();
+      } catch (IllegalAccessException e) {
+        e.printStackTrace();
+      } catch (InvocationTargetException e) {
+        e.printStackTrace();
+      }
+    }
   }
 
   @Override

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,8 +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: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

@@ -1,33 +1,46 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
     repositories {
-        jcenter()
         google()
+        mavenCentral()
     }
-    ext.kotlinVersion = '1.3.10'
+    ext.kotlinVersion = '1.3.40'
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
-
+        classpath('com.android.tools.build:gradle:7.0.4')
+        classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("de.undercouch:gradle-download-task:4.1.2")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 
 allprojects {
     repositories {
-        mavenLocal()
-        jcenter()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$rootDir/../node_modules/react-native/android"
+            url("$rootDir/../node_modules/react-native/android")
         }
+        maven {
+            // 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()
+        maven { url 'https://www.jitpack.io' }
         maven {
             url 'https://maven.google.com/'
             name 'Google'
         }
-        google()
         maven {
             // All of Detox' artifacts are provided via the npm module
             url "$rootDir/../node_modules/detox/Detox-android"
@@ -36,20 +49,16 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = "29.0.3"
-    minSdkVersion = 23
-    compileSdkVersion = 29
-    targetSdkVersion = 29
-    supportLibVersion = "29.0.0"
-}
+    buildToolsVersion = "33.0.2"
+    minSdkVersion = 21
+    compileSdkVersion = 33
+    targetSdkVersion = 33
 
-subprojects {
-    afterEvaluate {project ->
-        if (project.hasProperty("android")) {
-            android {
-                compileSdkVersion 29
-                buildToolsVersion '29.0.3'
-            }
-        }
+    if (System.properties['os.arch'] == "aarch64") {
+        // For M1 Users we need to use the NDK 24 which added support for aarch64
+        ndkVersion = "24.0.8215888"
+    } else {
+        // Otherwise we default to the side-by-side NDK version from AGP.
+        ndkVersion = "21.4.7075529"
     }
 }

android/gradle.properties

@@ -9,12 +9,32 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # 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.125.0
+
+# Use this property to specify which architecture you want to build.
+# You can also override it from the CLI using
+# ./gradlew <task> -PreactNativeArchitectures=x86_64
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+
+# Use this property to enable support to the new architecture.
+# This will allow you to use TurboModules and the Fabric render in
+# your application. You should enable this flag either if you want
+# to write custom TurboModules/Fabric components OR use libraries that
+# are providing them.
+newArchEnabled=false

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-5.4.1-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
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # 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
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, 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" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-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/keystores/BUCK

@@ -1,8 +0,0 @@
-keystore(
-    name = "debug",
-    properties = "debug.keystore.properties",
-    store = "debug.keystore",
-    visibility = [
-        "PUBLIC",
-    ],
-)

android/keystores/debug.keystore.properties

@@ -1,4 +0,0 @@
-key.store=debug.keystore
-key.alias=androiddebugkey
-key.store.password=android
-key.alias.password=android

android/settings.gradle

@@ -1,19 +1,12 @@
 rootProject.name = 'drip'
-include ':nodejs-mobile-react-native'
-project(':nodejs-mobile-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/nodejs-mobile-react-native/android')
-include ':react-native-restart'
-project(':react-native-restart').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-restart/android')
-include ':react-native-push-notification'
-project(':react-native-push-notification').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-push-notification/android')
-include ':react-native-vector-icons'
-project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
-include ':react-native-fs'
-project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
-include ':react-native-document-picker'
-project(':react-native-document-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-document-picker/android')
-include ':react-native-share'
-project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
-include ':realm'
-project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android')
+
+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')
+}

app.json

@@ -1,4 +1,4 @@
 {
-  "name": "drip",
-  "displayName": "drip"
-}
+  "name": "drip.",
+  "displayName": "drip."
+}

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

@@ -0,0 +1,133 @@
+import React from 'react'
+import { ScrollView, StyleSheet, View } from 'react-native'
+import PropTypes from 'prop-types'
+import moment from 'moment'
+
+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 {
+  fertilityTrackingObservable,
+  periodPredictionObservable,
+} from '../local-storage'
+
+import { Colors, Fonts, Sizes, Spacing } from '../styles'
+import { LocalDate } from '@js-joda/core'
+import { useTranslation } from 'react-i18next'
+
+const Home = ({ navigate, setDate }) => {
+  const { t } = useTranslation()
+
+  function navigateToCycleDayView() {
+    setDate(todayDateString)
+    navigate('CycleDay')
+  }
+
+  const isFertilityTrackingEnabled = fertilityTrackingObservable.value
+  const todayDateString = LocalDate.now().toString()
+  const { getCycleDayNumber, getPredictedMenses } = cycleModule()
+  const cycleDayNumber = getCycleDayNumber(todayDateString)
+  const { status, phase, statusText } =
+    isFertilityTrackingEnabled && getFertilityStatusForDay(todayDateString)
+  const isPeriodPredictionEnabled = periodPredictionObservable.value
+  const prediction = determinePredictionText(getPredictedMenses(), t)
+
+  const cycleDayText = cycleDayNumber
+    ? formatWithOrdinalSuffix(cycleDayNumber)
+    : ''
+
+  return (
+    <ScrollView
+      style={styles.container}
+      contentContainerStyle={styles.contentContainer}
+    >
+      <AppText style={styles.title}>{moment().format('MMM Do YYYY')}</AppText>
+
+      {/* display if at least 1 bleeding day has been entered */}
+      {cycleDayNumber && (
+        <View style={styles.line}>
+          <AppText style={styles.whiteSubtitle}>{cycleDayText}</AppText>
+          <AppText style={styles.turquoiseText}>
+            {t('labels.home.cycleDay')}
+          </AppText>
+        </View>
+      )}
+
+      {/* display if fertility tracking enabled and if phase 1, 2 or 3 has been identified  */}
+      {isFertilityTrackingEnabled && phase && (
+        <View style={styles.line}>
+          <AppText style={styles.whiteSubtitle}>
+            {formatWithOrdinalSuffix(phase)}
+          </AppText>
+          <AppText style={styles.turquoiseText}>
+            {t('labels.home.cyclePhase')}
+          </AppText>
+          <AppText style={styles.turquoiseText}>{status}</AppText>
+          <Asterisk />
+        </View>
+      )}
+
+      {isPeriodPredictionEnabled && (
+        <View style={styles.line}>
+          <AppText style={styles.turquoiseText}>{prediction}</AppText>
+        </View>
+      )}
+
+      {!isFertilityTrackingEnabled && <View style={styles.largePadding}></View>}
+      <Button isCTA isSmall={false} onPress={navigateToCycleDayView}>
+        {t('labels.home.addDataForToday')}
+      </Button>
+      {phase && <Footnote colorLabel="greyLight">{statusText}</Footnote>}
+    </ScrollView>
+  )
+}
+
+const styles = StyleSheet.create({
+  container: {
+    backgroundColor: Colors.purple,
+    flex: 1,
+  },
+  contentContainer: {
+    padding: Spacing.base,
+    paddingTop: 0,
+  },
+  line: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    alignContent: 'flex-start',
+    marginBottom: Spacing.tiny,
+    marginTop: Spacing.small,
+  },
+  title: {
+    color: Colors.purpleLight,
+    fontFamily: Fonts.bold,
+    fontSize: Sizes.huge,
+    marginVertical: Spacing.small,
+  },
+  turquoiseText: {
+    color: Colors.turquoise,
+    fontSize: Sizes.subtitle,
+  },
+  whiteSubtitle: {
+    color: 'white',
+    fontSize: Sizes.subtitle,
+  },
+  largePadding: {
+    padding: Spacing.large,
+  },
+})
+
+Home.propTypes = {
+  navigate: PropTypes.func,
+  setDate: PropTypes.func,
+}
+
+export default Home

components/app-wrapper.js

@@ -1,90 +1,52 @@
-import React, { Component } from 'react'
-import nodejs from 'nodejs-mobile-react-native'
+import React, { useState, useEffect } from 'react'
 
 import { getLicenseFlag, saveEncryptionFlag } from '../local-storage'
 import { openDb } from '../db'
 
 import App from './app'
-import PasswordPrompt from './password-prompt'
-import License from './license'
 import AppLoadingView from './common/app-loading'
+import AppStatusBar from './common/app-status-bar'
+import AcceptLicense from './AcceptLicense'
+import PasswordPrompt from './password-prompt'
 
-import store from "../store"
-import { Provider } from 'react-redux'
+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 {
-  constructor() {
-    super()
-    this.state = {
-      isCheckingLicenseAgreement: true,
-      shouldShowLicenseAgreement: false,
-      shouldShowPasswordPrompt: false,
-      shouldShowApp: false,
-    }
-    nodejs.start('main.js')
-    this.checkLicenseAgreement()
-    this.checkDbPasswordSet()
-  }
-
-  async checkLicenseAgreement() {
+  const checkIsLicenseAccepted = async () => {
     const isLicenseFlagSet = await getLicenseFlag()
-    if (!isLicenseFlagSet) {
-      this.enableShowLicenseAgreement()
-    } else {
-      this.setState({ isCheckingLicenseAgreement: false })
-    }
+    setIsLicenseAccepted(isLicenseFlagSet)
+    setIsLoading(false)
   }
 
-  async checkDbPasswordSet() {
-    const canConnectToDb = await openDb()
-    if (canConnectToDb) {
-      this.enableShowApp()
-      await saveEncryptionFlag(false)
-      return false
-    }
-    this.setState({ shouldShowPasswordPrompt: true })
-    await saveEncryptionFlag(true)
+  const checkIsDbEncrypted = async () => {
+    const isEncrypted = !(await openDb())
+    if (isEncrypted) setIsDbEncrypted(true)
+    await saveEncryptionFlag(isEncrypted)
   }
 
-  enableShowLicenseAgreement = () => {
-    this.setState({
-      shouldShowLicenseAgreement: true,
-      isCheckingLicenseAgreement: false
-    })
+  useEffect(() => {
+    checkIsLicenseAccepted()
+    checkIsDbEncrypted()
+  }, [])
+
+  if (isLoading) {
+    return <AppLoadingView />
   }
 
-  disableShowLicenseAgreement = () => {
-    this.setState({ shouldShowLicenseAgreement: false })
+  if (!isLicenseAccepted) {
+    return <AcceptLicense setLicense={() => setIsLicenseAccepted(true)} />
   }
 
-  enableShowApp = () => {
-    this.setState({
-      shouldShowApp: true,
-      shouldShowPasswordPrompt: false
-    })
-  }
-
-  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}>{initialView}</Provider>
-
-  }
-}
+  return (
+    <>
+      <AppStatusBar />
+      {isDbEncrypted ? (
+        <PasswordPrompt enableShowApp={() => setIsDbEncrypted(false)} />
+      ) : (
+        <App restartApp={() => checkIsDbEncrypted()} />
+      )}
+    </>
+  )
+}

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 { getDate } from '../slices/date'
-import { getNavigation, navigate, goBack } from '../slices/navigation'
+import { LocalDate } from '@js-joda/core'
 
 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'
-
-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
+import { closeDb } from '../db'
 
+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() {
-    this.backHandler.remove()
-  }
-
-  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>
+  useEffect(() => {
+    const backHandler = BackHandler.addEventListener(
+      'hardwareBackPress',
+      goBack
     )
+
+    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) => {
-  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)
+export default 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 {
-  static propTypes = {
-    setDate: PropTypes.func.isRequired,
-    navigate: PropTypes.func.isRequired,
+const CalendarView = ({ setDate, navigate }) => {
+  const bleedingDays = getBleedingDaysSortedByDate()
+  const predictedMenses = cycleModule().getPredictedMenses()
+
+  const passDateToDayView = ({ dateString }) => {
+    setDate(dateString)
+    navigate('CycleDay')
   }
 
-  constructor(props) {
-    super(props)
-    this.bleedingDays = getBleedingDaysSortedByDate()
-    const predictedMenses = cycleModule().getPredictedMenses()
-    this.state = {
-      bleedingDaysInCalFormat: toCalFormat(this.bleedingDays),
-      predictedBleedingDaysInCalFormat: predictionToCalFormat(predictedMenses),
-      todayInCalFormat: todayToCalFormat(),
-    }
+  const markedDates = Object.assign(
+    {},
+    todayToCalFormat(),
+    toCalFormat(bleedingDays),
+    predictionToCalFormat(predictedMenses)
+  )
 
-    this.bleedingDays.addListener(this.setStateWithCalFormattedDays)
-  }
-
-  setStateWithCalFormattedDays = (_, changes) => {
-    if (nothingChanged(changes)) return
-    const predictedMenses = cycleModule().getPredictedMenses()
-    this.setState({
-      bleedingDaysInCalFormat: toCalFormat(this.bleedingDays),
-      predictedBleedingDaysInCalFormat: predictionToCalFormat(predictedMenses),
-      todayInCalFormat: todayToCalFormat(),
-    })
-  }
-
-  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>
-    )
-  }
+  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={passDateToDayView}
+        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) => {
-  return {
-    setDate: (date) => dispatch(setDate(date)),
-    navigate: (page) => dispatch(navigate(page)),
-  }
+CalendarView.propTypes = {
+  setDate: PropTypes.func.isRequired,
+  navigate: PropTypes.func.isRequired,
 }
 
-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>
-      <AppText style={styles.text}>{labels.date}</AppText>
+      <View style={[styles.singleLabelContainer, { height: height / 2 }]}>
+        <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 (
-    <Shape d={path} stroke={color} strokeWidth={width} />
-  )
+  return <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,255 +1,193 @@
-import React, { Component } from 'react'
+import React, { useEffect, useState } from 'react'
 import PropTypes from 'prop-types'
-import { ActivityIndicator, FlatList, Dimensions, StyleSheet, View } from 'react-native'
+import { Dimensions, 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 { getChartFlag, scaleObservable, setChartFlag } from '../../local-storage'
-import { makeColumnInfo, nfpLines } from '../helpers/chart'
+import {
+  getChartFlag,
+  setChartFlag,
+  desireTrackingCategoryObservable,
+  moodTrackingCategoryObservable,
+  noteTrackingCategoryObservable,
+  painTrackingCategoryObservable,
+  sexTrackingCategoryObservable,
+  temperatureTrackingCategoryObservable,
+  mucusTrackingCategoryObservable,
+  cervixTrackingCategoryObservable,
+} from '../../local-storage'
+import { makeColumnInfo } from '../helpers/chart'
 
 import {
   CHART_COLUMN_WIDTH,
-  SYMPTOMS,
+  CHART_GRID_LINE_HORIZONTAL_WIDTH,
   CHART_SYMPTOM_HEIGHT_RATIO,
-  CHART_XAXIS_HEIGHT_RATIO
+  CHART_XAXIS_HEIGHT_RATIO,
+  SYMPTOMS,
 } from '../../config'
-import { shared } from '../../i18n/en/labels'
-import { Colors, Spacing } from '../../styles'
+import { Spacing } from '../../styles'
 
-class CycleChart extends Component {
-  static propTypes = {
-    navigate: PropTypes.func,
-    end: PropTypes.bool
-  }
+const getSymptomsFromCycleDays = (cycleDays) =>
+  SYMPTOMS.filter((symptom) => cycleDays.some((cycleDay) => cycleDay[symptom]))
 
-  constructor(props) {
-    super(props)
+const CycleChart = ({ navigate, setDate }) => {
+  const [shouldShowHint, setShouldShowHint] = useState(false)
 
-    this.state = {}
-    this.cycleDaysSortedByDate = getCycleDaysSortedByDate()
-    this.getFhmAndLtlInfo = nfpLines()
-    this.shouldShowTemperatureColumn = false
+  useEffect(() => {
+    let isMounted = true
 
-    this.checkShouldShowHint()
-    this.prepareSymptomData()
-  }
-
-  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
+    async function checkShouldShowHint() {
+      const flag = await getChartFlag()
+      if (isMounted) {
+        setShouldShowHint(flag === '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 === 'mucus') {
+      return mucusTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'cervix') {
+      return cervixTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'desire') {
+      return desireTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'pain') {
+      return painTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'mood') {
+      return moodTrackingCategoryObservable.value ? symptom : null
+    } else if (symptom === 'note') {
+      return noteTrackingCategoryObservable.value ? symptom : null
+    } else {
+      return symptom
+    }
+  })
+
+  const isTemperatureEnabled = temperatureTrackingCategoryObservable.value
+  const shouldShowTemperatureColumn =
+    isTemperatureEnabled && chartSymptoms.indexOf('temperature') > -1
+  const shouldShowNoDataWarning =
+    isTemperatureEnabled && chartSymptoms.indexOf('temperature') <= -1
+
+  const { width, height } = Dimensions.get('window')
+  const numberOfColumnsToRender = Math.round(width / CHART_COLUMN_WIDTH)
+
+  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={this.props.navigate}
-        symptomHeight={this.symptomHeight}
-        columnHeight={this.columnHeight}
-        symptomRowSymptoms={this.symptomRowSymptoms}
-        chartSymptoms={this.chartSymptoms}
-        shouldShowTemperatureColumn={this.shouldShowTemperatureColumn}
-        getFhmAndLtlInfo={this.getFhmAndLtlInfo}
-        xAxisHeight={this.xAxisHeight}
+        navigate={navigate}
+        symptomHeight={symptomHeight}
+        columnHeight={columnHeight}
+        symptomRowSymptoms={symptomRowEnabledSymptoms}
+        chartSymptoms={chartSymptoms}
+        shouldShowTemperatureColumn={shouldShowTemperatureColumn}
+        xAxisHeight={xAxisHeight}
       />
     )
   }
 
-  reCalculateChartInfo = () => {
-    const { width, height } = Dimensions.get('window')
+  const hasDataToDisplay = chartSymptoms.length > 0
 
-    this.xAxisHeight = height * 0.7 * CHART_XAXIS_HEIGHT_RATIO
-    const remainingHeight = height * 0.7 - this.xAxisHeight
-    this.symptomHeight = remainingHeight * CHART_SYMPTOM_HEIGHT_RATIO
-    this.symptomRowHeight = this.symptomRowSymptoms.length *
-      this.symptomHeight
-    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 })
+  if (!hasDataToDisplay) {
+    return <NoData navigate={navigate} />
   }
 
-  updateListeners(dataUpdateHandler) {
-    // remove existing listeners
-    if(this.handleDbChange) {
-      this.cycleDaysSortedByDate.removeListener(this.handleDbChange)
-    }
-    if (this.removeObvListener) this.removeObvListener()
-
-    this.handleDbChange = (_, changes) => {
-      if (nothingChanged(changes)) return
-      dataUpdateHandler()
-    }
-
-    this.cycleDaysSortedByDate.addListener(this.handleDbChange)
-    this.removeObvListener = scaleObservable(dataUpdateHandler, false)
-  }
-
-  render() {
-    const {
-      chartHeight,
-      chartLoaded,
-      shouldShowHint,
-      numberOfColumnsToRender
-    } = this.state
-    const hasDataToDisplay = this.chartSymptoms.length > 0
-
-    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>
+  return (
+    <AppPage
+      contentContainerStyle={styles.pageContainer}
+      scrollViewStyle={styles.page}
+    >
+      <View style={styles.chartContainer}>
+        {shouldShowHint && <Tutorial onClose={hideHint} />}
+        {shouldShowNoDataWarning && <NoTemperature />}
+        <View style={styles.chartArea}>
+          <YAxis
+            height={columnHeight}
+            symptomsToDisplay={symptomRowEnabledSymptoms}
+            symptomsSectionHeight={symptomRowHeight}
+            shouldShowTemperatureColumn={shouldShowTemperatureColumn}
+            xAxisHeight={xAxisHeight}
+          />
+          <MainGrid
+            data={columns}
+            renderItem={renderColumn}
+            initialNumToRender={numberOfColumnsToRender}
+            contentContainerStyle={{ height: chartHeight }}
+          />
+          {shouldShowTemperatureColumn && (
+            <HorizontalGrid height={columnHeight} />
           )}
         </View>
-      </AppPage>
-    )
-  }
-}
-
-function LoadingMoreView({ end }) {
-  return (
-    <View style={styles.loadingContainer}>
-      {!end && <ActivityIndicator size={'large'} color={Colors.orange}/>}
-    </View>
+      </View>
+    </AppPage>
   )
 }
 
-LoadingMoreView.propTypes = {
-  end: PropTypes.bool
+CycleChart.propTypes = {
+  navigate: PropTypes.func,
+  setDate: PropTypes.func,
 }
 
 const styles = StyleSheet.create({
   chartArea: {
-    flexDirection: 'row'
+    flexDirection: 'row',
   },
   chartContainer: {
-    flexDirection: 'column'
-  },
-  loadingContainer: {
-    height: '100%',
-    backgroundColor: Colors.turquoiseLight,
-    justifyContent: 'center'
+    flexDirection: 'column',
   },
   page: {
-    marginVertical: Spacing.small
+    marginVertical: Spacing.small,
   },
   pageContainer: {
-    paddingHorizontal: Spacing.base
+    paddingHorizontal: Spacing.base,
   },
-  warning: {
-    padding: Spacing.large
-  }
 })
 
-const mapDispatchToProps = (dispatch) => {
-  return({
-    navigate: (page) => dispatch(navigate(page)),
-  })
-}
-
-export default connect(
-  null,
-  mapDispatchToProps,
-)(CycleChart)
+export default CycleChart

components/chart/cycle-day-label.js

@@ -7,7 +7,7 @@ import AppText from '../common/app-text'
 
 import cycleModule from '../../lib/cycle'
 import { getOrdinalSuffix } from '../helpers/home'
-import { Containers, Typography, Sizes } from '../../styles'
+import { Typography, Sizes } from '../../styles'
 
 const CycleDayLabel = ({ height, date }) => {
   const cycleDayNumber = cycleModule().getCycleDayNumber(date)
@@ -19,16 +19,25 @@ const CycleDayLabel = ({ height, date }) => {
 
   return (
     <View style={[styles.container, { height }]}>
-      <AppText style={styles.textBold}>{cycleDayLabel}</AppText>
-      <View style={styles.dateLabel}>
-        <AppText style={styles.text}>
-          {isFirstDayOfMonth ? momentDate.format('MMM') : dayOfMonth}
-        </AppText>
-        {!isFirstDayOfMonth &&
+      <View style={{ ...styles.labelRow, height: height / 2 }}>
+        <AppText style={styles.textBold}>{cycleDayLabel}</AppText>
+      </View>
+
+      <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)}
           </AppText>
-        }
+        )}
       </View>
     </View>
   )
@@ -45,24 +54,25 @@ const styles = StyleSheet.create({
     justifyContent: 'flex-end',
     left: 4,
   },
-  containerRow: {
-    ...Containers.rowContainer
-  },
-  text: {
+  textSmall: {
     ...Typography.label,
     fontSize: Sizes.small,
   },
+  textFootnote: {
+    ...Typography.label,
+    fontSize: Sizes.footnote,
+  },
   textBold: {
-    ...Typography.labelBold
+    ...Typography.labelBold,
   },
   textLight: {
     ...Typography.labelLight,
   },
-  dateLabel: {
+  labelRow: {
     flexDirection: 'row',
     justifyContent: 'space-around',
     alignItems: 'center',
-  }
+  },
 })
 
 export default CycleDayLabel

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 { setDate } from '../../slices/date'
-import { navigate } from '../../slices/navigation'
+import moment from 'moment'
 
 import { getCycleDay } from '../../db'
 
@@ -15,124 +12,109 @@ import CycleDayLabel from './cycle-day-label'
 import {
   symptomColorMethods,
   getTemperatureProps,
-  isSymptomDataComplete
+  isSymptomDataComplete,
+  nfpLines,
 } from '../helpers/chart'
 
-class DayColumn extends Component {
-  static propTypes = {
-    dateString: PropTypes.string.isRequired,
-    chartSymptoms: PropTypes.array,
-    columnHeight: PropTypes.number.isRequired,
-    getFhmAndLtlInfo: PropTypes.func.isRequired,
-    navigate: PropTypes.func.isRequired,
-    setDate: PropTypes.func.isRequired,
-    shouldShowTemperatureColumn: PropTypes.bool,
-    symptomHeight: PropTypes.number.isRequired,
-    symptomRowSymptoms: PropTypes.array,
-    xAxisHeight: PropTypes.number,
-  }
+const DayColumn = ({
+  dateString,
+  chartSymptoms,
+  columnHeight,
+  setDate,
+  navigate,
+  shouldShowTemperatureColumn,
+  symptomHeight,
+  symptomRowSymptoms,
+  xAxisHeight,
+}) => {
+  const momentDate = moment(dateString)
+  const isWeekend = momentDate.day() == 0 || momentDate.day() == 6
+  const cycleDayData = getCycleDay(dateString)
+  let data = {}
 
-  constructor(props) {
-    super()
+  if (cycleDayData) {
+    data = chartSymptoms.reduce((symptomDataToDisplay, symptom) => {
+      const symptomData = cycleDayData[symptom]
 
-    const { dateString, chartSymptoms, columnHeight } = props
-    const cycleDayData = getCycleDay(dateString)
-    this.data = {}
+      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']
 
-    if (cycleDayData) {
-      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)
-          }
+          symptomDataToDisplay[symptom] = getSymptomColorIndex(symptomData)
         }
+      }
 
-        return symptomDataToDisplay
-      }, this.data)
-    }
-
-    this.fhmAndLtl = props.getFhmAndLtlInfo(
-      props.dateString,
-      this.data.temperature ? this.data.temperature.value : null,
-      props.columnHeight
-    )
+      return symptomDataToDisplay
+    }, data)
   }
 
-  onDaySelect = (date) => {
-    this.props.setDate(date)
-    this.props.navigate('CycleDay')
+  const fhmAndLtl = nfpLines()(
+    dateString,
+    data.temperature ? data.temperature.value : null,
+    columnHeight
+  )
+
+  const onDaySelect = (date) => {
+    setDate(date)
+    navigate('CycleDay')
   }
 
-  shouldComponentUpdate() {
-    return false
-  }
-
-  render() {
-    const { columnHeight,
-      dateString,
-      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}
+  return (
+    <TouchableOpacity onPress={() => onDaySelect(dateString)} activeOpacity={1}>
+      {shouldShowTemperatureColumn && (
+        <TemperatureColumn
+          horizontalLinePosition={fhmAndLtl.drawLtlAt}
+          isVerticalLine={fhmAndLtl.drawFhmLine}
+          data={data && data.temperature}
           columnHeight={columnHeight}
-        />}
-
-        <CycleDayLabel
-          height={xAxisHeight}
-          date={dateString}
+          isWeekend={isWeekend}
         />
+      )}
 
-        { symptomRowSymptoms.map((symptom, i) => {
-          const hasSymptomData = this.data.hasOwnProperty(symptom)
-          return (
-            <SymptomCell
-              index={i}
-              key={symptom}
-              symptom={symptom}
-              symptomValue={hasSymptomData && this.data[symptom]}
-              isSymptomDataComplete={
-                hasSymptomData && isSymptomDataComplete(symptom, dateString)
-              }
-              height={symptomHeight}
-            />)
-        }
-        )}
+      <CycleDayLabel height={xAxisHeight} date={dateString} />
 
-      </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) => {
-  return({
-    setDate: (date) => dispatch(setDate(date)),
-    navigate: (page) => dispatch(navigate(page)),
-  })
+DayColumn.propTypes = {
+  dateString: PropTypes.string.isRequired,
+  chartSymptoms: PropTypes.array,
+  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(
-  null,
-  mapDispatchToProps,
-)(DayColumn)
+export default 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_STROKE_WIDTH
+  CHART_DOT_RADIUS_SYMPTOM,
+  CHART_DOT_RADIUS_TEMPERATURE,
+  CHART_STROKE_WIDTH,
 } from '../../config'
 
-export default class DotAndLine extends Component {
-  static propTypes = {
-    exclude: PropTypes.bool,
-    leftY: PropTypes.number,
-    leftTemperatureExclude: PropTypes.bool,
-    rightY: PropTypes.number,
-    rightTemperatureExclude: PropTypes.bool,
-    y: PropTypes.number.isRequired
+const DotAndLine = ({
+  exclude,
+  leftTemperatureExclude,
+  leftY,
+  rightTemperatureExclude,
+  rightY,
+  y,
+}) => {
+  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) {
-    return Object.keys(newProps).some(key => newProps[key] != this.props[key])
-  }
+  const dot = new Path()
+    .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() {
-    const {
-      exclude,
-      leftTemperatureExclude,
-      leftY,
-      rightTemperatureExclude,
-      rightY,
-      y
-    } = this.props
-    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)
-    }
-
-    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>
-    )
-  }
+  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_SYMPTOM}
+      />
+      <Shape
+        d={dot}
+        stroke={dotColor}
+        strokeWidth={CHART_STROKE_WIDTH}
+        fill={dotColor}
+        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 (
-      <View key={tick} top={tick} {...styles.line}/>
-    )
+  return getTickPositions(height).map((tick) => {
+    return <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',
-    right: 0
-  }
+    position: 'absolute',
+    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) => {
-  return({
-    navigate: (page) => dispatch(navigate(page)),
-  })
-}
-
-export default connect(
-  null,
-  mapDispatchToProps,
-)(NoData)
+export default 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_GRID_LINE_HORIZONTAL_WIDTH
+  CHART_DOT_RADIUS_SYMPTOM,
+  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
-    ? [styles.cell, { height, width: CHART_COLUMN_WIDTH }]
-    : [styles.cell, { height, width: CHART_COLUMN_WIDTH }, styles.topBorder]
+  // Determine the background color based on isWeekend prop
+  const backgroundColor = isWeekend ? Colors.greyVeryLight : 'white'
+  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 backgroundColor = (isMucusOrCervix && !isSymptomDataComplete) ?
-      'white' : symptomColor
-    const borderWidth = (isMucusOrCervix && !isSymptomDataComplete) ? 2 : 0
+    const isMucusOrCervix = symptom === 'mucus' || symptom === 'cervix'
+    const backgroundColor =
+      isMucusOrCervix && !isSymptomDataComplete ? 'white' : symptomColor
+    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([
-    PropTypes.bool,
-    PropTypes.number,
-  ]),
+  symptomValue: PropTypes.oneOfType([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,
-    height: CHART_DOT_RADIUS * 2,
-    borderRadius: 50
-  }
+    width: CHART_DOT_RADIUS_SYMPTOM * 2,
+    height: CHART_DOT_RADIUS_SYMPTOM * 2,
+    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
-        path={new Path()
-          .moveTo(0, horizontalLinePosition)
-          .lineTo(CHART_COLUMN_WIDTH, horizontalLinePosition)
-        }
-        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'
-      />}
+      {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"
+        />
+      )}
     </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(({ isBold, label, position, shouldShowLabel, tickHeight}) => {
-            return (
-              <Tick
-                height={tickHeight}
-                isBold={isBold}
-                key={label}
-                label={label}
-                shouldShowLabel={shouldShowLabel}
-                yPosition={position}
-              />
-            )
-          })
-      }
+      {getTickList(height).map(
+        ({ isBold, label, position, shouldShowLabel, tickHeight }) => {
+          return (
+            <Tick
+              height={tickHeight}
+              isBold={isBold}
+              key={label}
+              label={label}
+              shouldShowLabel={shouldShowLabel}
+              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

@@ -5,15 +5,18 @@ import PropTypes from 'prop-types'
 import AppText from '../common/app-text'
 
 import { Sizes } from '../../styles'
+import { CHART_TICK_WIDTH } from '../../config'
 
 const Tick = ({ yPosition, height, isBold, shouldShowLabel, label }) => {
-  const top = yPosition - height / 2
-  const containerStyle = [ styles.container, { flexBasis: height, height, top }]
+  const top = yPosition - height / 2 - 4
+  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>
   )
 }
@@ -26,28 +29,26 @@ Tick.propTypes = {
   label: PropTypes.string,
 }
 
-
 const text = {
-  lineHeight: Sizes.base,
-  right: 4,
-  textAlign: 'right'
+  textAlign: 'right',
 }
 const styles = StyleSheet.create({
   container: {
     justifyContent: 'center',
     position: 'absolute',
     right: 0,
-    width: 40
+    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}]}>
-        {symptomsToDisplay.map(symptom => (
+      <View style={[styles.yAxis, { height: symptomsSectionHeight }]}>
+        {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 }) => {
-  return(
-    <Modal
-      animationType='fade'
-      onRequestClose={onClose}
-      transparent={true}
-      visible={true}
-    >
-      <TouchableOpacity onPress={onClose} style={styles.blackBackground} />
+import CloseIcon from './close-icon'
+
+import { Sizes, Spacing } from '../../styles'
+
+const AppModal = ({ children, onClose }) => (
+  <Modal
+    animationType="fade"
+    onRequestClose={onClose}
+    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: {
-    backgroundColor: Colors.turquoiseLight,
-    flex: 1
-  },
+  container: { ...Containers.pageContainer },
   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

@@ -0,0 +1,29 @@
+import React from 'react'
+import { SafeAreaView, StatusBar, StyleSheet, View } from 'react-native'
+
+import { Colors } from '../../styles'
+import { STATUSBAR_HEIGHT } from '../../config'
+
+const AppStatusBar = () => (
+  <View style={styles.statusBar}>
+    <SafeAreaView>
+      <StatusBar
+        backgroundColor={Colors.purple}
+        barStyle="light-content"
+        translucent
+      />
+    </SafeAreaView>
+  </View>
+)
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  statusBar: {
+    backgroundColor: Colors.purple,
+    height: STATUSBAR_HEIGHT,
+  },
+})
+
+export default AppStatusBar

components/common/app-switch.js

@@ -1,18 +1,25 @@
 import React from 'react'
-import { StyleSheet, Switch, View } from 'react-native'
+import { Platform, StyleSheet, Switch, View } from 'react-native'
 import PropTypes from 'prop-types'
 
 import AppText from './app-text'
 
-import { Containers } from '../../styles'
+import { Colors, Containers, Spacing } from '../../styles'
 
-const AppSwitch = ({ onToggle, text, value }) => {
+const AppSwitch = ({ onToggle, text, value, disabled }) => {
+  const trackColor = { true: Colors.turquoiseDark }
   return (
     <View style={styles.container}>
       <View style={styles.textContainer}>
         <AppText>{text}</AppText>
       </View>
-      <Switch onValueChange={onToggle} style={styles.switch} value={value} />
+      <Switch
+        onValueChange={onToggle}
+        style={styles.switch}
+        value={value}
+        trackColor={trackColor}
+        disabled={disabled}
+      />
     </View>
   )
 }
@@ -20,19 +27,25 @@ const AppSwitch = ({ onToggle, text, value }) => {
 AppSwitch.propTypes = {
   onToggle: PropTypes.func.isRequired,
   text: PropTypes.string,
-  value: PropTypes.bool
+  value: PropTypes.bool,
+  disabled: PropTypes.bool,
 }
 
 const styles = StyleSheet.create({
   container: {
-    ...Containers.rowContainer
+    ...Containers.rowContainer,
+    marginTop: Spacing.tiny,
   },
   switch: {
     flex: 1,
+    transform:
+      Platform.OS === 'ios'
+        ? [{ scaleX: 0.8 }, { scaleY: 0.8 }]
+        : [{ scaleX: 1 }, { scaleY: 1 }],
   },
   textContainer: {
     flex: 4,
-  }
+  },
 })
 
-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 behavior = isKeyboardOffset ? "padding" : "height"
-  const keyboardVerticalOffset = isKeyboardOffset ? 300 : 0
-
-  return (
-    <KeyboardAvoidingView
-      behavior={behavior}
-      keyboardVerticalOffset={keyboardVerticalOffset}
-    >
-      <TextInput style={[styles.input, style]} {...props} />
-    </KeyboardAvoidingView>
-  )
-}
+const AppTextInput = ({ style, ...props }) => (
+  <TextInput style={[styles.input, style]} {...props} />
+)
 
 AppTextInput.propTypes = {
   style: PropTypes.object,
-  isKeyboardOffset: PropTypes.bool,
-}
-
-AppTextInput.defultProps = {
-  isKeyboardOffset: true,
 }
 
 const styles = StyleSheet.create({
@@ -38,8 +23,9 @@ const styles = StyleSheet.create({
     marginTop: Spacing.base,
     minWidth: '80%',
     paddingHorizontal: Spacing.base,
-    ...Typography.mainText
-  }
+    paddingVertical: Spacing.tiny,
+    ...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 }) => {
-  // we parse for links in case the text contains any
+const AppText = ({ children, style, ...props }) => {
   return (
-    <Link style={linkStyle}>
-      <Text style={[styles.text, style]} {...props}>
-        {children}
-      </Text>
-    </Link>
+    <Text style={[styles.text, style]} {...props}>
+      {children}
+    </Text>
   )
 }
 
 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/button-row.js

@@ -0,0 +1,20 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { StyleSheet, View } from 'react-native'
+
+const ButtonRow = ({ children }) => {
+  return <View style={styles.container}>{children}</View>
+}
+
+ButtonRow.propTypes = {
+  children: PropTypes.node.isRequired,
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
+})
+
+export default ButtonRow

components/common/button.js

@@ -5,7 +5,7 @@ import { StyleSheet, TouchableOpacity } from 'react-native'
 import AppIcon from './app-icon'
 import AppText from './app-text'
 
-import { Colors, Fonts, Spacing } from '../../styles'
+import { Colors, Fonts, Sizes, Spacing } from '../../styles'
 
 const Button = ({
   children,
@@ -39,49 +39,51 @@ Button.propTypes = {
   isCTA: PropTypes.bool,
   isSmall: PropTypes.bool,
   onPress: PropTypes.func,
-  testID: PropTypes.string
+  testID: PropTypes.string,
 }
 
 Button.defaultProps = {
-  isSmall: true
+  isSmall: true,
 }
 
 const text = {
   padding: Spacing.base,
-  textTransform: 'uppercase'
+  textTransform: 'uppercase',
 }
 
 const textSmall = {
-  fontSize: Fonts.small,
+  fontSize: Sizes.small,
   padding: Spacing.small,
-  textTransform: 'uppercase'
+  textTransform: 'uppercase',
 }
 
 const button = {
   alignItems: 'center',
+  alignSelf: 'center',
   flexDirection: 'row',
   justifyContent: 'center',
-  margin: Spacing.base,
-  minWidth: '15%'
+  marginTop: Spacing.base,
+  paddingHorizontal: Spacing.tiny,
+  minWidth: '15%',
 }
 
 const styles = StyleSheet.create({
   regular: {
-    ...button
+    ...button,
   },
   cta: {
     backgroundColor: Colors.orange,
     borderRadius: 25,
-    ...button
+    ...button,
   },
   buttonTextBold: {
     color: 'white',
-    fontFamily: Fonts.bold
+    fontFamily: Fonts.bold,
   },
   buttonTextRegular: {
     color: Colors.greyDark,
-    fontFamily: Fonts.main
-  }
+    fontFamily: Fonts.main,
+  },
 })
 
 export default Button

components/common/close-icon.js

@@ -4,29 +4,32 @@ import { StyleSheet, TouchableOpacity } from 'react-native'
 
 import AppIcon from './app-icon'
 
+import { HIT_SLOP } from '../../config'
 import { Colors, Sizes } from '../../styles'
 
-const CloseIcon = ({ onClose, ...props }) => {
+const CloseIcon = ({ onClose, color, ...props }) => {
   return (
     <TouchableOpacity
+      hitSlop={HIT_SLOP}
       onPress={onClose}
       style={styles.container}
       {...props}
     >
-      <AppIcon name='cross' color={Colors.orange} />
+      <AppIcon name="cross" color={color ? color : Colors.orange} />
     </TouchableOpacity>
   )
 }
 
 CloseIcon.propTypes = {
-  onClose: PropTypes.func.isRequired
+  onClose: PropTypes.func.isRequired,
+  color: PropTypes.string,
 }
 
 const styles = StyleSheet.create({
   container: {
     alignSelf: 'flex-start',
-    marginBottom: Sizes.base
-  }
+    marginBottom: Sizes.base,
+  },
 })
 
-export default CloseIcon
+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,15 +4,16 @@ 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 Segment = ({ children, last, title, subheader }) => {
   const containerStyle = last ? styles.containerLast : styles.container
   const commonStyle = Object.assign({}, containerStyle)
 
   return (
     <View style={commonStyle}>
       {title && <AppText style={styles.title}>{title}</AppText>}
+      {subheader && <AppText style={styles.subheader}>{subheader}</AppText>}
       {children}
     </View>
   )
@@ -23,11 +24,7 @@ Segment.propTypes = {
   last: PropTypes.bool,
   style: PropTypes.object,
   title: PropTypes.string,
-}
-
-const segmentContainer = {
-  marginHorizontal: Spacing.base,
-  marginBottom: Spacing.base,
+  subheader: PropTypes.string,
 }
 
 const styles = StyleSheet.create({
@@ -36,14 +33,19 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderBottomColor: Colors.greyLight,
     paddingBottom: Spacing.base,
-    ...segmentContainer,
+    ...Containers.segmentContainer,
   },
   containerLast: {
-    ...segmentContainer,
+    ...Containers.segmentContainer,
   },
   title: {
     ...Typography.subtitle,
-  }
+  },
+  subheader: {
+    ...Typography.subtitle,
+    fontWeight: 'bold',
+    marginBottom: Spacing.zero,
+  },
 })
 
-export default Segment
+export default Segment

components/common/tracking-category-switch.js

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