Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Sofiya Tepikin
|
c50a7656e4 |
@@ -1,2 +0,0 @@
|
||||
BUNDLE_PATH: "vendor/bundle"
|
||||
BUNDLE_FORCE_RUBY_PLATFORM: 1
|
||||
+5
-1
@@ -32,7 +32,6 @@ build/
|
||||
.gradle
|
||||
local.properties
|
||||
*.iml
|
||||
*.hprof
|
||||
|
||||
# node.js
|
||||
#
|
||||
@@ -73,6 +72,11 @@ 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
|
||||
|
||||
@@ -8,7 +8,6 @@ cache:
|
||||
|
||||
test_async:
|
||||
script:
|
||||
- npm install npm@7.0.1 -g
|
||||
- npm install
|
||||
- npm test
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ updates:
|
||||
- dependency-name: '*'
|
||||
update-types: ['version-update:semver-patch']
|
||||
- dependency-name: 'realm'
|
||||
- dependency-name: 'nodejs-mobile-react-native'
|
||||
- dependency-name: 'react'
|
||||
- dependency-name: 'react-native'
|
||||
- dependency-name: 'react-native-push-notifications'
|
||||
- dependency-name: '@babel/core'
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
## oh no a bug 🐛
|
||||
|
||||
### Description what has happened
|
||||
|
||||
Short overview how the bug manifests.
|
||||
|
||||
### which OS + version is your device
|
||||
|
||||
- [ ] Android _number_
|
||||
- [ ] iOS _number_
|
||||
|
||||
### which drip version number are you using
|
||||
|
||||
_On your phone go to ➞ menu on the top right ➞ about, scroll to the very bottom and find the version number_
|
||||
|
||||
### how did it happen
|
||||
|
||||
_what triggered the bug/behavior, always/sometimes, is it reproducible(how)?_
|
||||
|
||||
### describe how it looks or add screenshot
|
||||
|
||||
feel free to attach a file 📎
|
||||
|
||||
### any idea to solve it
|
||||
|
||||
💡
|
||||
@@ -1,22 +0,0 @@
|
||||
## This has to be done 🪠
|
||||
|
||||
### Description what has to be done
|
||||
|
||||
Short overview
|
||||
|
||||
### is it urgent? ⏳
|
||||
|
||||
- [ ] Yes
|
||||
- [ ] No
|
||||
- [ ] something in between
|
||||
|
||||
_Explain the urgency if possible, e.g. is it a security vulnerability for potentially everyone?_
|
||||
|
||||
### which OS
|
||||
|
||||
- [ ] Android
|
||||
- [ ] iOS
|
||||
|
||||
### what shall be the ideal outcome 🎆
|
||||
|
||||
_You can e.g. specify here the version number for a library update_
|
||||
@@ -1,19 +0,0 @@
|
||||
## Yeah a feature idea 🧩
|
||||
|
||||
### what should this feature do or solve? 🪄
|
||||
|
||||
Please give a short overview so as many people as possible would be able to understand.
|
||||
|
||||
### what is particularly important to the people who would use this feature?
|
||||
|
||||
Do you have certain user groups in mind?
|
||||
|
||||
### Any idea where it shall be placed in the app?
|
||||
|
||||
### is it connected with or dependent on some other feature?
|
||||
|
||||
### any idea how it shall look (sketch?)
|
||||
|
||||
feel free to attach a file 📎
|
||||
|
||||
### what could be difficulties (with other components) 🪆
|
||||
@@ -1,5 +1,7 @@
|
||||
## Why this change?
|
||||
|
||||
Closes ticket #
|
||||
|
||||
## Description
|
||||
|
||||
I have tested this MR:
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
2.7.4
|
||||
+2
-70
@@ -2,80 +2,12 @@
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## v1.2311.14
|
||||
|
||||
### 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.2102.28
|
||||
|
||||
### 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
|
||||
@@ -129,7 +61,7 @@ All notable changes to this project will be documented in this file.
|
||||
### 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
|
||||
|
||||
@@ -148,7 +80,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
|
||||
|
||||
+24
-23
@@ -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](#tldr)
|
||||
[TL;DR](#tl-dr)
|
||||
|
||||
[What should I know before I get started?](#what-should-i-know-before-i-get-started)
|
||||
|
||||
@@ -14,44 +14,45 @@ So good to see you here, hello :wave_tone1: :wave_tone2: :wave_tone3: :wave_tone
|
||||
|
||||
## TL;DR
|
||||
|
||||
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).
|
||||
You just want to say hello? Send us a [nice email](mailto:drip@mailbox.org?Subject=Nice%20incoming%20mail) :postbox:, ask to [join our Slack](mailto:drip@mailbox.org?Subject=Join%20Slack) or tweet :bird: at us [@dripberlin](https://twitter.com/dripberlin).
|
||||
|
||||
## What should I know before I get started?
|
||||
|
||||
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: !
|
||||
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: !
|
||||
|
||||
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?
|
||||
|
||||
We are an open source project and we highly appreciate contributions. At the same time please keep some things in mind: :heart:
|
||||
### Your First Code Condripution
|
||||
|
||||
- The drip maintainers are usually around 2-3 people and are responsible for everything from developing new features to answering press inquiries or fixing bugs. Most of this work is done unpaid. (If you write a nice email your chances to get an answer are much higher than if you behave like a tech bro.)
|
||||
- We have a plan for the direction in which drip should evolve. This means that even if it isn't always transparent on gitlab, we have a list of features that we are building and more importantly, which bugs need to be fixed and which dependencies need to be updated.
|
||||
- drips core values are:
|
||||
- 🔮 open source
|
||||
- 🩸 feminist and gender inclusive
|
||||
- 🔒 secure: data entered stays with that person/on their device
|
||||
- 🔬 science based: we implemented the symptothermal method
|
||||
|
||||
This means that we will never implement anything that contradicts these core values. Some examples: We will never build a cloud integration, we will never make an ovulation prediction.
|
||||
- If you would like to make a sustainable contribution to the project, we would be happy to join the game.
|
||||
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".
|
||||
|
||||
### Reporting Bugs or Making Suggestions
|
||||
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.
|
||||
|
||||
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.
|
||||
### Reporting Bugs
|
||||
|
||||
### Your First Condripution
|
||||
You found a bug :bug:? Please feel free to investigate and save logs for more specific details.
|
||||
|
||||
- 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.
|
||||
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?
|
||||
|
||||
To send us a new issue you can also use our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with a description text taken from the body of your email.
|
||||
|
||||
### Suggesting Enhancements
|
||||
|
||||
Do you have suggestions for enhancing the app or for cleaning up some code? Fantastic!
|
||||
|
||||
Before creating a new issue, please review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure nobody else had the same idea before you! You are then invited to open a new issue with a somewhat extensive description, you can use emojis or GIFs if it helps :)!
|
||||
|
||||
To send us a new issue you can also use our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with the title taken from the subject line and the description text for the issue taken from the body of your email.
|
||||
|
||||
### Thank you
|
||||
|
||||
|
||||
|
||||
Thank you for condriputing to open source, thank you for condriputing to drip!
|
||||
Much love from Bloody Health :heart_exclamation:
|
||||
Much love from Bloody Health :heart\_exclamation:
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
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'
|
||||
@@ -1,96 +0,0 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
CFPropertyList (3.0.5)
|
||||
rexml
|
||||
activesupport (6.1.5)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
tzinfo (~> 2.0)
|
||||
zeitwerk (~> 2.3)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
algoliasearch (1.27.5)
|
||||
httpclient (~> 2.8, >= 2.8.3)
|
||||
json (>= 1.5.1)
|
||||
atomos (0.1.3)
|
||||
claide (1.1.0)
|
||||
cocoapods (1.11.3)
|
||||
addressable (~> 2.8)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.11.3)
|
||||
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
||||
cocoapods-downloader (>= 1.4.0, < 2.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
cocoapods-search (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.4.0, < 2.0)
|
||||
cocoapods-try (>= 1.1.0, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
escape (~> 0.0.4)
|
||||
fourflusher (>= 2.3.0, < 3.0)
|
||||
gh_inspector (~> 1.0)
|
||||
molinillo (~> 0.8.0)
|
||||
nap (~> 1.0)
|
||||
ruby-macho (>= 1.0, < 3.0)
|
||||
xcodeproj (>= 1.21.0, < 2.0)
|
||||
cocoapods-core (1.11.3)
|
||||
activesupport (>= 5.0, < 7)
|
||||
addressable (~> 2.8)
|
||||
algoliasearch (~> 1.0)
|
||||
concurrent-ruby (~> 1.1)
|
||||
fuzzy_match (~> 2.0.4)
|
||||
nap (~> 1.0)
|
||||
netrc (~> 0.11)
|
||||
public_suffix (~> 4.0)
|
||||
typhoeus (~> 1.0)
|
||||
cocoapods-deintegrate (1.0.5)
|
||||
cocoapods-downloader (1.5.1)
|
||||
cocoapods-plugins (1.0.0)
|
||||
nap
|
||||
cocoapods-search (1.0.1)
|
||||
cocoapods-trunk (1.6.0)
|
||||
nap (>= 0.8, < 2.0)
|
||||
netrc (~> 0.11)
|
||||
cocoapods-try (1.2.0)
|
||||
colored2 (3.1.2)
|
||||
concurrent-ruby (1.1.9)
|
||||
escape (0.0.4)
|
||||
ethon (0.15.0)
|
||||
ffi (>= 1.15.0)
|
||||
ffi (1.15.5)
|
||||
fourflusher (2.3.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.10.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.6.1)
|
||||
minitest (5.15.0)
|
||||
molinillo (0.8.0)
|
||||
nanaimo (0.3.0)
|
||||
nap (1.1.0)
|
||||
netrc (0.11.0)
|
||||
public_suffix (4.0.6)
|
||||
rexml (3.2.5)
|
||||
ruby-macho (2.5.1)
|
||||
typhoeus (1.4.0)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
xcodeproj (1.21.0)
|
||||
CFPropertyList (>= 2.3.3, < 4.0)
|
||||
atomos (~> 0.1.3)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
colored2 (~> 3.1)
|
||||
nanaimo (~> 0.3.0)
|
||||
rexml (~> 3.2.4)
|
||||
zeitwerk (2.5.4)
|
||||
PLATFORMS
|
||||
ruby
|
||||
DEPENDENCIES
|
||||
cocoapods (~> 1.11, >= 1.11.2)
|
||||
RUBY VERSION
|
||||
ruby 2.7.4p191
|
||||
BUNDLED WITH
|
||||
2.2.27
|
||||
@@ -3,24 +3,21 @@
|
||||
A menstrual cycle tracking app that's open-source and leaves your data on your phone. Use it to track your menstrual cycle and/or for fertility awareness!
|
||||
Find more information on [our website](https://dripapp.org/).
|
||||
|
||||
[<img src="https://dripapp.org/assets/get.png"
|
||||
[<img src="https://dripapp.org/assets/get.png"
|
||||
alt="Get it here"
|
||||
height="55">](https://dripapp.org/release/v1.2311.14.apk)
|
||||
[<img src="https://dripapp.org/assets/badge_google-play.png"
|
||||
alt="Get it on Google Play"
|
||||
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"
|
||||
height="55">](https://dripapp.org/release/8.apk)
|
||||
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
|
||||
alt="Get it on F-Droid"
|
||||
height="55">](https://dripapp.org/fdroid)
|
||||
height="80">](https://f-droid.org/packages/com.drip/)
|
||||
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
|
||||
alt="Get it on Google Play"
|
||||
height="80">](https://play.google.com/store/apps/details?id=com.drip)
|
||||
|
||||
The app is built in React Native and developed for Android and iOS.
|
||||
The app is built in React Native and currently developed for Android.
|
||||
|
||||
▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/main/CONTRIBUTING.md)
|
||||
▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/master/CONTRIBUTING.md)
|
||||
|
||||
▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/main/RELEASE.md)
|
||||
▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/master/RELEASE.md)
|
||||
|
||||
## Development setup
|
||||
|
||||
@@ -36,14 +33,14 @@ or clone it with HTTPS
|
||||
|
||||
### 2. Node & yarn version
|
||||
|
||||
Make sure you are running Node 14 and classic yarn (v.1). It's easiest to switch Node versions using `nvm`, here's how to install NVM: https://github.com/nvm-sh/nvm#installing-and-updating. 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:
|
||||
Make sure you are running Node 14 and classic yarn (v.1). It's easiest to switch Node versions using `nvm`, here's how to install NVM: https://github.com/nvm-sh/nvm#installing-and-updating. Once you have nvm you can install node 14:
|
||||
|
||||
nvm install v14.19.3
|
||||
|
||||
use npm to install yarn:
|
||||
and then run
|
||||
|
||||
npm install --global yarn
|
||||
cd drip
|
||||
yarn install
|
||||
|
||||
## for Android
|
||||
|
||||
@@ -53,46 +50,21 @@ Install [Android Studio](https://developer.android.com/studio/) - you'll need it
|
||||
|
||||
### 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.
|
||||
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.
|
||||
|
||||
### 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.
|
||||
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.
|
||||
|
||||
i. Open a terminal, navigate to the drip folder and run
|
||||
i. Open a terminal and run
|
||||
|
||||
yarn install
|
||||
|
||||
In a separate tab, that needs to keep running as long as you want to keep the app connected, run
|
||||
|
||||
yarn start
|
||||
|
||||
Also run in a new tab
|
||||
|
||||
yarn android
|
||||
|
||||
ii. To see logging output, run the following command in another tab:
|
||||
|
||||
yarn log
|
||||
|
||||
iii. If you had an older version of drip before and you are now trying to run a new drip version, clear cache by running
|
||||
|
||||
yarn clear
|
||||
|
||||
iv. Run the following command and select enable hot reloading (see https://facebook.github.io/react-native/docs/debugging.html):
|
||||
iii. Run the following command and select enable hot reloading (see https://facebook.github.io/react-native/docs/debugging.html):
|
||||
|
||||
adb shell input keyevent 82
|
||||
|
||||
@@ -175,7 +147,7 @@ You can run the tests with:
|
||||
|
||||
### End to end tests
|
||||
|
||||
1. Check what testing device is specified in [package.json](https://gitlab.com/bloodyhealth/drip/blob/main/package.json) under:
|
||||
1. Check what testing device is specified in [package.json](https://gitlab.com/bloodyhealth/drip/blob/master/package.json) under:
|
||||
```
|
||||
{"detox":
|
||||
{"configurations":
|
||||
@@ -229,3 +201,7 @@ More information about how the app calculates fertility status and bleeding pred
|
||||
react-native link
|
||||
|
||||
5. You should be able to use the icon now within drip, e.g. in Cycle Day Overview and on the chart.
|
||||
|
||||
## Translation
|
||||
|
||||
We are using [Weblate](https://weblate.org/) as translation software.
|
||||
|
||||
+17
-92
@@ -1,108 +1,33 @@
|
||||
# How to release a new app version for Android
|
||||
# How to release a 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. More documentation on 'How to release a new app version for iOS' coming soon._
|
||||
Note: You need the release-key to bundle a release that can be uploaded to Google Play Store.
|
||||
|
||||
# Table of Contents
|
||||
|
||||
1. [version updating](#Version-updating)
|
||||
2. [android building](#Building-in-Android)
|
||||
- [APK](#APK)
|
||||
- [AAB](#AAB)
|
||||
3. [release sharing](#Share-the-release)
|
||||
|
||||
## Version updating
|
||||
|
||||
When you are done with a chore, a feature or a bugfix, you may want to share it with testers and eventually publish a release. In order to identify a specific app version we can update the version name, which is created based on the following format: `1.yymm.d` e.g. `1.2311.7`. If you want to upload a new app version to Google Play you also need to update the version code.
|
||||
|
||||
The following command will:
|
||||
|
||||
- create a new versionName and a new higher versionCode (+1)
|
||||
- create a commit including a tag named after the new release version name.
|
||||
Run the release wizard that takes you through all the steps necessary to prepare a new release:
|
||||
|
||||
```
|
||||
yarn release
|
||||
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
|
||||
|
||||
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).
|
||||
|
||||
## Building in Android
|
||||
|
||||
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:
|
||||
To then bundle a release run the following command on your branch:
|
||||
|
||||
```
|
||||
yarn build-android-apk-release
|
||||
cd android && ./gradlew bundleRelease
|
||||
```
|
||||
|
||||
_which is a shortcut for:_ `cd android && ./gradlew clean && ./gradlew assembleRelease && cd ..`
|
||||
This command creates an `app.aab` file in the folder `/android/app/build/outputs/bundle/release`.
|
||||
|
||||
This will create a new apk file named `app-release.apk` under `./android/app/build/outputs/apk/release/`.
|
||||
[More on Android App Bundle](https://blog.swmansion.com/make-your-react-native-app-3x-smaller-44c993eda2c9)
|
||||
|
||||
For signing an apk you can run this command:
|
||||
You need to manually push the created tag to Gitlab:
|
||||
|
||||
```
|
||||
yarn sign-android-apk-release
|
||||
git push origin <tagname>
|
||||
```
|
||||
Also don't forget to push your branch to Gitlab and review and merge it if ready!
|
||||
|
||||
_which is a shortcut for:_ `zipalign -v -p 4 ./android/app/build/outputs/apk/release/app-release.apk ./android/app/build/outputs/apk/release/app-release_signed.apk`
|
||||
|
||||
It adds a file name `app-release_signed.apk` in the same folder in `./android/app/build/outputs/apk/release/`
|
||||
|
||||
### AAB
|
||||
|
||||
To build a release aab file, run:
|
||||
|
||||
```
|
||||
yarn build-android-aab-release
|
||||
```
|
||||
|
||||
_which is a shortcut for:_ `cd android && ./gradlew clean && ./gradlew :app:bundleRelease && cd ..`
|
||||
|
||||
It creates a new aab file named `app-release.aab` under `./android/app/build/outputs/bundle/release`
|
||||
|
||||
For signing an aab you first need to configure the base module’s build.gradle file with your app’s signing information. You can then run this command:
|
||||
|
||||
```
|
||||
yarn sign-android-aab-release
|
||||
```
|
||||
|
||||
_which is a shortcut for:_ `jarsigner -keystore ./android/app/drip-release-key.keystore ./android/app/build/outputs/bundle/release/app-release.aab drip-release-key`
|
||||
|
||||
## Share the release
|
||||
|
||||
### Gitlab repository
|
||||
|
||||
For a quick and easy way to share an apk to testers who are willing to sideload drip onto their Android phones, do this: Upload a signed apk to the Gitlab repository of the drip website under `/release` https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/tree/main/release and maybe adapt the name of the apk with a more specific name than "app-release.apk". Now you can simply share a direct link to download your newly bundled apk, e.g. [a download link for v1.2311.14](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/main/release/v1.2311.14.apk).
|
||||
|
||||
### Google Play Console
|
||||
|
||||
Upload a signed aab to the [Google Play Console for developers](https://play.google.com/console/) and add it to the "App bundle explorer". This requires a higher versionCode and a different version name compared to previously uploaded aab or apk files.
|
||||
You can decide if you want the new app version to get released for testing (internal, closed or open) or for production. Keep in mind that any track other than "internal testing" triggers an external review by Google and might take a few hours.
|
||||
|
||||
#### Phone screenshots
|
||||
|
||||
If there are visual changes in the app you may want to update the screenshots for the Google Play Store listing. Keep in mind that Google Play has specific resolution requirements. You'll find them in Grow -> Store presence -> Main Store Listing -> Phone screenshots.
|
||||
|
||||
### drip website
|
||||
|
||||
After a new version has been published on Google Play (or F-Droid) the apk version that is downloadable directly from the [drip website](https://dripapp.org) needs to get updated as well. Therefore you upload a signed apk to the [repository](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/) and adapt the name and link on /index.html.
|
||||
Last time I checked it was [here](f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L114).
|
||||
|
||||
#### Phone screenshots
|
||||
|
||||
Please also update [phone screenshots here](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/tree/main/assets) and set links on [/index](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/f3da9776b1943ffa32458e74ef86eeca98c1891c/index.html#L47) and [/media](https://gitlab.com/bloodyhealth/bloodyhealth.gitlab.io/-/blob/c7f999bb7ad736345321537cbffa3f4c24eeee6d/media.html#L33) that can then also be attached to a social media post.
|
||||
|
||||
You probably want to share the app update by posting on one or more of these platforms:
|
||||
|
||||
- [Twitter](twitter.com/dripberlin)
|
||||
- [Mastodon](mastodon.social/@dripapp)
|
||||
- [Ko-fi](https://ko-fi.com/dripapp)
|
||||
- [Linkedin](https://www.linkedin.com/company/34899684/)
|
||||
- Different tech, privacy, feminist oriented slacks
|
||||
Yay, done (have a scoop of ice cream, I suggest coconut 🍦)!
|
||||
@@ -114,17 +114,12 @@ 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
|
||||
* This should be set on project.ext.react and mirrored here. If it is not set
|
||||
* on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
|
||||
* and the benefits of using Hermes will therefore be sharply reduced.
|
||||
*/
|
||||
def enableHermes = project.ext.react.get("enableHermes", false);
|
||||
|
||||
/**
|
||||
* Architectures to build native code for in debug.
|
||||
*/
|
||||
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
|
||||
|
||||
android {
|
||||
ndkVersion rootProject.ext.ndkVersion
|
||||
compileSdkVersion rootProject.ext.compileSdkVersion
|
||||
@@ -134,10 +129,10 @@ android {
|
||||
applicationId "com.drip"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 25
|
||||
versionName "1.2311.14"
|
||||
versionCode 8
|
||||
versionName "1.2102.28"
|
||||
ndk {
|
||||
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
|
||||
abiFilters "armeabi-v7a", "x86", "arm64-v8a"
|
||||
}
|
||||
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type
|
||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||
@@ -169,11 +164,6 @@ android {
|
||||
buildTypes {
|
||||
debug {
|
||||
signingConfig signingConfigs.debug
|
||||
if (nativeArchitectures) {
|
||||
ndk {
|
||||
abiFilters nativeArchitectures.split(',')
|
||||
}
|
||||
}
|
||||
}
|
||||
release {
|
||||
// Caution! In production, you need to generate your own keystore file.
|
||||
@@ -198,7 +188,7 @@ android {
|
||||
// For each separate APK per architecture, set a unique version code as described here:
|
||||
// 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 versionCodes = ["armeabi-v7a": 1, "x86": 2]
|
||||
def abi = output.getFilter(OutputFile.ABI)
|
||||
if (abi != null) { // null for the universal-debug, universal-release variants
|
||||
output.versionCodeOverride =
|
||||
@@ -211,12 +201,11 @@ android {
|
||||
dependencies {
|
||||
implementation fileTree(dir: "libs", include: ["*.jar"])
|
||||
//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 'androidx.appcompat:appcompat:1.0.0'
|
||||
implementation 'androidx.annotation:annotation:1.1.0'
|
||||
implementation "com.facebook.react:react-native:+" // From node_modules
|
||||
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
|
||||
|
||||
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
|
||||
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
|
||||
exclude group:'com.facebook.fbjni'
|
||||
}
|
||||
|
||||
@@ -5,81 +5,74 @@
|
||||
>
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
|
||||
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||
<uses-permission tools:node="remove" android:name="android.permission.READ_PHONE_STATE" />
|
||||
<uses-permission tools:node="remove" android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-permission tools:node="remove" android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
|
||||
<permission
|
||||
android:name="${applicationId}.permission.C2D_MESSAGE"
|
||||
android:protectionLevel="signature" />
|
||||
|
||||
<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
|
||||
|
||||
<application
|
||||
android:name=".MainApplication"
|
||||
android:name=".MainApplication"
|
||||
android:label="@string/app_name"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:allowBackup="false"
|
||||
android:theme="@style/AppTheme">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:label="@string/app_name"
|
||||
android: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:exported="true"
|
||||
android:label="@string/app_name"
|
||||
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
|
||||
android:launchMode="singleTask"
|
||||
android:windowSoftInputMode="adjustPan"
|
||||
android:screenOrientation="sensorPortrait">
|
||||
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<provider
|
||||
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
|
||||
android:launchMode="singleTask"
|
||||
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>
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="com.drip.provider"
|
||||
android:grantUriPermissions="true"
|
||||
android:exported="false" >
|
||||
android:exported="false">
|
||||
<meta-data
|
||||
tools:replace="android:resource"
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/filepaths" />
|
||||
</provider>
|
||||
</provider>
|
||||
|
||||
<meta-data android:name="com.dieam.reactnativepushnotification.notification_foreground"
|
||||
android:value="false"/>
|
||||
<!-- Change the resource name to your App's accent color - or any other color you want -->
|
||||
<meta-data android:name="com.dieam.reactnativepushnotification.notification_color"
|
||||
android:resource="@android:color/white"/> <!-- or @android:color/{name} to use a standard color -->
|
||||
|
||||
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
|
||||
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
|
||||
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
|
||||
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
|
||||
<service
|
||||
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"
|
||||
android:exported="false" >
|
||||
<intent-filter>
|
||||
<action android:name="com.google.firebase.MESSAGING_EVENT" />
|
||||
</intent-filter>
|
||||
</service>
|
||||
</application>
|
||||
</manifest>
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
<?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>
|
||||
@@ -14,5 +14,4 @@
|
||||
<color name="grey">#A5A5A5</color>
|
||||
<color name="orange">#F38337</color>
|
||||
<color name="purple">#3A2671</color>
|
||||
<color name="turquoiseDark">#69CBC1</color>
|
||||
</resources>
|
||||
@@ -3,7 +3,7 @@
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
|
||||
<!-- Customize your theme here. -->
|
||||
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
|
||||
<item name="android:textColor">#000000</item>
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
|
||||
+24
-15
@@ -5,18 +5,20 @@ buildscript {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
ext.kotlinVersion = '1.3.40'
|
||||
ext.kotlinVersion = "1.3.10"
|
||||
dependencies {
|
||||
classpath('com.android.tools.build:gradle:7.0.3')
|
||||
classpath("com.android.tools.build:gradle:4.2.1")
|
||||
|
||||
// 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()
|
||||
mavenCentral()
|
||||
maven {
|
||||
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
|
||||
url("$rootDir/../node_modules/react-native/android")
|
||||
@@ -25,13 +27,6 @@ allprojects {
|
||||
// Android JSC is installed from npm
|
||||
url("$rootDir/../node_modules/jsc-android/dist")
|
||||
}
|
||||
mavenCentral {
|
||||
// We don't want to fetch react-native from Maven Central as there are
|
||||
// older versions over there.
|
||||
content {
|
||||
excludeGroup "com.facebook.react"
|
||||
}
|
||||
}
|
||||
google()
|
||||
maven { url 'https://www.jitpack.io' }
|
||||
maven {
|
||||
@@ -46,9 +41,23 @@ allprojects {
|
||||
}
|
||||
|
||||
ext {
|
||||
buildToolsVersion = "33.0.2"
|
||||
minSdkVersion = 21
|
||||
compileSdkVersion = 33
|
||||
targetSdkVersion = 33
|
||||
ndkVersion = "21.4.7075529"
|
||||
googlePlayServicesVersion = "+" // default: "+"
|
||||
firebaseMessagingVersion = "21.1.0" // default: "+"
|
||||
|
||||
buildToolsVersion = "30.0.2"
|
||||
minSdkVersion = 23
|
||||
compileSdkVersion = 30
|
||||
targetSdkVersion = 30
|
||||
ndkVersion = "20.1.5948944"
|
||||
}
|
||||
|
||||
subprojects {
|
||||
afterEvaluate {project ->
|
||||
if (project.hasProperty("android")) {
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion '29.0.3'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
# Default value: -Xmx1024m -XX:MaxPermSize=256m
|
||||
# Default value: -Xmx10248m -XX:MaxPermSize=256m
|
||||
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
|
||||
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
@@ -25,7 +25,4 @@ android.useAndroidX=true
|
||||
android.enableJetifier=true
|
||||
|
||||
# Version of flipper SDK to use with React Native
|
||||
FLIPPER_VERSION=0.99.0
|
||||
|
||||
# https://github.com/facebook/react-native/issues/30729
|
||||
org.gradle.jvmargs=-Xmx4g
|
||||
FLIPPER_VERSION=0.93.0
|
||||
+2
-3
@@ -1,6 +1,5 @@
|
||||
#Wed Oct 11 14:45:21 CEST 2023
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
module.exports = {
|
||||
presets: ['module:metro-react-native-babel-preset'],
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
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,
|
||||
},
|
||||
})
|
||||
+28
-3
@@ -4,9 +4,7 @@ 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'
|
||||
@@ -71,12 +69,26 @@ const Home = ({ navigate, setDate }) => {
|
||||
<Button isCTA isSmall={false} onPress={navigateToCycleDayView}>
|
||||
{t('labels.home.addDataForToday')}
|
||||
</Button>
|
||||
{phase && <Footnote colorLabel="greyLight">{statusText}</Footnote>}
|
||||
{phase && (
|
||||
<View style={styles.asteriskLine}>
|
||||
<Asterisk />
|
||||
<AppText linkStyle={styles.whiteText} style={styles.greyText}>
|
||||
{statusText}
|
||||
</AppText>
|
||||
</View>
|
||||
)}
|
||||
</ScrollView>
|
||||
)
|
||||
}
|
||||
|
||||
const Asterisk = () => {
|
||||
return <AppText style={styles.asterisk}>*</AppText>
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
asterisk: {
|
||||
color: Colors.orange,
|
||||
},
|
||||
container: {
|
||||
backgroundColor: Colors.purple,
|
||||
flex: 1,
|
||||
@@ -92,6 +104,12 @@ const styles = StyleSheet.create({
|
||||
marginBottom: Spacing.tiny,
|
||||
marginTop: Spacing.small,
|
||||
},
|
||||
asteriskLine: {
|
||||
flexDirection: 'row',
|
||||
alignContent: 'flex-start',
|
||||
marginBottom: Spacing.tiny,
|
||||
marginTop: Spacing.small,
|
||||
},
|
||||
title: {
|
||||
color: Colors.purpleLight,
|
||||
fontFamily: Fonts.bold,
|
||||
@@ -106,6 +124,13 @@ const styles = StyleSheet.create({
|
||||
color: 'white',
|
||||
fontSize: Sizes.subtitle,
|
||||
},
|
||||
whiteText: {
|
||||
color: 'white',
|
||||
},
|
||||
greyText: {
|
||||
color: Colors.greyLight,
|
||||
paddingLeft: Spacing.base,
|
||||
},
|
||||
})
|
||||
|
||||
Home.propTypes = {
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { BackHandler, StyleSheet, View } from 'react-native'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import AppPage from './common/app-page'
|
||||
import AppText from './common/app-text'
|
||||
import Button from './common/button'
|
||||
import Segment from './common/segment'
|
||||
|
||||
import { saveLicenseFlag } from '../local-storage'
|
||||
|
||||
import { Containers } from '../styles'
|
||||
|
||||
export default function License({ setLicense }) {
|
||||
const onAcceptLicense = async () => {
|
||||
await saveLicenseFlag()
|
||||
setLicense()
|
||||
}
|
||||
|
||||
const { t } = useTranslation()
|
||||
const currentYear = new Date().getFullYear()
|
||||
|
||||
return (
|
||||
<AppPage testID="licensePage">
|
||||
<Segment last testID="test" title={t('settings.license.title')}>
|
||||
<AppText testID="test">
|
||||
{t('settings.license.text', { currentYear })}
|
||||
</AppText>
|
||||
<View style={styles.container}>
|
||||
<Button onPress={BackHandler.exitApp} testID="licenseCancelButton">
|
||||
{t('labels.shared.cancel')}
|
||||
</Button>
|
||||
<Button isCTA onPress={onAcceptLicense} testID="licenseOkButton">
|
||||
{t('labels.shared.ok')}
|
||||
</Button>
|
||||
</View>
|
||||
</Segment>
|
||||
</AppPage>
|
||||
)
|
||||
}
|
||||
|
||||
License.propTypes = {
|
||||
setLicense: PropTypes.func.isRequired,
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
...Containers.rowContainer,
|
||||
},
|
||||
})
|
||||
@@ -1,4 +1,5 @@
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import nodejs from 'nodejs-mobile-react-native'
|
||||
|
||||
import { getLicenseFlag, saveEncryptionFlag } from '../local-storage'
|
||||
import { openDb } from '../db'
|
||||
@@ -6,7 +7,7 @@ import { openDb } from '../db'
|
||||
import App from './app'
|
||||
import AppLoadingView from './common/app-loading'
|
||||
import AppStatusBar from './common/app-status-bar'
|
||||
import AcceptLicense from './AcceptLicense'
|
||||
import License from './License'
|
||||
import PasswordPrompt from './password-prompt'
|
||||
|
||||
export default function AppWrapper() {
|
||||
@@ -27,6 +28,7 @@ export default function AppWrapper() {
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
nodejs.start('main.js')
|
||||
checkIsLicenseAccepted()
|
||||
checkIsDbEncrypted()
|
||||
}, [])
|
||||
@@ -36,7 +38,7 @@ export default function AppWrapper() {
|
||||
}
|
||||
|
||||
if (!isLicenseAccepted) {
|
||||
return <AcceptLicense setLicense={() => setIsLicenseAccepted(true)} />
|
||||
return <License setLicense={() => setIsLicenseAccepted(true)} />
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
@@ -4,19 +4,15 @@ import { StyleSheet, View } from 'react-native'
|
||||
|
||||
import AppText from '../common/app-text'
|
||||
|
||||
import { Sizes, Typography } from '../../styles'
|
||||
import { 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 }]}>
|
||||
<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>
|
||||
<AppText style={styles.textBold}>#</AppText>
|
||||
<AppText style={styles.text}>{labels.date}</AppText>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -31,13 +27,8 @@ const styles = StyleSheet.create({
|
||||
justifyContent: 'flex-end',
|
||||
width: CHART_YAXIS_WIDTH,
|
||||
},
|
||||
singleLabelContainer: {
|
||||
justifyContent: 'space-around',
|
||||
alignItems: 'center',
|
||||
},
|
||||
text: {
|
||||
...Typography.label,
|
||||
fontSize: Sizes.footnote,
|
||||
},
|
||||
textBold: {
|
||||
...Typography.labelBold,
|
||||
|
||||
@@ -9,7 +9,7 @@ import HorizontalGrid from './horizontal-grid'
|
||||
import MainGrid from './main-grid'
|
||||
import NoData from './no-data'
|
||||
import NoTemperature from './no-temperature'
|
||||
import Tutorial from './Tutorial'
|
||||
import Tutorial from './tutorial'
|
||||
import YAxis from './y-axis'
|
||||
|
||||
import { getCycleDaysSortedByDate } from '../../db'
|
||||
@@ -29,23 +29,11 @@ const getSymptomsFromCycleDays = (cycleDays) =>
|
||||
SYMPTOMS.filter((symptom) => cycleDays.some((cycleDay) => cycleDay[symptom]))
|
||||
|
||||
const CycleChart = ({ navigate, setDate }) => {
|
||||
const [shouldShowHint, setShouldShowHint] = useState(false)
|
||||
const [shouldShowHint, setShouldShowHint] = useState(true)
|
||||
|
||||
useEffect(() => {
|
||||
let isMounted = true
|
||||
|
||||
async function checkShouldShowHint() {
|
||||
const flag = await getChartFlag()
|
||||
if (isMounted) {
|
||||
setShouldShowHint(flag === 'true')
|
||||
}
|
||||
}
|
||||
|
||||
checkShouldShowHint()
|
||||
|
||||
return () => {
|
||||
isMounted = false
|
||||
}
|
||||
useEffect(async () => {
|
||||
const flag = await getChartFlag()
|
||||
setShouldShowHint(flag === 'true')
|
||||
}, [])
|
||||
|
||||
const hideHint = () => {
|
||||
|
||||
@@ -19,20 +19,11 @@ const CycleDayLabel = ({ height, date }) => {
|
||||
|
||||
return (
|
||||
<View style={[styles.container, { height }]}>
|
||||
<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>
|
||||
)}
|
||||
<AppText style={styles.textBold}>{cycleDayLabel}</AppText>
|
||||
<View style={styles.dateLabel}>
|
||||
<AppText style={styles.text}>
|
||||
{isFirstDayOfMonth ? momentDate.format('MMM') : dayOfMonth}
|
||||
</AppText>
|
||||
{!isFirstDayOfMonth && (
|
||||
<AppText style={styles.textLight}>
|
||||
{getOrdinalSuffix(dayOfMonth)}
|
||||
@@ -54,21 +45,17 @@ const styles = StyleSheet.create({
|
||||
justifyContent: 'flex-end',
|
||||
left: 4,
|
||||
},
|
||||
textSmall: {
|
||||
text: {
|
||||
...Typography.label,
|
||||
fontSize: Sizes.small,
|
||||
},
|
||||
textFootnote: {
|
||||
...Typography.label,
|
||||
fontSize: Sizes.footnote,
|
||||
},
|
||||
textBold: {
|
||||
...Typography.labelBold,
|
||||
},
|
||||
textLight: {
|
||||
...Typography.labelLight,
|
||||
},
|
||||
labelRow: {
|
||||
dateLabel: {
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'space-around',
|
||||
alignItems: 'center',
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { TouchableOpacity } from 'react-native'
|
||||
import moment from 'moment'
|
||||
|
||||
import { getCycleDay } from '../../db'
|
||||
|
||||
@@ -27,8 +26,6 @@ const DayColumn = ({
|
||||
symptomRowSymptoms,
|
||||
xAxisHeight,
|
||||
}) => {
|
||||
const momentDate = moment(dateString)
|
||||
const isWeekend = momentDate.day() == 0 || momentDate.day() == 6
|
||||
const cycleDayData = getCycleDay(dateString)
|
||||
let data = {}
|
||||
|
||||
@@ -76,7 +73,6 @@ const DayColumn = ({
|
||||
isVerticalLine={fhmAndLtl.drawFhmLine}
|
||||
data={data && data.temperature}
|
||||
columnHeight={columnHeight}
|
||||
isWeekend={isWeekend}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -96,7 +92,6 @@ const DayColumn = ({
|
||||
isSymptomDataComplete={
|
||||
hasSymptomData && isSymptomDataComplete(symptom, dateString)
|
||||
}
|
||||
isWeekend={isWeekend}
|
||||
height={symptomHeight}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -7,8 +7,7 @@ import { Colors } from '../../styles'
|
||||
import {
|
||||
CHART_COLUMN_WIDTH,
|
||||
CHART_COLUMN_MIDDLE,
|
||||
CHART_DOT_RADIUS_SYMPTOM,
|
||||
CHART_DOT_RADIUS_TEMPERATURE,
|
||||
CHART_DOT_RADIUS,
|
||||
CHART_STROKE_WIDTH,
|
||||
} from '../../config'
|
||||
|
||||
@@ -36,9 +35,9 @@ const DotAndLine = ({
|
||||
}
|
||||
|
||||
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)
|
||||
.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
|
||||
@@ -59,13 +58,13 @@ const DotAndLine = ({
|
||||
d={lineRight}
|
||||
stroke={lineColorRight}
|
||||
strokeWidth={CHART_STROKE_WIDTH}
|
||||
key={y + CHART_DOT_RADIUS_SYMPTOM}
|
||||
key={y + CHART_DOT_RADIUS}
|
||||
/>
|
||||
<Shape
|
||||
d={dot}
|
||||
stroke={dotColor}
|
||||
strokeWidth={CHART_STROKE_WIDTH}
|
||||
fill={Colors.turquoiseDark}
|
||||
fill="white"
|
||||
key="dot"
|
||||
/>
|
||||
</React.Fragment>
|
||||
|
||||
@@ -5,7 +5,7 @@ import { StyleSheet, View } from 'react-native'
|
||||
import { Colors, Containers } from '../../styles'
|
||||
import {
|
||||
CHART_COLUMN_WIDTH,
|
||||
CHART_DOT_RADIUS_SYMPTOM,
|
||||
CHART_DOT_RADIUS,
|
||||
CHART_GRID_LINE_HORIZONTAL_WIDTH,
|
||||
} from '../../config'
|
||||
|
||||
@@ -15,31 +15,14 @@ const SymptomCell = ({
|
||||
symptom,
|
||||
symptomValue,
|
||||
isSymptomDataComplete,
|
||||
isWeekend,
|
||||
}) => {
|
||||
const shouldDrawDot = symptomValue !== false
|
||||
// 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,
|
||||
]
|
||||
? [styles.cell, { height, width: CHART_COLUMN_WIDTH }]
|
||||
: [styles.cell, { height, width: CHART_COLUMN_WIDTH }, styles.topBorder]
|
||||
let styleDot
|
||||
|
||||
if (shouldDrawDot) {
|
||||
const styleSymptom = Colors.iconColors[symptom]
|
||||
const symptomColor = styleSymptom.shades[symptomValue]
|
||||
@@ -64,11 +47,11 @@ SymptomCell.propTypes = {
|
||||
symptom: PropTypes.string,
|
||||
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,
|
||||
@@ -80,8 +63,8 @@ const styles = StyleSheet.create({
|
||||
borderTopWidth: CHART_GRID_LINE_HORIZONTAL_WIDTH,
|
||||
},
|
||||
dot: {
|
||||
width: CHART_DOT_RADIUS_SYMPTOM * 2,
|
||||
height: CHART_DOT_RADIUS_SYMPTOM * 2,
|
||||
width: CHART_DOT_RADIUS * 2,
|
||||
height: CHART_DOT_RADIUS * 2,
|
||||
borderRadius: 50,
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { Colors } from '../../styles'
|
||||
import { StyleSheet } from 'react-native'
|
||||
|
||||
import { Surface, Path } from '@react-native-community/art'
|
||||
|
||||
@@ -14,16 +14,14 @@ const TemperatureColumn = ({
|
||||
isVerticalLine,
|
||||
data,
|
||||
columnHeight,
|
||||
isWeekend,
|
||||
}) => {
|
||||
const x = CHART_STROKE_WIDTH / 2
|
||||
|
||||
const backgroundColor = isWeekend ? Colors.greyVeryLight : 'white'
|
||||
return (
|
||||
<Surface
|
||||
width={CHART_COLUMN_WIDTH}
|
||||
height={columnHeight}
|
||||
style={{ backgroundColor: backgroundColor }}
|
||||
style={styles.container}
|
||||
>
|
||||
<ChartLine path={new Path().lineTo(0, columnHeight)} />
|
||||
|
||||
@@ -65,7 +63,12 @@ TemperatureColumn.propTypes = {
|
||||
isVerticalLine: PropTypes.bool,
|
||||
data: PropTypes.object,
|
||||
columnHeight: PropTypes.number,
|
||||
isWeekend: PropTypes.bool,
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
backgroundColor: 'white',
|
||||
},
|
||||
})
|
||||
|
||||
export default TemperatureColumn
|
||||
|
||||
@@ -8,15 +8,13 @@ import { Sizes } from '../../styles'
|
||||
import { CHART_TICK_WIDTH } from '../../config'
|
||||
|
||||
const Tick = ({ yPosition, height, isBold, shouldShowLabel, label }) => {
|
||||
const top = yPosition - height / 2 - 4
|
||||
const top = yPosition - height / 2
|
||||
const containerStyle = [styles.container, { flexBasis: height, height, top }]
|
||||
const textStyle = isBold ? styles.textBold : styles.textNormal
|
||||
|
||||
if (!shouldShowLabel) return null
|
||||
|
||||
return (
|
||||
<View style={containerStyle}>
|
||||
<AppText style={textStyle}>{label}</AppText>
|
||||
<AppText style={textStyle}>{shouldShowLabel && label}</AppText>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -38,7 +36,6 @@ const styles = StyleSheet.create({
|
||||
position: 'absolute',
|
||||
right: 0,
|
||||
width: CHART_TICK_WIDTH,
|
||||
minHeight: Sizes.base + 2,
|
||||
},
|
||||
textBold: {
|
||||
fontSize: Sizes.base,
|
||||
|
||||
@@ -6,17 +6,16 @@ import AppText from '../common/app-text'
|
||||
import CloseIcon from '../common/close-icon'
|
||||
|
||||
import { Containers, Spacing } from '../../styles'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { chart } from '../../i18n/en/labels'
|
||||
|
||||
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} />
|
||||
<View style={styles.textContainer}>
|
||||
<AppText>{t('chart.tutorial')}</AppText>
|
||||
<AppText>{chart.tutorial}</AppText>
|
||||
</View>
|
||||
<CloseIcon onClose={onClose} />
|
||||
</View>
|
||||
@@ -1,28 +0,0 @@
|
||||
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
|
||||
@@ -1,16 +0,0 @@
|
||||
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
|
||||
@@ -1,50 +0,0 @@
|
||||
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
|
||||
@@ -1,33 +1,20 @@
|
||||
import React from 'react'
|
||||
import {
|
||||
Dimensions,
|
||||
Modal,
|
||||
StyleSheet,
|
||||
TouchableOpacity,
|
||||
View,
|
||||
} from 'react-native'
|
||||
import { Modal, StyleSheet, TouchableOpacity } from 'react-native'
|
||||
import PropTypes from 'prop-types'
|
||||
|
||||
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>
|
||||
const AppModal = ({ children, onClose }) => {
|
||||
return (
|
||||
<Modal
|
||||
animationType="fade"
|
||||
onRequestClose={onClose}
|
||||
transparent={true}
|
||||
visible={true}
|
||||
>
|
||||
<TouchableOpacity onPress={onClose} style={styles.blackBackground} />
|
||||
{children}
|
||||
</View>
|
||||
</Modal>
|
||||
)
|
||||
</Modal>
|
||||
)
|
||||
}
|
||||
|
||||
AppModal.propTypes = {
|
||||
children: PropTypes.node,
|
||||
@@ -40,28 +27,6 @@ const styles = StyleSheet.create({
|
||||
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
|
||||
|
||||
@@ -4,7 +4,7 @@ import { ScrollView, StyleSheet, View } from 'react-native'
|
||||
|
||||
import AppText from '../common/app-text'
|
||||
|
||||
import { Colors, Containers, Typography } from '../../styles'
|
||||
import { Colors, Typography } from '../../styles'
|
||||
|
||||
const AppPage = ({
|
||||
children,
|
||||
@@ -35,7 +35,10 @@ AppPage.propTypes = {
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: { ...Containers.pageContainer },
|
||||
container: {
|
||||
backgroundColor: Colors.turquoiseLight,
|
||||
flex: 1,
|
||||
},
|
||||
scrollView: {
|
||||
backgroundColor: Colors.turquoiseLight,
|
||||
flexGrow: 1,
|
||||
|
||||
@@ -1,15 +1,30 @@
|
||||
import React from 'react'
|
||||
import { StyleSheet, TextInput } from 'react-native'
|
||||
import { KeyboardAvoidingView, StyleSheet, TextInput } from 'react-native'
|
||||
import PropTypes from 'prop-types'
|
||||
|
||||
import { Colors, Spacing, Typography } from '../../styles'
|
||||
|
||||
const AppTextInput = ({ style, ...props }) => (
|
||||
<TextInput style={[styles.input, style]} {...props} />
|
||||
)
|
||||
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>
|
||||
)
|
||||
}
|
||||
|
||||
AppTextInput.propTypes = {
|
||||
style: PropTypes.object,
|
||||
isKeyboardOffset: PropTypes.bool,
|
||||
}
|
||||
|
||||
AppTextInput.defultProps = {
|
||||
isKeyboardOffset: true,
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
|
||||
@@ -2,18 +2,24 @@ 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, style, ...props }) => {
|
||||
const AppText = ({ children, linkStyle, style, ...props }) => {
|
||||
// we parse for links in case the text contains any
|
||||
return (
|
||||
<Text style={[styles.text, style]} {...props}>
|
||||
{children}
|
||||
</Text>
|
||||
<Link style={linkStyle}>
|
||||
<Text style={[styles.text, style]} {...props}>
|
||||
{children}
|
||||
</Text>
|
||||
</Link>
|
||||
)
|
||||
}
|
||||
|
||||
AppText.propTypes = {
|
||||
children: PropTypes.node,
|
||||
linkStyle: PropTypes.object,
|
||||
style: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
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
|
||||
@@ -4,7 +4,7 @@ import { StyleSheet, View } from 'react-native'
|
||||
|
||||
import AppText from './app-text'
|
||||
|
||||
import { Colors, Containers, Spacing, Typography } from '../../styles'
|
||||
import { Colors, Spacing, Typography } from '../../styles'
|
||||
|
||||
const Segment = ({ children, last, title }) => {
|
||||
const containerStyle = last ? styles.containerLast : styles.container
|
||||
@@ -25,16 +25,21 @@ Segment.propTypes = {
|
||||
title: PropTypes.string,
|
||||
}
|
||||
|
||||
const segmentContainer = {
|
||||
marginHorizontal: Spacing.base,
|
||||
marginBottom: Spacing.base,
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
borderStyle: 'solid',
|
||||
borderBottomWidth: 1,
|
||||
borderBottomColor: Colors.greyLight,
|
||||
paddingBottom: Spacing.base,
|
||||
...Containers.segmentContainer,
|
||||
...segmentContainer,
|
||||
},
|
||||
containerLast: {
|
||||
...Containers.segmentContainer,
|
||||
...segmentContainer,
|
||||
},
|
||||
title: {
|
||||
...Typography.subtitle,
|
||||
|
||||
@@ -2,25 +2,25 @@ import React from 'react'
|
||||
import { StyleSheet, View } from 'react-native'
|
||||
import PropTypes from 'prop-types'
|
||||
|
||||
import AppText from '../common/app-text'
|
||||
import AppText from './app-text'
|
||||
|
||||
import { Sizes, Spacing, Typography } from '../../styles'
|
||||
|
||||
const StatsOverview = ({ data }) => {
|
||||
return data.map((rowContent, i) => <Row key={i} rowContent={rowContent} />)
|
||||
const Table = ({ tableContent }) => {
|
||||
return tableContent.map((rowContent, i) => (
|
||||
<Row key={i} rowContent={rowContent} />
|
||||
))
|
||||
}
|
||||
|
||||
StatsOverview.propTypes = {
|
||||
data: PropTypes.array.isRequired,
|
||||
Table.propTypes = {
|
||||
tableContent: PropTypes.array.isRequired,
|
||||
}
|
||||
|
||||
const Row = ({ rowContent }) => {
|
||||
const isStandardDeviation = rowContent[1].includes('deviation')
|
||||
|
||||
return (
|
||||
<View style={styles.row}>
|
||||
<Cell content={rowContent[0]} isLeft />
|
||||
<Cell content={rowContent[1]} hasAsterisk={isStandardDeviation} />
|
||||
<Cell content={rowContent[1]} />
|
||||
</View>
|
||||
)
|
||||
}
|
||||
@@ -29,7 +29,7 @@ Row.propTypes = {
|
||||
rowContent: PropTypes.array.isRequired,
|
||||
}
|
||||
|
||||
const Cell = ({ content, isLeft, hasAsterisk }) => {
|
||||
const Cell = ({ content, isLeft }) => {
|
||||
const styleContainer = isLeft ? styles.cellLeft : styles.cellRight
|
||||
const styleText = isLeft ? styles.accentPurpleBig : styles.accentOrange
|
||||
const numberOfLines = isLeft ? 1 : 2
|
||||
@@ -43,7 +43,6 @@ const Cell = ({ content, isLeft, hasAsterisk }) => {
|
||||
style={styleText}
|
||||
>
|
||||
{content}
|
||||
{hasAsterisk && <AppText style={styles.accentOrange}>*</AppText>}
|
||||
</AppText>
|
||||
</View>
|
||||
)
|
||||
@@ -52,7 +51,6 @@ const Cell = ({ content, isLeft, hasAsterisk }) => {
|
||||
Cell.propTypes = {
|
||||
content: PropTypes.node.isRequired,
|
||||
isLeft: PropTypes.bool,
|
||||
hasAsterisk: PropTypes.bool,
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
@@ -67,11 +65,18 @@ const styles = StyleSheet.create({
|
||||
},
|
||||
cellLeft: {
|
||||
alignItems: 'flex-end',
|
||||
flex: 3,
|
||||
flex: 5,
|
||||
justifyContent: 'center',
|
||||
},
|
||||
cellRight: { flex: 5 },
|
||||
row: { flexDirection: 'row' },
|
||||
cellRight: {
|
||||
flex: 5,
|
||||
justifyContent: 'center',
|
||||
},
|
||||
row: {
|
||||
flexDirection: 'row',
|
||||
marginBottom: Spacing.tiny,
|
||||
marginLeft: Spacing.tiny,
|
||||
},
|
||||
})
|
||||
|
||||
export default StatsOverview
|
||||
export default Table
|
||||
@@ -10,7 +10,7 @@ import SymptomEditView from './symptom-edit-view'
|
||||
import { isDateInFuture } from '../helpers/cycle-day'
|
||||
|
||||
import { Colors, Sizes, Spacing } from '../../styles'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import { headerTitles as symptomTitles } from '../../i18n/en/labels'
|
||||
|
||||
const SymptomBox = ({
|
||||
date,
|
||||
@@ -20,7 +20,6 @@ const SymptomBox = ({
|
||||
editedSymptom,
|
||||
setEditedSymptom,
|
||||
}) => {
|
||||
const { t } = useTranslation(null, { keyPrefix: 'cycleDay.symptomBox' })
|
||||
const isSymptomEdited = editedSymptom === symptom
|
||||
const isSymptomDisabled = isDateInFuture(date) && symptom !== 'note'
|
||||
const isExcluded = symptomData !== null ? symptomData.exclude : false
|
||||
@@ -62,7 +61,9 @@ const SymptomBox = ({
|
||||
size={Sizes.icon}
|
||||
/>
|
||||
<View style={styles.textContainer}>
|
||||
<AppText style={symptomNameStyle}>{t(symptom)}</AppText>
|
||||
<AppText style={symptomNameStyle}>
|
||||
{symptomTitles[symptom].toLowerCase()}
|
||||
</AppText>
|
||||
{symptomDataToDisplay && (
|
||||
<AppText style={textStyle} numberOfLines={4}>
|
||||
{symptomDataToDisplay}
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
import React, { useState } from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { ScrollView, StyleSheet, View } from 'react-native'
|
||||
import { Dimensions, ScrollView, StyleSheet, View } from 'react-native'
|
||||
|
||||
import AppModal from '../common/app-modal'
|
||||
import AppSwitch from '../common/app-switch'
|
||||
import AppText from '../common/app-text'
|
||||
import AppTextInput from '../common/app-text-input'
|
||||
import Button from '../common/button'
|
||||
import CloseIcon from '../common/close-icon'
|
||||
import Segment from '../common/segment'
|
||||
import SelectBoxGroup from './select-box-group'
|
||||
import SelectTabGroup from './select-tab-group'
|
||||
@@ -108,20 +109,16 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
|
||||
}
|
||||
const iconName = shouldShowInfo ? 'chevron-up' : 'chevron-down'
|
||||
const noteText = symptom === 'note' ? data.value : data.note
|
||||
const inputProps = {
|
||||
multiline: true,
|
||||
numberOfLines: 3,
|
||||
scrollEnabled: false,
|
||||
style: styles.input,
|
||||
textAlignVertical: 'top',
|
||||
}
|
||||
|
||||
return (
|
||||
<AppModal onClose={onSave}>
|
||||
<ScrollView
|
||||
contentContainerStyle={styles.modalContainer}
|
||||
keyboardDismissMode="on-drag"
|
||||
style={styles.modalWindow}
|
||||
>
|
||||
<View style={styles.headerContainer}>
|
||||
<CloseIcon onClose={onSave} />
|
||||
</View>
|
||||
{symptom === 'temperature' && (
|
||||
<Temperature
|
||||
date={date}
|
||||
@@ -159,7 +156,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
|
||||
/>
|
||||
{isOtherSelected && (
|
||||
<AppTextInput
|
||||
{...inputProps}
|
||||
multiline={true}
|
||||
placeholder={sharedLabels.enter}
|
||||
value={data.note}
|
||||
onChangeText={(value) => onSelectBoxNote(value)}
|
||||
@@ -181,7 +178,8 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
|
||||
<Segment style={styles.segmentBorder}>
|
||||
<AppText>{symtomPage[symptom].note}</AppText>
|
||||
<AppTextInput
|
||||
{...inputProps}
|
||||
multiline={true}
|
||||
numberOfLines={3}
|
||||
onChangeText={onEditNote}
|
||||
placeholder={sharedLabels.enter}
|
||||
testID="noteInput"
|
||||
@@ -220,14 +218,24 @@ SymptomEditView.propTypes = {
|
||||
const styles = StyleSheet.create({
|
||||
buttonsContainer: {
|
||||
...Containers.rowContainer,
|
||||
paddingHorizontal: Spacing.base,
|
||||
paddingBottom: Spacing.base,
|
||||
},
|
||||
input: {
|
||||
height: Sizes.base * 5,
|
||||
headerContainer: {
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'flex-end',
|
||||
paddingVertical: Spacing.tiny,
|
||||
},
|
||||
modalContainer: {
|
||||
paddingHorizontal: Spacing.base,
|
||||
flex: 1,
|
||||
padding: Spacing.base,
|
||||
},
|
||||
modalWindow: {
|
||||
alignSelf: 'center',
|
||||
backgroundColor: 'white',
|
||||
borderRadius: 10,
|
||||
marginVertical: Sizes.huge * 2,
|
||||
position: 'absolute',
|
||||
minHeight: '40%',
|
||||
maxHeight: Dimensions.get('window').height * 0.7,
|
||||
},
|
||||
segmentBorder: {
|
||||
borderBottomColor: Colors.greyLight,
|
||||
|
||||
@@ -7,28 +7,28 @@ import {
|
||||
View,
|
||||
} from 'react-native'
|
||||
import PropTypes from 'prop-types'
|
||||
import AppText from '../common/app-text'
|
||||
|
||||
import AppIcon from '../common/app-icon'
|
||||
import CloseIcon from '../common/close-icon'
|
||||
import MenuItem from './menu-item'
|
||||
|
||||
import { Colors, Sizes, Typography } from '../../styles'
|
||||
import { Colors, Sizes } from '../../styles'
|
||||
import settingsLabels from '../../i18n/en/settings'
|
||||
import { HIT_SLOP } from '../../config'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
const { menuItems } = settingsLabels
|
||||
|
||||
const settingsMenuItems = [
|
||||
{ labelKey: 'settings', componentName: 'SettingsMenu' },
|
||||
{ labelKey: 'about', componentName: 'About' },
|
||||
{ labelKey: 'license', componentName: 'License' },
|
||||
{ labelKey: 'privacyPolicy', componentName: 'PrivacyPolicy' },
|
||||
{ name: menuItems.settings, component: 'SettingsMenu' },
|
||||
{ name: menuItems.about, component: 'About' },
|
||||
{ name: menuItems.license, component: 'License' },
|
||||
{ name: menuItems.privacyPolicy, component: 'PrivacyPolicy' },
|
||||
]
|
||||
|
||||
const HamburgerMenu = ({ navigate }) => {
|
||||
const [isOpen, setIsOpen] = useState(false)
|
||||
const closeMenu = () => setIsOpen(false)
|
||||
|
||||
const { t } = useTranslation(null, { keyPrefix: 'hamburgerMenu.menuMain' })
|
||||
|
||||
if (!isOpen)
|
||||
return (
|
||||
<TouchableOpacity onPress={() => setIsOpen(true)} hitSlop={HIT_SLOP}>
|
||||
@@ -36,25 +36,23 @@ const HamburgerMenu = ({ navigate }) => {
|
||||
</TouchableOpacity>
|
||||
)
|
||||
|
||||
function onPress(componentName) {
|
||||
closeMenu()
|
||||
navigate(componentName)
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal animationType="fade" onRequestClose={closeMenu} transparent>
|
||||
<TouchableOpacity onPress={closeMenu} style={styles.blackBackground} />
|
||||
<Modal animationType="fade" onRequestClose={closeMenu} transparent={true}>
|
||||
<TouchableOpacity
|
||||
onPress={closeMenu}
|
||||
style={styles.blackBackground}
|
||||
></TouchableOpacity>
|
||||
<View style={styles.menu}>
|
||||
<View style={styles.iconContainer}>
|
||||
<CloseIcon color={'black'} onClose={closeMenu} />
|
||||
</View>
|
||||
{settingsMenuItems.map(({ labelKey, componentName }) => (
|
||||
<TouchableOpacity
|
||||
onPress={() => onPress(componentName)}
|
||||
key={labelKey}
|
||||
>
|
||||
<AppText style={styles.menuItem}>{t(labelKey)}</AppText>
|
||||
</TouchableOpacity>
|
||||
{settingsMenuItems.map((item) => (
|
||||
<MenuItem
|
||||
item={item}
|
||||
key={item.name}
|
||||
closeMenu={closeMenu}
|
||||
navigate={navigate}
|
||||
/>
|
||||
))}
|
||||
</View>
|
||||
</Modal>
|
||||
@@ -86,5 +84,4 @@ const styles = StyleSheet.create({
|
||||
position: 'absolute',
|
||||
width: '60%',
|
||||
},
|
||||
menuItem: Typography.subtitle,
|
||||
})
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
import React from 'react'
|
||||
import { StyleSheet, TouchableOpacity } from 'react-native'
|
||||
import PropTypes from 'prop-types'
|
||||
|
||||
import AppText from '../common/app-text'
|
||||
|
||||
import { Typography } from '../../styles'
|
||||
|
||||
const MenuItem = ({ item, navigate, closeMenu }) => {
|
||||
const { component, name } = item
|
||||
const onPress = () => {
|
||||
closeMenu()
|
||||
navigate(component)
|
||||
}
|
||||
|
||||
return (
|
||||
<TouchableOpacity onPress={onPress}>
|
||||
<AppText style={styles.text}>{name}</AppText>
|
||||
</TouchableOpacity>
|
||||
)
|
||||
}
|
||||
|
||||
MenuItem.propTypes = {
|
||||
item: PropTypes.object.isRequired,
|
||||
navigate: PropTypes.func.isRequired,
|
||||
closeMenu: PropTypes.func.isRequired,
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
text: {
|
||||
...Typography.subtitle,
|
||||
},
|
||||
})
|
||||
|
||||
export default MenuItem
|
||||
@@ -22,18 +22,3 @@ export function dateToTitle(dateString) {
|
||||
? labels.today
|
||||
: moment(dateString).format('ddd DD. MMM YY')
|
||||
}
|
||||
|
||||
export function humanizeDate(dateString) {
|
||||
if (!dateString) return ''
|
||||
|
||||
const today = LocalDate.now()
|
||||
|
||||
try {
|
||||
const dateToDisplay = LocalDate.parse(dateString)
|
||||
return today.equals(dateToDisplay)
|
||||
? labels.today
|
||||
: moment(dateString).format('DD. MMM YY')
|
||||
} catch (e) {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,23 +6,20 @@ import MenuItem from './menu-item'
|
||||
|
||||
import { Containers } from '../../styles'
|
||||
import { pages } from '../pages'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
const Menu = ({ currentPage, navigate }) => {
|
||||
const menuItems = pages.filter((page) => page.isInMenu)
|
||||
|
||||
const { t } = useTranslation(null, { keyPrefix: 'bottomMenu' })
|
||||
|
||||
return (
|
||||
<View style={styles.container}>
|
||||
{menuItems.map(({ icon, labelKey, component }) => {
|
||||
{menuItems.map(({ icon, label, component }) => {
|
||||
return (
|
||||
<MenuItem
|
||||
isActive={component === currentPage}
|
||||
onPress={() => navigate(component)}
|
||||
icon={icon}
|
||||
key={labelKey}
|
||||
label={t(labelKey)}
|
||||
key={label}
|
||||
label={label}
|
||||
/>
|
||||
)
|
||||
})}
|
||||
|
||||
+15
-3
@@ -1,63 +1,75 @@
|
||||
import settingsViews from './settings'
|
||||
|
||||
import settingsLabels from '../i18n/en/settings'
|
||||
const labels = settingsLabels.menuItems
|
||||
|
||||
export const pages = [
|
||||
{
|
||||
component: 'Home',
|
||||
icon: 'home',
|
||||
label: 'Home',
|
||||
},
|
||||
{
|
||||
component: 'Calendar',
|
||||
icon: 'calendar',
|
||||
isInMenu: true,
|
||||
labelKey: 'calendar',
|
||||
label: 'Calendar',
|
||||
parent: 'Home',
|
||||
},
|
||||
{
|
||||
component: 'Chart',
|
||||
icon: 'chart',
|
||||
isInMenu: true,
|
||||
labelKey: 'chart',
|
||||
label: 'Chart',
|
||||
parent: 'Home',
|
||||
},
|
||||
{
|
||||
component: 'Stats',
|
||||
icon: 'statistics',
|
||||
isInMenu: true,
|
||||
labelKey: 'stats',
|
||||
label: 'Stats',
|
||||
parent: 'Home',
|
||||
},
|
||||
{
|
||||
children: Object.keys(settingsViews),
|
||||
component: 'SettingsMenu',
|
||||
icon: 'settings',
|
||||
label: 'Settings',
|
||||
parent: 'Home',
|
||||
},
|
||||
{
|
||||
component: 'Reminders',
|
||||
label: labels.reminders.name,
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'NfpSettings',
|
||||
label: labels.nfpSettings.name,
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'DataManagement',
|
||||
label: labels.dataManagement.name,
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'Password',
|
||||
label: labels.password.name,
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'About',
|
||||
label: 'About',
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'License',
|
||||
label: 'License',
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
component: 'PrivacyPolicy',
|
||||
label: 'PrivacyPolicy',
|
||||
parent: 'SettingsMenu',
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React, { useState } from 'react'
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { Alert, KeyboardAvoidingView, StyleSheet, View } from 'react-native'
|
||||
import { SHA512 } from 'jshashes'
|
||||
import { Alert, StyleSheet, View } from 'react-native'
|
||||
import nodejs from 'nodejs-mobile-react-native'
|
||||
|
||||
import AppPage from './common/app-page'
|
||||
import AppTextInput from './common/app-text-input'
|
||||
@@ -9,7 +9,7 @@ import Button from './common/button'
|
||||
import Header from './header'
|
||||
|
||||
import { saveEncryptionFlag } from '../local-storage'
|
||||
import { deleteDbAndOpenNew, openDb } from '../db'
|
||||
import { requestHash, deleteDbAndOpenNew, openDb } from '../db'
|
||||
import { passwordPrompt as labels, shared } from '../i18n/en/labels'
|
||||
import { Containers, Spacing } from '../styles'
|
||||
|
||||
@@ -17,10 +17,9 @@ const cancelButton = { text: shared.cancel, style: 'cancel' }
|
||||
|
||||
const PasswordPrompt = ({ enableShowApp }) => {
|
||||
const [password, setPassword] = useState(null)
|
||||
const unlockApp = () => requestHash('check-pw', password)
|
||||
const isPasswordEntered = Boolean(password)
|
||||
|
||||
const unlockApp = async () => {
|
||||
const hash = new SHA512().hex(password)
|
||||
const passHashToDb = async (hash) => {
|
||||
const connected = await openDb(hash)
|
||||
|
||||
if (!connected) {
|
||||
@@ -32,9 +31,16 @@ const PasswordPrompt = ({ enableShowApp }) => {
|
||||
])
|
||||
return
|
||||
}
|
||||
|
||||
enableShowApp()
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
nodejs.channel.addListener('check-pw', passHashToDb, this)
|
||||
|
||||
return () => nodejs.channel.remove('check-pw', passHashToDb)
|
||||
}, [])
|
||||
|
||||
const onDeleteDataConfirmation = async () => {
|
||||
await deleteDbAndOpenNew()
|
||||
await saveEncryptionFlag(false)
|
||||
@@ -62,23 +68,22 @@ const PasswordPrompt = ({ enableShowApp }) => {
|
||||
<>
|
||||
<Header isStatic />
|
||||
<AppPage contentContainerStyle={styles.contentContainer}>
|
||||
<KeyboardAvoidingView behavior="padding" keyboardVerticalOffset={150}>
|
||||
<AppTextInput
|
||||
onChangeText={setPassword}
|
||||
secureTextEntry={true}
|
||||
placeholder={labels.enterPassword}
|
||||
/>
|
||||
<View style={styles.containerButtons}>
|
||||
<Button onPress={onConfirmDeletion}>{labels.forgotPassword}</Button>
|
||||
<Button
|
||||
disabled={!isPasswordEntered}
|
||||
isCTA={isPasswordEntered}
|
||||
onPress={unlockApp}
|
||||
>
|
||||
{labels.title}
|
||||
</Button>
|
||||
</View>
|
||||
</KeyboardAvoidingView>
|
||||
<AppTextInput
|
||||
isKeyboardOffset={false}
|
||||
onChangeText={setPassword}
|
||||
secureTextEntry={true}
|
||||
placeholder={labels.enterPassword}
|
||||
/>
|
||||
<View style={styles.containerButtons}>
|
||||
<Button onPress={onConfirmDeletion}>{labels.forgotPassword}</Button>
|
||||
<Button
|
||||
disabled={!isPasswordEntered}
|
||||
isCTA={isPasswordEntered}
|
||||
onPress={unlockApp}
|
||||
>
|
||||
{labels.title}
|
||||
</Button>
|
||||
</View>
|
||||
</AppPage>
|
||||
</>
|
||||
)
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import AppPage from '../common/app-page'
|
||||
import AppText from '../common/app-text'
|
||||
import AppLink from '../common/AppLink'
|
||||
import Segment from '../common/segment'
|
||||
|
||||
const License = ({ children }) => {
|
||||
const { t } = useTranslation(null, { keyPrefix: 'hamburgerMenu.license' })
|
||||
const currentYear = new Date().getFullYear()
|
||||
const link = 'https://www.gnu.org/licenses/gpl-3.0.html'
|
||||
return (
|
||||
<AppPage title={t('title')}>
|
||||
<Segment last>
|
||||
<AppText>{t('text', { currentYear })}</AppText>
|
||||
<AppLink url={link}>{link}</AppLink>
|
||||
{children}
|
||||
</Segment>
|
||||
</AppPage>
|
||||
)
|
||||
}
|
||||
|
||||
License.propTypes = {
|
||||
children: PropTypes.node,
|
||||
}
|
||||
|
||||
export default License
|
||||
@@ -3,7 +3,6 @@ import { Platform, Linking } from 'react-native'
|
||||
|
||||
import AppPage from '../common/app-page'
|
||||
import AppText from '../common/app-text'
|
||||
import AppLink from '../common/AppLink'
|
||||
import Segment from '../common/segment'
|
||||
import Button from '../common/button'
|
||||
import ButtonRow from '../common/button-row'
|
||||
@@ -12,7 +11,7 @@ import links from '../../i18n/en/links'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
const AboutSection = () => {
|
||||
const { t } = useTranslation(null, { keyPrefix: 'hamburgerMenu.about' })
|
||||
const { t } = useTranslation(null, { keyPrefix: 'settings.about' })
|
||||
|
||||
return (
|
||||
<AppPage title={t('title')}>
|
||||
@@ -36,15 +35,13 @@ const AboutSection = () => {
|
||||
</Segment>
|
||||
<Segment title={t('credits.title')}>
|
||||
<AppText>
|
||||
{t('credits.text')}{' '}
|
||||
<AppLink url={links.flaticon.url}>flaticon</AppLink>.{' '}
|
||||
</AppText>
|
||||
<AppText>
|
||||
{t('credits.madeBy')}{' '}
|
||||
<AppLink url={links.smashicons.url}>smashicons</AppLink>,{' '}
|
||||
<AppLink url={links.pause08.url}>pause08</AppLink>,{' '}
|
||||
<AppLink url={links.kazachek.url}>kazachek</AppLink>,{' '}
|
||||
<AppLink url={links.freepik.url}>freepik</AppLink>.
|
||||
{t('credits.text', {
|
||||
smashicons: links.smashicons.url,
|
||||
pause08: links.pause08.url,
|
||||
kazachek: links.kazachek.url,
|
||||
freepik: links.freepik.url,
|
||||
flaticon: links.flaticon.url,
|
||||
})}
|
||||
</AppText>
|
||||
</Segment>
|
||||
<Segment title={t('donate.title')}>
|
||||
@@ -1,12 +1,12 @@
|
||||
import React, { useState } from 'react'
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { Alert, KeyboardAvoidingView, StyleSheet, View } from 'react-native'
|
||||
import { SHA512 } from 'jshashes'
|
||||
import { Alert, StyleSheet, View } from 'react-native'
|
||||
import nodejs from 'nodejs-mobile-react-native'
|
||||
|
||||
import AppTextInput from '../../common/app-text-input'
|
||||
import Button from '../../common/button'
|
||||
|
||||
import { openDb } from '../../../db'
|
||||
import { requestHash, openDb } from '../../../db'
|
||||
import { Containers } from '../../../styles'
|
||||
import settings from '../../../i18n/en/settings'
|
||||
import { shared } from '../../../i18n/en/labels'
|
||||
@@ -14,8 +14,7 @@ import { shared } from '../../../i18n/en/labels'
|
||||
const ConfirmWithPassword = ({ onSuccess, onCancel }) => {
|
||||
const [password, setPassword] = useState(null)
|
||||
|
||||
const checkPassword = async () => {
|
||||
const hash = new SHA512().hex(password)
|
||||
const checkPassword = async (hash) => {
|
||||
try {
|
||||
await openDb(hash)
|
||||
onSuccess()
|
||||
@@ -24,6 +23,13 @@ const ConfirmWithPassword = ({ onSuccess, onCancel }) => {
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
nodejs.channel.addListener('password-check', checkPassword, this)
|
||||
return () => {
|
||||
nodejs.channel.removeListener('password-check', checkPassword)
|
||||
}
|
||||
}, [])
|
||||
|
||||
const onIncorrectPassword = () => {
|
||||
Alert.alert(shared.incorrectPassword, shared.incorrectPasswordMessage, [
|
||||
{
|
||||
@@ -37,11 +43,15 @@ const ConfirmWithPassword = ({ onSuccess, onCancel }) => {
|
||||
])
|
||||
}
|
||||
|
||||
const initPasswordCheck = () => {
|
||||
requestHash('password-check', password)
|
||||
}
|
||||
|
||||
const labels = settings.passwordSettings
|
||||
const isPassword = password !== null
|
||||
|
||||
return (
|
||||
<KeyboardAvoidingView behavior="padding" keyboardVerticalOffset={150}>
|
||||
<>
|
||||
<AppTextInput
|
||||
onChangeText={setPassword}
|
||||
placeholder={labels.enterCurrent}
|
||||
@@ -53,12 +63,12 @@ const ConfirmWithPassword = ({ onSuccess, onCancel }) => {
|
||||
<Button
|
||||
disabled={!isPassword}
|
||||
isCTA={isPassword}
|
||||
onPress={checkPassword}
|
||||
onPress={initPasswordCheck}
|
||||
>
|
||||
{shared.confirmToProceed}
|
||||
</Button>
|
||||
</View>
|
||||
</KeyboardAvoidingView>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import { Alert } from 'react-native'
|
||||
import DocumentPicker from 'react-native-document-picker'
|
||||
import rnfs from 'react-native-fs'
|
||||
import importCsv from '../../../lib/import-export/import-from-csv'
|
||||
import alertError from '../common/alert-error'
|
||||
import Segment from '../../common/segment'
|
||||
import AppText from '../../common/app-text'
|
||||
import Button from '../../common/button'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
export default function ImportData({ resetIsDeletingData, setIsLoading }) {
|
||||
const { t } = useTranslation(null, {
|
||||
keyPrefix: 'hamburgerMenu.settings.data.import',
|
||||
})
|
||||
|
||||
async function startImport(shouldDeleteExistingData) {
|
||||
setIsLoading(true)
|
||||
await importData(shouldDeleteExistingData)
|
||||
setIsLoading(false)
|
||||
}
|
||||
|
||||
async function getFileInfo() {
|
||||
try {
|
||||
const fileInfo = await DocumentPicker.pickSingle({
|
||||
type: [DocumentPicker.types.csv, 'text/comma-separated-values'],
|
||||
})
|
||||
return fileInfo
|
||||
} catch (error) {
|
||||
if (DocumentPicker.isCancel(error)) return // User cancelled the picker, exit any dialogs or menus and move on
|
||||
showImportErrorAlert(error)
|
||||
}
|
||||
}
|
||||
|
||||
async function getFileContent() {
|
||||
const fileInfo = await getFileInfo()
|
||||
if (!fileInfo) return null
|
||||
|
||||
try {
|
||||
const fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
|
||||
return fileContent
|
||||
} catch (err) {
|
||||
return showImportErrorAlert(t('error.couldNotOpenFile'))
|
||||
}
|
||||
}
|
||||
|
||||
async function importData(shouldDeleteExistingData) {
|
||||
const fileContent = await getFileContent()
|
||||
if (!fileContent) return
|
||||
|
||||
try {
|
||||
await importCsv(fileContent, shouldDeleteExistingData)
|
||||
Alert.alert(t('success.title'), t('success.message'))
|
||||
} catch (err) {
|
||||
showImportErrorAlert(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
function openImportDialog() {
|
||||
resetIsDeletingData()
|
||||
Alert.alert(t('dialog.title'), t('dialog.message'), [
|
||||
{
|
||||
text: t('dialog.cancel'),
|
||||
style: 'cancel',
|
||||
onPress: () => {},
|
||||
},
|
||||
{
|
||||
text: t('dialog.delete'),
|
||||
onPress: () => startImport(true),
|
||||
},
|
||||
{
|
||||
text: t('dialog.replace'),
|
||||
onPress: () => startImport(false),
|
||||
},
|
||||
])
|
||||
}
|
||||
|
||||
function showImportErrorAlert(message) {
|
||||
const errorMessage = t('error.noDataImported', { message })
|
||||
alertError(errorMessage)
|
||||
}
|
||||
|
||||
return (
|
||||
<Segment title={t('button')}>
|
||||
<AppText>{t('segmentExplainer')}</AppText>
|
||||
<Button isCTA onPress={openImportDialog}>
|
||||
{t('button')}
|
||||
</Button>
|
||||
</Segment>
|
||||
)
|
||||
}
|
||||
|
||||
ImportData.propTypes = {
|
||||
resetIsDeletingData: PropTypes.func.isRequired,
|
||||
setIsLoading: PropTypes.func.isRequired,
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
import { Alert } from 'react-native'
|
||||
import DocumentPicker from 'react-native-document-picker'
|
||||
import rnfs from 'react-native-fs'
|
||||
import importCsv from '../../../lib/import-export/import-from-csv'
|
||||
import { shared as sharedLabels } from '../../../i18n/en/labels'
|
||||
import labels from '../../../i18n/en/settings'
|
||||
import alertError from '../common/alert-error'
|
||||
|
||||
export function openImportDialog(onImportData) {
|
||||
Alert.alert(labels.import.title, labels.import.message, [
|
||||
{
|
||||
text: sharedLabels.cancel,
|
||||
style: 'cancel',
|
||||
onPress: () => {},
|
||||
},
|
||||
{
|
||||
text: labels.import.replaceOption,
|
||||
onPress: () => onImportData(false),
|
||||
},
|
||||
{
|
||||
text: labels.import.deleteOption,
|
||||
onPress: () => onImportData(true),
|
||||
},
|
||||
])
|
||||
}
|
||||
|
||||
export async function getFileContent() {
|
||||
let fileInfo
|
||||
try {
|
||||
fileInfo = await DocumentPicker.pickSingle({
|
||||
type: [DocumentPicker.types.csv, 'text/comma-separated-values'],
|
||||
})
|
||||
} catch (error) {
|
||||
if (DocumentPicker.isCancel(error)) {
|
||||
// User cancelled the picker, exit any dialogs or menus and move on
|
||||
return
|
||||
} else {
|
||||
importError(error)
|
||||
}
|
||||
}
|
||||
|
||||
let fileContent
|
||||
try {
|
||||
fileContent = await rnfs.readFile(fileInfo.uri, 'utf8')
|
||||
} catch (err) {
|
||||
return importError(labels.import.errors.couldNotOpenFile)
|
||||
}
|
||||
|
||||
return fileContent
|
||||
}
|
||||
|
||||
export async function importData(shouldDeleteExistingData, fileContent) {
|
||||
try {
|
||||
await importCsv(fileContent, shouldDeleteExistingData)
|
||||
Alert.alert(sharedLabels.successTitle, labels.import.success.message)
|
||||
} catch (err) {
|
||||
importError(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
function importError(msg) {
|
||||
const postFixed = `${msg}\n\n${labels.import.errors.postFix}`
|
||||
alertError(postFixed)
|
||||
}
|
||||
+27
-8
@@ -6,23 +6,40 @@ import AppText from '../../common/app-text'
|
||||
import Button from '../../common/button'
|
||||
import Segment from '../../common/segment'
|
||||
|
||||
import { openImportDialog, getFileContent, importData } from './import-dialog'
|
||||
import openShareDialogAndExport from './export-dialog'
|
||||
import DeleteData from './delete-data'
|
||||
|
||||
import labels from '../../../i18n/en/settings'
|
||||
import ImportData from './ImportData'
|
||||
import { ACTION_DELETE, ACTION_EXPORT, ACTION_IMPORT } from '../../../config'
|
||||
|
||||
const DataManagement = () => {
|
||||
const [isLoading, setIsLoading] = useState(false)
|
||||
const [isDeletingData, setIsDeletingData] = useState(false)
|
||||
const [currentAction, setCurrentAction] = useState(null)
|
||||
|
||||
const startImportFlow = async (shouldDeleteExistingData) => {
|
||||
setIsLoading(true)
|
||||
const fileContent = await getFileContent()
|
||||
if (fileContent) {
|
||||
await importData(shouldDeleteExistingData, fileContent)
|
||||
}
|
||||
setIsLoading(false)
|
||||
}
|
||||
|
||||
const startExport = () => {
|
||||
setIsDeletingData(false)
|
||||
setCurrentAction(ACTION_EXPORT)
|
||||
openShareDialogAndExport()
|
||||
}
|
||||
|
||||
const startImport = () => {
|
||||
setCurrentAction(ACTION_IMPORT)
|
||||
openImportDialog(startImportFlow)
|
||||
}
|
||||
|
||||
if (isLoading) return <AppLoadingView />
|
||||
|
||||
const isDeletingData = currentAction === ACTION_DELETE
|
||||
|
||||
return (
|
||||
<AppPage>
|
||||
<Segment title={labels.export.button}>
|
||||
@@ -31,15 +48,17 @@ const DataManagement = () => {
|
||||
{labels.export.button}
|
||||
</Button>
|
||||
</Segment>
|
||||
<ImportData
|
||||
resetIsDeletingData={() => setIsDeletingData(false)}
|
||||
setIsLoading={setIsLoading}
|
||||
/>
|
||||
<Segment title={labels.import.button}>
|
||||
<AppText>{labels.import.segmentExplainer}</AppText>
|
||||
<Button isCTA onPress={startImport}>
|
||||
{labels.import.button}
|
||||
</Button>
|
||||
</Segment>
|
||||
<Segment title={labels.deleteSegment.title} last>
|
||||
<AppText>{labels.deleteSegment.explainer}</AppText>
|
||||
<DeleteData
|
||||
isDeletingData={isDeletingData}
|
||||
onStartDeletion={() => setIsDeletingData(true)}
|
||||
onStartDeletion={() => setCurrentAction(ACTION_DELETE)}
|
||||
/>
|
||||
</Segment>
|
||||
</AppPage>
|
||||
@@ -1,9 +1,9 @@
|
||||
import Reminders from './reminders/reminders'
|
||||
import NfpSettings from './nfp-settings'
|
||||
import DataManagement from './data-management/DataManagement'
|
||||
import DataManagement from './data-management'
|
||||
import Password from './password'
|
||||
import About from './About'
|
||||
import License from './License'
|
||||
import About from './about'
|
||||
import License from './license'
|
||||
import PrivacyPolicy from './privacy-policy'
|
||||
|
||||
export default {
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import React from 'react'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import AppPage from '../common/app-page'
|
||||
import AppText from '../common/app-text'
|
||||
import Segment from '../common/segment'
|
||||
|
||||
const License = () => {
|
||||
const { t } = useTranslation()
|
||||
const currentYear = new Date().getFullYear()
|
||||
|
||||
return (
|
||||
<AppPage title={t('settings.license.title')}>
|
||||
<Segment last>
|
||||
<AppText>{t('settings.license.text', { currentYear })}</AppText>
|
||||
</Segment>
|
||||
</AppPage>
|
||||
)
|
||||
}
|
||||
|
||||
export default License
|
||||
@@ -7,22 +7,18 @@ import AppText from '../common/app-text'
|
||||
import Segment from '../common/segment'
|
||||
|
||||
import { Colors, Containers, Sizes } from '../../styles'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
const MenuItem = ({ item, last, navigate }) => {
|
||||
const { t } = useTranslation(null, {
|
||||
keyPrefix: 'hamburgerMenu.settings.menuItem',
|
||||
})
|
||||
return (
|
||||
<Segment last={last}>
|
||||
<TouchableOpacity
|
||||
style={styles.container}
|
||||
key={item.label}
|
||||
onPress={() => navigate(item.componentName)}
|
||||
key={item.name}
|
||||
onPress={() => navigate(item.component)}
|
||||
>
|
||||
<View>
|
||||
<AppText style={styles.title}>{t(`${item.label}.name`)}</AppText>
|
||||
{!!item.label && <AppText>{t(`${item.label}.text`)}</AppText>}
|
||||
<AppText style={styles.title}>{item.name}</AppText>
|
||||
{item.text.length > 0 && <AppText>{item.text}</AppText>}
|
||||
</View>
|
||||
<AppIcon name="chevron-right" color={Colors.orange} />
|
||||
</TouchableOpacity>
|
||||
|
||||
@@ -1,24 +1,35 @@
|
||||
import React, { useState } from 'react'
|
||||
import { KeyboardAvoidingView, StyleSheet } from 'react-native'
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import { StyleSheet } from 'react-native'
|
||||
import nodejs from 'nodejs-mobile-react-native'
|
||||
import PropTypes from 'prop-types'
|
||||
import { SHA512 } from 'jshashes'
|
||||
|
||||
import AppText from '../../common/app-text'
|
||||
import AppTextInput from '../../common/app-text-input'
|
||||
import Button from '../../common/button'
|
||||
|
||||
import { requestHash } from '../../../db'
|
||||
import { Colors, Spacing } from '../../../styles'
|
||||
import settings from '../../../i18n/en/settings'
|
||||
|
||||
const LISTENER_TYPE = 'create-or-change-pw'
|
||||
|
||||
const EnterNewPassword = ({ changeEncryptionAndRestart }) => {
|
||||
const [password, setPassword] = useState('')
|
||||
const [passwordConfirmation, setPasswordConfirmation] = useState('')
|
||||
const [shouldShowErrorMessage, setShouldShowErrorMessage] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
const listener = nodejs.channel.addListener(
|
||||
LISTENER_TYPE,
|
||||
changeEncryptionAndRestart,
|
||||
this
|
||||
)
|
||||
return () => listener.remove()
|
||||
}, [])
|
||||
|
||||
const savePassword = () => {
|
||||
if (comparePasswords()) {
|
||||
const hash = new SHA512().hex(password)
|
||||
changeEncryptionAndRestart(hash)
|
||||
requestHash(LISTENER_TYPE, password)
|
||||
} else {
|
||||
setShouldShowErrorMessage(true)
|
||||
}
|
||||
@@ -30,8 +41,9 @@ const EnterNewPassword = ({ changeEncryptionAndRestart }) => {
|
||||
const isButtonActive = password.length > 0 && passwordConfirmation.length > 0
|
||||
|
||||
return (
|
||||
<KeyboardAvoidingView behavior="padding" keyboardVerticalOffset={150}>
|
||||
<>
|
||||
<AppTextInput
|
||||
isKeyboardOffset={false}
|
||||
onChangeText={setPassword}
|
||||
placeholder={labels.enterNew}
|
||||
textContentType="password"
|
||||
@@ -39,6 +51,7 @@ const EnterNewPassword = ({ changeEncryptionAndRestart }) => {
|
||||
secureTextEntry={true}
|
||||
/>
|
||||
<AppTextInput
|
||||
isKeyboardOffset={false}
|
||||
onChangeText={setPasswordConfirmation}
|
||||
placeholder={labels.confirmPassword}
|
||||
textContentType="password"
|
||||
@@ -55,7 +68,7 @@ const EnterNewPassword = ({ changeEncryptionAndRestart }) => {
|
||||
>
|
||||
{labels.savePassword}
|
||||
</Button>
|
||||
</KeyboardAvoidingView>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -9,9 +9,7 @@ import Segment from '../common/segment'
|
||||
import { Colors, Sizes } from '../../styles'
|
||||
|
||||
const PrivacyPolicy = () => {
|
||||
const { t } = useTranslation(null, {
|
||||
keyPrefix: 'hamburgerMenu.privacyPolicy',
|
||||
})
|
||||
const { t } = useTranslation(null, { keyPrefix: 'settings.privacyPolicy' })
|
||||
const sections = ['intro', 'dataUse', 'permissions', 'transparency']
|
||||
|
||||
return (
|
||||
|
||||
@@ -4,21 +4,21 @@ import PropTypes from 'prop-types'
|
||||
import AppPage from '../common/app-page'
|
||||
import MenuItem from './menu-item'
|
||||
|
||||
import { useTranslation } from 'react-i18next'
|
||||
import settingsLabels from '../../i18n/en/settings'
|
||||
|
||||
const menuItems = [
|
||||
{ label: 'reminders', componentName: 'Reminders' },
|
||||
{ label: 'nfpSettings', componentName: 'NfpSettings' },
|
||||
{ label: 'dataManagement', componentName: 'DataManagement' },
|
||||
{ label: 'password', componentName: 'Password' },
|
||||
const { menuItems } = settingsLabels
|
||||
const menu = [
|
||||
{ ...menuItems.reminders, component: 'Reminders' },
|
||||
{ ...menuItems.nfpSettings, component: 'NfpSettings' },
|
||||
{ ...menuItems.dataManagement, component: 'DataManagement' },
|
||||
{ ...menuItems.password, component: 'Password' },
|
||||
]
|
||||
|
||||
const SettingsMenu = ({ navigate }) => {
|
||||
const { t } = useTranslation()
|
||||
return (
|
||||
<AppPage title={t('hamburgerMenu.settings.title')}>
|
||||
{menuItems.map((menuItem, i) => {
|
||||
const last = menuItems.length === i + 1
|
||||
<AppPage title={settingsLabels.title}>
|
||||
{menu.map((menuItem, i) => {
|
||||
const last = menu.length === i + 1
|
||||
|
||||
return (
|
||||
<MenuItem item={menuItem} key={i} last={last} navigate={navigate} />
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
import React from 'react'
|
||||
import { ImageBackground, View } from 'react-native'
|
||||
import { ScaledSheet } from 'react-native-size-matters'
|
||||
|
||||
import AppPage from './common/app-page'
|
||||
import AppText from './common/app-text'
|
||||
import Segment from './common/segment'
|
||||
import Table from './common/table'
|
||||
|
||||
import cycleModule from '../lib/cycle'
|
||||
import {getCycleLengthStats as getCycleInfo} from '../lib/cycle-length'
|
||||
import {stats as labels} from '../i18n/en/labels'
|
||||
|
||||
import { Sizes, Spacing, Typography } from '../styles'
|
||||
|
||||
const image = require('../assets/cycle-icon.png')
|
||||
|
||||
const Stats = () => {
|
||||
const cycleLengths = cycleModule().getAllCycleLengths()
|
||||
const numberOfCycles = cycleLengths.length
|
||||
const hasAtLeastOneCycle = numberOfCycles >= 1
|
||||
const cycleData = hasAtLeastOneCycle ? getCycleInfo(cycleLengths)
|
||||
: { minimum: '—', maximum: '—', stdDeviation: '—' }
|
||||
const statsData = [
|
||||
[cycleData.minimum, labels.minLabel],
|
||||
[cycleData.maximum, labels.maxLabel],
|
||||
[cycleData.stdDeviation ? cycleData.stdDeviation : '—', labels.stdLabel],
|
||||
[numberOfCycles, labels.basisOfStatsEnd]
|
||||
]
|
||||
|
||||
return (
|
||||
<AppPage contentContainerStyle={styles.pageContainer}>
|
||||
<Segment last style={styles.pageContainer}>
|
||||
<AppText>{labels.cycleLengthExplainer}</AppText>
|
||||
{!hasAtLeastOneCycle && <AppText>{labels.emptyStats}</AppText>}
|
||||
{hasAtLeastOneCycle &&
|
||||
<View style={styles.container}>
|
||||
<View style={styles.columnLeft}>
|
||||
<ImageBackground
|
||||
source={image}
|
||||
imageStyle={styles.image}
|
||||
style={styles.imageContainter}
|
||||
>
|
||||
<AppText
|
||||
numberOfLines={1}
|
||||
ellipsizeMode="clip"
|
||||
style={styles.accentPurpleGiant}
|
||||
>
|
||||
{cycleData.mean}
|
||||
</AppText>
|
||||
<AppText style={styles.accentPurpleHuge}>
|
||||
{labels.daysLabel}
|
||||
</AppText>
|
||||
</ImageBackground>
|
||||
<AppText style={styles.accentOrange}>
|
||||
{labels.averageLabel}
|
||||
</AppText>
|
||||
</View>
|
||||
<View style={styles.columnRight}>
|
||||
<Table tableContent={statsData} />
|
||||
</View>
|
||||
</View>
|
||||
}
|
||||
</Segment>
|
||||
</AppPage>
|
||||
)
|
||||
}
|
||||
|
||||
const column = {
|
||||
flexDirection: 'column',
|
||||
}
|
||||
|
||||
const styles = ScaledSheet.create({
|
||||
accentOrange: {
|
||||
...Typography.accentOrange,
|
||||
fontSize: Sizes.small,
|
||||
},
|
||||
accentPurpleGiant: {
|
||||
...Typography.accentPurpleGiant,
|
||||
marginTop: Spacing.base * (-2),
|
||||
},
|
||||
accentPurpleHuge: {
|
||||
...Typography.accentPurpleHuge,
|
||||
marginTop: Spacing.base * (-1),
|
||||
},
|
||||
container: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'space-between',
|
||||
paddingTop: Spacing.base
|
||||
},
|
||||
columnLeft: {
|
||||
...column,
|
||||
flex: 2,
|
||||
},
|
||||
columnRight: {
|
||||
...column,
|
||||
flex: 3,
|
||||
paddingTop: Spacing.small,
|
||||
},
|
||||
image: {
|
||||
resizeMode: 'contain',
|
||||
},
|
||||
imageContainter: {
|
||||
paddingTop: Spacing.large * 2.5,
|
||||
marginBottom: Spacing.large,
|
||||
},
|
||||
pageContainer: {
|
||||
marginTop: Spacing.base * 2,
|
||||
}
|
||||
})
|
||||
|
||||
export default Stats
|
||||
@@ -1,118 +0,0 @@
|
||||
import React from 'react'
|
||||
import { FlatList, StyleSheet, View } from 'react-native'
|
||||
import PropTypes from 'prop-types'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import AppModal from '../common/app-modal'
|
||||
import AppText from '../common/app-text'
|
||||
|
||||
import cycleModule from '../../lib/cycle'
|
||||
import { Spacing, Typography, Colors } from '../../styles'
|
||||
import { humanizeDate } from '../helpers/format-date'
|
||||
|
||||
const Item = ({ data }) => {
|
||||
const { t } = useTranslation(null, { keyPrefix: 'plurals' })
|
||||
|
||||
if (!data) return false
|
||||
|
||||
const { date, cycleLength, bleedingLength } = data
|
||||
|
||||
return (
|
||||
<View style={styles.row}>
|
||||
<View style={styles.accentCell}>
|
||||
<AppText>{humanizeDate(date)}</AppText>
|
||||
</View>
|
||||
<View style={styles.cell}>
|
||||
<AppText>{t('day', { count: cycleLength })}</AppText>
|
||||
</View>
|
||||
<View style={styles.cell}>
|
||||
<AppText>{t('day', { count: bleedingLength })}</AppText>
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
|
||||
Item.propTypes = {
|
||||
data: PropTypes.object.isRequired,
|
||||
}
|
||||
|
||||
const PeriodDetailsModal = ({ onClose }) => {
|
||||
const renderItem = ({ item }) => <Item data={item} />
|
||||
const data = cycleModule().getStats()
|
||||
|
||||
if (!data || data.length === 0) return false
|
||||
|
||||
return (
|
||||
<AppModal onClose={onClose}>
|
||||
<View>
|
||||
<FlatList
|
||||
data={data}
|
||||
renderItem={renderItem}
|
||||
keyExtractor={(item) => item.date}
|
||||
ItemSeparatorComponent={ItemDivider}
|
||||
ListHeaderComponent={FlatListHeader}
|
||||
ListHeaderComponentStyle={styles.headerDivider}
|
||||
stickyHeaderIndices={[0]}
|
||||
contentContainerStyle={styles.container}
|
||||
/>
|
||||
</View>
|
||||
</AppModal>
|
||||
)
|
||||
}
|
||||
|
||||
PeriodDetailsModal.propTypes = {
|
||||
onClose: PropTypes.func,
|
||||
}
|
||||
|
||||
const ItemDivider = () => <View style={styles.divider} />
|
||||
|
||||
const FlatListHeader = () => (
|
||||
<View style={styles.row}>
|
||||
<View style={styles.accentCell}>
|
||||
<AppText style={styles.header}>{'Cycle Start'}</AppText>
|
||||
</View>
|
||||
<View style={styles.cell}>
|
||||
<AppText style={styles.header}>{'Cycle Length'}</AppText>
|
||||
</View>
|
||||
<View style={styles.cell}>
|
||||
<AppText style={styles.header}>{'Bleeding'}</AppText>
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
divider: {
|
||||
height: 1,
|
||||
width: '100%',
|
||||
backgroundColor: Colors.grey,
|
||||
},
|
||||
header: {
|
||||
...Typography.accentOrange,
|
||||
paddingVertical: Spacing.small,
|
||||
},
|
||||
headerDivider: {
|
||||
borderBottomColor: Colors.purple,
|
||||
borderBottomWidth: 2,
|
||||
},
|
||||
row: {
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'space-between',
|
||||
paddingVertical: Spacing.tiny,
|
||||
backgroundColor: 'white',
|
||||
},
|
||||
cell: {
|
||||
flex: 2,
|
||||
justifyContent: 'center',
|
||||
},
|
||||
accentCell: {
|
||||
flex: 3,
|
||||
justifyContent: 'center',
|
||||
},
|
||||
container: {
|
||||
minHeight: '40%',
|
||||
minWidth: '95%',
|
||||
paddingHorizontal: Spacing.base,
|
||||
},
|
||||
})
|
||||
|
||||
export default PeriodDetailsModal
|
||||
@@ -1,135 +0,0 @@
|
||||
import React, { useState } from 'react'
|
||||
import { ImageBackground, SafeAreaView, ScrollView, View } from 'react-native'
|
||||
import { ScaledSheet } from 'react-native-size-matters'
|
||||
import { useTranslation } from 'react-i18next'
|
||||
|
||||
import AppText from '../common/app-text'
|
||||
import Button from '../common/button'
|
||||
import Footnote from '../common/Footnote'
|
||||
import StatsOverview from './StatsOverview'
|
||||
import PeriodDetailsModal from './PeriodDetailsModal'
|
||||
|
||||
import cycleModule from '../../lib/cycle'
|
||||
import { getCycleLengthStats as getCycleInfo } from '../../lib/cycle-length'
|
||||
|
||||
import { Containers, Sizes, Spacing, Typography } from '../../styles'
|
||||
|
||||
const image = require('../../assets/cycle-icon.png')
|
||||
|
||||
const Stats = () => {
|
||||
const [isStatsVisible, setIsStatsVisible] = useState(false)
|
||||
|
||||
const { t } = useTranslation(null, { keyPrefix: 'stats' })
|
||||
|
||||
const cycleLengths = cycleModule().getAllCycleLengths()
|
||||
const numberOfCycles = cycleLengths.length
|
||||
const cycleData =
|
||||
numberOfCycles > 0
|
||||
? getCycleInfo(cycleLengths)
|
||||
: { minimum: '—', maximum: '—', stdDeviation: '—' }
|
||||
const standardDeviation = cycleData.stdDeviation
|
||||
? cycleData.stdDeviation
|
||||
: '—'
|
||||
const statsData = [
|
||||
[cycleData.minimum, t('overview.min')],
|
||||
[cycleData.maximum, t('overview.max')],
|
||||
[standardDeviation, t('overview.standardDeviation')],
|
||||
[numberOfCycles, t('overview.completedCycles')],
|
||||
]
|
||||
|
||||
return (
|
||||
<SafeAreaView style={styles.pageContainer}>
|
||||
<ScrollView contentContainerStyle={styles.overviewContainer}>
|
||||
<AppText>{t('intro')}</AppText>
|
||||
{numberOfCycles === 0 ? (
|
||||
<AppText>{t('noData')}</AppText>
|
||||
) : (
|
||||
<>
|
||||
<View style={styles.container}>
|
||||
<View style={styles.columnLeft}>
|
||||
<ImageBackground
|
||||
source={image}
|
||||
imageStyle={styles.image}
|
||||
style={styles.imageContainter}
|
||||
>
|
||||
<AppText
|
||||
numberOfLines={1}
|
||||
ellipsizeMode="clip"
|
||||
style={styles.accentPurpleGiant}
|
||||
>
|
||||
{cycleData.mean}
|
||||
</AppText>
|
||||
<AppText style={styles.accentPurpleHuge}>
|
||||
{t('overview.days')}
|
||||
</AppText>
|
||||
</ImageBackground>
|
||||
<AppText style={styles.accentOrange}>
|
||||
{t('overview.average')}
|
||||
</AppText>
|
||||
</View>
|
||||
<View style={styles.columnRight}>
|
||||
<StatsOverview data={statsData} />
|
||||
</View>
|
||||
</View>
|
||||
<Button isCTA onPress={() => setIsStatsVisible(true)}>
|
||||
{t('showStats')}
|
||||
</Button>
|
||||
{isStatsVisible && (
|
||||
<PeriodDetailsModal onClose={() => setIsStatsVisible(false)} />
|
||||
)}
|
||||
<Footnote>{t('footnote')}</Footnote>
|
||||
</>
|
||||
)}
|
||||
</ScrollView>
|
||||
</SafeAreaView>
|
||||
)
|
||||
}
|
||||
|
||||
const column = {
|
||||
flexDirection: 'column',
|
||||
}
|
||||
|
||||
const styles = ScaledSheet.create({
|
||||
accentOrange: {
|
||||
...Typography.accentOrange,
|
||||
fontSize: Sizes.small,
|
||||
},
|
||||
accentPurpleGiant: {
|
||||
...Typography.accentPurpleGiant,
|
||||
marginTop: Spacing.base * -2,
|
||||
},
|
||||
accentPurpleHuge: {
|
||||
...Typography.accentPurpleHuge,
|
||||
marginTop: Spacing.base * -1,
|
||||
},
|
||||
container: {
|
||||
alignItems: 'center',
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'space-between',
|
||||
},
|
||||
columnLeft: {
|
||||
...column,
|
||||
flex: 3,
|
||||
},
|
||||
columnRight: {
|
||||
...column,
|
||||
flex: 5,
|
||||
paddingTop: Spacing.small,
|
||||
},
|
||||
image: {
|
||||
resizeMode: 'contain',
|
||||
},
|
||||
imageContainter: {
|
||||
paddingTop: Spacing.large * 2.5,
|
||||
marginBottom: Spacing.large,
|
||||
},
|
||||
overviewContainer: {
|
||||
paddingHorizontal: Spacing.base,
|
||||
paddingTop: Spacing.base,
|
||||
},
|
||||
pageContainer: {
|
||||
...Containers.pageContainer,
|
||||
},
|
||||
})
|
||||
|
||||
export default Stats
|
||||
@@ -1,6 +1,10 @@
|
||||
import { PixelRatio, StatusBar } from 'react-native'
|
||||
import { scale, verticalScale } from 'react-native-size-matters'
|
||||
|
||||
export const ACTION_DELETE = 'delete'
|
||||
export const ACTION_EXPORT = 'export'
|
||||
export const ACTION_IMPORT = 'import'
|
||||
|
||||
export const SYMPTOMS = [
|
||||
'bleeding',
|
||||
'temperature',
|
||||
@@ -15,13 +19,12 @@ export const SYMPTOMS = [
|
||||
|
||||
export const CHART_COLUMN_WIDTH = 32
|
||||
export const CHART_COLUMN_MIDDLE = CHART_COLUMN_WIDTH / 2
|
||||
export const CHART_DOT_RADIUS_SYMPTOM = scale(6)
|
||||
export const CHART_DOT_RADIUS_TEMPERATURE = scale(4)
|
||||
export const CHART_DOT_RADIUS = scale(6)
|
||||
export const CHART_GRID_LINE_HORIZONTAL_WIDTH =
|
||||
PixelRatio.roundToNearestPixel(0.3)
|
||||
export const CHART_ICON_SIZE = scale(20)
|
||||
export const CHART_STROKE_WIDTH = scale(1.5)
|
||||
export const CHART_SYMPTOM_HEIGHT_RATIO = scale(0.06)
|
||||
export const CHART_STROKE_WIDTH = scale(3)
|
||||
export const CHART_SYMPTOM_HEIGHT_RATIO = scale(0.08)
|
||||
export const CHART_XAXIS_HEIGHT_RATIO = scale(0.1)
|
||||
export const CHART_YAXIS_WIDTH = scale(32)
|
||||
export const CHART_TICK_WIDTH = scale(44)
|
||||
@@ -37,7 +40,7 @@ export const HIT_SLOP = {
|
||||
top: verticalScale(20),
|
||||
bottom: verticalScale(20),
|
||||
left: scale(20),
|
||||
right: scale(20),
|
||||
right: scale(20)
|
||||
}
|
||||
|
||||
export const STATUSBAR_HEIGHT = StatusBar.currentHeight
|
||||
|
||||
+11
@@ -1,5 +1,6 @@
|
||||
import Realm from 'realm'
|
||||
import { LocalDate, ChronoUnit } from '@js-joda/core'
|
||||
import nodejs from 'nodejs-mobile-react-native'
|
||||
import fs from 'react-native-fs'
|
||||
|
||||
import schemas from './schemas'
|
||||
@@ -183,6 +184,16 @@ export function tryToImportWithoutDelete(cycleDays) {
|
||||
})
|
||||
}
|
||||
|
||||
export function requestHash(type, pw) {
|
||||
nodejs.channel.post(
|
||||
'request-SHA512',
|
||||
JSON.stringify({
|
||||
type: type,
|
||||
message: pw,
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
export async function changeDbEncryption(hash) {
|
||||
let key
|
||||
if (hash) key = hashToInt8Array(hash)
|
||||
|
||||
+3
-98
@@ -1,25 +1,4 @@
|
||||
{
|
||||
"bottomMenu": {
|
||||
"calendar": "Calendar",
|
||||
"chart": "Chart",
|
||||
"stats": "Stats"
|
||||
},
|
||||
"chart": {
|
||||
"tutorial": "You can swipe the chart to view more dates."
|
||||
},
|
||||
"cycleDay": {
|
||||
"symptomBox": {
|
||||
"bleeding": "bleeding",
|
||||
"temperature": "temperature",
|
||||
"mucus": "cervical mucus",
|
||||
"cervix": "cervix",
|
||||
"note": "note",
|
||||
"desire": "desire",
|
||||
"sex": "sex",
|
||||
"pain": "pain",
|
||||
"mood": "mood"
|
||||
}
|
||||
},
|
||||
"labels": {
|
||||
"bleedingPrediction": {
|
||||
"noPrediction": "As soon as you have tracked 3 menstrual cycles, drip. will make predictions for the next ones."
|
||||
@@ -34,12 +13,11 @@
|
||||
"ok": "OK"
|
||||
}
|
||||
},
|
||||
"hamburgerMenu": {
|
||||
"settings": {
|
||||
"about": {
|
||||
"credits": {
|
||||
"title": "Credits",
|
||||
"text": "We love the drip. team. Thanks and lots of <3 to all of our condriputors. Thanks to Paula Härtel for the symptom tracking icons. All the other icons from:",
|
||||
"madeBy": "Made by:"
|
||||
"text": "We love the drip. team. Thanks and lots of <3 to all of our condriputors. Thanks to Paula Härtel for the symptom tracking icons. All the other icons are made by {{smashicons}}, {{pause08}}, {{kazachek}} & {{freepik}} from {{flaticon}}."
|
||||
},
|
||||
"donate": {
|
||||
"button": "Donate here",
|
||||
@@ -60,13 +38,7 @@
|
||||
},
|
||||
"license": {
|
||||
"title": "drip. an open-source cycle tracking app",
|
||||
"text": "Copyright (C) {{currentYear}} Heart of Code e.V.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details:"
|
||||
},
|
||||
"menuMain": {
|
||||
"about": "About",
|
||||
"license": "License",
|
||||
"settings": "Settings",
|
||||
"privacyPolicy": "Privacy Policy"
|
||||
"text": "Copyright (C) {{currentYear}} Heart of Code e.V.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details: https://www.gnu.org/licenses/gpl-3.0.html."
|
||||
},
|
||||
"privacyPolicy": {
|
||||
"title": "Privacy Policy",
|
||||
@@ -86,73 +58,6 @@
|
||||
"title": "Transparency",
|
||||
"text": "You can read through the source code of drip. to ensure the given information is correct. The source code is like a recipe: It tells you how much and what kind of ingredients you need and how you prepare them to cook a tasty meal or program a funky app.\n\nBuon appetito!"
|
||||
}
|
||||
},
|
||||
"settings": {
|
||||
"data": {
|
||||
"import": {
|
||||
"button": "Import data",
|
||||
"dialog": {
|
||||
"cancel": "Cancel",
|
||||
"delete": "Import and delete existing",
|
||||
"message": "There are two options for the import:\n\n1. Keep existing cycle days and replace only the ones in the import file.\n\n2. Delete all existing cycle days and import cycle days from file",
|
||||
"replace": "Import and replace",
|
||||
"title": "Keep existing data?"
|
||||
},
|
||||
"error": {
|
||||
"couldNotOpenFile": "Could not open file",
|
||||
"futureEdit": "Future dates may only contain a note, no other symptoms",
|
||||
"incorrectColumns": "Expected CSV column titles to be {{incorrectColumns}}",
|
||||
"noDataImported": "{{message}}\n\nNo data was imported or changed"
|
||||
},
|
||||
"segmentExplainer": "Import data in CSV format",
|
||||
"success": {
|
||||
"message": "Data successfully imported",
|
||||
"title": "Success"
|
||||
}
|
||||
}
|
||||
},
|
||||
"menuItem": {
|
||||
"dataManagement": {
|
||||
"name": "Data",
|
||||
"text": "import, export or delete your data"
|
||||
},
|
||||
"nfpSettings": {
|
||||
"name": "NFP settings",
|
||||
"text": "define how you want to use NFP"
|
||||
},
|
||||
"password": {
|
||||
"name": "Password",
|
||||
"text": ""
|
||||
},
|
||||
"reminders": {
|
||||
"name": "Reminders",
|
||||
"text": "turn on/off reminders"
|
||||
}
|
||||
},
|
||||
"title": "Settings"
|
||||
}
|
||||
},
|
||||
"stats": {
|
||||
"noData": "At least one completed cycle is needed to display stats.",
|
||||
"intro": "Basic statistics about the length of your cycles.",
|
||||
"overview": {
|
||||
"average": "Average cycle",
|
||||
"days": "days",
|
||||
"min": "Shortest",
|
||||
"max": "Longest",
|
||||
"standardDeviation": "Standard\ndeviation",
|
||||
"completedCycles": "completed\ncycles"
|
||||
},
|
||||
"showStats": "Show period details",
|
||||
"details": {
|
||||
"cycleStart": "Cycle start",
|
||||
"cycleLength": "Cycle length",
|
||||
"bleedingDays": "Bleeding"
|
||||
},
|
||||
"footnote": "Based on the standard deviation of all your tracked periods drip. calculates a range for the starting day of the upcoming 3 periods. The range will be 3 days if your standard deviation is smaller than 1.5 and 5 days if the value is bigger.\n\nThe standard deviation tells you how much the length of your periods vary, 0 means all your periods are exactly the same length and the bigger the value the more the period length varies."
|
||||
},
|
||||
"plurals": {
|
||||
"day": "{{count}} day",
|
||||
"day_plural": "{{count}} days"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,15 @@
|
||||
import labels from './settings'
|
||||
const settingsTitles = labels.menuItems
|
||||
|
||||
export const home = {
|
||||
unknown: '?',
|
||||
phase: (n) => `${['1st', '2nd', '3rd'][n - 1]} cycle phase`,
|
||||
}
|
||||
|
||||
export const chart = {
|
||||
tutorial: 'You can swipe the chart to view more dates.',
|
||||
}
|
||||
|
||||
export const shared = {
|
||||
cancel: 'Cancel',
|
||||
save: 'Save',
|
||||
@@ -26,6 +33,30 @@ export const shared = {
|
||||
learnMore: 'Learn more',
|
||||
}
|
||||
|
||||
export const headerTitles = {
|
||||
Home: 'Home',
|
||||
Calendar: 'Calendar',
|
||||
Chart: 'Chart',
|
||||
Stats: 'Statistics',
|
||||
SettingsMenu: 'Settings',
|
||||
Reminders: settingsTitles.reminders.name,
|
||||
NfpSettings: settingsTitles.nfpSettings.name,
|
||||
DataManagement: settingsTitles.dataManagement.name,
|
||||
Password: settingsTitles.password.name,
|
||||
About: 'About',
|
||||
License: 'License',
|
||||
PrivacyPolicy: 'Privacy Policy',
|
||||
bleeding: 'Bleeding',
|
||||
temperature: 'Temperature',
|
||||
mucus: 'Cervical Mucus',
|
||||
cervix: 'Cervix',
|
||||
note: 'Note',
|
||||
desire: 'Desire',
|
||||
sex: 'Sex',
|
||||
pain: 'Pain',
|
||||
mood: 'Mood',
|
||||
}
|
||||
|
||||
export const stats = {
|
||||
cycleLengthExplainer: 'Basic statistics about the length of your cycles.',
|
||||
emptyStats: 'At least one completed cycle is needed to display stats.',
|
||||
|
||||
@@ -1,6 +1,29 @@
|
||||
import links from './links'
|
||||
|
||||
export default {
|
||||
title: 'Settings',
|
||||
menuItems: {
|
||||
reminders: {
|
||||
name: 'Reminders',
|
||||
text: 'turn on/off reminders',
|
||||
},
|
||||
nfpSettings: {
|
||||
name: 'NFP settings',
|
||||
text: 'define how you want to use NFP',
|
||||
},
|
||||
dataManagement: {
|
||||
name: 'Data',
|
||||
text: 'import, export or delete your data',
|
||||
},
|
||||
password: {
|
||||
name: 'Password',
|
||||
text: '',
|
||||
},
|
||||
about: 'About',
|
||||
license: 'License',
|
||||
settings: 'Settings',
|
||||
privacyPolicy: 'Privacy Policy',
|
||||
},
|
||||
export: {
|
||||
errors: {
|
||||
noData: 'There is no data to export',
|
||||
@@ -13,6 +36,24 @@ export default {
|
||||
segmentExplainer:
|
||||
'Export data in CSV format for backup or so you can use it elsewhere',
|
||||
},
|
||||
import: {
|
||||
button: 'Import data',
|
||||
title: 'Keep existing data?',
|
||||
message: `There are two options for the import:
|
||||
1. Keep existing cycle days and replace only the ones in the import file.
|
||||
2. Delete all existing cycle days and import cycle days from file.`,
|
||||
replaceOption: 'Import and replace',
|
||||
deleteOption: 'Import and delete existing',
|
||||
errors: {
|
||||
couldNotOpenFile: 'Could not open file',
|
||||
postFix: 'No data was imported or changed',
|
||||
futureEdit: 'Future dates may only contain a note, no other symptoms',
|
||||
},
|
||||
success: {
|
||||
message: 'Data successfully imported',
|
||||
},
|
||||
segmentExplainer: 'Import data in CSV format',
|
||||
},
|
||||
deleteSegment: {
|
||||
title: 'Delete app data',
|
||||
explainer: 'Delete app data from this phone',
|
||||
|
||||
@@ -17,6 +17,7 @@ i18n
|
||||
compatibilityJSON: 'v3', // TODO: migrate json to v4 and afterwards remove it
|
||||
resources,
|
||||
fallbackLng: 'en',
|
||||
debug: true,
|
||||
|
||||
interpolation: {
|
||||
escapeValue: false, // not needed for react as it escapes by default
|
||||
|
||||
@@ -19,6 +19,5 @@ target 'drip' do
|
||||
|
||||
post_install do |installer|
|
||||
react_native_post_install(installer)
|
||||
__apply_Xcode_12_5_M1_post_install_workaround(installer)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -36,9 +36,12 @@
|
||||
54DFE73D25D94DED0025C3FC /* cycle-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73C25D94DED0025C3FC /* cycle-icon.png */; };
|
||||
54DFE73E25D94DED0025C3FC /* cycle-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 54DFE73C25D94DED0025C3FC /* cycle-icon.png */; };
|
||||
54E1D49923E7588F003FA37B /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54E1D49823E7588F003FA37B /* JavaScriptCore.framework */; };
|
||||
5C4C9DDE2824847500B72CBE /* NodeMobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C225FC4966694B9FBD32E946 /* NodeMobile.framework */; };
|
||||
62F2A4645AC84CDC9506FF27 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AEBF0735214455AAEDF56D5 /* libc++.tbd */; };
|
||||
A16B351C3F3644CF95F104D2 /* builtin_modules in Resources */ = {isa = PBXBuildFile; fileRef = 36F1B55D0DEE47AA9AF4BBDD /* builtin_modules */; };
|
||||
BD7041F2826E4A2CBE6CB87D /* RealmJSTests.xctest in Frameworks */ = {isa = PBXBuildFile; fileRef = F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */; };
|
||||
D91133DCE120440893E2FD2E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CD8C8B91E0A747B3883A0D56 /* libz.tbd */; };
|
||||
E4584E55EEC24302A3E84A23 /* nodejs-project in Resources */ = {isa = PBXBuildFile; fileRef = 6466AE2461BE4FA88B8372F0 /* nodejs-project */; };
|
||||
E545887DBE87912F11770AB9 /* libPods-drip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 699D3B3789FC2E5185CB9894 /* libPods-drip.a */; };
|
||||
FAC423E577F555F66C9891E4 /* libPods-drip-dripTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F33CCAAB670FD0D98C5C72DF /* libPods-drip-dripTests.a */; };
|
||||
/* End PBXBuildFile section */
|
||||
@@ -66,6 +69,7 @@
|
||||
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = drip/main.m; sourceTree = "<group>"; };
|
||||
2B1578D5817F46EE9BFC9BAF /* Pods-drip.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip.debug.xcconfig"; path = "Target Support Files/Pods-drip/Pods-drip.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
36F1B55D0DEE47AA9AF4BBDD /* builtin_modules */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = builtin_modules; path = "../node_modules/nodejs-mobile-react-native/install/resources/nodejs-modules/builtin_modules"; sourceTree = "<group>"; };
|
||||
4A9B2D77CAC90DFEB5C4565A /* Pods-dripTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-dripTests.debug.xcconfig"; path = "Target Support Files/Pods-dripTests/Pods-dripTests.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
5409189625AB725F00086AE1 /* OpenSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSans-LightItalic.ttf"; path = "../../assets/fonts/OpenSans-LightItalic.ttf"; sourceTree = "<group>"; };
|
||||
540918A225AB725F00086AE1 /* Prompt-ExtraLight.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Prompt-ExtraLight.ttf"; path = "../../assets/fonts/Prompt-ExtraLight.ttf"; sourceTree = "<group>"; };
|
||||
@@ -93,6 +97,7 @@
|
||||
54E1D49823E7588F003FA37B /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
|
||||
5ABC2C1190B4D25AC0398D09 /* Pods-dripTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-dripTests.release.xcconfig"; path = "Target Support Files/Pods-dripTests/Pods-dripTests.release.xcconfig"; sourceTree = "<group>"; };
|
||||
5C649EDC281151BC005FED46 /* dripRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = dripRelease.entitlements; path = drip/dripRelease.entitlements; sourceTree = "<group>"; };
|
||||
6466AE2461BE4FA88B8372F0 /* nodejs-project */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "nodejs-project"; path = "../nodejs-assets/nodejs-project"; sourceTree = "<group>"; };
|
||||
699D3B3789FC2E5185CB9894 /* libPods-drip.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
6B7C2A0A7AAA83BBEFBD0B6A /* libPods-drip-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
72DDDE8D34518ED64FD7EBBA /* Pods-drip-dripTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.release.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.release.xcconfig"; sourceTree = "<group>"; };
|
||||
@@ -103,6 +108,7 @@
|
||||
A8B59389C2FC4F19BD30ABC3 /* libRNShare.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNShare.a; sourceTree = "<group>"; };
|
||||
AB636AA0286D45CE9B23B2C3 /* libRCTRestart.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTRestart.a; sourceTree = "<group>"; };
|
||||
B6FD0A300273E09D74C14C19 /* Pods-drip-dripTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-drip-dripTests.debug.xcconfig"; path = "Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests.debug.xcconfig"; sourceTree = "<group>"; };
|
||||
C225FC4966694B9FBD32E946 /* NodeMobile.framework */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.framework; name = NodeMobile.framework; path = "../node_modules/nodejs-mobile-react-native/ios/NodeMobile.framework"; sourceTree = "<group>"; };
|
||||
CD8C8B91E0A747B3883A0D56 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
|
||||
D211D71BE5A8436A978770A9 /* libRNDocumentPicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDocumentPicker.a; sourceTree = "<group>"; };
|
||||
E086AB579387F878A2CBCFEB /* libPods-drip-tvOSTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-drip-tvOSTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
@@ -111,6 +117,7 @@
|
||||
F5039D0A572B4BBCB7995891 /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
|
||||
F710D85E391D4094816E1B62 /* libRealmJS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRealmJS.a; sourceTree = "<group>"; };
|
||||
F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = RealmJSTests.xctest; sourceTree = "<group>"; };
|
||||
F992F2D99E614DD79FAD6565 /* libRNNodeJsMobile.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNNodeJsMobile.a; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXFrameworksBuildPhase section */
|
||||
@@ -130,6 +137,7 @@
|
||||
62F2A4645AC84CDC9506FF27 /* libc++.tbd in Frameworks */,
|
||||
D91133DCE120440893E2FD2E /* libz.tbd in Frameworks */,
|
||||
BD7041F2826E4A2CBE6CB87D /* RealmJSTests.xctest in Frameworks */,
|
||||
5C4C9DDE2824847500B72CBE /* NodeMobile.framework in Frameworks */,
|
||||
E545887DBE87912F11770AB9 /* libPods-drip.a in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -196,6 +204,7 @@
|
||||
2D16E6891FA4F8E400B85C8A /* libReact.a */,
|
||||
9AEBF0735214455AAEDF56D5 /* libc++.tbd */,
|
||||
CD8C8B91E0A747B3883A0D56 /* libz.tbd */,
|
||||
C225FC4966694B9FBD32E946 /* NodeMobile.framework */,
|
||||
6B7C2A0A7AAA83BBEFBD0B6A /* libPods-drip-tvOS.a */,
|
||||
E086AB579387F878A2CBCFEB /* libPods-drip-tvOSTests.a */,
|
||||
699D3B3789FC2E5185CB9894 /* libPods-drip.a */,
|
||||
@@ -213,6 +222,7 @@
|
||||
D211D71BE5A8436A978770A9 /* libRNDocumentPicker.a */,
|
||||
84CCEBD3B2C44758853BC941 /* libRNFS.a */,
|
||||
AB636AA0286D45CE9B23B2C3 /* libRCTRestart.a */,
|
||||
F992F2D99E614DD79FAD6565 /* libRNNodeJsMobile.a */,
|
||||
90224CB4571D41C4969E9722 /* libGCDWebServers.a */,
|
||||
F710D85E391D4094816E1B62 /* libRealmJS.a */,
|
||||
F79F72C5390646E0A06AAE68 /* RealmJSTests.xctest */,
|
||||
@@ -257,6 +267,8 @@
|
||||
00E356EF1AD99517003FC87E /* dripTests */,
|
||||
83CBBA001A601CBA00E9B192 /* Products */,
|
||||
2D16E6871FA4F8E400B85C8A /* Frameworks */,
|
||||
6466AE2461BE4FA88B8372F0 /* nodejs-project */,
|
||||
36F1B55D0DEE47AA9AF4BBDD /* builtin_modules */,
|
||||
42C7F9942202468200F22656 /* Recovered References */,
|
||||
6817ABC38854EEB6D3EE933A /* Pods */,
|
||||
006C39A0B9774387BC5ACA43 /* Resources */,
|
||||
@@ -286,6 +298,7 @@
|
||||
00E356EA1AD99517003FC87E /* Sources */,
|
||||
00E356EB1AD99517003FC87E /* Frameworks */,
|
||||
00E356EC1AD99517003FC87E /* Resources */,
|
||||
22A5D3F7F84BDF2020F07B0E /* [CP] Embed Pods Frameworks */,
|
||||
46313D848A7A3E69E5ED05E7 /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
@@ -307,6 +320,14 @@
|
||||
13B07F8C1A680F5B00A75B9A /* Frameworks */,
|
||||
13B07F8E1A680F5B00A75B9A /* Resources */,
|
||||
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
|
||||
DE9DD9049EBE47E5A1EA3F5D /* Build NodeJS Mobile Native Modules */,
|
||||
6C10CEE2CE544C7F9400F1B4 /* Sign NodeJS Mobile Native Modules */,
|
||||
B93B657279074F0DB95BCDE2 /* Remove NodeJS Mobile Framework Simulator Strips */,
|
||||
CD43B73558845DFAF38EE039 /* [CP] Embed Pods Frameworks */,
|
||||
935E6C85F581DC5BB536B833 /* [CP-User] [NODEJS MOBILE] Copy Node.js Project files */,
|
||||
FCE9B437260EC219FF32251C /* [CP-User] [NODEJS MOBILE] Build Native Modules */,
|
||||
2A3F66C5C345646DE949E1FF /* [CP-User] [NODEJS MOBILE] Sign Native Modules */,
|
||||
CD7DBF41D9E2377DC61F80D8 /* [CP-User] [NODEJS MOBILE] Remove Simulator Strip */,
|
||||
616E70055A3365D214C7B201 /* [CP] Copy Pods Resources */,
|
||||
);
|
||||
buildRules = (
|
||||
@@ -391,6 +412,8 @@
|
||||
54DFE73A25D94D6E0025C3FC /* swipe.png in Resources */,
|
||||
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
|
||||
5472A44A25BB7806005E81DE /* drip-home-icons.ttf in Resources */,
|
||||
E4584E55EEC24302A3E84A23 /* nodejs-project in Resources */,
|
||||
A16B351C3F3644CF95F104D2 /* builtin_modules in Resources */,
|
||||
5472A45225BB7807005E81DE /* Jost-700-Bold.otf in Resources */,
|
||||
5472A44E25BB7807005E81DE /* Prompt-ExtraLight.ttf in Resources */,
|
||||
);
|
||||
@@ -413,6 +436,34 @@
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
|
||||
};
|
||||
22A5D3F7F84BDF2020F07B0E /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-frameworks.sh",
|
||||
"${PODS_ROOT}/../../node_modules/nodejs-mobile-react-native/ios/NodeMobile.framework",
|
||||
);
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NodeMobile.framework",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip-dripTests/Pods-drip-dripTests-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
2A3F66C5C345646DE949E1FF /* [CP-User] [NODEJS MOBILE] Sign Native Modules */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
name = "[CP-User] [NODEJS MOBILE] Sign Native Modules";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "#!/bin/sh\nset -e\nif [ -z \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then\n# If build native modules preference is not set, look for it in the project's\n#nodejs-assets/BUILD_NATIVE_MODULES.txt file.\nNODEJS_ASSETS_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../nodejs-assets/ && pwd )\"\nPREFERENCE_FILE_PATH=\"$NODEJS_ASSETS_DIR/BUILD_NATIVE_MODULES.txt\"\n if [ -f \"$PREFERENCE_FILE_PATH\" ]; then\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=\"$(cat $PREFERENCE_FILE_PATH | xargs)\"\n fi\nfi\nif [ -z \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then\n# If build native modules preference is not set, try to find .gyp files\n#to turn it on.\n gypfiles=($(find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -type f -name \"*.gyp\"))\n if [ ${#gypfiles[@]} -gt 0 ]; then\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=1\n else\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=0\n fi\nfi\nif [ \"1\" != \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then exit 0; fi\n# Delete object files\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.o\" -type f -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.a\" -type f -delete\n# Create Info.plist for each framework built and loader override.\nPATCH_SCRIPT_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/scripts/ && pwd )\"\nNODEJS_PROJECT_DIR=\"$( cd \"$CODESIGNING_FOLDER_PATH\" && cd nodejs-project/ && pwd )\"\nnode \"$PATCH_SCRIPT_DIR\"/ios-create-plists-and-dlopen-override.js $NODEJS_PROJECT_DIR\n# Embed every resulting .framework in the application and delete them afterwards.\nembed_framework()\n{\n FRAMEWORK_NAME=\"$(basename \"$1\")\"\n cp -r \"$1\" \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/\"\n /usr/bin/codesign --force --sign $EXPANDED_CODE_SIGN_IDENTITY --preserve-metadata=identifier,entitlements,flags --timestamp=none \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/$FRAMEWORK_NAME\"\n}\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d | while read frmwrk_path; do embed_framework \"$frmwrk_path\"; done\n\n#Delete gyp temporary .deps dependency folders from the project structure.\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/.deps/*\" -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \".deps\" -type d -delete\n\n#Delete frameworks from their build paths\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete\n";
|
||||
};
|
||||
46313D848A7A3E69E5ED05E7 /* [CP] Copy Pods Resources */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -513,6 +564,20 @@
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-resources.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
6C10CEE2CE544C7F9400F1B4 /* Sign NodeJS Mobile Native Modules */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Sign NodeJS Mobile Native Modules";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\nset -e\nif [ -z \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then\n# If build native modules preference is not set, look for it in the project's\n#nodejs-assets/BUILD_NATIVE_MODULES.txt file.\nNODEJS_ASSETS_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../nodejs-assets/ && pwd )\"\nPREFERENCE_FILE_PATH=\"$NODEJS_ASSETS_DIR/BUILD_NATIVE_MODULES.txt\"\n if [ -f \"$PREFERENCE_FILE_PATH\" ]; then\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=\"$(cat $PREFERENCE_FILE_PATH | xargs)\"\n fi\nfi\nif [ -z \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then\n# If build native modules preference is not set, try to find .gyp files\n#to turn it on.\n gypfiles=($(find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -type f -name \"*.gyp\"))\n if [ ${#gypfiles[@]} -gt 0 ]; then\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=1\n else\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=0\n fi\nfi\nif [ \"1\" != \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then exit 0; fi\n# Delete object files\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.o\" -type f -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.a\" -type f -delete\n# Create Info.plist for each framework built and loader override.\nPATCH_SCRIPT_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/scripts/ && pwd )\"\nNODEJS_PROJECT_DIR=\"$( cd \"$CODESIGNING_FOLDER_PATH\" && cd nodejs-project/ && pwd )\"\nnode \"$PATCH_SCRIPT_DIR\"/ios-create-plists-and-dlopen-override.js $NODEJS_PROJECT_DIR\n# Embed every resulting .framework in the application and delete them afterwards.\nembed_framework()\n{\n FRAMEWORK_NAME=\"$(basename \"$1\")\"\n cp -r \"$1\" \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/\"\n \n /usr/bin/codesign --force --sign $EXPANDED_CODE_SIGN_IDENTITY --preserve-metadata=identifier,entitlements,flags --timestamp=none \"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/$FRAMEWORK_NAME\"\n}\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d | while read frmwrk_path; do embed_framework \"$frmwrk_path\"; done\n\n#Delete gyp temporary .deps dependency folders from the project structure.\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/.deps/*\" -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \".deps\" -type d -delete\n\n#Delete frameworks from their build paths\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete\n";
|
||||
};
|
||||
852A2E0CD5D0F561CE2927A3 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -535,6 +600,48 @@
|
||||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
935E6C85F581DC5BB536B833 /* [CP-User] [NODEJS MOBILE] Copy Node.js Project files */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
name = "[CP-User] [NODEJS MOBILE] Copy Node.js Project files";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "#!/bin/sh\nset -e\nNODEJS_ASSETS_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../nodejs-assets/ && pwd )\"\nNODEJS_BUILT_IN_MODULES_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/install/resources/nodejs-modules/ && pwd )\"\nif [ -d \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" ]\nthen\nrm -rf \"$CODESIGNING_FOLDER_PATH/nodejs-project/\"\nfi\nif [ -d \"$CODESIGNING_FOLDER_PATH/builtin_modules/\" ]\nthen\nrm -rf \"$CODESIGNING_FOLDER_PATH/builtin_modules/\"\nfi\nrsync -av --delete \"$NODEJS_ASSETS_DIR/nodejs-project\" \"$CODESIGNING_FOLDER_PATH\"\nrsync -av --delete \"$NODEJS_BUILT_IN_MODULES_DIR/builtin_modules\" \"$CODESIGNING_FOLDER_PATH\"\n";
|
||||
};
|
||||
B93B657279074F0DB95BCDE2 /* Remove NodeJS Mobile Framework Simulator Strips */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Remove NodeJS Mobile Framework Simulator Strips";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\nset -e\nFRAMEWORK_BINARY_PATH=\"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/NodeMobile.framework/NodeMobile\"\nFRAMEWORK_STRIPPED_PATH=\"$FRAMEWORK_BINARY_PATH-strip\"\nif [ \"$PLATFORM_NAME\" != \"iphonesimulator\" ]; then\n if $(lipo \"$FRAMEWORK_BINARY_PATH\" -verify_arch \"x86_64\") ; then\n lipo -output \"$FRAMEWORK_STRIPPED_PATH\" -remove \"x86_64\" \"$FRAMEWORK_BINARY_PATH\"\n rm \"$FRAMEWORK_BINARY_PATH\"\n mv \"$FRAMEWORK_STRIPPED_PATH\" \"$FRAMEWORK_BINARY_PATH\"\n echo \"Removed simulator strip from NodeMobile.framework\"\n fi\nfi\n";
|
||||
};
|
||||
CD43B73558845DFAF38EE039 /* [CP] Embed Pods Frameworks */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-frameworks.sh",
|
||||
"${PODS_ROOT}/../../node_modules/nodejs-mobile-react-native/ios/NodeMobile.framework",
|
||||
);
|
||||
name = "[CP] Embed Pods Frameworks";
|
||||
outputPaths = (
|
||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/NodeMobile.framework",
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-drip/Pods-drip-frameworks.sh\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
CD68B565C5F4A7A674494D02 /* [CP] Check Pods Manifest.lock */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -557,6 +664,40 @@
|
||||
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
CD7DBF41D9E2377DC61F80D8 /* [CP-User] [NODEJS MOBILE] Remove Simulator Strip */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
name = "[CP-User] [NODEJS MOBILE] Remove Simulator Strip";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "#!/bin/sh\nset -e\nFRAMEWORK_BINARY_PATH=\"$TARGET_BUILD_DIR/$FRAMEWORKS_FOLDER_PATH/NodeMobile.framework/NodeMobile\"\nFRAMEWORK_STRIPPED_PATH=\"$FRAMEWORK_BINARY_PATH-strip\"\nif [ \"$PLATFORM_NAME\" != \"iphonesimulator\" ]; then\n if $(lipo \"$FRAMEWORK_BINARY_PATH\" -verify_arch \"x86_64\") ; then\n lipo -output \"$FRAMEWORK_STRIPPED_PATH\" -remove \"x86_64\" \"$FRAMEWORK_BINARY_PATH\"\n rm \"$FRAMEWORK_BINARY_PATH\"\n mv \"$FRAMEWORK_STRIPPED_PATH\" \"$FRAMEWORK_BINARY_PATH\"\n echo \"Removed simulator strip from NodeMobile.framework\"\n fi\nfi\n";
|
||||
};
|
||||
DE9DD9049EBE47E5A1EA3F5D /* Build NodeJS Mobile Native Modules */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
inputPaths = (
|
||||
);
|
||||
name = "Build NodeJS Mobile Native Modules";
|
||||
outputPaths = (
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "\nset -e\nif [ -z \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then\n# If build native modules preference is not set, look for it in the project's\n#nodejs-assets/BUILD_NATIVE_MODULES.txt file.\nNODEJS_ASSETS_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../nodejs-assets/ && pwd )\"\nPREFERENCE_FILE_PATH=\"$NODEJS_ASSETS_DIR/BUILD_NATIVE_MODULES.txt\"\n if [ -f \"$PREFERENCE_FILE_PATH\" ]; then\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=\"$(cat $PREFERENCE_FILE_PATH | xargs)\"\n fi\nfi\nif [ -z \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then\n# If build native modules preference is not set, try to find .gyp files\n#to turn it on.\n gypfiles=($(find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -type f -name \"*.gyp\"))\n if [ ${#gypfiles[@]} -gt 0 ]; then\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=1\n else\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=0\n fi\nfi\nif [ \"1\" != \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then exit 0; fi\n# Delete object files that may already come from within the npm package.\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.o\" -type f -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.a\" -type f -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.node\" -type f -delete\n# Delete bundle contents that may be there from previous builds.\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.node/*\" -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.node\" -type d -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete\n# Apply patches to the modules package.json\nif [ -d \"$CODESIGNING_FOLDER_PATH\"/nodejs-project/node_modules/ ]; then\n PATCH_SCRIPT_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/scripts/ && pwd )\"\n NODEJS_PROJECT_MODULES_DIR=\"$( cd \"$CODESIGNING_FOLDER_PATH\" && cd nodejs-project/node_modules/ && pwd )\"\n node \"$PATCH_SCRIPT_DIR\"/patch-package.js $NODEJS_PROJECT_MODULES_DIR\nfi\n# Get the nodejs-mobile-gyp location\nif [ -d \"$PROJECT_DIR/../node_modules/nodejs-mobile-gyp/\" ]; then\n NODEJS_MOBILE_GYP_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-gyp/ && pwd )\"\nelse\n NODEJS_MOBILE_GYP_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/node_modules/nodejs-mobile-gyp/ && pwd )\"\nfi\nNODEJS_MOBILE_GYP_BIN_FILE=\"$NODEJS_MOBILE_GYP_DIR\"/bin/node-gyp.js\n# Rebuild modules with right environment\nNODEJS_HEADERS_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/ios/libnode/ && pwd )\"\npushd $CODESIGNING_FOLDER_PATH/nodejs-project/\nif [ \"$PLATFORM_NAME\" == \"iphoneos\" ]\nthen\n GYP_DEFINES=\"OS=ios\" npm_config_nodedir=\"$NODEJS_HEADERS_DIR\" npm_config_node_gyp=\"$NODEJS_MOBILE_GYP_BIN_FILE\" npm_config_platform=\"ios\" npm_config_format=\"make-ios\" npm_config_node_engine=\"chakracore\" npm_config_arch=\"arm64\" npm --verbose rebuild --build-from-source\nelse\n GYP_DEFINES=\"OS=ios\" npm_config_nodedir=\"$NODEJS_HEADERS_DIR\" npm_config_node_gyp=\"$NODEJS_MOBILE_GYP_BIN_FILE\" npm_config_platform=\"ios\" npm_config_format=\"make-ios\" npm_config_node_engine=\"chakracore\" npm_config_arch=\"x64\" npm --verbose rebuild --build-from-source\nfi\npopd\n";
|
||||
};
|
||||
FCE9B437260EC219FF32251C /* [CP-User] [NODEJS MOBILE] Build Native Modules */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
);
|
||||
name = "[CP-User] [NODEJS MOBILE] Build Native Modules";
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "#!/bin/sh\nset -e\nif [ -z \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then\n# If build native modules preference is not set, look for it in the project's\n#nodejs-assets/BUILD_NATIVE_MODULES.txt file.\nNODEJS_ASSETS_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../nodejs-assets/ && pwd )\"\nPREFERENCE_FILE_PATH=\"$NODEJS_ASSETS_DIR/BUILD_NATIVE_MODULES.txt\"\n if [ -f \"$PREFERENCE_FILE_PATH\" ]; then\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=\"$(cat $PREFERENCE_FILE_PATH | xargs)\"\n fi\nfi\nif [ -z \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then\n# If build native modules preference is not set, try to find .gyp files\n#to turn it on.\n gypfiles=($(find \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -type f -name \"*.gyp\"))\n if [ ${#gypfiles[@]} -gt 0 ]; then\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=1\n else\n NODEJS_MOBILE_BUILD_NATIVE_MODULES=0\n fi\nfi\nif [ \"1\" != \"$NODEJS_MOBILE_BUILD_NATIVE_MODULES\" ]; then exit 0; fi\n# Delete object files that may already come from within the npm package.\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.o\" -type f -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.a\" -type f -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.node\" -type f -delete\n# Delete bundle contents that may be there from previous builds.\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.node/*\" -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.node\" -type d -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -path \"*/*.framework/*\" -delete\nfind \"$CODESIGNING_FOLDER_PATH/nodejs-project/\" -name \"*.framework\" -type d -delete\n# Apply patches to the modules package.json\nif [ -d \"$CODESIGNING_FOLDER_PATH\"/nodejs-project/node_modules/ ]; then\n PATCH_SCRIPT_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/scripts/ && pwd )\"\n NODEJS_PROJECT_MODULES_DIR=\"$( cd \"$CODESIGNING_FOLDER_PATH\" && cd nodejs-project/node_modules/ && pwd )\"\n node \"$PATCH_SCRIPT_DIR\"/patch-package.js $NODEJS_PROJECT_MODULES_DIR\nfi\n# Get the nodejs-mobile-gyp location\nif [ -d \"$PROJECT_DIR/../node_modules/nodejs-mobile-gyp/\" ]; then\n NODEJS_MOBILE_GYP_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-gyp/ && pwd )\"\nelse\n NODEJS_MOBILE_GYP_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/node_modules/nodejs-mobile-gyp/ && pwd )\"\nfi\nNODEJS_MOBILE_GYP_BIN_FILE=\"$NODEJS_MOBILE_GYP_DIR\"/bin/node-gyp.js\n# Support building neon-bindings (Rust) native modules\nif [ -f ~/.cargo/env ]; then\n source ~/.cargo/env;\nfi\n# Rebuild modules with right environment\nNODEJS_HEADERS_DIR=\"$( cd \"$PROJECT_DIR\" && cd ../node_modules/nodejs-mobile-react-native/ios/libnode/ && pwd )\"\npushd $CODESIGNING_FOLDER_PATH/nodejs-project/\nif [ \"$PLATFORM_NAME\" == \"iphoneos\" ]\nthen\n GYP_DEFINES=\"OS=ios\" CARGO_BUILD_TARGET=\"aarch64-apple-ios\" npm_config_nodedir=\"$NODEJS_HEADERS_DIR\" npm_config_node_gyp=\"$NODEJS_MOBILE_GYP_BIN_FILE\" npm_config_platform=\"ios\" npm_config_format=\"make-ios\" npm_config_node_engine=\"chakracore\" npm_config_arch=\"arm64\" npm --verbose rebuild --build-from-source\nelse\n GYP_DEFINES=\"OS=ios\" CARGO_BUILD_TARGET=\"x86_64-apple-ios\" npm_config_nodedir=\"$NODEJS_HEADERS_DIR\" npm_config_node_gyp=\"$NODEJS_MOBILE_GYP_BIN_FILE\" npm_config_platform=\"ios\" npm_config_format=\"make-ios\" npm_config_node_engine=\"chakracore\" npm_config_arch=\"x64\" npm --verbose rebuild --build-from-source\nfi\npopd\n";
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
/* Begin PBXSourcesBuildPhase section */
|
||||
@@ -596,6 +737,8 @@
|
||||
ENABLE_BITCODE = "$(inherited)";
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"\"../node_modules/nodejs-mobile-react-native/ios\"",
|
||||
"\"../node_modules/nodejs-mobile-react-native/ios\"",
|
||||
"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
|
||||
);
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
@@ -610,6 +753,7 @@
|
||||
"$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker",
|
||||
"$(SRCROOT)/../node_modules/react-native-fs/**",
|
||||
"$(SRCROOT)/../node_modules/react-native-restart/ios/RCTRestart/**",
|
||||
"$(SRCROOT)/../node_modules/nodejs-mobile-react-native/ios/**",
|
||||
"$(SRCROOT)/../node_modules/realm/src/**",
|
||||
);
|
||||
INFOPLIST_FILE = dripTests/Info.plist;
|
||||
@@ -641,6 +785,8 @@
|
||||
ENABLE_BITCODE = "$(inherited)";
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"\"../node_modules/nodejs-mobile-react-native/ios\"",
|
||||
"\"../node_modules/nodejs-mobile-react-native/ios\"",
|
||||
"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
|
||||
);
|
||||
HEADER_SEARCH_PATHS = (
|
||||
@@ -651,6 +797,7 @@
|
||||
"$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker",
|
||||
"$(SRCROOT)/../node_modules/react-native-fs/**",
|
||||
"$(SRCROOT)/../node_modules/react-native-restart/ios/RCTRestart/**",
|
||||
"$(SRCROOT)/../node_modules/nodejs-mobile-react-native/ios/**",
|
||||
"$(SRCROOT)/../node_modules/realm/src/**",
|
||||
);
|
||||
INFOPLIST_FILE = dripTests/Info.plist;
|
||||
@@ -685,7 +832,10 @@
|
||||
ENABLE_BITCODE = "$(inherited)";
|
||||
EXCLUDED_ARCHS = "";
|
||||
"EXCLUDED_ARCHS[sdk=*]" = "";
|
||||
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"\"../node_modules/nodejs-mobile-react-native/ios\"",
|
||||
);
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"COCOAPODS=1",
|
||||
"$(inherited)",
|
||||
@@ -698,6 +848,7 @@
|
||||
"$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker",
|
||||
"$(SRCROOT)/../node_modules/react-native-fs/**",
|
||||
"$(SRCROOT)/../node_modules/react-native-restart/ios/RCTRestart/**",
|
||||
"$(SRCROOT)/../node_modules/nodejs-mobile-react-native/ios/**",
|
||||
"$(SRCROOT)/../node_modules/@react-native-community/push-notification-ios/ios",
|
||||
"$(SRCROOT)/../node_modules/realm/src/**",
|
||||
);
|
||||
@@ -732,6 +883,7 @@
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/RealmJS\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/nodejs-mobile-react-native\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-document-picker\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-restart\"",
|
||||
"\"${PODS_ROOT}/../../node_modules/realm/vendor/realm-ios\"",
|
||||
@@ -763,7 +915,10 @@
|
||||
DEVELOPMENT_TEAM = 6AD72X6W26;
|
||||
ENABLE_BITCODE = "$(inherited)";
|
||||
EXCLUDED_ARCHS = "";
|
||||
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
|
||||
FRAMEWORK_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
"\"../node_modules/nodejs-mobile-react-native/ios\"",
|
||||
);
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"COCOAPODS=1",
|
||||
"$(inherited)",
|
||||
@@ -776,6 +931,7 @@
|
||||
"$(SRCROOT)/../node_modules/react-native-document-picker/ios/RNDocumentPicker",
|
||||
"$(SRCROOT)/../node_modules/react-native-fs/**",
|
||||
"$(SRCROOT)/../node_modules/react-native-restart/ios/RCTRestart/**",
|
||||
"$(SRCROOT)/../node_modules/nodejs-mobile-react-native/ios/**",
|
||||
"$(SRCROOT)/../node_modules/@react-native-community/push-notification-ios/ios",
|
||||
"$(SRCROOT)/../node_modules/realm/src/**",
|
||||
);
|
||||
@@ -810,6 +966,7 @@
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/RealmJS\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/Yoga\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/glog\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/nodejs-mobile-react-native\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-document-picker\"",
|
||||
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-restart\"",
|
||||
"\"${PODS_ROOT}/../../node_modules/realm/vendor/realm-ios\"",
|
||||
@@ -881,8 +1038,8 @@
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(SDKROOT)/usr/lib/swift",
|
||||
"\"$(inherited)\"",
|
||||
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
|
||||
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
|
||||
);
|
||||
MTL_ENABLE_DEBUG_INFO = YES;
|
||||
@@ -937,8 +1094,8 @@
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
|
||||
LIBRARY_SEARCH_PATHS = (
|
||||
"$(SDKROOT)/usr/lib/swift",
|
||||
"\"$(inherited)\"",
|
||||
"\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"",
|
||||
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
|
||||
);
|
||||
MTL_ENABLE_DEBUG_INFO = NO;
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
// Import Jest Native matchers
|
||||
import '@testing-library/jest-native/extend-expect'
|
||||
@@ -1,12 +0,0 @@
|
||||
module.exports = {
|
||||
preset: '@testing-library/react-native',
|
||||
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
|
||||
setupFilesAfterEnv: ['./jest-setup.js'],
|
||||
transformIgnorePatterns: [
|
||||
'node_modules/(?!((jest-)?react-native(-.*)?|@react-native(-community)?)/)',
|
||||
],
|
||||
watchPlugins: [
|
||||
'jest-watch-typeahead/filename',
|
||||
'jest-watch-typeahead/testname',
|
||||
],
|
||||
}
|
||||
@@ -17,7 +17,6 @@ export default function config(opts) {
|
||||
bleedingDaysSortedByDate = require('../db').getBleedingDaysSortedByDate()
|
||||
cycleStartsSortedByDate = require('../db').getCycleStartsSortedByDate()
|
||||
cycleDaysSortedByDate = require('../db').getCycleDaysSortedByDate()
|
||||
|
||||
maxBreakInBleeding = 1
|
||||
maxCycleLength = 99
|
||||
minCyclesForPrediction = 3
|
||||
@@ -223,19 +222,6 @@ export default function config(opts) {
|
||||
return predictedMenses
|
||||
}
|
||||
|
||||
const getStats = () =>
|
||||
cycleStartsSortedByDate.map((day, i) => {
|
||||
const today = getTodayDate()
|
||||
const cycleLength =
|
||||
i === 0 ? getCycleDayNumber(today) : getAllCycleLengths()[i - 1]
|
||||
|
||||
return {
|
||||
date: day.date,
|
||||
cycleLength,
|
||||
bleedingLength: ++getMensesDaysRightAfter(day).length,
|
||||
}
|
||||
})
|
||||
|
||||
return {
|
||||
getCycleDayNumber,
|
||||
getCycleForDay,
|
||||
@@ -246,6 +232,5 @@ export default function config(opts) {
|
||||
isMensesStart,
|
||||
getMensesDaysRightAfter,
|
||||
getCycleByStartDay,
|
||||
getStats,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import {
|
||||
import getColumnNamesForCsv from './get-csv-column-names'
|
||||
import replaceWithNullIfAllPropertiesAreNull from './replace-with-null'
|
||||
import { LocalDate } from '@js-joda/core'
|
||||
import i18next from 'i18next'
|
||||
import labels from '../../i18n/en/settings'
|
||||
|
||||
export default async function importCsv(csv, deleteFirst) {
|
||||
const parseFuncs = {
|
||||
@@ -46,10 +46,7 @@ export default async function importCsv(csv, deleteFirst) {
|
||||
|
||||
const cycleDays = await csvParser(config)
|
||||
.fromString(csv)
|
||||
.on('header', (headers) => validateHeaders(headers))
|
||||
.on('error', (error) => {
|
||||
throw error
|
||||
})
|
||||
.on('header', validateHeaders)
|
||||
|
||||
//remove symptoms where all fields are null
|
||||
putNullForEmptySymptoms(cycleDays)
|
||||
@@ -70,11 +67,8 @@ function validateHeaders(headers) {
|
||||
return expectedHeaders.indexOf(header) > -1
|
||||
})
|
||||
) {
|
||||
throw new Error(
|
||||
i18next.t('hamburgerMenu.settings.data.import.error.incorrectColumns', {
|
||||
incorrectColumns: expectedHeaders.join(),
|
||||
})
|
||||
)
|
||||
const msg = `Expected CSV column titles to be ${expectedHeaders.join()}`
|
||||
throw new Error(msg)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,9 +92,7 @@ function throwIfFutureData(cycleDays) {
|
||||
day.date > today &&
|
||||
Object.keys(day).some((symptom) => symptom != 'date' && symptom != 'note')
|
||||
) {
|
||||
throw new Error(
|
||||
i18next.t('hamburgerMenu.settings.data.import.error.futureEdit')
|
||||
)
|
||||
throw new Error(labels.import.errors.futureEdit)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+4
-3
@@ -1,16 +1,17 @@
|
||||
export default function getSensiplanMucus(feeling, texture) {
|
||||
export default function (feeling, texture) {
|
||||
|
||||
if (typeof feeling != 'number' || typeof texture != 'number') return null
|
||||
|
||||
const feelingMapping = {
|
||||
0: 0,
|
||||
1: 1,
|
||||
2: 2,
|
||||
3: 4,
|
||||
3: 4
|
||||
}
|
||||
const textureMapping = {
|
||||
0: 0,
|
||||
1: 3,
|
||||
2: 4,
|
||||
2: 4
|
||||
}
|
||||
const nfpFeelingValue = feelingMapping[feeling]
|
||||
const nfpTextureValue = textureMapping[texture]
|
||||
|
||||
+7
-21
@@ -1,10 +1,8 @@
|
||||
import { Platform } from 'react-native'
|
||||
import {
|
||||
tempReminderObservable,
|
||||
periodReminderObservable,
|
||||
} from '../local-storage'
|
||||
import * as PN from 'react-native-push-notification'
|
||||
import { requestNotifications } from 'react-native-permissions'
|
||||
import Notification from 'react-native-push-notification'
|
||||
import Moment from 'moment'
|
||||
import { LocalDate } from '@js-joda/core'
|
||||
|
||||
@@ -14,16 +12,7 @@ import cycleModule from './cycle'
|
||||
import nothingChanged from '../db/db-unchanged'
|
||||
|
||||
export default function setupNotifications(navigate, setDate) {
|
||||
requestNotifications()
|
||||
const PushNotification = Platform.OS === 'ios' ? PN : PN.default
|
||||
|
||||
PushNotification.createChannel({
|
||||
channelId: 'drip-channel-id', // (required)
|
||||
channelName: 'drip reminder', // (required)
|
||||
playSound: false, // (optional) default: true
|
||||
})
|
||||
|
||||
PushNotification.configure({
|
||||
Notification.configure({
|
||||
onNotification: (notification) => {
|
||||
// https://github.com/zo0r/react-native-push-notification/issues/966#issuecomment-479069106
|
||||
if (notification.data?.id === '1' || notification.id === '1') {
|
||||
@@ -37,7 +26,7 @@ export default function setupNotifications(navigate, setDate) {
|
||||
})
|
||||
|
||||
tempReminderObservable((reminder) => {
|
||||
PushNotification.cancelLocalNotification({ id: '1' })
|
||||
Notification.cancelLocalNotifications({ id: '1' })
|
||||
if (reminder.enabled) {
|
||||
const [hours, minutes] = reminder.time.split(':')
|
||||
let target = new Moment()
|
||||
@@ -49,33 +38,31 @@ export default function setupNotifications(navigate, setDate) {
|
||||
target = target.add(1, 'd')
|
||||
}
|
||||
|
||||
PushNotification.localNotificationSchedule({
|
||||
Notification.localNotificationSchedule({
|
||||
id: '1',
|
||||
userInfo: { id: '1' },
|
||||
message: labels.tempReminder.notification,
|
||||
date: target.toDate(),
|
||||
vibrate: false,
|
||||
repeatType: 'day',
|
||||
channelId: 'drip-channel-id',
|
||||
})
|
||||
}
|
||||
}, false)
|
||||
|
||||
periodReminderObservable((reminder) => {
|
||||
PushNotification.cancelLocalNotification({ id: '2' })
|
||||
Notification.cancelLocalNotifications({ id: '2' })
|
||||
if (reminder.enabled) setupPeriodReminder()
|
||||
}, false)
|
||||
|
||||
getBleedingDaysSortedByDate().addListener((_, changes) => {
|
||||
// the listener fires on setup, so we check if there were actually any changes
|
||||
if (nothingChanged(changes)) return
|
||||
PushNotification.cancelLocalNotification({ id: '2' })
|
||||
Notification.cancelLocalNotifications({ id: '2' })
|
||||
if (periodReminderObservable.value.enabled) setupPeriodReminder()
|
||||
})
|
||||
}
|
||||
|
||||
function setupPeriodReminder() {
|
||||
const PushNotification = Platform.OS === 'ios' ? PN : PN.default
|
||||
const bleedingPrediction = cycleModule().getPredictedMenses()
|
||||
if (bleedingPrediction.length > 0) {
|
||||
const predictedBleedingStart = Moment(
|
||||
@@ -93,13 +80,12 @@ function setupPeriodReminder() {
|
||||
// period is likely to start in 3 to 3 + (length of prediction - 1) days
|
||||
const daysToEndOfPrediction = bleedingPrediction[0].length + 2
|
||||
|
||||
PushNotification.localNotificationSchedule({
|
||||
Notification.localNotificationSchedule({
|
||||
id: '2',
|
||||
userInfo: { id: '2' },
|
||||
message: labels.periodReminder.notification(daysToEndOfPrediction),
|
||||
date: reminderDate.toDate(),
|
||||
vibrate: false,
|
||||
channelId: 'drip-channel-id',
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 190 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 136 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 120 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 121 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 190 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 152 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 129 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 104 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user