Compare commits

...

952 Commits

Author SHA1 Message Date
bl00dymarie ff52bbc13d Release: iOS-1.2401.17 2024-01-29 17:08:17 +01:00
bl00dymarie d395ba9be4 Address xcode error messages 2024-01-29 17:08:17 +01:00
bl00dymarie 91c05e79c0 Update project changes according to xCode suggestion 2024-01-29 17:08:17 +01:00
Liv 1e56f4e3f4 Reorder import buttons depending on OS 2024-01-29 17:08:17 +01:00
bl00dymarie 5e55a2e2ef Partial update RN to 0.68.3 for android build 2024-01-29 17:07:42 +01:00
bl00dymarie 20af120498 Update RN to 0.68.3 for iOS build 2024-01-29 17:07:42 +01:00
Liv M 4e8e92b0d5 Merge branch 'fix/rounding-stats' into 'main'
Change formatting of decimals in stats

Closes #669

See merge request bloodyhealth/drip!633
2024-01-24 17:45:07 +00:00
Liv M f337272933 Merge branch 'fix/toggle-tab' into 'main'
Fix: Make tab groups (single select) togglable

See merge request bloodyhealth/drip!645
2024-01-24 17:41:49 +00:00
Liv M d7e9bae558 Fix: Make tab groups (single select) togglable 2024-01-24 17:41:49 +00:00
bl00dymarie 27274aa994 Merge branch 'feature/Customize-tracking-categories-sex-desire-pain–mood-note' into 'main'
Feature: customize tracking categories sex desire pain mood note

See merge request bloodyhealth/drip!648
2024-01-23 13:25:20 +00:00
bl00dymarie 28fd610e9d Make desire, pain, mood and note customizable 2024-01-22 17:43:03 +01:00
bl00dymarie 26d971a8b2 Remove sex from chart if not enabled 2024-01-22 17:43:03 +01:00
bl00dymarie 40af118563 Remove sex from cycle day if not enabled 2024-01-22 17:43:03 +01:00
bl00dymarie 750bfa58c3 Add sexTrackingCategory as toggle 2024-01-22 17:43:03 +01:00
bl00dymarie c645c48d31 Merge branch '671-feature-customisation-not-display-menstrual-bleeding-prediction' into 'main'
Feature: Customizable period prediction

Closes #671

See merge request bloodyhealth/drip!647
2024-01-22 14:40:31 +00:00
bl00dymarie 62e3328113 Remove double npm install 2024-01-22 15:38:45 +01:00
bl00dymarie db93aa74bb Typo and other text corrections 2024-01-22 15:07:16 +01:00
wunderfisch b53be31868 functionality that disables the next-periode-reminder-switch if menstrual bleeding shall not be predicted (new customization feature). also an alert pops up when the user still tries to press the disabled toggle or the text area next to it 2024-01-15 18:05:54 +01:00
bl00dymarie 974a9735c5 Improve text for periodPrediction off 2024-01-10 18:00:01 +01:00
bl00dymarie 5787e96e53 set periodReminder to false if periodPrediction is turned off 2024-01-10 17:52:14 +01:00
bl00dymarie 5d62cbfffe Makes periodPrediction text on Home adjustable 2024-01-08 11:58:21 +01:00
bl00dymarie 791c0d345f Make periodPrediction on Calendar adjustable 2024-01-08 11:58:15 +01:00
bl00dymarie c7c905fd5f Add functionality to turn on/off period predictions 2024-01-08 11:58:02 +01:00
wunderfisch 9800b663fb Merge branch '683-ui-scaffold-for-customization' into 'main'
Resolve "UI scaffold for customization"

Closes #683

See merge request bloodyhealth/drip!642
2024-01-08 10:40:19 +00:00
wunderfisch 4d7895b9f2 Toggles set to true by default 2024-01-08 10:35:13 +00:00
wunderfisch 7977be6f3f Merge branch '682-change-order-of-reminders' into 'main'
change order of periode and temperature reminder

Closes #682

See merge request bloodyhealth/drip!643
2024-01-05 15:18:32 +00:00
bl00dymarie bb8338c842 Update license year in snapshot 2024-01-05 16:14:46 +01:00
bl00dymarie 31e87db23f Update license year snapshot 2024-01-05 15:59:59 +01:00
bl00dymarie 09f0a0f11d Add WIP for customization section 2024-01-05 15:51:56 +01:00
wunderfisch dd9ad9e393 switched temperature reminder and periode reminder. now periode reminder is at the top, temperature reminder below 2024-01-05 15:51:46 +01:00
bl00dymarie e18eedd4e7 Add info section under settings 2024-01-05 15:51:25 +01:00
bl00dymarie 3e50991d12 Rename nfp-settings into customization 2024-01-05 15:50:47 +01:00
wunderfisch bda09438ee Merge branch '655-bug-bring-back-outofrangewarning-label-text' into 'main'
Chore: Bring back warning hint + orange highlight

Closes #655

See merge request bloodyhealth/drip!640
2024-01-05 14:35:11 +00:00
wunderfisch eb804fe6c8 Merge branch 'Chore/build-for-ios-1.2312.11' into 'main'
Chore: build latest android update for ios

Closes #673

See merge request bloodyhealth/drip!636
2024-01-04 17:00:18 +00:00
bl00dymarie f0750cd45f Remove formatting changes 2023-12-13 14:52:00 +00:00
bl00dymarie c6662e02bf Chore: Bring back warning hint + orange highlight 2023-12-13 15:35:17 +01:00
bl00dymarie f3aa5b4d68 Merge branch 'main' into 'Chore/build-for-ios-1.2312.11'
# Conflicts:
#   package.json
2023-12-13 11:14:43 +00:00
bl00dymarie b2f277eb12 Merge branch '678-bug-excluded-temp-value-needs-lighter-color' into 'main'
Fix: Specify dot fill color for excluded temp value

Closes #678

See merge request bloodyhealth/drip!637
2023-12-13 11:05:59 +00:00
bl00dymarie 3bdf660c27 Merge branch '677-fix-license-screen-cut-out-on-top' into 'main'
Fix: Give some marginTop on very first License screen

Closes #677

See merge request bloodyhealth/drip!638
2023-12-13 11:00:48 +00:00
bl00dymarie a0ee200149 Add iPhone 14 simulator 2023-12-12 15:58:39 +01:00
bl00dymarie 79ab093584 Update license snapshot for jest 2023-12-12 15:57:46 +01:00
bl00dymarie 7418fc2cce Give some marginTop on very first License screen 2023-12-12 15:19:59 +01:00
bl00dymarie e297903468 Specify dot fill color for excluded temp value 2023-12-12 13:11:57 +01:00
bl00dymarie 4f54d19f78 Chore: build latest android update for ios 2023-12-11 17:01:43 +01:00
wunderfisch 31ccb22c82 better readability 2023-12-11 10:20:44 +00:00
wunderfisch ddfbc4cee8 reentered the merge part 2023-12-11 10:18:40 +00:00
wunderfisch 9d21138da7 Merge branch 'chore/contribution' into 'main'
suggestions to rewrite how to contribute

See merge request bloodyhealth/drip!634
2023-12-11 10:12:14 +00:00
bl00dymarie a6fc38ca47 Merge branch '674-chore-update-media-for-fdroid' into 'main'
Resolve "Chore: Update media for Fdroid"

Closes #674

See merge request bloodyhealth/drip!635
2023-12-05 15:08:28 +00:00
bl00dymarie 2f07b76b6c improved text how to contribute to drip 2023-12-05 12:28:17 +00:00
bl00dymarie bb29f29de5 Update file Default.md 2023-12-04 19:36:39 +00:00
bl00dymarie b39a5681ea Chore: Add new screenshots (sharepics) 2023-12-04 20:23:30 +01:00
bl00dymarie 38a56b0fbd Chore: Remove outdated screenshots 2023-12-04 20:22:40 +01:00
bl00dymarie c5906c2144 Update file RELEASE.md 2023-12-04 15:08:31 +00:00
bl00dymarie 89015abe17 Update file RELEASE.md 2023-12-04 15:07:57 +00:00
bl00dymarie 06fc4f4b6b Update file RELEASE.md 2023-12-04 15:07:04 +00:00
bl00dymarie 64ed3aba4a Update file RELEASE.md 2023-12-04 15:03:16 +00:00
wunderfisch 5a18593ab5 improvements of explanation how to run the android app on a virtual device 2023-12-04 11:34:46 +00:00
wunderfisch 3755ac8ac9 suggestions to rewrite how to contribute 2023-11-29 18:15:23 +01:00
Liv 0579897fc1 Change formatting of decimals in stats 2023-11-27 16:45:11 +01:00
bl00dymarie d6dbea78ac Merge branch 'Chore/Release-steps' into 'main'
Chore: Android release documentation

See merge request bloodyhealth/drip!631
2023-11-22 15:29:06 +00:00
wunderfisch 84ff76096b Implement review feedback 2023-11-22 14:53:57 +00:00
bl00dymarie e030c4d75e Update download badges 2023-11-21 13:16:26 +00:00
bl00dymarie 4ed399c50c Add toc, screenshot info and some more 2023-11-20 18:04:41 +01:00
bl00dymarie 92546362a0 Chore: document release process for android 2023-11-18 00:34:50 +01:00
bl00dymarie 486dd185e2 Remove automatic changelog update 2023-11-18 00:34:44 +01:00
bl00dymarie e576c5dc7d Rename master to main in documentation 2023-11-18 00:34:38 +01:00
bl00dymarie 536106f757 Merge branch 'release' into 'main'
Keep main up to date with release branch after android v1.2311.14 Google Play Publish

See merge request bloodyhealth/drip!630
2023-11-17 23:29:48 +00:00
bl00dymarie 552e63c9ef Merge branch 'chore/ci-cd' into 'main'
Chore: Bump npm version

See merge request bloodyhealth/drip!624
2023-11-17 13:13:10 +00:00
Liv M 9dff2808c0 Chore: Bump npm version 2023-11-17 13:13:10 +00:00
bl00dymarie 0f375530c8 Merge branch 'Chore/Release-v1.2311.14-versionCode25' into 'release'
Release: v1.2311.14

See merge request bloodyhealth/drip!629
2023-11-16 15:49:19 +00:00
bl00dymarie 5401789c46 Release: v1.2311.14 2023-11-14 13:08:11 +01:00
bl00dymarie f6944328fb Fix: Middle chart legend improved;
Row height halfed, elements aligned, fontsize partially decreased
2023-11-14 13:06:58 +01:00
bl00dymarie f730b617cb Remove no-unused-var error 2023-11-13 17:00:02 +01:00
Liv 668faf2534 Clean up backgroundColor variable 2023-11-13 17:00:02 +01:00
livi f304fee293 Highlight weekend dates in chart 2023-11-13 17:00:02 +01:00
bl00dymarie 54b08c15bb Merge branch '656-chore-write-changelog-and-release-notes-1' into 'release'
Add Changelog for Release v1.2311.10

See merge request bloodyhealth/drip!628
2023-11-13 11:50:52 +00:00
bl00dymarie 6d51826dd6 Add Changelog for Release v1.2311.10 2023-11-13 12:22:21 +01:00
tintenfisch 5ff680a591 Merge branch '653-bug-grid-labels-for-temperature-chart-cut-out' into 'release'
fix: changes to the temperature chart

See merge request bloodyhealth/drip!626
2023-11-10 16:50:25 +00:00
tintenfisch 2cda2c38e9 fix: changes to the temperature chart 2023-11-10 16:50:25 +00:00
tintenfisch b638a5bd08 Merge branch '372-ui-bug-import-pop-up' into 'release'
fix: change to data import dialog

See merge request bloodyhealth/drip!625
2023-11-10 12:25:46 +00:00
wunderfisch 32cec10a79 change to data import dialog. first have replace option, second delete. like this synchronous to text above. 2023-11-10 12:30:17 +01:00
bl00dymarie 2eca9ba097 Merge branch 'fix/Update-android-1.2310.31-versionNumber21' into 'release'
Fix: Update android to v1.2310.31 for testing

See merge request bloodyhealth/drip!619
2023-11-09 11:10:35 +00:00
tintenfisch c432edbbaf Merge branch '645-chore-update-readme-for-android' into 'main'
updated readme for android

Closes #645

See merge request bloodyhealth/drip!617
2023-11-09 10:04:34 +00:00
bl00dymarie 67d58e3db4 Update 2 files
- /.gitlab/issue_templates/bug-template.md
- /.gitlab/issue_templates/chore-template.md
2023-11-09 09:55:01 +00:00
wunderfisch 773f1c86c2 added link to adb website 2023-11-07 11:26:00 +01:00
bl00dymarie 3f2af788f3 Apply reviewed suggestions 2023-11-07 10:20:12 +00:00
bl00dymarie 573de7545e Merge branch 'chore/edit-merge-request-template-to-close-issues' into 'main'
Edit merge request template to close issues automatically

See merge request bloodyhealth/drip!578
2023-11-07 10:04:44 +00:00
wunderfisch 4139cba63c updated readme after checking on two different ubuntu devices 2023-11-06 15:15:05 +01:00
bl00dymarie d81dbac60c Chore: Update versionName 1.2310.31, versionCode 21 and cl tool 2023-10-31 13:05:09 +01:00
bl00dymarie 40fb65ca88 Chore: Target Android 13 and Sdk33 2023-10-31 12:53:01 +01:00
bl00dymarie ed7a5a341b Updates jetifier; converts support libraries of all dependencies to AndroidX 2023-10-31 12:37:15 +01:00
tintenfisch ca3cf16ff7 Merge branch 'chore/templates-for-issue-feature-chore' into 'main'
3 templates for issues

See merge request bloodyhealth/drip!616
2023-10-27 15:40:56 +00:00
bl00dymarie fdbfef38f9 Chore: Add permission request for notifications;
- required on Android 13
2023-10-26 16:44:35 +02:00
bl00dymarie 5c13e91fb3 Chore: Update notifications for Android;
- Use new updated fork of react-native-push-notification without google
- Create channel for PushNotifications
- Adapt AndroidManifest.xml
2023-10-26 16:44:35 +02:00
bl00dymarie 2b235f4d10 Address Google Play 64-bit error;
release isn't compliant with Google Play 64-bit requirement error
2023-10-26 16:43:44 +02:00
bl00dymarie bcc7eaada9 Fix hint display on chart 2023-10-26 16:43:44 +02:00
bl00dymarie 714021465e lowercase symptom names as before 2023-10-26 16:43:44 +02:00
Sofiya Tepikin c3e4fd3f03 Revert json conversion 2023-10-26 16:43:44 +02:00
bl00dymarie e7f76bad33 implement feedback suggestions 2023-10-20 11:20:38 +02:00
wunderfisch 9537e377e0 first draft for possible templates to get certain information when writing issues. 2023-10-20 11:20:38 +02:00
Sofiya Tepikin f11eb3d1a1 Merge branch 'fix/outdated-snapshot' into 'main'
Fix outdated snapshot

See merge request bloodyhealth/drip!593
2023-01-19 09:31:57 +00:00
Sofiya Tepikin 5f83464649 Fix outdated snapshot 2023-01-19 10:23:48 +01:00
Sofiya Tepikin 6e2e03f39e Merge branch 'chore/update-babel-dependencies' into 'main'
Chore/update babel dependencies

See merge request bloodyhealth/drip!579
2022-11-13 20:00:23 +00:00
Sofiya Tepikin cc62e24229 Chore/update babel dependencies 2022-11-13 20:00:23 +00:00
Lisa Hillebrand 1907a78dbf Edit merge request template to close issues automatically 2022-11-06 16:20:03 +01:00
Sofiya Tepikin cd24522b4d Merge branch '618/Refactor-import-section-to-use-translation-lib' into 'main'
618 Refactor import section to use translation lib

See merge request bloodyhealth/drip!555
2022-11-06 14:47:05 +00:00
Lisa 446638d6de 618 Refactor import section to use translation lib 2022-11-06 14:47:05 +00:00
Lisa ae23ef2c58 Merge branch '624/Use-translation-library-in-tutorial' into 'main'
624 Use translation library in tutorial

See merge request bloodyhealth/drip!573
2022-11-06 14:43:15 +00:00
Lisa 38b9e8b31f Merge branch 'dependabot-npm_and_yarn-react-i18next-12.0.0' into 'main'
Bump react-i18next from 11.18.3 to 12.0.0

See merge request bloodyhealth/drip!571
2022-10-23 10:11:06 +00:00
Lisa Hillebrand 84d657cabb 614 Uppercase tutorial component 2022-10-23 11:56:32 +02:00
Lisa Hillebrand 4573b93921 624 Use translation library for chart tutorial 2022-10-23 11:54:11 +02:00
Sofiya Tepikin ab88a4c163 Bump react-i18next from 11.18.3 to 12.0.0
Bumps [react-i18next](https://github.com/i18next/react-i18next) from 11.18.3 to 12.0.0.
- [Release notes](https://github.com/i18next/react-i18next/releases)
- [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/react-i18next/compare/v11.18.3...v12.0.0)
2022-10-23 09:06:40 +00:00
Lisa baaf89c04e Merge branch 'dependabot-npm_and_yarn-i18next-22.0.2' into 'main'
Bump i18next from 21.9.0 to 22.0.2

See merge request bloodyhealth/drip!570
2022-10-23 08:13:38 +00:00
Sofiya Tepikin d476f6c143 Bump i18next from 21.9.0 to 22.0.2
Bumps [i18next](https://github.com/i18next/i18next) from 21.9.0 to 22.0.2.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next/compare/v21.9.0...v22.0.2)
2022-10-21 09:07:30 +00:00
Sofiya Tepikin b56e0818f3 Merge branch '619/Create-test-utils-for-react-testing-library' into 'main'
619 Create test utils for react testing library

See merge request bloodyhealth/drip!556
2022-10-19 13:17:19 +00:00
Lisa 1b5ffaf5d6 619 Create test utils for react testing library 2022-10-19 13:17:19 +00:00
Sofiya Tepikin f68cc2b49e Merge branch 'fix/exclude-babel-core-from-dependabot' into 'main'
Exclude @babel/core library from dependabot updates

See merge request bloodyhealth/drip!560
2022-10-05 11:31:38 +00:00
Sofiya Tepikin 27d430a465 Exclude @babel/core library from dependabot updates 2022-10-05 13:28:49 +02:00
Sofiya Tepikin 28f52e2cea Merge branch '617/Remove-weblate-reference-from-readme' into 'main'
617 Remove reference to weblate from readme

See merge request bloodyhealth/drip!554
2022-10-05 10:10:46 +00:00
Lisa 3f87f298fb Merge branch '615-Use-translation-library-for-pages' into 'main'
615 Use translation library for pages

Closes #615

See merge request bloodyhealth/drip!530
2022-10-01 08:13:24 +00:00
Lisa Hillebrand 585f32863d 617 Remove reference to weblate from readme 2022-09-30 11:58:11 +02:00
Lisa Hillebrand 51e1c95e71 615 Remove unused page labels 2022-09-30 11:39:16 +02:00
Lisa Hillebrand 36c33c69b7 615 Use translation library for bottom menu 2022-09-30 11:39:00 +02:00
Sofiya Tepikin 9dfe8b4b05 Merge branch '614/Use-translation-library-for-settings-menu' into 'main'
614 Use translation library for settings menu

See merge request bloodyhealth/drip!529
2022-09-27 16:24:41 +00:00
Lisa b7d97f0589 614 Use translation library for settings menu 2022-09-27 16:24:40 +00:00
Maria Zadnepryanets fd611db750 Merge branch 'feature/add-stats-explainer-take2' into 'main'
Feature: add stats explainer take2

See merge request bloodyhealth/drip!546
2022-09-26 17:19:23 +00:00
Maria Zadnepryanets 7b9293f7a2 Feature: add stats explainer take2 2022-09-26 17:19:23 +00:00
Lisa db1388c3c4 Merge branch 'chore/retire-nodejs-mobile' into 'main'
Retire nodejs mobile

See merge request bloodyhealth/drip!541
2022-09-25 17:14:15 +00:00
Lisa 09d164b9fc Merge branch '613/Use-translation-library-for-symptom-boxes' into 'main'
613 Use translation library for symptom boxes

See merge request bloodyhealth/drip!527
2022-09-24 17:18:39 +00:00
Maria Zadnepryanets d78fbf74e3 Merge branch 'chore/add-translations-to-stats' into 'main'
Chore: add translations to stats

See merge request bloodyhealth/drip!545
2022-09-20 17:50:05 +00:00
Maria Zadnepryanets c9430439c5 Chore: add translations to stats 2022-09-20 17:50:05 +00:00
Maria Zadnepryanets 08712f460e Merge branch 'chore/add-footnote-component' into 'main'
Chore: add footnote component

See merge request bloodyhealth/drip!544
2022-09-20 16:43:21 +00:00
Maria Zadnepryanets 3447a0ea1e Chore: add footnote component 2022-09-20 16:43:20 +00:00
Sofiya Tepikin b4d92d0d7b Merge branch 'fix/chart-warning' into 'main'
Fix useEffect callback cannot be async

See merge request bloodyhealth/drip!540
2022-09-20 15:32:47 +00:00
Sofiya Tepikin d5f0e3532a Fix useEffect callback cannot be async 2022-09-20 15:32:47 +00:00
Maria Zadnepryanets 8774d251de Merge branch 'chore/add-statistics' into 'main'
Add more data to stats

Closes #264

See merge request bloodyhealth/drip!472
2022-09-19 14:23:56 +00:00
Maria Zadnepryanets 974d081f40 Add more data to stats 2022-09-19 14:23:55 +00:00
Sofiya Tepikin 9f9eadfc46 Cleanup 2022-09-19 15:56:54 +02:00
Sofiya Tepikin f5004f2d7a Use jshashes on Enter new password 2022-09-19 15:15:48 +02:00
Sofiya Tepikin afc177cb53 Use jshashes on Confirmation with password 2022-09-19 15:07:03 +02:00
Sofiya Tepikin 0ebadbc92a Use jshashes on Password prompt screen 2022-09-19 14:40:57 +02:00
Sofiya Tepikin 47b7021fa3 Add jshashes dependency 2022-09-19 14:40:25 +02:00
Sofiya Tepikin c847270159 Merge branch 'chore/extend-license-test' into 'main'
Chore/extend license test

See merge request bloodyhealth/drip!539
2022-09-19 10:54:34 +00:00
Sofiya Tepikin d58c230eda Chore/extend license test 2022-09-19 10:54:33 +00:00
Sofiya Tepikin 0747ea8a5f Merge branch 'dependabot-npm_and_yarn-babel-eslint-parser-7.19.1' into 'main'
Chore(deps-dev): bump @babel/eslint-parser from 7.16.3 to 7.19.1

See merge request bloodyhealth/drip!533
2022-09-19 09:46:54 +00:00
Sofiya Tepikin 0bba7afc6f Merge branch 'chore/retire-hyperlink' into 'main'
Chore/Retire hyperlink library

See merge request bloodyhealth/drip!538
2022-09-19 09:25:16 +00:00
Sofiya Tepikin f957553026 Chore/Retire hyperlink library 2022-09-19 09:25:16 +00:00
Maria Zadnepryanets 0597540b88 Merge branch 'fix/stop-keyboard-from-overlapping-with-inputs' into 'main'
Fix: Define isKeyboardOffset based on Platform

See merge request bloodyhealth/drip!523
2022-09-19 09:12:32 +00:00
Maria Zadnepryanets 75823ed750 Fix: Define isKeyboardOffset based on Platform 2022-09-19 09:12:31 +00:00
Sofiya Tepikin dd1c2cd96d Merge branch 'fix/license' into 'main'
Bring back License

See merge request bloodyhealth/drip!537
2022-09-18 13:54:56 +00:00
Sofiya Tepikin 06d346ee46 Bring back License 2022-09-18 15:51:39 +02:00
Sofiya Tepikin d4bd576cc9 Delete license.js 2022-09-18 13:49:24 +00:00
Sofiya Tepikin 85b3a8b4b6 Delete License.js 2022-09-18 13:46:21 +00:00
Sofiya Tepikin 206d4b06fa Merge branch 'fix/bring-back-license-test' into 'main'
Bring back the test

See merge request bloodyhealth/drip!536
2022-09-18 13:30:18 +00:00
Sofiya Tepikin 2669738c9d Bring back the test 2022-09-18 15:25:51 +02:00
Sofiya Tepikin 195c792837 Merge branch 'chore/unify-license-screens' into 'main'
Distinction between License and AcceptLicense screens

See merge request bloodyhealth/drip!534
2022-09-18 13:02:43 +00:00
Sofiya Tepikin f6a90994b6 Distinction between License and AcceptLicense screens 2022-09-18 13:02:43 +00:00
Sofiya Tepikin fb863c832b Merge branch 'chore/testing-library' into 'main'
Chore/testing library

See merge request bloodyhealth/drip!532
2022-09-18 10:32:10 +00:00
Sofiya Tepikin 7dd1a297a2 Chore/testing library 2022-09-18 10:32:10 +00:00
Sofiya Tepikin 1eadd1c5d6 Chore(deps-dev): bump @babel/eslint-parser from 7.16.3 to 7.19.1
Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.16.3 to 7.19.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.1/eslint/babel-eslint-parser)
2022-09-18 09:07:33 +00:00
Sofiya Tepikin 3c7cb3dfff Merge branch 'chore/update-rn-0.67.4' into 'main'
Chore/update RN 0.67.4

See merge request bloodyhealth/drip!531
2022-09-18 05:54:28 +00:00
Sofiya Tepikin ef3a50ea76 Chore/update RN 0.67.4 2022-09-18 05:54:28 +00:00
Sofiya Tepikin 5166b65e81 Merge branch 'dependabot-npm_and_yarn-react-native-modal-datetime-picker-14.0.0' into 'main'
Bump react-native-modal-datetime-picker from 10.2.0 to 14.0.0

See merge request bloodyhealth/drip!514
2022-09-17 17:43:31 +00:00
Sofiya Tepikin 658ce1d074 Merge branch 'chore/update-rn-0.66.4' into 'main'
Chore/update RN 0.66.4

See merge request bloodyhealth/drip!528
2022-09-17 10:03:14 +00:00
Sofiya Tepikin 997332565f Chore/update RN 0.66.4 2022-09-17 10:03:14 +00:00
Sofiya Tepikin f1df68e973 Merge branch 'fix/temperature-screen' into 'main'
Fix: temperature screen

See merge request bloodyhealth/drip!525
2022-09-16 18:29:26 +00:00
Maria Zadnepryanets e289094d97 Fix: temperature screen 2022-09-16 18:29:26 +00:00
Lisa Hillebrand d6d333432c 613 Use translation library for symptom boxes 2022-09-16 19:14:03 +02:00
Sofiya Tepikin 2fb82d95e6 Merge branch 'chore/nodejs-mobile-new-api' into 'main'
Change the API to remove nodejs listeners

See merge request bloodyhealth/drip!524
2022-09-16 17:05:13 +00:00
Sofiya Tepikin 1610c8416a Change the API to remove nodejs listeners 2022-09-13 19:47:11 +02:00
Sofiya Tepikin afced905bf Merge branch 'chore/make-function-components-5' into 'main'
Chore/make function components 5

See merge request bloodyhealth/drip!522
2022-09-12 11:04:21 +00:00
Sofiya Tepikin 92236dfc8a Chore/make function components 5 2022-09-12 11:04:20 +00:00
Maria Zadnepryanets c8d2f5d9ee Merge branch 'chore/make-function-components-6' into 'main'
Chore: make function components 6

See merge request bloodyhealth/drip!519
2022-09-12 10:42:24 +00:00
Maria Zadnepryanets 2f785319cd Chore: make function components 6 2022-09-12 10:42:24 +00:00
Sofiya Tepikin b20a5d5533 Merge branch 'chore/make-function-components-7' into 'main'
Chore/make function components 7

See merge request bloodyhealth/drip!521
2022-09-12 10:14:26 +00:00
Sofiya Tepikin 17a2ca9952 Chore/make function components 7 2022-09-12 10:14:26 +00:00
Maria Zadnepryanets 7d3d63ad0d Merge branch 'fix/warning-on-privacy-policy-page' into 'main'
Fix: warning on privacy policy page

See merge request bloodyhealth/drip!520
2022-09-12 09:45:19 +00:00
Maria Zadnepryanets b3514bd652 Fix: warning on privacy policy page 2022-09-12 09:45:18 +00:00
Lisa e137e1b82a Merge branch '611-Use-translation-library-for-about-section' into 'main'
611 Use translation library in about section

Closes #611

See merge request bloodyhealth/drip!517
2022-09-12 08:41:26 +00:00
Lisa Hillebrand 695286393d 611 Use key prefix in about section and restructure tree in translation file 2022-09-12 10:34:04 +02:00
Maria Zadnepryanets acc91773bf Merge branch 'chore/make-function-components-3' into 'main'
Chore/make function components 3

See merge request bloodyhealth/drip!518
2022-09-11 15:35:16 +00:00
Maria Zadnepryanets 9202945e9c Chore/make function components 3 2022-09-11 15:35:16 +00:00
Sofiya Tepikin 8404a3bbe8 Merge branch 'chore/make-function-components-4' into 'main'
Chore/make function components 4

See merge request bloodyhealth/drip!516
2022-09-11 14:01:23 +00:00
Sofiya Tepikin cd43271bbd Chore/make function components 4 2022-09-11 14:01:23 +00:00
Lisa Hillebrand d3e5df2acf 611 Use translation library in about section 2022-09-11 14:12:38 +02:00
Sofiya Tepikin 971ea4bdcf Bump react-native-modal-datetime-picker from 10.2.0 to 14.0.0
Bumps [react-native-modal-datetime-picker](https://github.com/mmazzarolo/react-native-modal-datetime-picker) from 10.2.0 to 14.0.0.
- [Release notes](https://github.com/mmazzarolo/react-native-modal-datetime-picker/releases)
- [Changelog](https://github.com/mmazzarolo/react-native-modal-datetime-picker/blob/master/.releaserc)
- [Commits](https://github.com/mmazzarolo/react-native-modal-datetime-picker/compare/v10.2.0...v14.0.0)
2022-09-11 09:07:11 +00:00
Sofiya Tepikin cec2c5bc2e Merge branch 'chore/make-function-components-2' into 'main'
Chore/make function components 2

See merge request bloodyhealth/drip!513
2022-09-11 08:47:43 +00:00
Sofiya Tepikin 4a69cbf4cf Chore/make function components 2 2022-09-11 08:47:43 +00:00
Sofiya Tepikin c6eee43138 Merge branch 'chore/make-function-components' into 'main'
Components using hooks part 1

See merge request bloodyhealth/drip!512
2022-09-10 17:46:17 +00:00
Sofiya Tepikin 4da5870581 Components using hooks part 1 2022-09-10 17:46:17 +00:00
Sofiya Tepikin 0be2d1a958 Merge branch 'chore/retire-redux' into 'main'
Chore/retire redux

See merge request bloodyhealth/drip!511
2022-09-10 16:00:19 +00:00
Sofiya Tepikin 176e4f6a70 Chore/retire redux 2022-09-10 16:00:19 +00:00
Sofiya Tepikin 7d0fa07976 Merge branch 'chore/retire-npm' into 'main'
Chore/retire npm

See merge request bloodyhealth/drip!510
2022-09-10 12:25:55 +00:00
Sofiya Tepikin 22528ffe17 Chore/retire npm 2022-09-10 12:25:54 +00:00
Sofiya Tepikin f9e01012d1 Merge branch 'chore/update-rn-0.65.2' into 'main'
Update react-native to v0.65.2

See merge request bloodyhealth/drip!509
2022-09-10 12:11:41 +00:00
Sofiya Tepikin c7b68ab1ea Update react-native to v0.65.2 2022-09-10 12:11:40 +00:00
Sofiya Tepikin 66fe97af18 Merge branch 'chore/remove-date-usage' into 'main'
Chore/remove date usage

See merge request bloodyhealth/drip!508
2022-09-10 10:56:09 +00:00
Sofiya Tepikin 7afdcd405a Chore/remove date usage 2022-09-10 10:56:09 +00:00
Maria Zadnepryanets bc931b4fbd Merge branch 'fix/async-storage' into 'main'
Fix/async storage

See merge request bloodyhealth/drip!500
2022-09-08 15:15:16 +00:00
Sofiya Tepikin 1c6c784d4f Fix/async storage 2022-09-08 15:15:15 +00:00
Maria Zadnepryanets 6329fc68ed Merge branch 'chore/batch-prettify-rest' into 'main'
Prettify rest of the components files except stats

See merge request bloodyhealth/drip!507
2022-09-08 15:14:22 +00:00
Sofiya Tepikin 840fca5b9e Prettify rest of the components files except stats 2022-09-08 12:19:36 +02:00
Lisa 23549ee72d Merge branch 'chore/batch-prettify' into 'main'
Chore/batch prettify

See merge request bloodyhealth/drip!501
2022-09-04 13:57:01 +00:00
Sofiya Tepikin d4375b7a45 Merge branch 'dependabot-npm_and_yarn-react-native-modal-datetime-picker-10.2.0' into 'main'
Bump react-native-modal-datetime-picker from 8.0.0 to 10.2.0

See merge request bloodyhealth/drip!495
2022-08-23 16:00:28 +00:00
Sofiya Tepikin b0fc327331 Bump react-native-modal-datetime-picker from 8.0.0 to 10.2.0 2022-08-23 16:00:27 +00:00
Sofiya Tepikin 6808f40953 Prettify settings files 2022-08-23 13:00:25 +02:00
Sofiya Tepikin ac7a36925f Prettify misc files 2022-08-23 12:58:32 +02:00
Sofiya Tepikin 1b8fd97d16 Prettify common files 2022-08-23 12:55:25 +02:00
Sofiya Tepikin 732f19ed63 Prettify chart files 2022-08-23 12:52:38 +02:00
Sofiya Tepikin f72994082c Merge branch 'dependabot-npm_and_yarn-react-native-share-7.9.0' into 'main'
Bump react-native-share from 7.8.0 to 7.9.0

See merge request bloodyhealth/drip!499
2022-08-23 07:44:53 +00:00
Sofiya Tepikin ab6e9c5d87 Bump react-native-share from 7.8.0 to 7.9.0
Bumps [react-native-share](https://github.com/react-native-community/react-native-share) from 7.8.0 to 7.9.0.
- [Release notes](https://github.com/react-native-community/react-native-share/releases)
- [Changelog](https://github.com/react-native-share/react-native-share/blob/main/CHANGELOG.md)
- [Commits](https://github.com/react-native-community/react-native-share/compare/v7.8.0...v7.9.0)
2022-08-23 09:41:27 +02:00
Sofiya Tepikin 27dd9bca19 Merge branch 'chore/update-rn-0.64.3' into 'main'
Update react-native to v0.64.3

See merge request bloodyhealth/drip!493
2022-08-22 10:01:08 +00:00
Sofiya Tepikin a44827f65a Update react-native to v0.64.3 2022-08-22 10:01:07 +00:00
Sofiya Tepikin 1b4f076792 Merge branch 'revert-dc75b7b4' into 'main'
Revert "Merge branch 'chore/cleanup-date-usage' into 'main'"

See merge request bloodyhealth/drip!498
2022-08-20 14:07:14 +00:00
Sofiya Tepikin 1ada7a0cde Revert "Merge branch 'chore/cleanup-date-usage' into 'main'"
This reverts merge request !492
2022-08-20 14:03:43 +00:00
Maria Zadnepryanets 84f72d74bf Merge branch 'chore/update-mr-template' into 'main'
Chore: add default MR template

See merge request bloodyhealth/drip!418
2022-08-19 15:36:42 +00:00
Maria Zadnepryanets 65dfbdf580 Chore: add default MR template 2022-08-19 15:36:42 +00:00
Sofiya Tepikin dc75b7b4cf Merge branch 'chore/cleanup-date-usage' into 'main'
Chore/cleanup date usage

See merge request bloodyhealth/drip!492
2022-08-19 15:27:20 +00:00
Sofiya Tepikin 6446073125 Chore/cleanup date usage 2022-08-19 15:27:20 +00:00
Sofiya Tepikin 505584f1eb Merge branch 'chore/migrate-to-yarn-v1' into 'main'
Chore: migrate project to yarn v1

See merge request bloodyhealth/drip!489
2022-08-18 14:35:52 +00:00
Maria Zadnepryanets 2896a767ab Chore: migrate project to yarn v1 2022-08-18 14:35:52 +00:00
Sofiya Tepikin 38f4836632 Merge branch 'chore/rn-0.63' into 'main'
Update react-native to v0.63.4

See merge request bloodyhealth/drip!488
2022-08-17 17:16:34 +00:00
Sofiya Tepikin 90e9aeeeb5 Update react-native to v0.63.4 2022-08-17 17:16:34 +00:00
Sofiya Tepikin d085c567eb Merge branch 'chore/refactor-app-wrapper' into 'main'
Refactor app wrapper

See merge request bloodyhealth/drip!487
2022-08-16 16:31:05 +00:00
Maria Zadnepryanets 205fd37203 Merge branch 'dependabot-npm_and_yarn-react-native-share-7.8.0' into 'main'
Bump react-native-share from 3.8.5 to 7.8.0

See merge request bloodyhealth/drip!485
2022-08-16 12:41:22 +00:00
Sofiya Tepikin cafdcbd36e Refactor app wrapper 2022-08-16 14:23:58 +02:00
Sofiya Tepikin 08b27f100e Bump react-native-share from 3.8.5 to 7.8.0
Bumps [react-native-share](https://github.com/react-native-community/react-native-share) from 3.8.5 to 7.8.0.
- [Release notes](https://github.com/react-native-community/react-native-share/releases)
- [Changelog](https://github.com/react-native-share/react-native-share/blob/main/CHANGELOG.md)
- [Commits](https://github.com/react-native-community/react-native-share/compare/v3.8.5...v7.8.0)
2022-08-16 14:14:46 +02:00
Maria Zadnepryanets e1232664d9 Merge branch 'dependabot-npm_and_yarn-react-native-vector-icons-9.2.0' into 'main'
Bump react-native-vector-icons from 9.1.0 to 9.2.0

See merge request bloodyhealth/drip!486
2022-08-16 12:13:34 +00:00
Sofiya Tepikin 04a09fac9a Bump react-native-vector-icons from 9.1.0 to 9.2.0 2022-08-16 12:13:34 +00:00
Sofiya Tepikin 69c14f6ce8 Merge branch 'fix/ignore-dependabot-patches' into 'main'
Ignore patches versions when running dependabot

See merge request bloodyhealth/drip!484
2022-08-16 10:57:12 +00:00
Sofiya Tepikin d508d59981 Ignore patches versions when running dependabot 2022-08-16 12:14:44 +02:00
Maria Zadnepryanets f8e81978b5 Merge branch 'dependabot-npm_and_yarn-react-native-document-picker-8.1.1' into 'main'
Bump react-native-document-picker from 4.3.0 to 8.1.1

See merge request bloodyhealth/drip!468
2022-08-15 20:22:49 +00:00
Sofiya Tepikin fdf78dc7a7 Bump react-native-document-picker from 4.3.0 to 8.1.1 2022-08-15 20:22:48 +00:00
Sofiya Tepikin 1d9caa4d0e Merge branch 'dependabot-npm_and_yarn-js-joda-core-5.3.0' into 'main'
Bump @js-joda/core from 5.2.0 to 5.3.0

See merge request bloodyhealth/drip!478
2022-08-15 20:01:56 +00:00
Sofiya Tepikin cc35d8fc12 Bump @js-joda/core from 5.2.0 to 5.3.0 2022-08-15 20:01:56 +00:00
Sofiya Tepikin a3f059a01e Merge branch 'chore/retire-left-pad' into 'main'
Chore/retire left pad

See merge request bloodyhealth/drip!477
2022-08-15 19:24:36 +00:00
Sofiya Tepikin 137c2672d7 Chore/retire left pad 2022-08-15 19:24:34 +00:00
Maria Zadnepryanets b433fa805f Merge branch 'chore/add-rn-push-notifications-to-dependabot-ignore' into 'main'
Ignore react-native-push-notifications in dependabot settings

See merge request bloodyhealth/drip!481
2022-08-15 19:13:24 +00:00
Maria Zadnepryanets 7e7edb99b5 Ignore react-native-push-notifications in dependabot settings 2022-08-15 21:08:00 +02:00
Maria Zadnepryanets 3da4157bcc Merge branch 'chore/update-clear-script' into 'main'
Chore/update clear script

See merge request bloodyhealth/drip!480
2022-08-15 19:01:28 +00:00
Maria Zadnepryanets 7d2c7d4844 Chore/update clear script 2022-08-15 19:01:28 +00:00
Sofiya Tepikin c31d4252bb Merge branch 'chore/merge-back-release' into 'main'
Merge back from release -> main

See merge request bloodyhealth/drip!476
2022-08-15 18:55:36 +00:00
Sofiya Tepikin c6c084e115 Fix after merge conflicts 2022-08-15 18:16:25 +02:00
bl00dymarie f61f450c91 Setting for ITSAppUsesNonExemptEncryption 2022-08-15 17:52:42 +02:00
bl00dymarie 038ed9e11f Bump version number 1.2208.11 2022-08-15 17:52:42 +02:00
Sofiya Tepikin 55fd07b256 Fixes linter failing 2022-08-15 17:52:42 +02:00
Sofiya Tepikin e9bf86006e Cleanup 2022-08-15 17:52:05 +02:00
Sofiya Tepikin 08b0dc7734 Reset app state without closing/restarting it 2022-08-15 17:48:47 +02:00
Sofiya Tepikin 0ec23219bf Prettify files before other changes
Prettify
2022-08-15 17:48:46 +02:00
bl00dymarie 04bd981871 Remove email and hence typo from text 2022-08-15 17:48:46 +02:00
Sofiya Tepikin 5e44901638 Fix deprecated way of using writeCopyTo - realm method 2022-08-15 17:48:46 +02:00
bl00dymarie 02d873b8f6 Bump version number 1.2208.8 2022-08-15 17:48:46 +02:00
Sofiya Tepikin c689a08fe3 Disable button when no input 2022-08-15 17:48:46 +02:00
Sofiya Tepikin 10f731525b Prettify enter-new-password 2022-08-15 17:48:46 +02:00
Sofiya Tepikin aff1e2735f Merge branch 'fix/path-to-cli' into 'main'
Fix path to the cli

See merge request bloodyhealth/drip!479
2022-08-15 15:48:16 +00:00
Sofiya Tepikin d598e6d6c5 Fix path to the cli 2022-08-15 16:51:45 +02:00
Sofiya Tepikin 80422e1935 Merge branch 'chore/jest' into 'main'
Chore/jest

See merge request bloodyhealth/drip!466
2022-08-12 09:31:34 +00:00
Sofiya Tepikin a103949f7c Chore/jest 2022-08-12 09:31:33 +00:00
Sofiya Tepikin 0cd2770996 Merge branch 'dependabot-npm_and_yarn-react-native-fs-2.20.0' into 'main'
Bump react-native-fs from 2.19.0 to 2.20.0

See merge request bloodyhealth/drip!469
2022-08-12 09:20:30 +00:00
Maria Zadnepryanets 9a4cba3731 Merge branch 'chore/add-known-issues-to-readme' into 'main'
Chore: Add a link to test protocol & document known issues in android emulator

See merge request bloodyhealth/drip!471
2022-08-12 09:13:46 +00:00
Maria Zadnepryanets e35fc4d78a Chore: Add a link to test protocol & document known issues in android emulator 2022-08-12 09:13:46 +00:00
Sofiya Tepikin b0bc7c107a Bump react-native-fs from 2.19.0 to 2.20.0
Bumps [react-native-fs](https://github.com/itinance/react-native-fs) from 2.19.0 to 2.20.0.
- [Release notes](https://github.com/itinance/react-native-fs/releases)
- [Changelog](https://github.com/itinance/react-native-fs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/itinance/react-native-fs/compare/v2.19.0...v2.20.0)
2022-08-12 10:36:00 +02:00
Sofiya Tepikin 6e1c932bd5 Merge branch 'chore/update-rn-0.62.0' into 'main'
Update react-native to v0.62.0

See merge request bloodyhealth/drip!446
2022-08-12 08:29:30 +00:00
Sofiya Tepikin 78edee3b07 Update react-native to v0.62.0 2022-08-12 08:29:30 +00:00
Sofiya Tepikin ccdcced112 Merge branch 'fix/dependabot-package-manage' into 'main'
Fix dependabot job

See merge request bloodyhealth/drip!467
2022-08-12 07:22:55 +00:00
Sofiya Tepikin 89f0a22e15 Fix dependabot job 2022-08-12 09:15:55 +02:00
Sofiya Tepikin 179b8e2b39 Merge branch 'fix/ignore-react-native-dependabot' into 'main'
Ignore react native dependabot

See merge request bloodyhealth/drip!462
2022-08-12 07:00:25 +00:00
Sofiya Tepikin 1579293f26 Merge branch 'dependabot-npm_and_yarn-react-native-calendars-1.1287.0' into 'main'
Bump react-native-calendars from 1.1286.0 to 1.1287.0

See merge request bloodyhealth/drip!464
2022-08-11 14:32:59 +00:00
Sofiya Tepikin f0d3d82d65 Bump react-native-calendars from 1.1286.0 to 1.1287.0
Bumps [react-native-calendars](https://github.com/wix/react-native-calendars) from 1.1286.0 to 1.1287.0.
- [Release notes](https://github.com/wix/react-native-calendars/releases)
- [Changelog](https://github.com/wix/react-native-calendars/blob/master/CHANGELOG.md)
- [Commits](https://github.com/wix/react-native-calendars/compare/v1.1286.0...v1.1287)
2022-08-11 15:57:57 +02:00
Sofiya Tepikin a9f73b5fe1 Merge branch 'dependabot-npm_and_yarn-i18next-21.9.0' into 'main'
Bump i18next from 21.8.16 to 21.9.0

See merge request bloodyhealth/drip!457
2022-08-11 13:46:53 +00:00
Sofiya Tepikin f485b51402 Bump i18next from 21.8.16 to 21.9.0
Bumps [i18next](https://github.com/i18next/i18next) from 21.8.16 to 21.9.0.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next/compare/v21.8.16...v21.9.0)
2022-08-11 13:59:12 +02:00
Sofiya Tepikin f0e161b8dd Merge branch 'dependabot-npm_and_yarn-react-native-calendars-1.1286.0' into 'main'
Bump react-native-calendars from 1.1266.0 to 1.1286.0

See merge request bloodyhealth/drip!454
2022-08-10 19:30:43 +00:00
Sofiya Tepikin 535c8d79fc Bump react-native-calendars from 1.1266.0 to 1.1286.0
Bumps [react-native-calendars](https://github.com/wix/react-native-calendars) from 1.1266.0 to 1.1286.0.
- [Release notes](https://github.com/wix/react-native-calendars/releases)
- [Changelog](https://github.com/wix/react-native-calendars/blob/master/CHANGELOG.md)
- [Commits](https://github.com/wix/react-native-calendars/compare/1.1266.0...v1.1286.0)
2022-08-10 20:55:08 +02:00
Sofiya Tepikin b955973acc Change the name of the job to be more descriptive 2022-08-10 20:50:50 +02:00
Sofiya Tepikin 01368b7083 Ignore react-native dependency when running dependabot 2022-08-10 20:49:45 +02:00
Sofiya Tepikin bc3cffa36c Merge branch 'dependabot-npm_and_yarn-react-i18next-11.18.3' into 'main'
Bump react-i18next from 11.12.0 to 11.18.3

See merge request bloodyhealth/drip!452
2022-08-10 18:45:02 +00:00
Sofiya Tepikin 9f640c71f4 Bump react-i18next from 11.12.0 to 11.18.3
Bumps [react-i18next](https://github.com/i18next/react-i18next) from 11.12.0 to 11.18.3.
- [Release notes](https://github.com/i18next/react-i18next/releases)
- [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/react-i18next/compare/v11.12.0...v11.18.3)
2022-08-07 09:06:06 +00:00
Sofiya Tepikin 33c1205940 Merge branch 'dependabot-npm_and_yarn-react-native-community-datetimepicker-6.3.1' into 'main'
Bump @react-native-community/datetimepicker from 6.3.0 to 6.3.1

See merge request bloodyhealth/drip!449
2022-08-06 17:03:40 +00:00
Sofiya Tepikin 81dd0f970c Bump @react-native-community/datetimepicker from 6.3.0 to 6.3.1
Bumps [@react-native-community/datetimepicker](https://github.com/react-native-community/datetimepicker) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/react-native-community/datetimepicker/releases)
- [Changelog](https://github.com/react-native-datetimepicker/datetimepicker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-native-community/datetimepicker/compare/v6.3.0...v6.3.1)
2022-08-06 18:23:28 +02:00
Sofiya Tepikin fe2ab40183 Merge branch 'dependabot-npm_and_yarn-prop-types-15.8.1' into 'main'
Bump prop-types from 15.7.2 to 15.8.1

See merge request bloodyhealth/drip!444
2022-08-06 16:23:06 +00:00
Sofiya Tepikin aad7e0460d Bump prop-types from 15.7.2 to 15.8.1
Bumps [prop-types](https://github.com/facebook/prop-types) from 15.7.2 to 15.8.1.
- [Release notes](https://github.com/facebook/prop-types/releases)
- [Changelog](https://github.com/facebook/prop-types/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/prop-types/compare/v15.7.2...v15.8.1)
2022-08-06 17:04:35 +02:00
Sofiya Tepikin 295e6d2071 Merge branch 'fix/ignore-react-dependabot' into 'main'
Exclude react from dependabot

See merge request bloodyhealth/drip!451
2022-08-06 14:57:17 +00:00
Sofiya Tepikin 1ec29e12dd Exclude react from dependabot 2022-08-06 16:52:59 +02:00
Sofiya Tepikin 51114c50c8 Merge branch 'fix/ignore-dependabot-node-js-mobile' into 'main'
Ignore node-js-mobile by dependabot

See merge request bloodyhealth/drip!448
2022-08-06 14:48:41 +00:00
Sofiya Tepikin ce9a7601fc Merge branch 'release' into 'main'
Merge back from release -> main

See merge request bloodyhealth/drip!450
2022-08-06 14:42:22 +00:00
Sofiya Tepikin fa2a6d2208 Ignore node-js-mobile by dependabot 2022-08-05 21:49:25 +02:00
bl00dymarie 1c1d64e719 Bump version to 1.2208.2 2022-08-02 23:07:36 +02:00
Sofiya Tepikin 48c256bcb4 Merge branch 'dependabot-npm_and_yarn-i18next-21.8.16' into 'main'
Bump i18next from 21.8.14 to 21.8.16

See merge request bloodyhealth/drip!440
2022-08-01 14:09:37 +00:00
Sofiya Tepikin 20e1ae5a78 Merge branch 'dependabot-npm_and_yarn-react-native-community-datetimepicker-6.3.0' into 'main'
Bump @react-native-community/datetimepicker from 6.2.2 to 6.3.0

See merge request bloodyhealth/drip!439
2022-08-01 13:51:08 +00:00
Sofiya Tepikin 714f00f046 Merge branch 'chore/remove-jase-dependency' into 'main'
Remove unused jase dependency

See merge request bloodyhealth/drip!438
2022-08-01 13:36:25 +00:00
Sofiya Tepikin 33fc2a65e1 Remove unused jase dependency 2022-08-01 15:28:46 +02:00
Sofiya Tepikin 811a88abb8 Merge branch 'chore/remove-jest-dependency' into 'main'
Remove unused jest dependency

See merge request bloodyhealth/drip!437
2022-08-01 13:10:51 +00:00
Sofiya Tepikin 1527d6b93f Remove unused jest dependency 2022-08-01 14:40:46 +02:00
Sofiya Tepikin 3f3b19f766 Merge branch 'chore/retire-dirty-chai' into 'main'
Chore/retire dirty chai

See merge request bloodyhealth/drip!436
2022-08-01 12:34:26 +00:00
Sofiya Tepikin f78d2c480d Chore/retire dirty chai 2022-08-01 12:34:26 +00:00
Sofiya Tepikin 95ce1b6768 Force light mode for iOS 2022-08-01 12:46:09 +02:00
Sofiya Tepikin 6411dfce4f Bump i18next from 21.8.14 to 21.8.16
Bumps [i18next](https://github.com/i18next/i18next) from 21.8.14 to 21.8.16.
- [Release notes](https://github.com/i18next/i18next/releases)
- [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next/compare/v21.8.14...v21.8.16)
2022-07-31 19:56:35 +00:00
Sofiya Tepikin e654bae5b1 Bump @react-native-community/datetimepicker from 6.2.2 to 6.3.0
Bumps [@react-native-community/datetimepicker](https://github.com/react-native-community/datetimepicker) from 6.2.2 to 6.3.0.
- [Release notes](https://github.com/react-native-community/datetimepicker/releases)
- [Changelog](https://github.com/react-native-datetimepicker/datetimepicker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-native-community/datetimepicker/compare/v6.2.2...v6.3.0)
2022-07-31 19:56:08 +00:00
Sofiya Tepikin 6a6de1d5ea Merge branch 'chore/remove-is-object' into 'main'
Chore/remove is object

See merge request bloodyhealth/drip!435
2022-07-31 18:23:17 +00:00
Sofiya Tepikin 3015628821 Chore/remove is object 2022-07-31 18:23:17 +00:00
Sofiya Tepikin 7b100d2dfc Merge branch 'dependabot-npm_and_yarn-isobject-4.0.0' into 'main'
Bump isobject from 3.0.1 to 4.0.0

See merge request bloodyhealth/drip!429
2022-07-31 10:07:55 +00:00
Sofiya Tepikin 3fb15cb02d Bump isobject from 3.0.1 to 4.0.0 2022-07-31 11:57:48 +02:00
Sofiya Tepikin afd36f5ba9 Merge branch 'chalkedgoose/js-joda-upgrade' into 'main'
Upgrading js-joda

See merge request bloodyhealth/drip!406
2022-07-29 08:57:19 +00:00
chalkedgoose f654ef60ef Upgrading js-joda 2022-07-29 08:57:19 +00:00
Sofiya Tepikin 0230da4c2e Merge branch 'chore/retire-assert' into 'main'
Chore/retire assert

See merge request bloodyhealth/drip!426
2022-07-27 18:06:12 +00:00
Sofiya Tepikin 49d3c279d5 Chore/retire assert 2022-07-27 18:06:12 +00:00
Sofiya Tepikin ced60af78b Merge branch 'chore/prettify-for-joda' into 'main'
Chore/prettify for joda

See merge request bloodyhealth/drip!433
2022-07-27 17:57:41 +00:00
Sofiya Tepikin 4e8c0080e6 Chore/prettify for joda 2022-07-27 17:57:41 +00:00
Sofiya Tepikin 9848c7d3e3 Merge branch 'dependabot-npm_and_yarn-moment-2.29.4' into 'main'
Bump moment from 2.29.1 to 2.29.4

See merge request bloodyhealth/drip!432
2022-07-26 17:30:31 +00:00
Sofiya Tepikin f1b33852b1 Merge branch 'dependabot-npm_and_yarn-react-native-community-datetimepicker-6.2.2' into 'main'
Bump @react-native-community/datetimepicker from 6.2.0 to 6.2.2

See merge request bloodyhealth/drip!431
2022-07-26 16:05:26 +00:00
Sofiya Tepikin 7830c8a7f8 Bump moment from 2.29.1 to 2.29.4
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.4)
2022-07-26 14:56:10 +00:00
Sofiya Tepikin a21b3d8a42 Bump @react-native-community/datetimepicker from 6.2.0 to 6.2.2
Bumps [@react-native-community/datetimepicker](https://github.com/react-native-community/datetimepicker) from 6.2.0 to 6.2.2.
- [Release notes](https://github.com/react-native-community/datetimepicker/releases)
- [Changelog](https://github.com/react-native-datetimepicker/datetimepicker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-native-community/datetimepicker/compare/v6.2.0...v6.2.2)
2022-07-26 14:55:00 +00:00
Sofiya Tepikin 1bd00a7ec2 Merge branch 'fix/dependabot-fails-on-realm' into 'main'
Ignore realm from dependabot check

See merge request bloodyhealth/drip!430
2022-07-26 14:47:37 +00:00
Sofiya Tepikin d1833f1dc4 Merge branch 'chore/remove-rn-eslint-config' into 'main'
Remove unused dependency - react-native eslint config

See merge request bloodyhealth/drip!427
2022-07-26 14:40:52 +00:00
Sofiya Tepikin d71eb06c5e Ignore realm from dependabot check 2022-07-25 15:54:06 +02:00
Sofiya Tepikin 830b045172 Merge branch 'dependabot-npm_and_yarn-react-native-community-datetimepicker-6.2.0' into 'main'
Bump @react-native-community/datetimepicker from 3.5.2 to 6.2.0

See merge request bloodyhealth/drip!421
2022-07-25 13:22:32 +00:00
Sofiya Tepikin 97408a13d5 Remove unused dependency - react-native eslint config 2022-07-24 22:14:31 +02:00
Sofiya Tepikin 36a8640fd5 Merge branch 'dependabot-npm_and_yarn-i18next-21.8.14' into 'main'
Bump i18next from 20.6.1 to 21.8.14

See merge request bloodyhealth/drip!423
2022-07-24 09:33:29 +00:00
Sofiya Tepikin af63daf604 Bump i18next from 20.6.1 to 21.8.14 2022-07-24 09:33:29 +00:00
Sofiya Tepikin d61a074480 Merge branch 'fix/dependabot' into 'main'
Final touches to setup Dependabot

See merge request bloodyhealth/drip!424
2022-07-23 17:24:48 +00:00
Sofiya Tepikin 7602e9f7b1 Final touches to setup Dependabot 2022-07-23 17:24:47 +00:00
Sofiya Tepikin 391c460af3 Bump @react-native-community/datetimepicker from 3.5.2 to 6.2.0
Bumps [@react-native-community/datetimepicker](https://github.com/react-native-community/datetimepicker) from 3.5.2 to 6.2.0.
- [Release notes](https://github.com/react-native-community/datetimepicker/releases)
- [Changelog](https://github.com/react-native-datetimepicker/datetimepicker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-native-community/datetimepicker/compare/v3.5.2...v6.2.0)
2022-07-23 16:47:37 +00:00
Sofiya Tepikin 3fe83a5a89 Update gitlab-cy.yml 2022-07-23 18:43:39 +02:00
Sofiya Tepikin c743f64af2 Update gitlab-cy.yml 2022-07-23 15:49:02 +02:00
Sofiya Tepikin 1171ca049c Merge branch 'chore/schedule-dependabot' into 'main'
Schedule dependabot

See merge request bloodyhealth/drip!420
2022-07-23 13:05:05 +00:00
Sofiya Tepikin d552690eba Schedule dependabot 2022-07-23 14:51:25 +02:00
Sofiya Tepikin f9a0a2451f Merge branch 'chore/dependabot-config' into 'main'
Change dependabot configuration

See merge request bloodyhealth/drip!419
2022-07-23 12:49:26 +00:00
Sofiya Tepikin 23af183162 Change dependabot configuration 2022-07-23 12:49:26 +00:00
Sofiya Tepikin eece8ef180 Merge branch 'chore/set-date-on-navigation' into 'main'
Refactor cycle day overview screen

See merge request bloodyhealth/drip!417
2022-07-23 10:22:43 +00:00
Sofiya Tepikin f6225c8523 Refactor cycle day overview screen 2022-07-23 10:22:42 +00:00
bl00dymarie 77e1a16778 Merge branch '574-adapt-wording-in-privacy-policy' into 'main'
Remove ios from text bc it applies to android as well

Closes #574

See merge request bloodyhealth/drip!415
2022-07-20 10:35:37 +00:00
bl00dymarie b6bd2332eb Merge branch '575-activate-nfp-setting' into 'main'
Disable temperature slider for iOS only

Closes #575

See merge request bloodyhealth/drip!414
2022-07-20 10:35:13 +00:00
bl00dymarie 5fa0ba5bb2 Disable temperature slider for iOS only 2022-07-12 16:43:00 +02:00
bl00dymarie 5d37620b28 Remove ios from text bc it applies to android as well 2022-07-12 16:24:22 +02:00
bl00dymarie 85301fb89c Merge branch 'Chore/Update-readme-for-ios' into 'master'
Update README.md

See merge request bloodyhealth/drip!409
2022-07-12 10:47:14 +00:00
Sofiya Tepikin f73564a1a4 Merge branch 'Chore/Bump-version-of-the-day-and-potentially-beta-test' into 'master'
Chore/bump version of the day and potentially beta test

See merge request bloodyhealth/drip!413
2022-07-10 17:41:16 +00:00
bl00dymarie 5c235b5197 Update https website link 2022-07-10 19:34:01 +02:00
bl00dymarie 31bcece857 Bump version number 1.2207.10 2022-07-10 19:33:11 +02:00
bl00dymarie aa12f8f249 Merge branch 'fix/donate-button-fork' into 'master'
Cleanup donation button fork on iOS & update the link to the website

Closes #572 and #566

See merge request bloodyhealth/drip!412
2022-07-10 17:27:59 +00:00
Sofiya Tepikin 800b831958 Update the link to our website with the brand new domain 2022-07-10 19:22:30 +02:00
Sofiya Tepikin 3b45a32727 Cleanup donation button fork on iOS 2022-07-10 19:04:30 +02:00
bl00dymarie c311900e27 Merge branch '546-bug-cycle-day-title-covers-navigation-on-upper-right-2' into 'master'
Fix: Make date format more compact for cycle day

Closes #546

See merge request bloodyhealth/drip!411
2022-07-10 16:46:04 +00:00
bl00dymarie 71d81904ad Make date format more compact for cycle day 2022-07-10 18:11:02 +02:00
bl00dymarie 3f9547a2cc Use xcode 13 2022-07-10 15:33:51 +02:00
bl00dymarie 9732dd4711 Use brew for installing cocoapods 2022-07-10 15:29:37 +02:00
bl00dymarie 81e3a610f4 Correct formatting for code snippets 2022-07-10 15:28:36 +02:00
bl00dymarie 5920e67a1a Correct nvm how to install info 2022-07-10 13:56:31 +02:00
BloodyMarie 6fb98f7193 Update text for support 2022-07-06 23:08:12 +02:00
BloodyMarie 8721bc484c Feature: Remove donate button for iOS 2022-07-06 23:06:46 +02:00
bl00dymarie a8a72ddbf4 Update README.md 2022-07-06 20:56:51 +00:00
Sofiya Tepikin 68d8a55034 Merge branch 'fix/weblate-parse-error' into 'master'
Fix weblate parse error

See merge request bloodyhealth/drip!408
2022-07-05 18:13:11 +00:00
Sofiya Tepikin 36a77111ce Fix invalid json file 2022-07-05 16:52:39 +02:00
Sofiya Tepikin 1e504a6143 Merge branch 'feature/Add-privacy-policy' into 'master'
Feature: Adds privacy policy

See merge request bloodyhealth/drip!399
2022-07-03 20:28:39 +00:00
Lisa 2b116c375d Merge branch 'chore/update-husky' into 'master'
Update husky version 6 -> 8

See merge request bloodyhealth/drip!405
2022-07-03 18:08:22 +00:00
Sofiya Tepikin c35afa2dbf Merge branch 'chalkedgoose/rm-flowconfig' into 'master'
Remove .flowconfig

See merge request bloodyhealth/drip!407
2022-07-02 08:51:14 +00:00
Sofiya Tepikin 6b441294d9 Update husky version 7 -> 8 2022-06-30 13:38:04 +02:00
Carlos Alba 99069bac8e Remove .flowconfig 2022-06-26 18:10:40 -07:00
Lisa 3633108006 Merge branch 'chore/add-rn-exit-app-library' into 'master'
Chore: add rn-exit-app-v2 library

See merge request bloodyhealth/drip!401
2022-06-25 10:19:01 +00:00
Sofiya Tepikin 7a6643cc1a Add alert before closing 2022-06-23 21:46:41 +02:00
Sofiya Tepikin f223616ee1 Fork restart functionality for different platforms 2022-06-23 21:40:15 +02:00
BloodyMarie ae2a05f9b0 Add package-lock.json after clear script 2022-06-23 17:42:05 +02:00
Maria Zadnepryanets 81cc3087fd Update wordings to advise user that app will close 2022-06-23 17:42:05 +02:00
Maria Zadnepryanets d8c4278fec Add react-native-exit-app-v2 2022-06-23 17:42:05 +02:00
Sofiya Tepikin e87d569b8b Update husky version 6 -> 7 2022-06-23 17:09:55 +02:00
bl00dymarie 829b4bf242 Merge branch 'chore/Bump-version-number' into 'master'
Chore/bump version number to 1.2206.19

See merge request bloodyhealth/drip!402
2022-06-22 09:58:13 +00:00
BloodyMarie dcf7c07a85 Specify node and npm version 2022-06-21 09:42:16 +02:00
BloodyMarie 4f24357420 Add missing 'key' prop for element in iterator 2022-06-20 16:57:20 +02:00
BloodyMarie 3b187a5a4e Feature: Adds privacy policy 2022-06-19 23:26:06 +02:00
BloodyMarie 5b9d904a02 Update package-lock after rebase 2022-06-19 23:08:36 +02:00
BloodyMarie f018332dcc Prepare for archiving 2022-06-19 23:01:27 +02:00
BloodyMarie 1e94c6d7c9 Bump version number to 1.2206.19 2022-06-19 23:01:24 +02:00
Sofiya Tepikin 40f9ea23f3 Merge branch 'fix/ci-pipeline' into 'master'
Regenerate package-lock.json with correct npm version

See merge request bloodyhealth/drip!403
2022-06-19 18:35:24 +00:00
Sofiya Tepikin 33a657cda4 Regenerate package-lock.json with correct npm version 2022-06-19 18:35:24 +00:00
Sofiya Tepikin 229f864b54 Update .gitlab-ci.yml file 2022-06-19 17:52:02 +00:00
bl00dymarie 09c808f99b Merge branch 'chore/realm-upgrade' into 'master'
Chore/realm upgrade

See merge request bloodyhealth/drip!393
2022-06-19 17:04:30 +00:00
Maria Zadnepryanets 37b607aee2 Bump up the node version of the image in the CI pipline 2022-06-19 19:01:50 +02:00
bl00dymarie f56b94463f Merge branch 'Fix/rename-drip-for-ios' into 'master'
Rename drip to drip.

See merge request bloodyhealth/drip!400
2022-06-19 15:51:34 +00:00
bl00dymarie c2af69cfec Revert README changes 2022-06-19 15:04:05 +00:00
BloodyMarie 8b3a5359e8 Rename to drip. 2022-06-19 16:57:11 +02:00
BloodyMarie 670857f5ff Rename drip to drip. 2022-06-19 16:41:52 +02:00
bl00dymarie 52094573e2 Merge branch 'Fix/Switch-options-in-import-text' into 'master'
Fix: Switch button order to match explainer text

See merge request bloodyhealth/drip!397
2022-06-19 13:34:47 +00:00
bl00dymarie 1f3cdb9438 Merge branch 'chore/start-on-xcode13' into 'chore/realm-upgrade'
Chore/start on xcode13

See merge request bloodyhealth/drip!394
2022-05-26 13:51:33 +00:00
BloodyMarie 6b5ed65e90 Switch button order to match explainer text 2022-05-26 14:22:55 +02:00
Sofiya Tepikin 9940c2c46e Map realm object on the export only 2022-05-01 16:33:57 +02:00
bl00dymarie f7fc81d865 Merge branch '542-bug-styling' into 'master'
Resolve "Bug: Styling"

Closes #542

See merge request bloodyhealth/drip!391
2022-04-30 16:37:49 +00:00
mashazyu 10b9ec8818 Pachage-lock.json update after rebase 2022-04-25 22:05:59 +02:00
mashazyu 712f65e001 Make app buils on Xcode13 2022-04-25 21:59:25 +02:00
Sofiya Tepikin 7d109878fc Fix sex, mood & pain symptoms not showing data on the overview 2022-04-24 22:04:10 +02:00
Sofiya Tepikin bce21ff9a9 Fix when the object from db is empty 2022-04-24 21:48:36 +02:00
Sofiya Tepikin 95b0cc5059 Update readme 2022-04-23 22:17:12 +02:00
Sofiya Tepikin f0e6cae055 Update realm version 3.6.5 -> 10.16.0 2022-04-23 22:16:32 +02:00
BloodyMarie dea67c88f5 Chart styling adaption: Temporarily disbale temp scale settings 2022-04-19 23:20:43 +02:00
BloodyMarie 8a29f08dca Cycle Day styling improvements 2022-04-19 22:40:41 +02:00
BloodyMarie 655f6b31d8 Cycle day styling: Remove new line for better display of mucus 2022-04-19 22:40:41 +02:00
BloodyMarie 0cebe910c4 Remove idle code 2022-04-19 22:40:41 +02:00
BloodyMarie 77c7a57463 Stats styling improvement 2022-04-18 19:50:36 +02:00
bl00dymarie 342f9798b2 Merge branch 'Fix-title-for-picker' into 'master'
Fix: Specify the title for timePicker in IOS

See merge request bloodyhealth/drip!387
2022-04-15 21:22:03 +00:00
bl00dymarie 9cfc93cd8e Merge branch '539-bug-values-for-sex-mood-pain-symptom-boxes-on-overviews-are-not-shown' into 'master'
Revert "Update realm version 3.6.5 -> 5.0.9"

Closes #539

See merge request bloodyhealth/drip!386
2022-04-15 19:45:13 +00:00
BloodyMarie 977ed07d97 Add picker title to labels 2022-04-15 21:40:14 +02:00
BloodyMarie 1813bf82f9 Fix: Specify the title for timePicker in IOS 2022-04-15 21:29:36 +02:00
bl00dymarie 9b5a717c7d Merge branch '540-Temperature-value-cannot-be-entered-with-comma' into 'master'
Resolve "Bug: Temperature value cannot be entered with comma"

Closes #540

See merge request bloodyhealth/drip!390
2022-04-15 19:23:04 +00:00
bl00dymarie 76f81841f4 Merge branch '537-bug-temperature-reminder-on-ios' into 'master'
Fix: Target reminder with correct id

Closes #537

See merge request bloodyhealth/drip!389
2022-04-15 17:29:19 +00:00
Lisa Hillebrand 585017eadd 540 Refactor temperature to functional component 2022-04-15 19:03:18 +02:00
Lisa Hillebrand fe9d9b4fdc 540 Rename method to get previous temperature 2022-04-15 17:41:53 +02:00
bl00dymarie a37607eae6 fix indentation 2022-04-15 14:06:06 +00:00
bl00dymarie 54bc836811 fix indentation 2022-04-15 14:05:41 +00:00
BloodyMarie 992161e3ce Implement review feedback 2022-04-15 16:03:17 +02:00
Lisa 534f554986 Merge branch 'chore/Swap-icon-for-learn-more' into 'master'
Chore: exchange icons for learn more

See merge request bloodyhealth/drip!388
2022-04-15 13:47:33 +00:00
BloodyMarie 407fa834ab Make temp reminder work for android & ios 2022-04-11 22:22:55 +02:00
BloodyMarie 16d2afaf1e Fix: Target reminder with correct id 2022-04-10 23:04:09 +02:00
BloodyMarie 765a8ae3b2 Chore: exchange icons for learn more 2022-04-10 21:23:12 +02:00
BloodyMarie 0eb3c93a17 Revert "Update readme and engines definition in package.json"
This reverts commit cce8e4ef0e.
2022-03-28 00:35:10 +02:00
BloodyMarie 96d7deb47c Revert "Update realm version 3.6.5 -> 5.0.9"
This reverts commit 7d6a577eeb.
2022-03-28 00:34:33 +02:00
bl00dymarie 2a49e43065 Merge branch 'chore/update-styling' into 'master'
Chore/update styling

See merge request bloodyhealth/drip!374
2022-03-26 12:15:59 +00:00
bl00dymarie 6aef594b29 Adding paddingTop to title of symptom box 2022-03-26 13:13:27 +01:00
MariaZ eb53b8b87e Return some button styling to fix button display on simptom edit 2022-03-26 13:13:27 +01:00
MariaZ f34df0233c Increase box size and change back number of lines to display to 4 2022-03-26 13:13:27 +01:00
MariaZ 37e1d54358 More fine-tuning of calendar and symptom box 2022-03-26 13:13:27 +01:00
MariaZ 7faa18bd60 Remove fontratio (I think we don't need it any more) 2022-03-26 13:13:27 +01:00
MariaZ 3c02dd77bb Update buttons styling to make them not that horizontally big 2022-03-26 13:13:27 +01:00
MariaZ 272b1f387d Font size fine-tuning 2022-03-26 13:13:27 +01:00
MariaZ c5aaf1b29b Add note to remove images fix after RN update 2022-03-26 13:13:27 +01:00
MariaZ 2bbcadcf53 Elipsise date on day overview 2022-03-26 13:13:27 +01:00
MariaZ f4ef00d4ea Fix adding images to final build 2022-03-26 13:13:27 +01:00
MariaZ 953e080032 Fix symptom-box text overflow 2022-03-26 13:13:27 +01:00
MariaZ 10fdcecf61 Fix buttons on simptom edit view for small screens 2022-03-26 13:13:27 +01:00
MariaZ cfef925414 Fix styling 2022-03-26 13:13:27 +01:00
MariaZ 7cab47665f Fix today day styling in calendar 2022-03-26 13:13:27 +01:00
MariaZ 9fb08fb66f Fix linter errors 2022-03-26 13:13:27 +01:00
MariaZ 388985034f Update symptom box styling 2022-03-26 13:13:27 +01:00
MariaZ f842ebe13c Update stats page styling 2022-03-26 13:13:27 +01:00
MariaZ 070c1487af Install react-native-size-matters library for better layout 2022-03-26 13:13:27 +01:00
bl00dymarie a624b5c015 Merge branch '535-chore-remove-unsupported-platforms-for-gradle' into 'master'
Chore: Remove unspported platforms for gradle

Closes #535

See merge request bloodyhealth/drip!383
2022-03-26 10:54:00 +00:00
Lisa 7f945c9fdd Merge branch '432-button-for-email-contact-instead-of-hyperlink' into 'master'
Chore: Adds buttons instead of links to about

Closes #432

See merge request bloodyhealth/drip!384
2022-03-26 10:52:09 +00:00
BloodyMarie d6a18bb44d Remove unused file 2022-03-26 11:46:32 +01:00
bl00dymarie 09de52b5df Dot notation 2022-03-26 11:46:32 +01:00
bl00dymarie 1584d2d368 Dot notation 2022-03-26 11:46:32 +01:00
BloodyMarie d1ac12d165 Chore: Implement review feedback 2022-03-26 11:46:32 +01:00
bl00dymarie 03b359019e Chore: Adds buttons instead of links to about 2022-03-26 11:46:29 +01:00
Lisa b93983243e Merge branch '511-use-translation-library-for-license-component' into 'master'
Use translation library for license component

Closes #511

See merge request bloodyhealth/drip!373
2022-03-26 10:21:26 +00:00
bl00dymarie 009b6b38e1 Correct email 2022-03-26 10:19:15 +00:00
bl00dymarie f462b349fc Merge branch 'chore/update-realm' into 'master'
Update realm version 3.6.5 -> 5.0.9

See merge request bloodyhealth/drip!380
2022-03-25 21:48:36 +00:00
bl00dymarie 64124c2fd5 Chore: Remove unspported platforms for gradle 2022-02-06 14:13:40 +01:00
Sofiya Tepikin cce8e4ef0e Update readme and engines definition in package.json 2022-01-23 17:41:50 +01:00
Sofiya Tepikin 7d6a577eeb Update realm version 3.6.5 -> 5.0.9 2022-01-23 17:40:26 +01:00
Lisa dc8f829d34 Merge branch '518-replace-deprecated-babel-parser-for-eslint' into 'master'
518 Replace deprecated eslint parser

Closes #518

See merge request bloodyhealth/drip!378
2021-12-01 10:50:18 +00:00
Lisa Hillebrand 1f5ba4de12 518 Run eslint on missing directories 2021-11-28 16:16:35 +01:00
Lisa Hillebrand fbc561622c 518 Update eslint config 2021-11-28 16:11:15 +01:00
Lisa Hillebrand 426d35ab78 518 Replace deprecated eslint parser 2021-11-28 16:10:48 +01:00
Maria Zadnepryanets 1ec6fd9296 Merge branch 'master' into 'master'
Update README.md to linkt to Version 8 instread of Version 5

See merge request bloodyhealth/drip!379
2021-11-28 13:10:14 +00:00
bkqtnte10 a53c8ce4f7 Update README.md to linkt to Version 8 instread of Version 5 2021-10-20 05:33:54 +00:00
Sofiya Tepikin c6ffdaa46e Merge branch '517-Install-husky-and-prettier-to-format-staged-files' into 'master'
Install husky and prettier to format staged files

Closes #517

See merge request bloodyhealth/drip!377
2021-09-19 14:11:59 +00:00
Lisa 3625d5a4bb Install husky and prettier to format staged files 2021-09-19 14:11:59 +00:00
Maria Zadnepryanets 50d01cbaa4 Merge branch 'chore/add-dependabot-to-repo' into 'master'
Adds dependabot to repo

See merge request bloodyhealth/drip!375
2021-09-19 13:18:46 +00:00
bl00dymarie 1e734082af Merge branch 'chore/update-readme' into 'master'
Add info on nvm requirement and xcode 12.5 fix

See merge request bloodyhealth/drip!372
2021-09-19 12:46:26 +00:00
Maria Zadnepryanets 449c84e75e Add info on nvm requirement and xcode 12.5 fix 2021-09-19 12:46:26 +00:00
bl00dymarie f282e24308 Merge branch 'feature/add-toast-on-ios' into 'master'
Feature: add toast on ios

Closes #321

See merge request bloodyhealth/drip!370
2021-09-19 10:07:58 +00:00
bl00dymarie d1efd1d587 Merge branch '510-replace-metadata-folder-with-redesigned' into 'master'
Resolve "Replace metadata folder with redesigned"

Closes #510

See merge request bloodyhealth/drip!368
2021-09-05 12:17:24 +00:00
MariaZ 4d32c523ff Adds dependabot config 2021-08-29 20:18:51 +02:00
MariaZ d2a452e3c9 Add toast to saving/deleting symptom data 2021-08-29 14:08:37 +02:00
MariaZ 4bff5a3d68 Move toast showing function to helper 2021-08-29 14:03:29 +02:00
MariaZ 233d14968d Package-lock.json commit 2021-08-20 20:10:00 +02:00
Lisa Hillebrand 9596f8e52f 511 Use translation function in license components 2021-08-15 17:37:22 +02:00
Lisa Hillebrand 4f93d30872 511 Rename component 2021-08-15 16:57:04 +02:00
MariaZ f188f018b9 Refactor existing Toast 2021-08-15 16:15:10 +02:00
MariaZ 65d0e4f3a1 Install react-native-simple-toast 2021-08-15 16:07:04 +02:00
emelko c60347badf Update phone screenshots 2021-08-15 14:05:30 +02:00
emelko 6c1fa662f9 Update description text 2021-08-15 14:05:30 +02:00
emelko 0bf7f2525e Update icon and banner 2021-08-15 14:05:30 +02:00
Maria Zadnepryanets 7c70f7454e Merge branch 'chore/add-react-native-clean-project' into 'master'
Chore: add react native clean project

Closes #431

See merge request bloodyhealth/drip!367
2021-08-15 11:56:09 +00:00
Maria Zadnepryanets 4fedb1928c Chore: add react native clean project 2021-08-15 11:56:09 +00:00
Maria Zadnepryanets 87a68ba9c5 Merge branch 'chore/add-instructions-for-ios' into 'master'
Chore: adds instructions on how to run app on ios to readme

Closes #333

See merge request bloodyhealth/drip!358
2021-08-06 15:02:18 +00:00
Maria Zadnepryanets 4b06f03aec Chore: adds instructions on how to run app on ios to readme 2021-08-06 15:02:15 +00:00
Maria Zadnepryanets 948c7c0b24 Merge branch 'ios-launch-screen-and-icons' into 'master'
iOS assets: icons & launch screen

See merge request bloodyhealth/drip!365
2021-08-06 14:58:57 +00:00
sdvig 40083d819f Add ios icons and launch screen 2021-07-30 16:45:57 +02:00
bl00dymarie c5162beb3b Update Twitter handle 2021-07-30 12:12:33 +00:00
Lisa f65d06edb3 Update README.md 2021-06-18 12:07:17 +00:00
bl00dymarie e08c6be97c Merge branch 'weblate-drip-test-component' into 'master'
Translations update from Weblate

See merge request bloodyhealth/drip!362
2021-06-18 11:44:51 +00:00
bl00dymarie ea669c1fac Added translation using Weblate (German) 2021-06-18 13:33:17 +02:00
bl00dymarie 940c7806ee Merge branch '162-Prepare-localization' into 'master'
Resolve "Prepare localization"

Closes #162

See merge request bloodyhealth/drip!361
2021-06-18 11:11:28 +00:00
Lisa Hillebrand 8b8ae0d436 162 Update structure of english translation file 2021-06-18 11:37:00 +02:00
Lisa Hillebrand 3fd9cc0e02 162 Fix lint issue 2021-05-02 22:17:41 +02:00
Lisa Hillebrand 1514e21726 162 Remove component path from translation key 2021-05-02 22:02:07 +02:00
Lisa Hillebrand 0b447178c5 162 Use hook to merge component path with translation key 2021-05-02 21:45:46 +02:00
Lisa Hillebrand f3cabe5ca1 162 Use translation function in home component 2021-05-02 21:35:30 +02:00
Lisa Hillebrand e0f64173bf 162 Refactor Home component to functional component 2021-05-02 21:19:45 +02:00
Lisa Hillebrand 36ce29c346 162 Uppercase home component name 2021-05-02 21:09:21 +02:00
Lisa Hillebrand 4676c50504 162 Add configuration for i18next 2021-05-02 20:51:15 +02:00
Lisa Hillebrand 886a952e53 162 Install dependencies for i18next 2021-05-02 20:48:38 +02:00
Sofiya Tepikin 5b1544c8f4 Merge branch 'feature/ios-launch' into 'master'
Feature/ios launch

See merge request bloodyhealth/drip!351
2021-05-02 16:31:18 +00:00
Sofiya Tepikin f0155b342f Feature/ios launch 2021-05-02 16:31:17 +00:00
Maria Zadnepryanets e532c3d94c Merge branch 'upgrade-rn-and-friends' into 'master'
Upgrade RN and friends

Closes #491

See merge request bloodyhealth/drip!336
2021-04-18 12:55:22 +00:00
Sofiya Tepikin 2535d056b7 Upgrade RN and friends 2021-04-18 12:55:21 +00:00
Maria Zadnepryanets 9ff117ce4d Merge branch '402-give-export-file-more-specific-name' into 'master'
Give exported csv drip-data name

Closes #402

See merge request bloodyhealth/drip!359
2021-04-11 13:22:00 +00:00
emelko 78e4d109c7 Give exported csv drip-data name 2021-03-17 22:12:24 +01:00
bl00dymarie aa2de9e335 Update CONTRIBUTING.md 2021-03-13 17:30:02 +00:00
bl00dymarie e78337a8b3 Update CONTRIBUTING.md 2021-03-13 17:17:48 +00:00
bl00dymarie 448e0a8476 Merge branch 'Release-1.2102.28' into 'master'
Release: 1.2102.28

See merge request bloodyhealth/drip!357
2021-02-28 16:51:08 +00:00
emelko b1d35afc87 Adding back detox 2021-02-28 17:40:31 +01:00
emelko 50a16ee0dd Release: 1.2102.28 2021-02-28 17:09:13 +01:00
bl00dymarie d67c912e1d Merge branch '478-bug-fertility-text-on-home-page-not-correct' into 'master'
Resolve "Bug: fertility text on home page not correct"

Closes #478

See merge request bloodyhealth/drip!355
2021-02-28 16:05:01 +00:00
emelko 5ca129fd47 Adds flexWrap 'wrap' to phase text 2021-02-28 17:03:18 +01:00
emelko 2d4aa722c9 Less space for title 2021-02-20 15:02:39 +01:00
emelko 3d4a3ea7bf Remove wiki link 2021-02-20 15:01:54 +01:00
emelko df732e5acc Adds text for end of 2nd phase before infertility 2021-02-20 13:56:58 +01:00
bl00dymarie 19942d3afc Merge branch 'chore/fix-styling' into 'master'
Chore/fix styling

See merge request bloodyhealth/drip!353
2021-02-17 22:39:40 +00:00
bl00dymarie 8065dad6a0 Merge branch 'p_doub-master-patch-69749' into 'master'
Very small fixes in the README

See merge request bloodyhealth/drip!352
2021-02-14 22:24:25 +00:00
MariaZ 5325f071bd Remove detox for now to fix npm i errors 2021-02-14 20:07:45 +01:00
MariaZ a261154889 Fixes SymptomEditView centering 2021-02-14 19:42:47 +01:00
MariaZ 176b60be89 Update stats layout 2021-02-14 19:42:33 +01:00
Pascal Wengerter 3e918226d2 Very small fixes in the README 2021-01-29 10:18:04 +00:00
Sofiya Tepikin d2b7577fba Merge branch 'fix/incorrect-password-error-not-showing-on-login-screen' into 'master'
Fix/incorrect password error not showing on login screen

Closes #494

See merge request bloodyhealth/drip!349
2021-01-23 12:04:30 +00:00
Maria Zadnepryanets dd18611498 Fix/incorrect password error not showing on login screen 2021-01-23 12:04:30 +00:00
Sofiya Tepikin aa0e5b6836 Merge branch 'fix/bottom-padding-after-input-field' into 'master'
Fix/bottom padding after input field

Closes #493

See merge request bloodyhealth/drip!350
2021-01-23 11:53:34 +00:00
Maria Zadnepryanets 659eb8da31 Fix/bottom padding after input field 2021-01-23 11:53:34 +00:00
Sofiya Tepikin 03905be5f1 Merge branch '490-change-default-temperature-range-to-36-37-5' into 'master'
Changes temp range and default values

Closes #490

See merge request bloodyhealth/drip!348
2021-01-23 10:35:59 +00:00
bl00dymarie 6f36428fd2 Changes temp range and default values 2021-01-23 10:35:59 +00:00
Sofiya Tepikin fcde07f2f5 Merge branch 'fix/invalid-temperature-input' into 'master'
Block invalid input of temperature value

Closes #488

See merge request bloodyhealth/drip!335
2021-01-22 18:17:17 +00:00
Sofiya Tepikin 9dee0bd443 Block invalid input of temperature value 2021-01-13 21:14:06 +01:00
Sofiya Tepikin f1f18e6f93 Merge branch 'Update-tag-creation' into 'master'
Stable release 1.2101.9

See merge request bloodyhealth/drip!334
2021-01-09 16:59:27 +00:00
Sofiya Tepikin 3efc4efcad Merge branch 'rebased-redesign' into 'master'
Rebased redesign

See merge request bloodyhealth/drip!305
2021-01-09 16:57:07 +00:00
emelko 8721a87bb7 Manual version code update to 7 2021-01-09 01:10:56 +01:00
emelko f829b371e6 Release: 1.2101.9 2021-01-09 00:42:11 +01:00
emelko 8e73a64397 Update createVersion tag for production releases 2021-01-08 23:13:50 +01:00
bl00dymarie 199aa198d1 Merge branch 'Add-lisa' into 'rebased-redesign'
Add Lisa as condriputor <3

See merge request bloodyhealth/drip!333
2021-01-08 18:44:37 +00:00
emelko 7616d79687 Add Lisa as condriputor <3 2021-01-08 18:17:49 +01:00
bl00dymarie 83b80e5623 Merge branch '484-update-text-in-app' into 'rebased-redesign'
Adds updated text about credits.

See merge request bloodyhealth/drip!332
2021-01-08 16:47:20 +00:00
emelko 9aba800119 Better wording for prediction text 2021-01-08 17:45:28 +01:00
emelko e5d2a7e4cf Fix drip typo 2021-01-08 17:39:14 +01:00
Sofiya Tepikin 5856dca47b Merge branch 'fix-chart-date-label' into 'rebased-redesign'
Fixes the date label on chart from breaking

See merge request bloodyhealth/drip!331
2021-01-08 16:34:00 +00:00
Sofiya Tepikin e61f8c9483 Fixes the date label on chart from breaking 2021-01-08 16:34:00 +00:00
emelko 5fc2320afe Adds updated text about credits. 2021-01-08 17:25:29 +01:00
Sofiya Tepikin 9a87bf760c Merge branch 'notification-icon' into 'rebased-redesign'
Adds missing notification icon

See merge request bloodyhealth/drip!330
2021-01-08 12:36:58 +00:00
Sofiya Tepikin a51e485545 Adds missing notification icon 2021-01-06 20:11:55 +01:00
Sofiya Tepikin 0d821c7b39 Merge branch 'drip-new-icon' into 'rebased-redesign'
Changes the icon

See merge request bloodyhealth/drip!329
2021-01-03 15:49:45 +00:00
Sofiya Tepikin 97d9e8bd25 Changes the icon 2021-01-03 16:26:07 +01:00
Sofiya Tepikin 3b576e8173 Merge branch 'Add-back-computed-mucus-value' into 'rebased-redesign'
Adds back computed mucus value to be saved

See merge request bloodyhealth/drip!328
2021-01-03 14:13:51 +00:00
emelko 68ef06b93e Adds back computed mucus value to be saved 2021-01-03 15:10:44 +01:00
Sofiya Tepikin a35d757f84 Merge branch 'fix-chart-dots-and-lines' into 'rebased-redesign'
Fix chart dots and lines

See merge request bloodyhealth/drip!327
2021-01-03 12:36:37 +00:00
Sofiya Tepikin 2fb20c0031 Fix chart dots and lines 2021-01-03 12:36:37 +00:00
Maria Zadnepryanets 17266d46dd Merge branch 'fix-highest-scale-value' into 'rebased-redesign'
Fixes error on highes/lowest scale values

See merge request bloodyhealth/drip!326
2020-12-30 17:43:14 +00:00
Sofiya Tepikin 7aff04946e Fixes error on highes/lowest scale values 2020-12-30 18:35:33 +01:00
bl00dymarie 45bc9f6c51 Merge branch '468-removes-extra-grid-line-on-temperature-chart' into 'rebased-redesign'
Fixes extra horizontal grid line on chart

See merge request bloodyhealth/drip!325
2020-12-30 17:04:33 +00:00
mashazyu 97ff3deac3 Fixes extra horizontal grid line on chart 2020-12-30 17:32:34 +01:00
Sofiya Tepikin 08d18c1241 Merge branch 'Adjust-font-colors-of-marked-days-in-calendar' into 'rebased-redesign'
Change font color of marked calendar days

See merge request bloodyhealth/drip!323
2020-12-30 15:07:03 +00:00
Lisa af5c24c466 Change font color of marked calendar days 2020-12-30 15:07:03 +00:00
bl00dymarie 6a7323269a Merge branch '466-bug-temp-hint-for-too-high-or-low-value-shows-at-the-start' into 'rebased-redesign'
No warning msg if there is no temp data

See merge request bloodyhealth/drip!322
2020-12-29 11:12:29 +00:00
emelko 4e6653c54c Check for falsy value 2020-12-22 22:30:54 +01:00
bl00dymarie ab1acf21ba Merge branch '438-stats-page-tuning' into 'rebased-redesign'
Resolve "Stats"

See merge request bloodyhealth/drip!316
2020-12-20 19:11:03 +00:00
Maria Zadnepryanets d25af176d3 Resolve "Stats" 2020-12-20 19:11:03 +00:00
Sofiya Tepikin d375645316 Merge branch '460-fix-note-focus' into 'rebased-redesign'
Adds padding between keyboard and text input

See merge request bloodyhealth/drip!320
2020-12-20 16:26:32 +00:00
mashazyu 80cc9bc73d Update AppTextInput behavior, when Keyboard is visible 2020-12-20 17:20:55 +01:00
emelko 8f6ae97ef9 No warning msg if there is no temp data 2020-12-20 17:18:17 +01:00
Maria Zadnepryanets 8715f53140 Merge branch '464-bug-password-is-shown-in-plain-text' into 'rebased-redesign'
Resolve "Bug: Password is shown in plain text"

See merge request bloodyhealth/drip!321
2020-12-20 12:10:10 +00:00
emelko b00b97d411 Add secureTextEntry to password AppTextInput 2020-12-20 13:06:53 +01:00
Sofiya Tepikin 748b5bcbd1 Merge branch 'Bug-android-back-button-when-navigating-away-from-settings' into 'rebased-redesign'
Fix error occurring when navigating back from settings section

See merge request bloodyhealth/drip!319
2020-12-20 10:48:56 +00:00
Lisa 9e907dad0b Fix error occurring when navigating back from settings section 2020-12-20 10:48:56 +00:00
bl00dymarie 08e01346f3 Merge branch '434-home-page-tuning' into 'rebased-redesign'
Resolve "Redesign fix: Homepage fix"

See merge request bloodyhealth/drip!315
2020-12-20 10:38:11 +00:00
Maria Zadnepryanets ada60a745b Resolve "Redesign fix: Homepage fix" 2020-12-20 10:38:11 +00:00
mashazyu 59aef1126d Updates styling of Stats page 2020-12-13 18:02:39 +01:00
Lisa Hillebrand 8145619f28 Fix error occurring when navigating back from settings section 2020-12-13 18:02:39 +01:00
mashazyu c00e3f2bef Adds padding between keyboard and text input 2020-12-13 18:02:39 +01:00
Maria Zadnepryanets ead6db12a9 Merge branch 'fix-temp-edit-redirect' into 'rebased-redesign'
Fix redirect to TemperatureEditView from reminder

See merge request bloodyhealth/drip!318
2020-12-13 16:15:22 +00:00
Sofiya Tepikin 60cde25f76 Fix redirect to TemperatureEditView from reminder 2020-12-13 15:55:22 +01:00
bl00dymarie 9c9d06f192 Merge branch 'fix-ordinal-suffix' into 'rebased-redesign'
Fix ordinal suffix for numbers greater than 10

See merge request bloodyhealth/drip!306
2020-12-13 13:26:35 +00:00
bl00dymarie d47ae0de0e Merge branch '440-cycle-overview-page-limit-note-size-to-display' into 'rebased-redesign'
Limit line length on text of symptom box

See merge request bloodyhealth/drip!314
2020-12-13 12:20:37 +00:00
bl00dymarie 44b916354d Merge branch '439-settings-menu-update' into 'rebased-redesign'
Updates settings menu styling

See merge request bloodyhealth/drip!317
2020-12-13 12:13:05 +00:00
mashazyu 42bf02a0c7 Updates settings menu styling 2020-12-05 20:45:01 +01:00
Sofiya Tepikin 72bcd34272 Fixes ordinal number suffix on chart date labels 2020-12-05 19:31:30 +01:00
bl00dymarie 89ff4b2cdc Merge branch '449-change-crossed-out-text-for-excluded-values-on-cycle-day-overview' into 'rebased-redesign'
Remove line-through textDecoration for excluded values

See merge request bloodyhealth/drip!312
2020-12-05 11:48:34 +00:00
bl00dymarie 8f34cbc260 Merge branch '458-pont-8-not-shown-in-chart' into 'rebased-redesign'
Resolve "38.8 is not shown on a chart"

See merge request bloodyhealth/drip!313
2020-12-05 11:48:20 +00:00
emelko 295e751217 Limit line length on text of symptom box 2020-12-05 12:47:28 +01:00
mashazyu 45da01ba07 Fixes bug when .8 and .3 labels are not shown in chart 2020-12-05 12:33:11 +01:00
Sofiya Tepikin c270c7a55f Add tests to the getOrdinalSuffix function 2020-12-05 12:12:19 +01:00
Sofiya Tepikin f9eb06f197 Make use of formatWithOrdinalSuffix function 2020-12-05 12:12:19 +01:00
Sofiya Tepikin 9d3c332453 Fix getOrdinalSuffix and add a formatting function 2020-12-05 12:12:19 +01:00
Julia Friesel e5418c32e2 Fix ordinal suffix for numbers greater than 10 2020-12-05 12:12:19 +01:00
emelko fbfc4d6621 Remove line-through textDecoration for excluded values 2020-12-05 12:10:33 +01:00
Sofiya Tepikin 77908afd60 Merge branch '437-cycle-day-overview-fix' into 'rebased-redesign'
Resolve "Cycle day overview"

See merge request bloodyhealth/drip!307
2020-12-05 11:08:57 +00:00
Maria Zadnepryanets 750ceeaaf4 Resolve "Cycle day overview" 2020-12-05 11:08:57 +00:00
Maria Zadnepryanets 5af29f9628 Merge branch '436-chart-fix' into 'rebased-redesign'
Resolve "Chart"

See merge request bloodyhealth/drip!308
2020-12-05 10:15:12 +00:00
Maria Zadnepryanets cf63fbb37c Resolve "Chart" 2020-12-05 10:15:12 +00:00
Maria Zadnepryanets 1f83621e7d Merge branch 'Make-clickable-areas-bigger' into 'rebased-redesign'
Increase hitSlop of menu icon and navigation arrows

See merge request bloodyhealth/drip!309
2020-12-05 10:08:24 +00:00
Lisa 3778c1454f Increase hitSlop of menu icon and navigation arrows 2020-12-05 10:08:24 +00:00
Maria Zadnepryanets 59ee05eb1f Merge branch 'fix-dev-tools' into 'rebased-redesign'
Fixes the dev tools

See merge request bloodyhealth/drip!311
2020-11-18 18:15:58 +00:00
Sofiya Tepikin 7916bae848 Roll back alert dialog styling 2020-11-16 20:41:24 +01:00
emelko b429954ad2 Update home page with more color contrast for grey 2020-09-20 15:53:34 +02:00
emelko 4f4dc85f8c Sets calendar pastScrollRange to 10 years 2020-09-20 15:02:51 +02:00
emelko 6de05f0d70 Fix unlocking app with password 2020-09-20 14:49:17 +02:00
Sofiya Tepikin 99a2bf256d Fix linter issue 2020-08-22 14:19:29 +02:00
Sofiya Tepikin 14c2d17a20 Fix react-native-vector-icon 2020-08-22 14:13:52 +02:00
Sofiya Tepikin b91547032d Fix styles issue 2020-08-22 14:13:27 +02:00
bl00dymarie 0451b078ad Update README.md 2020-08-22 12:00:52 +00:00
Maria Zadnepryanets 5a555f5965 Calendar redesign 2020-08-22 13:08:24 +02:00
Maria Zadnepryanets 885da5c293 Symptom view redesign 2020-08-22 13:08:23 +02:00
Maria Zadnepryanets ef16cfd041 Redesign chart 2020-08-22 13:06:50 +02:00
mashazyu 550b1e6314 Post-review updates 2020-08-22 13:06:50 +02:00
mashazyu 0c3bfdfced Fix after rebase 2020-08-22 13:06:50 +02:00
mashazyu c367a1e233 Introduces RN Alert component styling update 2020-08-22 13:06:50 +02:00
mashazyu 3d2d659b54 Introduces PasswordPrompt component redesign 2020-08-22 13:06:50 +02:00
mashazyu cbe9f3947d Adds isSideMenuEnabled prop to Header component 2020-08-22 13:06:50 +02:00
mashazyu 1f5d869b17 Adds contentContainerStyle prop to AppPage component 2020-08-22 13:06:50 +02:00
mashazyu 9d6c0aa65c Introduces Stats page redesign 2020-08-22 13:06:50 +02:00
mashazyu fe5f734cff Refactors AppText and Segment components 2020-08-22 13:06:50 +02:00
mashazyu 111475b2e3 Introduces License page redesign 2020-08-22 13:06:50 +02:00
mashazyu c2e7bf8761 Updates SymptomSection component to fix lint rule 2020-08-22 13:06:50 +02:00
mashazyu 579c4af869 Styling fix of DataManagement component 2020-08-22 13:06:50 +02:00
mashazyu 7afaa1e156 Adds disabled prop to Button, style change name in AppSwitch component 2020-08-22 13:06:50 +02:00
mashazyu 61ca71fd1f Fixes AppLoadingView component centering 2020-08-22 13:06:50 +02:00
mashazyu bba25aeaac Sets default button type to small and moves action names to config file 2020-08-22 13:06:50 +02:00
mashazyu 45cff710c8 Separates TemperatureSlider component, adds minor post-review changes 2020-08-22 13:06:50 +02:00
mashazyu 42bc91d9c2 Removes extra space 2020-08-22 13:06:50 +02:00
mashazyu 6c89e642b4 Updates variable name to improve code readibility 2020-08-22 13:06:50 +02:00
mashazyu 9d7121f5d6 Updates button activity definition when entering new password 2020-08-22 13:06:50 +02:00
mashazyu eff15e67ee Introduces style definition update of Button component 2020-08-22 13:06:50 +02:00
mashazyu 1575aa29cd Separates TemperatureReminder component 2020-08-22 13:06:50 +02:00
mashazyu 08deb87df4 Introduces NFP section redesign, upgrades slider version 2020-08-22 13:06:50 +02:00
mashazyu f2706f509a Introduces data management section redesign 2020-08-22 13:05:17 +02:00
mashazyu a68ec248b0 Introduces password management section redesign 2020-08-22 13:05:17 +02:00
mashazyu 842e8a2a24 Introduces AppTextInput and Button components styling update 2020-08-22 13:05:17 +02:00
mashazyu c090e14835 Introduces Reminders page redesign 2020-08-22 13:05:17 +02:00
mashazyu 29d76d19b1 Introduces Home component redesign 2020-08-22 13:05:17 +02:00
mashazyu b6c0fd0dce SideMenu fix 2020-08-22 13:05:17 +02:00
mashazyu 1077f878ae AppIcon fix 2020-08-22 13:05:17 +02:00
mashazyu cec8dbaf38 Introduces bottom menu redesign (Menu component) 2020-08-22 13:05:17 +02:00
mashazyu b9d85042ef AppIcon props update 2020-08-22 13:05:17 +02:00
mashazyu f0caffacdd Moves MenuItem component from Header to separate file, naming update 2020-08-22 13:05:17 +02:00
mashazyu bf4446c742 Moves Logo component to separate file 2020-08-22 13:05:17 +02:00
mashazyu 4d6f0db30a Moves Segment stiles to local file, separates MenuItem component. 2020-08-22 13:05:17 +02:00
mashazyu ce92b0af33 Introduces Header redesign along with some global styles changes 2020-08-22 13:05:17 +02:00
mashazyu e101ecb8d1 Introduces SettingsMenu component redesign 2020-08-22 13:05:17 +02:00
mashazyu e609d51528 Removes unnecessary spaces 2020-08-22 13:05:17 +02:00
mashazyu e80d8880b0 Moves unique styles of AppPage component to local file 2020-08-22 13:05:17 +02:00
mashazyu 3de92b9f77 Moves unique styles of AppTextInput to local file and does some cleanup 2020-08-22 13:05:17 +02:00
mashazyu 652bc1ffe2 Moves unique styles of Button component from common to local file 2020-08-22 13:05:17 +02:00
mashazyu 1a46e1bb2e Moves unique style of Link component from common to local file 2020-08-22 13:05:17 +02:00
mashazyu fb519c4380 Moves unique styles of Segment component from common files to local one 2020-08-22 13:05:17 +02:00
mashazyu 78d4077fb4 Renames FramedSegment to Segment 2020-08-22 13:05:17 +02:00
mashazyu 6fb1c7cce9 Fix color naming 2020-08-22 13:05:17 +02:00
mashazyu 4f30db69f3 Introduces License and About components redesign 2020-08-22 13:05:17 +02:00
mashazyu 3f8f6dbbe6 Introduces AppLoading, AppTextInput, Button components redesign 2020-08-22 13:05:17 +02:00
mashazyu 8c1c72ccc9 Introduces AppText, Link and FramedSegment redesign 2020-08-22 13:05:17 +02:00
mashazyu 1fc7bc17b9 AppLoading/AppText/AppTextInput/Button/FramedSegment/Link -> ./common 2020-08-22 13:05:17 +02:00
mashazyu d3e795a51f Forbids landscape orientation for app 2020-08-22 13:05:17 +02:00
Sofiya Tepikin 4f736d5fe2 Adds new font 2020-08-22 13:05:17 +02:00
bl00dymarie afb53a6f82 Update RELEASE.md 2020-08-01 12:14:03 +00:00
Sofiya Tepikin b798f12266 Update RELEASE.md 2020-08-01 11:58:15 +00:00
bl00dymarie 9d05b27d32 Update RELEASE.md 2020-08-01 11:56:38 +00:00
bl00dymarie 2f7aba0137 Update README.md 2020-08-01 11:51:58 +00:00
bl00dymarie 722981d224 Update README.md 2020-08-01 11:50:26 +00:00
bl00dymarie ab45d2f1ca Add new RELEASE file 2020-08-01 11:48:31 +00:00
Sofiya Tepikin b974ba1d7e Merge branch 'androidx-and-sdk29' into 'master'
Update sdk 28 -> 29 and migrate to androidx

See merge request bloodyhealth/drip!302
2020-08-01 11:47:33 +00:00
Sofiya Tepikin 9cf542f4b7 Update sdk 28 -> 29 and migrate to androidx 2020-08-01 11:47:33 +00:00
Sofiya Tepikin 06337a7356 Merge branch 'New-release-12-july-2020' into 'master'
Release: 0.2007.12-beta

See merge request bloodyhealth/drip!301
2020-08-01 11:39:17 +00:00
bl00dymarie 3ac28e527d Release: 0.2007.12-beta 2020-08-01 11:39:17 +00:00
bl00dymarie fd818404d4 Merge branch 'Adds-drips' into 'master'
Adds Mariya & Sofiya as contributors <3

See merge request bloodyhealth/drip!300
2020-07-12 17:17:20 +00:00
emelko a26080ad2a Adds arm64-v8a and x86_64 for supporting 64-bit architecture 2020-07-12 19:14:54 +02:00
emelko bef7b6ae54 Adds Mariya & Sofiya as contributors <3 2020-07-12 19:12:26 +02:00
Sofiya Tepikin 70c13387a9 Merge branch 'update-realm' into 'master'
Update realm version

See merge request bloodyhealth/drip!299
2020-07-12 17:06:22 +00:00
Sofiya Tepikin ef9e7c535b Add clearing of metro cache 2020-07-11 21:23:43 +02:00
Sofiya Tepikin 1d449252c0 Update realm to support 64bit 2020-07-11 21:23:23 +02:00
Maria Zadnepryanets 71247e1c7d Merge branch 'updated-package-lock' into 'master'
Update package-lock.json

See merge request bloodyhealth/drip!298
2020-07-11 11:25:32 +00:00
Sofiya Tepikin 8469edc573 Update package-lock.json 2020-07-11 13:22:35 +02:00
bl00dymarie a7aae0673e Merge branch 'Changes-year-in-copyright-text' into 'master'
Uses built-in JS functionality for getting currentYear, thanks to @sdvig

See merge request bloodyhealth/drip!296
2020-06-19 09:02:58 +00:00
emelko 9d137dfd3a Uses built-in JS functionality for getting currentYear, thanks to @sdvig 2020-06-19 11:00:48 +02:00
bl00dymarie 930ed3fdc5 Merge branch 'Changes-year-in-copyright-text' into 'master'
Sets current year instead of hard coded

See merge request bloodyhealth/drip!295
2020-06-19 08:51:47 +00:00
emelko 240c61e46e Sets current year instead of hard coded 2020-06-06 01:00:31 +02:00
bl00dymarie 0e1b95d313 Update README.md 2020-06-05 22:40:57 +00:00
bl00dymarie 880dd8b843 Update README.md 2020-06-05 19:48:20 +00:00
bl00dymarie 54b30ec229 Update README.md 2020-06-05 19:45:34 +00:00
bl00dymarie dc1164ef03 Update README.md 2020-06-05 19:44:09 +00:00
bl00dymarie be4f50c962 Update README.md 2020-06-05 19:43:38 +00:00
bl00dymarie 91bf76621a Update README.md 2020-06-05 19:43:07 +00:00
Maria Zadnepryanets 37c5821411 Update CHANGELOG.md 2020-05-02 17:33:33 +00:00
Maria Zadnepryanets 4442c229f7 Update CHANGELOG.md 2020-05-02 15:57:21 +00:00
bl00dymarie c0c025cd69 Merge branch 'bug-cannot-enter-note-in-future' into 'master'
Bug fix: allows to enter note in the future

See merge request bloodyhealth/drip!288
2020-05-02 15:22:18 +00:00
Sofiya Tepikin 41e2406727 Merge branch 'fix-go-back-bug' into 'master'
Fixes the error on app exiting on via the device back button

See merge request bloodyhealth/drip!291
2020-04-26 15:25:40 +00:00
Maria Zadnepryanets e11915460c Merge branch '306-chart-displays-sex-dot-even-if-only-contraceptive-options-are-saved' into 'master'
Chart doesn't display sex dot although contraception method 'other' has been already removed

Closes #306

See merge request bloodyhealth/drip!285
2020-04-25 18:13:13 +00:00
Sofiya Tepikin 1413525e91 Fixes the error on app exiting on via the device back button 2020-04-25 19:47:05 +02:00
bl00dymarie 1291fe70bc Merge branch 'patch-1' into 'master'
Update README.md with F-Droid and Google Play Badges

See merge request bloodyhealth/drip!289
2020-04-03 15:38:05 +00:00
Poussinou 908ae9a305 Update README.md 2020-04-03 13:17:16 +00:00
mashazyu 7d46706cf2 Allows to enter note in the future 2020-03-30 18:34:26 +02:00
bl00dymarie f987628ced Update CONTRIBUTING.md 2020-03-28 19:06:07 +00:00
bl00dymarie 052b9bd2aa Update CHANGELOG.md 2020-03-28 19:04:21 +00:00
Maria Zadnepryanets c7740c7c57 Merge branch 'chart-navigation-bug' into 'master'
Chart navigation bug fix.

See merge request bloodyhealth/drip!287
2020-03-28 17:03:41 +00:00
mashazyu 5ec5d02b8d Chart navigation bug fix. 2020-03-28 17:17:21 +01:00
Maria Zadnepryanets 075813c314 Merge branch 'fix-clear-command' into 'master'
Change clear to lowercase to make it case sensitive and executable

See merge request bloodyhealth/drip!286
2020-03-28 16:11:35 +00:00
emelko 098c0e69a5 Change clear to lowercase to make it case sensitive and executable 2020-03-28 17:09:01 +01:00
Cathrin Senst 02db9c1722 fix 306 by setting other-note empty as contraception method 'other' is deactivated 2020-03-28 14:21:34 +01:00
Sofiya Tepikin 297c1cf3d5 Merge branch '183-show-no-temperature-when-not-tracked' into 'master'
Resolve "don't show temperature chart part of chart when temp not tracked"

Closes #183

See merge request bloodyhealth/drip!257
2020-03-28 13:03:51 +00:00
Maria Zadnepryanets ee0b83d1ca Resolve "don't show temperature chart part of chart when temp not tracked" 2020-03-28 13:03:51 +00:00
bl00dymarie 620f5e77da Merge branch '414-bug-darker-color-in-dots-for-sex-and-desire-on-chart-is-missing' into 'master'
Bring in different shades for desire dots on chart

Closes #414

See merge request bloodyhealth/drip!265
2020-03-27 16:15:22 +00:00
emelko 268ec56c88 Bring in different shades for desire dots on chart 2020-03-26 23:30:50 +01:00
Maria Zadnepryanets 9235a57fd7 Merge branch 'cycle-module-tests-split' into 'master'
Splits the rest of the tests without modifying them

See merge request bloodyhealth/drip!274
2020-03-14 14:07:40 +00:00
Sofiya Tepikin c1959962d0 Splits the rest of the tests without modifying them 2020-03-14 14:46:35 +01:00
Maria Zadnepryanets 06edde5340 Merge branch 'get-cycles-before-test' into 'master'
Moves out the test for getCyclesBefore method of cycle module

See merge request bloodyhealth/drip!273
2020-03-14 13:17:30 +00:00
Sofiya Tepikin 5b2dc82218 Moves out the test for getCyclesBefore method of cycle module 2020-03-14 13:17:30 +00:00
Maria Zadnepryanets 9b4da9bd19 Merge branch 'get-previous-cycle-test' into 'master'
Moves out the test for getPReviousCycle method of cycle module

See merge request bloodyhealth/drip!272
2020-03-14 11:40:04 +00:00
Sofiya Tepikin 64a4c8c455 Moves out the test for getPReviousCycle method of cycle module 2020-03-14 11:40:04 +00:00
Sofiya Tepikin 95068e92c4 Merge branch 'lint-rule-react-prop-types-addition' into 'master'
Lint rule react prop types addition

See merge request bloodyhealth/drip!270
2020-03-11 20:19:45 +00:00
Maria Zadnepryanets 47379d7a1e Lint rule react prop types addition 2020-03-11 20:19:45 +00:00
Maria Zadnepryanets 3dbcb41d67 Merge branch 'fix-get-cycle-by-start-day' into 'master'
Adds test and fixes getCycleByStartDate method of cycle module

See merge request bloodyhealth/drip!269
2020-03-11 18:42:04 +00:00
Sofiya Tepikin 8444d466db Merge branch 'eslint-cleanup' into 'master'
Cleans up the eslint rules

See merge request bloodyhealth/drip!271
2020-03-07 09:41:46 +00:00
Sofiya Tepikin f9d2838008 Cleans up the eslint rules 2020-03-05 21:20:59 +01:00
Sofiya Tepikin 9e34c1b8b4 Adds test and fixes getCycleByStartDate method of cycle module 2020-03-05 19:31:52 +01:00
Maria Zadnepryanets e901cae0f5 Merge branch 'get-cycle-day-number-test' into 'master'
Moves out the tests for getCycleDayNumber and organises them

See merge request bloodyhealth/drip!268
2020-03-04 20:53:55 +00:00
Maria Zadnepryanets 21c5ac72a6 Merge branch 'symptom-views-clean-up' into 'master'
Symptom views clean up

See merge request bloodyhealth/drip!267
2020-03-04 20:52:41 +00:00
Sofiya Tepikin 0e0e00948f Moves out the tests for getCycleDayNumber and organises them 2020-03-03 22:13:53 +01:00
Sofiya Tepikin 407bc2e524 Adds propTypes definition 2020-03-03 21:39:14 +01:00
Sofiya Tepikin aab64a433f Gets rid of a top level prop passed down through a tree of components 2020-03-03 21:39:14 +01:00
Sofiya Tepikin 346d7e6dad Cleanups symptom view 2020-03-03 21:39:14 +01:00
Sofiya Tepikin 12b8e5c213 Removes unnecessary prop and defines the missing propTypes 2020-03-03 21:39:14 +01:00
Sofiya Tepikin 9ce7dbf6b6 Merge branch 'home-split' into 'master'
Home split

See merge request bloodyhealth/drip!266
2020-03-02 20:51:04 +00:00
Sofiya Tepikin a9333bd848 Adds propTypes definition 2020-02-29 12:59:17 +01:00
Sofiya Tepikin ec907ab23c Gets rid of the redundant state on Home 2020-02-29 12:55:58 +01:00
Sofiya Tepikin d5b1944988 Moves out home helpers from the component 2020-02-29 12:09:38 +01:00
Sofiya Tepikin 0a86f38472 Moves out HomeElement component 2020-02-29 12:09:38 +01:00
Sofiya Tepikin 49fedcc634 Moves out IconText component 2020-02-29 12:09:38 +01:00
Sofiya Tepikin af562e329c Merge branch 'fix-cycle-day-prop' into 'master'
Fix cycle day prop

See merge request bloodyhealth/drip!264
2020-02-29 11:07:57 +00:00
Julia Friesel 6badd97f2c Update .eslintrc 2020-02-29 07:22:01 +00:00
Sofiya Tepikin 1c0c2276de Resets the date in store for today date when navigating home 2020-02-26 21:11:56 +01:00
Sofiya Tepikin f789a7990f Sets initial value of date in the store 2020-02-26 21:11:56 +01:00
Sofiya Tepikin aa2165590b Removes redundant state and corrects the cycle day prop 2020-02-26 21:11:56 +01:00
Julia Friesel 17815fcefe Merge branch 'use-updated-sympto' into 'master'
Use updated sympto

Closes #409

See merge request bloodyhealth/drip!253
2020-02-25 06:28:57 +00:00
Julia Friesel b42cbc8826 Use new published sympto 2020-02-25 07:26:43 +01:00
Julia Friesel 76101eec74 Merge branch 'navigation-state' into 'master'
Navigation state

See merge request bloodyhealth/drip!247
2020-02-17 13:39:34 +00:00
Julia Friesel 9fbc3e7e2a Merge branch 'no-multi-space' into 'master'
Adds linter rule for no multi spaces

See merge request bloodyhealth/drip!263
2020-02-17 13:05:44 +00:00
Sofiya Tepikin e88f26dc16 Fixes missing navigation state on exiting the app 2020-02-16 16:26:37 +01:00
Sofiya Tepikin d054187485 Adds linter rule for no multi spaces 2020-02-16 12:37:19 +01:00
Julia Friesel 856f6216ee Add e2e test device config for Nexus 5 2020-02-11 09:36:31 +01:00
Sofiya Tepikin c7f0c1cb6f Merge branch 'ios-integration' into 'master'
Ios integration

See merge request bloodyhealth/drip!258
2020-02-09 12:09:46 +00:00
Sofiya Tepikin c7882eb619 Merge branch 'fix-linter-warning' into 'master'
Fix linter warning

See merge request bloodyhealth/drip!261
2020-02-07 13:35:28 +00:00
Julia Friesel 28356d6664 Merge branch '413-bug-cycle-start-not-detected-if-day-before-period-excluded' into 'master'
Resolve "Bug: cycle start not detected if day before period excluded"

Closes #413

See merge request bloodyhealth/drip!259
2020-02-07 13:29:34 +00:00
Sofiya Tepikin 882f183c8e Removes linter complaint about react version not being specified 2020-02-07 14:16:21 +01:00
Sofiya Tepikin 7b69719e22 Removes linter warning 2020-02-07 14:16:07 +01:00
Julia Friesel 62df30de8a De-duplicate line 2020-02-07 09:53:11 +01:00
Sofiya Tepikin 8cad357e60 Fixes navigation logic 2020-02-05 19:50:40 +01:00
Sofiya Tepikin 026a9c17c3 Add go back functionality 2020-02-04 20:45:23 +01:00
Sofiya Tepikin e66ca3f8db Adds navigation tree to define the hierarchy 2020-02-04 20:45:23 +01:00
Sofiya Tepikin e479b93638 Moves navigation to the state 2020-02-04 20:45:23 +01:00
Sofiya Tepikin f444de0b87 Removes the lowercasing to the header title component 2020-02-04 20:45:23 +01:00
Julia Friesel ae0d909407 Remove now superfluous check for bleeding symptom 2020-02-04 12:18:24 +01:00
Julia Friesel 963e0ffea0 Add remaining tests for maybeSetNewCycleStart 2020-02-04 12:11:23 +01:00
Julia Friesel 009c8fa0f2 Add test for deleted bleeding value 2020-02-04 11:51:35 +01:00
Julia Friesel 7b8292ab6a Extract maybeSetNewCycleStart into own module 2020-02-04 11:51:07 +01:00
Julia Friesel 446c5d4600 Set new cycle start when bleeding value excluded 2020-02-03 11:04:20 +01:00
Sofiya Tepikin 1c7856081e Changes the name of the main component 2020-02-02 21:37:58 +01:00
Sofiya Tepikin cb13222780 Makes drip work on iOS 2020-02-02 21:09:36 +01:00
Sofiya Tepikin e52736f8a1 Adds a handy script to clear builds/cache/etc 2020-02-02 20:15:42 +01:00
Julia Friesel 580f1e79ba Merge branch '410-mucus-max-value-not-showing' into 'master'
Fix bug - not showing maximum value of mucus in chart

Closes #410

See merge request bloodyhealth/drip!256
2019-11-25 15:00:35 +00:00
mashazyu 45ee67e4d8 Fix bug - not showing maximum value of mucus in chart 2019-11-22 16:15:45 +01:00
Julia Friesel 51c96b5b37 Merge branch 'chart-refactoring-part-2' into 'master'
Chart refactoring part 2

See merge request bloodyhealth/drip!255
2019-11-22 12:00:49 +00:00
mashazyu 2ecb2e7647 Move calculations functions to helpers file 2019-11-21 22:23:56 +01:00
mashazyu c24284a57d Move YAxis & HorizontalGrid components in a common conditional expression 2019-11-21 22:21:47 +01:00
mashazyu 36ae949f31 Move auxiliary functions from day-column.js component file to helpers file 2019-11-21 22:01:13 +01:00
mashazyu 796d995aad Move Surface element to TemperatureColumn component 2019-11-21 21:57:09 +01:00
mashazyu 767a2c9709 Introduces CycleDayLabel component 2019-11-21 21:54:29 +01:00
mashazyu fe1ec38b68 Introduces TemperatureColumn component 2019-11-21 21:41:01 +01:00
mashazyu 71e4c6d11e Introduces ChartLine component 2019-11-21 21:09:48 +01:00
Julia Friesel 765916e7fe Merge branch 'chart-refactoring-part-1' into 'master'
Chart refactoring part 1

See merge request bloodyhealth/drip!254
2019-11-18 14:18:10 +00:00
mashazyu 03a235d8cb Formatting fix 2019-11-17 20:39:00 +01:00
mashazyu 0adbf3436b Introduces SymptomCell component 2019-11-17 20:38:29 +01:00
mashazyu 09129adba3 Introduces HorizontalGrid component 2019-11-17 19:57:47 +01:00
mashazyu ed66395318 Moves out chart (data modelling) helpers to a separate file 2019-11-17 19:47:25 +01:00
mashazyu bc04f6a24b Introduces Tick & TickList components 2019-11-17 19:37:19 +01:00
mashazyu 3598dd5b80 Introduces ChartLegend component 2019-11-17 17:46:21 +01:00
mashazyu 270b823c20 Introduces SymptomIcon component 2019-11-17 17:28:02 +01:00
mashazyu 34a0e15e66 Rafactors symptom color definition 2019-11-17 17:15:56 +01:00
mashazyu 02ca733147 Introduces YAxis component 2019-11-17 16:54:33 +01:00
Julia Friesel f00010e1ca Merge branch '368-display-incomplete-mucus-and-cervix' into 'master'
make graph display for incomplete mucus and cervix values

Closes #368

See merge request bloodyhealth/drip!245
2019-11-15 17:52:27 +00:00
Julia Friesel 1d8350c468 Use updated sympto 2019-11-15 18:24:54 +01:00
Sofiya Tepikin e14bd690dc Fixes typo, and removes a redundant line 2019-11-15 17:52:12 +01:00
mashazyu 7514b01cf4 Naming update: isFertile>isClosedAndHard, getSymptomColorIndex>symptomColorMethods; update of symptom index retrieval for the sake of readibility 2019-11-15 17:37:17 +01:00
mashazyu f376602843 Naming update, change switch to object, fertility logic review 2019-11-15 17:37:17 +01:00
mashazyu 889e0e36d7 make graph display for incomplete mucus and cervix values 2019-11-15 17:37:17 +01:00
Julia Friesel 5d3950ca5c Merge branch 'update-to-0.59.10' into 'master'
Update to 0.59.10 - or all to avoid updating the README :D

See merge request bloodyhealth/drip!250
2019-11-15 16:20:11 +00:00
Sofiya Tepikin 3d53af8012 Fixes some warnings on build 2019-11-14 17:39:31 +01:00
Sofiya Tepikin 6175738fec Updates the RN version to 0.59.10 2019-11-14 17:15:36 +01:00
Julia Friesel 71c5a0b51b Re-add missing build script 2019-11-10 10:43:53 +01:00
Sofiya Tepikin 23ba5115d2 Updates the RN version to 0.59 2019-11-08 20:00:05 +01:00
Julia Friesel 3dd235f8d9 Move metadata directory to root of project. So fdroid can find it. 2019-09-22 19:26:14 +02:00
Sofiya Tepikin 1c25ad3046 Merge branch 'header-refactoring' into 'master'
Refactors the header

See merge request bloodyhealth/drip!246
2019-09-15 13:02:08 +00:00
Sofiya Tepikin 48d519d557 Cleans the console.log 2019-09-15 14:50:37 +02:00
Sofiya Tepikin e0091497e4 Adds test for data deletion 2019-09-15 13:52:29 +02:00
Sofiya Tepikin 5d436630d3 Refactors the header 2019-09-15 13:52:29 +02:00
Sofiya Tepikin 20595c6c3a Merge branch 'composition-instead-inheritance' into 'master'
Replaces the inheritance with composition pattern in the Symptom view

See merge request bloodyhealth/drip!241
2019-09-14 17:36:41 +00:00
Sofiya Tepikin 8ce840306a Replaces the inheritance with composition pattern in the Symptom view 2019-09-13 10:32:09 +02:00
Maria Zadnepryanets c74c5d372c Merge branch 'data-input-e2e-test' into 'master'
Adds e2e symptom data input tests and necessary testIDs to the existing components

See merge request bloodyhealth/drip!244
2019-09-02 16:39:35 +00:00
mashazyu c0235d148b Adds e2e symptom data input tests and necessary testIDs to the existing components 2019-09-02 18:04:57 +02:00
Sofiya Tepikin 85b5b4d387 Merge branch 'simplify-temperature-view' into 'master'
Simplifies the temperature edit view

See merge request bloodyhealth/drip!243
2019-09-01 15:51:18 +00:00
Sofiya Tepikin 2f25c5cffe Splits the temperature view to simplify it 2019-09-01 15:04:16 +02:00
Maria Zadnepryanets 3f7b58b04c Update README.md 2019-08-27 08:56:39 +00:00
Maria Zadnepryanets e9fd961913 Update README.md 2019-08-27 08:55:29 +00:00
Sofiya Tepikin c3a2eea3a5 Merge branch 'hotfix-cycleday-data' into 'master'
Fixes the cycle day data is not being passed to the symptom view

See merge request bloodyhealth/drip!242
2019-08-24 14:58:21 +00:00
Sofiya Tepikin 525defa1c9 Fixes the cycle day data is not being passed to the symptom view 2019-08-22 21:03:11 +02:00
Sofiya Tepikin 16cc2cef5c Merge branch 'redux-on-detox' into 'master'
Redux

See merge request bloodyhealth/drip!238
2019-08-21 19:54:17 +00:00
Sofiya Tepikin 29a076e5a2 Fixes the date not being set on changing cycle day, and adds a test for this case 2019-08-21 21:35:18 +02:00
Sofiya Tepikin c226923759 Starts using redux store for storing the date 2019-08-21 21:34:17 +02:00
Sofiya Tepikin 216a9044cd Redux initial setup 2019-08-21 21:28:54 +02:00
bl00dymarie 2d1ab273a0 Merge branch '403-add-how-to-e2e-test-to-readme' into 'master'
Adds e2e test setup to README

Closes #403

See merge request bloodyhealth/drip!239
2019-08-17 14:29:00 +00:00
emelko a7d6cdc8cc Implements review feedback 2019-08-13 12:13:29 +09:00
Sofiya Tepikin e2270ea1e2 Merge branch 'simplify-cycle-day-overview' into 'master'
Splits <CycleDayOverView /> to smaller components, to simplify it

See merge request bloodyhealth/drip!240
2019-08-12 19:02:33 +00:00
Sofiya Tepikin d2d5d2f41f Splits <CycleDayOverView /> to smaller components, to simplify it 2019-08-09 21:33:26 +02:00
Sofiya Tepikin 8a528d5529 Merge branch 'detox' into 'master'
Introducing detox - the tool for e2e testing

See merge request bloodyhealth/drip!237
2019-08-08 18:44:25 +00:00
emelko 82cf26334f Adds e2e test setup to README 2019-08-06 19:03:11 +02:00
Sofiya Tepikin 917bd8f7c4 Adding more tests 2019-07-31 12:56:47 +02:00
Sofiya Tepikin 48778c1959 Adds initial tests 2019-07-21 21:16:59 +02:00
Sofiya Tepikin 7e807dba7f Introducing detox 2019-07-21 16:17:16 +02:00
Julia Friesel 888be9531d Move app store metadata for here from fdroiddata repo 2019-07-15 09:31:59 +02:00
Julia Friesel 2539918d0c Merge branch '334-check-for-min-android-version-to-use-drip-with' into 'master'
Resolve "Check for min Android version to use drip with"

Closes #334

See merge request bloodyhealth/drip!235
2019-06-28 05:38:34 +00:00
Julia Friesel a9e84b9255 Set minSdk to Marshmallow (earlier versions don't work) 2019-06-26 11:00:29 +02:00
Julia Friesel 5b2cd1c8f4 Merge branch '390-bug-temperature-timestamp-can-be-deleted' into 'master'
Only show timestamp when it has a value

Closes #390

See merge request bloodyhealth/drip!234
2019-06-25 18:17:42 +00:00
Julia Friesel 6628543141 Only show timestamp when it has a value 2019-06-23 11:46:20 +02:00
Julia Friesel 6065470b2f Merge branch 'reopening-after-back-fix' into 'master'
Fixes reopenning after back button

Closes #388

See merge request bloodyhealth/drip!231
2019-06-19 07:54:47 +00:00
Sofiya Tepikin e4209e28b7 Refactors App wrapper component 2019-06-19 00:02:58 +02:00
Sofiya Tepikin fa20e84bfe Fixes reopenning after back button 2019-06-18 23:53:17 +02:00
Sofiya Tepikin a152b497fb Merge branch '391-bug-home-screen-not-centered' into 'master'
Resolve "bug: home screen not centered"

Closes #391

See merge request bloodyhealth/drip!232
2019-06-18 21:48:18 +00:00
Julia Friesel c11b80d7fa Make home screen centered 2019-06-17 06:38:55 +02:00
Julia Friesel b21938fdd8 Add release wizard 2019-06-14 17:52:08 +02:00
Julia Friesel c7f1a029a3 Update nodejs-mobile to fix security issue 2019-06-08 09:07:48 +02:00
Julia Friesel e8b0d60fdd release: 0.1905.29-beta 2019-05-29 13:30:46 +02:00
bl00dymarie 5e32f4d7dc Merge branch 'Bugfix-password-crash' into 'master'
Makes sure style is an array for it to spread

See merge request bloodyhealth/drip!230
2019-05-29 10:58:07 +00:00
emelko 8008c8e2cc Makes sure style is an array for it to spread 2019-05-29 12:25:00 +02:00
Julia Friesel 2cc5ffb50f Run gradle clean before assembleRelease 2019-05-29 08:16:09 +02:00
emelko e7949377a2 release: 0.1905.28-beta 2019-05-28 16:06:56 +02:00
bl00dymarie 592f2b3e16 Merge branch '386-bug-fertility-text-is-missing-on-homescreen' into 'master'
Make sure fertility text is displayed on home screen

Closes #386

See merge request bloodyhealth/drip!228
2019-05-28 08:17:12 +00:00
Julia Friesel 7506e911f7 Merge branch '377-put-donation-button-in-app' into 'master'
Resolve "put donation button in app"

Closes #377

See merge request bloodyhealth/drip!229
2019-05-28 08:08:50 +00:00
emelko 09bbfe8a7d Displays all the text for Home Elements;
Shortens margin btw Home Elements;
Adds missing "visit" to text
2019-05-28 09:38:34 +02:00
Julia Friesel bb1bd949c3 Add donation section to about 2019-05-28 09:03:43 +02:00
bl00dymarie 406b71250e Merge branch '384-bug-header-title-in-settings-moves-up' into 'master'
Gets rid of hidden icon in back button header

Closes #384

See merge request bloodyhealth/drip!227
2019-05-28 06:39:59 +00:00
bl00dymarie 6228cd8953 Merge branch 'Space-between-info-icon-and-text' into 'master'
Make uniform info icon and leave some space

See merge request bloodyhealth/drip!223
2019-05-28 06:38:14 +00:00
bl00dymarie 2623fedec9 Merge branch '382-bug-cervical-mucus-title-broken-on-symptom-view' into 'master'
Changes fontSize of titles in SymptomBoxes;

Closes #382

See merge request bloodyhealth/drip!226
2019-05-28 06:37:44 +00:00
bl00dymarie bfdad895ce Merge branch '375-change-description-of-mucus-and-cervix-on-cycle-day-overview' into 'master'
Adds more descriptive mucus and cervix labels for cycle day overview

Closes #375

See merge request bloodyhealth/drip!221
2019-05-28 06:36:35 +00:00
emelko dce8138e12 Gets rid of hidden icon in back button header 2019-05-27 23:42:37 +02:00
emelko 7864ebfc41 Adds subcategories of cevix and mucus as labels 2019-05-27 22:42:23 +02:00
emelko 442bcc5cee Adds subcategory names to the selected options 2019-05-27 17:49:39 +02:00
emelko e8aac6d41e Changes fontSize of titles in SymptomBoxes;makes sure it stays in 1 line 2019-05-27 16:51:38 +02:00
Julia Friesel 2bbe737101 Fix delete button 2019-05-26 19:27:55 +02:00
Julia Friesel 8856b3f1bc Merge branch '381-real-autosave' into 'master'
Resolve "real autosave"

Closes #381

See merge request bloodyhealth/drip!225
2019-05-26 12:23:16 +00:00
emelko aadc36f45c Get rid of extra styling for non functional info icon 2019-05-26 13:04:20 +02:00
Julia Friesel 6c56b6f83c Clean up 2019-05-26 12:47:22 +02:00
Julia Friesel 018ec3bcda Add autosave for temperate 2019-05-26 09:04:51 +02:00
Julia Friesel bc358bd9ed Auto save whenever symptom view updates 2019-05-26 07:39:15 +02:00
Julia Friesel f8eef66810 Merge branch '359-delete-data-bug-fix' into 'master'
Resolve "Bug: Settings > Manage your data > Delete app data"

Closes #359

See merge request bloodyhealth/drip!224
2019-05-26 04:08:54 +00:00
bl00dymarie ac2bad1de0 Merge branch '376-consider-rename-mucus-into-cervical-mucus' into 'master'
Specifying mucus as cervical mucus

Closes #376

See merge request bloodyhealth/drip!222
2019-05-25 21:38:47 +00:00
mashazyu 6cbfcb9d64 Fixes delete data bug 2019-05-25 17:45:02 +02:00
emelko 39df9c2ec0 Make uniform info icon and leave some space 2019-05-25 12:37:14 +02:00
emelko 138f1d28b3 Align droplet text on homescreen 2019-05-25 12:08:42 +02:00
bl00dymarie e2abc4dbeb Merge branch 'marie-move-info-button-out-of-header-to-body' into 'master'
Move info button out of header to body

See merge request bloodyhealth/drip!217
2019-05-25 09:35:31 +00:00
Julia Friesel 0cfc85933c Make info modal only as big as it needs to be 2019-05-25 09:17:39 +02:00
Julia Friesel c6fd5e6db2 Make sure info icon is always well pressable 2019-05-25 07:09:36 +02:00
emelko 8e57febf9e Specifying mucus as cervical mucus 2019-05-24 22:50:40 +02:00
bl00dymarie ed38a5b450 Merge branch '362-rearrange-home-screen-elements' into 'master'
Resolve "Rearrange home screen elements"

Closes #362

See merge request bloodyhealth/drip!220
2019-05-24 10:28:33 +00:00
Julia Friesel 16b3199892 Make sure drop text is always positioned correctly 2019-05-24 11:23:12 +02:00
emelko d13a776970 Position icon text for droplet 2019-05-23 22:07:46 +02:00
emelko 418b9c0f5d Styling for homescreen elements to breathe 2019-05-23 17:23:36 +02:00
Julia Friesel c35f333daa Merge branch 'import-alert-buttons-order' into 'master'
Changes order of buttons in the import alert

Closes #372

See merge request bloodyhealth/drip!219
2019-05-22 15:40:40 +00:00
Julia Friesel 668acb4afe simple way to rearrange home screen 2019-05-22 17:30:53 +02:00
emelko ac0690ec9f Set show more on homescreen to default and get rid of more/less switch 2019-05-22 17:27:31 +02:00
Julia Friesel cef2e850d7 Don't render delete icon, instead of just setting it invisible 2019-05-21 17:32:51 +02:00
Julia Friesel 4b469f2f49 Make isDeleteIconActive more readable 2019-05-21 17:08:26 +02:00
Julia Friesel b0b2e8ceb5 Merge branch '365-show-incomplete-symptom-in-day-view' into 'master'
Resolve "show incomplete symptom in day view"

Closes #365

See merge request bloodyhealth/drip!218
2019-05-21 14:22:04 +00:00
Julia Friesel 82a9bf0a0f Update README.md 2019-05-21 14:20:45 +00:00
Sofiya Tepikin 417083b0c1 Changes order of buttons in the import alert 2019-05-20 17:16:05 +02:00
Julia Friesel 25ed0d168e Remove formatting improvements that clutter up the diff 2019-05-20 15:17:27 +02:00
Julia Friesel d7b599d03b Fix cervix value display on overview 2019-05-20 06:44:34 +02:00
Julia Friesel 3f52cae04b Fix mucus value display on overview 2019-05-20 06:32:58 +02:00
Julia Friesel 59c3636139 Don't show delete icon just because symptom info is open 2019-05-20 06:08:46 +02:00
Julia Friesel 472d793627 Clean up markup 2019-05-19 19:00:05 +02:00
Julia Friesel 43b98ed9a5 Merge branch '364-delete-or-clear-button-that-is-visible-as-soon-as-any-value-is-selected-saved' into 'master'
Resolve "delete or clear button that is visible as soon as any value is selected/saved"

Closes #364

See merge request bloodyhealth/drip!216
2019-05-19 16:52:02 +00:00
Julia Friesel 69d2517dd2 Use own modal instead of alert for symptom info 2019-05-19 18:44:12 +02:00
Julia Friesel 0f6567e66b Merge branch '345-move-info-button-out-of-header-to-body' into marie-move-info-button-out-of-header-to-body 2019-05-19 17:53:14 +02:00
emelko c81f7d6291 Gets rid of trailing spaces 2019-05-19 13:09:21 +02:00
emelko e9c18add5e Gets rid of old info symptom screen 2019-05-19 12:57:07 +02:00
emelko 4071c30b8b [WIP] Adds info button to body as alert for:
* mood, pain, temperature
2019-05-19 12:56:52 +02:00
emelko ff1afcb8dc Adds info button to the body as alert 2019-05-19 12:56:08 +02:00
Julia Friesel d2c0891a68 Try out moving it to body 2019-05-18 06:40:36 +02:00
Julia Friesel a557733d30 For temperature, only show delete button when certain fields active 2019-05-17 16:47:31 +02:00
Julia Friesel 0f7ab6c803 Let symptom views overwrite isDeleteIconActive method 2019-05-17 16:09:49 +02:00
Julia Friesel b7088c44f2 Show or hide delete button based on entered data 2019-05-17 12:07:54 +02:00
Julia Friesel 00294ff6f6 Remove unused style 2019-05-17 11:54:50 +02:00
Julia Friesel 1d61675ef7 Ask before deleting entry 2019-05-17 11:01:50 +02:00
Julia Friesel 6a8d22f9f0 Change icon to trash can 2019-05-17 10:56:36 +02:00
emelko 6811b5a692 Replace info icon in header with delete 2019-05-16 16:10:17 +02:00
Julia Friesel 9ff37e2874 Merge branch '371-bug-back-navigation-doesn-t-wait-for-temperature-range-warning' into 'master'
Await alert result before navigating back

Closes #371 and #373

See merge request bloodyhealth/drip!215
2019-05-14 17:29:15 +00:00
Julia Friesel f022fb6b8a Await alert result before navigating back 2019-05-14 13:37:35 +02:00
Julia Friesel 37564621e0 Merge branch '363-alert-for-cervix-and-mucus-when-trying-to-navigate-away-and-one-value-is-missing' into 'master'
Basic auto save

Closes #363

See merge request bloodyhealth/drip!214
2019-05-13 18:56:40 +00:00
Julia Friesel 5057e1a38e Address MR change requests 2019-05-13 20:41:57 +02:00
Julia Friesel e781919434 Reset inadvertently changed file 2019-05-13 20:34:13 +02:00
Julia Friesel 3715e0c4d2 Filter incomplete mucus values in sympto adapter 2019-05-13 20:30:25 +02:00
Julia Friesel 3ff996e946 Don't crash on missing temperature value 2019-05-13 19:07:46 +02:00
Julia Friesel 6011bd9208 Fix linter problems 2019-05-13 12:55:28 +02:00
Julia Friesel d1e16abe34 Make header back arrow function for auto save 2019-05-13 12:55:28 +02:00
Julia Friesel bc13f5c1e6 Remove action button footer from symptom views 2019-05-13 12:55:28 +02:00
Julia Friesel ecf3ebf16d When nothing entered, delete entry 2019-05-13 12:55:28 +02:00
Julia Friesel 08fd3afc34 Add symptom view component with back button listener 2019-05-13 12:55:28 +02:00
Julia Friesel 2528c03315 Remove save button from footer 2019-05-13 12:55:28 +02:00
Julia Friesel d322e557a3 Remove unused line 2019-05-13 12:55:28 +02:00
Julia Friesel 9fd17d769e Make saving incomplete value possible 2019-05-13 12:55:28 +02:00
Julia Friesel ca68186351 Filter out incomplete cervix value days in sympto adapter 2019-05-13 12:49:37 +02:00
Julia Friesel 8d6f5d637b Update sympto 2019-05-13 12:49:37 +02:00
Julia Friesel c6790fe271 Add migration making mucus and cervix values optional 2019-05-13 12:49:37 +02:00
Julia Friesel 6402370eaf Don't compute nfp mucus value when data missing 2019-05-13 12:49:37 +02:00
Julia Friesel f1ca709f25 Add test for missing mucus vaues 2019-05-13 12:49:37 +02:00
tina 51160b033b Merge branch 'remove_default_permissions' into 'master'
excludes internet and system alert window from default permission

Closes #337

See merge request bloodyhealth/drip!212
2019-05-11 10:35:06 +00:00
tina c4884f8f8f excludes internet and system alert window from default permission 2019-05-10 13:28:59 +02:00
tina 647567abd2 Merge branch '250-check-vertical-line-width-in-chart' into 'master'
Fix line width in chart

Closes #250

See merge request bloodyhealth/drip!205
2019-05-10 11:19:09 +00:00
bl00dymarie f123dbf730 Merge branch '342-bleeding-prediction-on-homescreen' into 'master'
Resolve "Bleeding prediction on homescreen"

Closes #342

See merge request bloodyhealth/drip!202
2019-05-10 11:15:57 +00:00
emelko bc0d36ed54 Adds comment for bleeding prediction ranges 2019-05-10 13:11:36 +02:00
tina 745f874ccf Merge branch 'action_button_as_buttons' into 'master'
makes the action button footer more like buttons

Closes #318

See merge request bloodyhealth/drip!208
2019-05-10 11:02:33 +00:00
emelko ea36d4ec7a Change if statement with conditional operator 2019-05-10 12:59:11 +02:00
Julia Friesel bb5623a621 Merge branch '355-make-update-version-script' into 'master'
Resolve "make release script"

Closes #355

See merge request bloodyhealth/drip!209
2019-05-10 10:38:06 +00:00
tina cf6c601c47 changes action buttons color to teal, rounded corners for buttons in settings 2019-05-10 12:11:09 +02:00
Julia Friesel 8efe906e87 Filter release commits from changelog 2019-05-06 12:21:28 +02:00
Julia Friesel 3924c04e56 Add update-changelog script 2019-05-06 12:21:21 +02:00
Julia Friesel a9401d4a0f Remove square brackets from CHANGELOG. They are parsed as links 2019-05-06 12:21:09 +02:00
Julia Friesel 53ec882e53 Add commit-release and npm scripts 2019-05-06 12:21:09 +02:00
Julia Friesel 7387db4a69 Add update version script from manyverse 2019-05-06 12:21:01 +02:00
Julia Friesel 9ef84f9b31 Update RN to 58 2019-05-06 10:39:48 +02:00
Julia Friesel f9c928d45c Update eslint 2019-05-06 09:59:22 +02:00
Julia Friesel 70860860d5 Merge branch '238-loading-screen-for-data-import' into 'master'
Add loading screen for data import

Closes #238

See merge request bloodyhealth/drip!206
2019-05-06 06:44:54 +00:00
Julia Friesel 6a98b28427 Remove superfluous try/catch 2019-05-06 08:42:43 +02:00
Julia Friesel 9ee7819462 Rename methods 2019-05-06 08:37:26 +02:00
Julia Friesel 5a320e148c Merge branch '348-password-screen' into 'master'
Removes logo and adds header on the main login screen

Closes #348

See merge request bloodyhealth/drip!211
2019-05-03 17:51:47 +00:00
Julia Friesel 767aa23841 Merge branch 'app-page-rendering-update' into 'master'
Improves readability of app page rendering

See merge request bloodyhealth/drip!210
2019-05-03 17:49:00 +00:00
mashazyu 227aa69677 Add loading screen to data import 2019-05-02 18:53:44 +02:00
mashazyu 722c372f2d Fix line width in chart 2019-05-02 14:03:30 +02:00
tina 92e02c48dc Merge branch '347-maxlength-in-temp-input' into 'master'
adds maxLength to temperature input field

Closes #347

See merge request bloodyhealth/drip!207
2019-05-01 16:46:18 +00:00
Sofiya Tepikin 3449746ead Improves readability of app page rendering 2019-05-01 11:26:50 +02:00
Julia Friesel ee52f75927 Update README.md 2019-05-01 05:30:10 +00:00
tina 9c8cc8de2e makes the action button footer more like buttons 2019-05-01 00:04:38 +02:00
tina ea279338e0 adds maxLength to temperature input field 2019-04-30 23:24:44 +02:00
mashazyu f15dc75908 Removes logo and adds header on the main login screen 2019-04-30 20:23:09 +02:00
Julia Friesel c00684ebbb Adjust version name 2019-04-29 13:47:58 +02:00
Julia Friesel d0f4ae5109 Don't build for x86 2019-04-29 12:00:57 +02:00
Julia Friesel 187fbef207 Upgrade nodejs-mobile-rn to latest 2019-04-29 10:28:47 +02:00
Julia Friesel 4c655b13c3 Merge branch 'master' of gitlab.com:bloodyhealth/drip 2019-04-29 08:48:10 +02:00
Julia Friesel 2276b37741 Remove unneeded maven repo and upgrade gradle to 4.10 2019-04-29 08:47:58 +02:00
bl00dymarie 7c5d0b9ae2 Merge branch '344-lowercase-for-symptom-values' into 'master'
Lowercase values for sex, pain and mood

Closes #344

See merge request bloodyhealth/drip!204
2019-04-25 10:14:11 +00:00
emelko b8b2d3d2bf Lowercase values for sex, pain and mood 2019-04-25 11:48:03 +02:00
emelko 3ec4d2218e Adds getTime function for bleedingPredictions reuse; minor style formatting 2019-04-25 11:41:41 +02:00
emelko dc5b34546a Renames function to say what it 'does' 2019-04-25 11:01:33 +02:00
emelko 6577038f22 Rename to predictedBleeding 2019-04-25 10:58:04 +02:00
emelko 93abaf99be Nicer formatting for past bleeding prediction 2019-04-24 12:53:04 +02:00
emelko dd24e6058f Fixes prediction range in drop on homescreen 2019-04-23 20:44:59 +02:00
bl00dymarie ded3a79bbc Merge branch 'temperature-screen-improvement' into 'master'
temperature screen styling update

See merge request bloodyhealth/drip!196
2019-04-23 17:19:49 +00:00
bl00dymarie ab0970e33f Merge branch 'Remove-excessive-permissions' into 'master'
Removes permissions not required for debug or production

See merge request bloodyhealth/drip!201
2019-04-23 17:09:27 +00:00
bl00dymarie 49d5d77a82 Merge branch 'new-tag' into 'master'
0.0.3

See merge request bloodyhealth/drip!200
2019-04-23 06:55:52 +00:00
emelko 0cf8820e94 Removes permissions not required for debug or production 2019-04-22 16:43:13 +02:00
emelko 1ef3585cdc 0.0.3 2019-04-17 16:35:33 +02:00
bl00dymarie 25ff6ca01f Update CHANGELOG.md 2019-04-17 14:33:02 +00:00
mashazyu c22bff5948 temperature screen styling update 2019-04-14 22:43:57 +02:00
363 changed files with 19999 additions and 19036 deletions
-3
View File
@@ -1,3 +0,0 @@
{
"presets": ["module:metro-react-native-babel-preset"],
}
+2
View File
@@ -0,0 +1,2 @@
BUNDLE_PATH: "vendor/bundle"
BUNDLE_FORCE_RUBY_PLATFORM: 1
-61
View File
@@ -1,61 +0,0 @@
{
"env": {
"node": true,
"mocha": true,
"es6": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"parser": "babel-eslint",
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018
},
"plugins": [
"react"
],
"rules": {
"quotemark": false,
"ordered-imports": false,
"no-var-requires": false,
"indent": [
"error",
2
],
"no-console": 0,
"eofline": false,
"no-unused-variable": true,
"no-unused-expression": true,
"only-arrow-functions": false,
"space-before-function-paren": 0,
"trailing-comma": [
true,
"never"
],
"object-literal-sort-keys": false,
"semi": [
"warn",
"never"
],
"space-infix-ops": [
"warn"
],
"no-var": "error",
"prefer-const": "error",
"no-trailing-spaces": "error",
"react/prop-types": 0,
"max-len": [
1,
{
"ignoreStrings": true,
"ignoreComments": true,
"ignoreTemplateLiterals": true
}
]
}
}
+33
View File
@@ -0,0 +1,33 @@
module.exports = {
root: true,
extends: ['eslint:recommended', 'plugin:react/recommended'],
env: {
node: true,
jest: true,
es6: true,
},
parser: '@babel/eslint-parser',
parserOptions: {
requireConfigFile: false,
babelOptions: {
presets: ['@babel/preset-react'],
},
sourceType: 'module',
ecmaFeatures: {
jsx: true,
},
ecmaVersion: 2018,
},
plugins: ['react'],
settings: {
react: {
version: require('./package.json').dependencies.react,
},
},
rules: {
'no-console': ['error', { allow: ['warn', 'error'] }],
'no-var': 'error',
'prefer-const': 'error',
'react/prop-types': 2,
},
}
+16 -6
View File
@@ -2,6 +2,9 @@
# #
.DS_Store .DS_Store
# VSCode
.vscode/
# Xcode # Xcode
# #
build/ build/
@@ -20,7 +23,7 @@ DerivedData
*.hmap *.hmap
*.ipa *.ipa
*.xcuserstate *.xcuserstate
project.xcworkspace ios/Index/DataStore
# Android/IntelliJ # Android/IntelliJ
# #
@@ -29,17 +32,18 @@ build/
.gradle .gradle
local.properties local.properties
*.iml *.iml
*.hprof
# node.js # node.js
# #
node_modules/ node_modules/
npm-debug.log npm-debug.log
yarn-error.log
# BUCK # BUCK
buck-out/ buck-out/
\.buckd/ \.buckd/
*.keystore *.keystore
!debug.keystore
# fastlane # fastlane
# #
@@ -55,6 +59,9 @@ buck-out/
# Bundle artifact # Bundle artifact
*.jsbundle *.jsbundle
# CocoaPods
/ios/Pods/
# RN android release # RN android release
android/app/bin/ android/app/bin/
android/app/release/ android/app/release/
@@ -62,7 +69,10 @@ android/app/src/main/assets/index.android.bundle
android/.project android/.project
android/app/.project android/app/.project
# nodejs-mobile creates these with every npm install ios/Podfile.lock
nodejs-assets/nodejs-project/sample-* android/app/src/main/res/drawable-*
nodejs-assets/build-native-modules-MacOS-helper-script-node.sh android/app/src/main/assets/*
nodejs-assets/build-native-modules-MacOS-helper-script-npm.sh
# yarn
.yarn/*
yarn-error.log
+30 -4
View File
@@ -1,12 +1,38 @@
image: node:8 image: node:14
# This folder is cached between builds # This folder is cached between builds
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache # http://docs.gitlab.com/ce/ci/yaml/README.html#cache
cache: cache:
paths: paths:
- node_modules/ - node_modules/
test_async: test_async:
script: script:
- npm install - npm install npm@7.0.1 -g
- npm test - npm test
variables:
DEPENDABOT_IMAGE: docker.io/andrcuns/dependabot-gitlab:0.23.0
.dependabot-gitlab:
image:
name: $DEPENDABOT_IMAGE
entrypoint: ['']
variables:
GIT_STRATEGY: none
RAILS_ENV: production
SECRET_KEY_BASE: key
PACKAGE_MANAGER: npm
SETTINGS__GITLAB_URL: $CI_SERVER_URL
SETTINGS__STANDALONE: 'true'
SETTINGS__LOG_COLOR: 'true'
script:
- cd /home/dependabot/app
- bundle exec rake "dependabot:update[$PROJECT_PATH,$PACKAGE_MANAGER,$DIRECTORY]"
dependabot:
extends: .dependabot-gitlab
rules:
- if: $DEPENDENCY_UPDATES_DISABLED
when: never
- if: '$CI_PIPELINE_SOURCE == "schedule" && $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/'
+17
View File
@@ -0,0 +1,17 @@
# Configuration taken from this article:
# https://paperless.blog/dependabot-on-gitlab
version: 2
updates:
- package-ecosystem: npm
directory: /
schedule:
interval: daily
open-pull-requests-limit: 3
ignore:
- dependency-name: '*'
update-types: ['version-update:semver-patch']
- dependency-name: 'realm'
- dependency-name: 'react'
- dependency-name: 'react-native'
- dependency-name: 'react-native-push-notifications'
- dependency-name: '@babel/core'
+26
View File
@@ -0,0 +1,26 @@
## oh no a bug 🐛
### Description what has happened
Short overview how the bug manifests.
### which OS + version is your device
- [ ] Android _number_
- [ ] iOS _number_
### which drip version number are you using
_On your phone go to ➞ menu on the top right ➞ about, scroll to the very bottom and find the version number_
### how did it happen
_what triggered the bug/behavior, always/sometimes, is it reproducible(how)?_
### describe how it looks or add screenshot
feel free to attach a file 📎
### any idea to solve it
💡
+22
View File
@@ -0,0 +1,22 @@
## This has to be done 🪠
### Description what has to be done
Short overview
### is it urgent? ⏳
- [ ] Yes
- [ ] No
- [ ] something in between
_Explain the urgency if possible, e.g. is it a security vulnerability for potentially everyone?_
### which OS
- [ ] Android
- [ ] iOS
### what shall be the ideal outcome 🎆
_You can e.g. specify here the version number for a library update_
@@ -0,0 +1,19 @@
## Yeah a feature idea 🧩
### what should this feature do or solve? 🪄
Please give a short overview so as many people as possible would be able to understand.
### what is particularly important to the people who would use this feature?
Do you have certain user groups in mind?
### Any idea where it shall be placed in the app?
### is it connected with or dependent on some other feature?
### any idea how it shall look (sketch?)
feel free to attach a file 📎
### what could be difficulties (with other components) 🪆
@@ -0,0 +1,30 @@
## Why this change?
## Description
I have tested this MR:
- [ ] tested this PR on iOS simulator/physical device,
- [ ] tested this PR on Android simulator/physical device,
- [ ] ran e2e tests.
A few sentences describing the overall goals of the pull request's commits.
## Steps to Test or Reproduce
Outline the steps to test or reproduce the MR here.
## Reviewing
Here's what I am looking for feedback on in particular:
- additional testing on specific type of the devices,
- feedback on specific part of the code,
- etc.
## In addition:
- Screenshots
- Links to the additional info
- Migrations
- Follow-up tickets
+4
View File
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
npx pretty-quick --staged
+1
View File
@@ -0,0 +1 @@
engine-strict=true
+1
View File
@@ -0,0 +1 @@
v14.19.3
+4
View File
@@ -0,0 +1,4 @@
module.exports = {
singleQuote: true,
semi: false,
}
+1
View File
@@ -0,0 +1 @@
2.7.4
+445 -6
View File
@@ -1,24 +1,463 @@
# Changelog # Changelog
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## v1.2401.17 iOS
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [0.0.2] - 2019-04-16
## Second updated beta release version
### Changes ### Changes
- Updating React Native to 0.68.3
- Minor changes in temperature chart
### Adds
- Temperature scale slider
- out of range warning messages for temperature values
### Fixed
- Order of import buttons
## v1.2312.11 iOS
### Changes
- Chart: Improved readability
- Finer temperature lines and dots
- Enlarge screen space for temperature chart
- A very light grey background color for weekend days on the whole chart screen
- Homescreen: date displayed in new format
- Minor changes in "about" section
See more under v1.2311.14 Android
### Adds
- Stats: Show period details, including cycle start, cycle length and amount of days with bleeding
- Stats: Explainer text for standard deviation
- App asks for permissions for notifications right at the start, which allows you to set reminders (this is a new requirement for Android 13)
## v1.2311.14 Android
### Changes
- Make the app compatible with Android 13
- Update Android's targetSdkVersion to 33
- Update buildToolsVersion to 33.0.2
- Update Android Gradle plugin to 7.0.3
- Update Gradle to 7.3.3
- Update kotlinVersion to 1.3.40
- Chart: Improved readability
- Finer temperature lines and dots
- Enlarge screen space for temperature chart
- A very light grey background color for weekend days on the whole chart screen
- Reminders:
- Use new fork of react-native-push-notification: <https://github.com/github:bl00dymarie/react-native-push-notification> without google services
- Adding channels after breaking changes in react-native-push-notification
- Homescreen: date displayed in new format
- Minor changes in "about" section
- Updated dependencies:
- moment ^2.29.4,
- prop-types ^15.8.1,
- react v17.0.2,
- react-native v0.67.4,
- react-native-calendars ^1.1287.0,
- react-native-document-picker ^8.1.1,
- react-native-fs ^2.20.0,
- react-native-modal-datetime-picker v14.0.0,
- react-native-share ^7.9.0,
- react-native-vector-icons ^9.2.0,
- realm ^10.16.0,
- sympto v3.0.1
### Adds
- Stats: Show period details, including cycle start, cycle length and amount of days with bleeding
- Stats: Explainer text for standard deviation
- Settings: Privacy Policy
- App asks for permissions for notifications right at the start, which allows you to set reminders (this is a new requirement for Android 13)
- Buttons can now be displayed as row
- Added dependencies:
- @js-joda/core ^5.3.0,
- @react-native-async-storage/async-storage ^1.17.9,
- @react-native-community/art ^1.2.0,
- @react-native-community/datetimepicker ^6.3.1,
- @react-native-community/push-notification-ios ^1.11.0,
- i18next ^22.0.2,
- react-i18next ^12.0.0,
- jshashes ^1.0.8,
- react-native-permissions ^3.10.0,
- react-native-push-notification: github:bl00dymarie/react-native-push-notification,
- react-native-simple-toast ^1.1.3,
- react-native-size-matters ^0.4.0,
### Fixed
- Password: Disable setting empty passwords
- After updating the password the app will do a full restart
- Chart: Grid for symptoms
- Chart: Horizontal lines in temperature chart
### Unreleased
- Partially implemented translations with react-i18next
## v1.2208.11 iOS
### Adds
- first iOS Release
### Unreleased
- Temperature scale slider
- Warning message for out of scope temperature values
## v1.2102.28 Android
### Changes
- Temperature range is now between 35 - 39°C and its default values are now set to 35.5 - 37.5°C
### Fixed
- Blocks invalid input of temperature value
- Error message for incorrect password on login screen
- Phase text on home screen for last fertile day
- Styling improvements
## v1.2101.9 Android
### Adds
- Introduces complete redesign of all sections of the app
- Adds new font
- Adds Lisa as condriputor
- Adds updated text about credits.
- Adds missing notification icon
- Adds padding between keyboard and text input
- Adds limit line length on text of symptom box
### Changes
- Updates createVersion tag for production releases
- Better wording for prediction text
- Changes the icon
- Changes font color of marked calendar days
- Updates styling of Stats page
- Updates settings menu styling
- Increases hitSlop of menu icon and navigation arrows
- Sets calendar pastScrollRange to 10 years
- Introduces RN Alert component styling update
- Introduces PasswordPrompt component redesign
- Updates button activity definition when entering new password
- Forbids landscape orientation for app
- Updates README.md
- Updates sdk 28 -> 29 and migrate to androidx
### Fixed
- Fixed drip typo
- Fixed the date label on chart from breaking
- Fixed chart dots and lines
- Fixed error on highes/lowest scale values
- Fixed extra horizontal grid line on chart
- Fixed error occurring when navigating back from settings section
- Fixed redirect to TemperatureEditView from reminder
- Fixed ordinal number suffix on chart date labels
- Fixed bug when .8 and .3 labels are not shown in chart
- Fixed react-native-vector-icon
- Fixed AppLoadingView component centering
## v0.2007-12.beta Android
### Adds
- Allows chart not to show temperature part, when temperature is not tracked and corresponding refactoring
- Detox support for e2e testing and addition of the e2e tests
- 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
### Changes
- Updates of chart shades for bleeding
- Eslint rule cleanup and addition of new rules (checks for PropTypes definition for React components, multi spaces)
- sympto library upgrade to version 2.2.0
- Preparation for support of drip on iOS devices
- Updates representation of the incomplete mucus and cervix values on chart
- React Native update to 0.59.10
- Refactors of header, cycle day overview, temperature edit view pages
- Setting minimum SDK version to 23 to allow using drip on earlier versions of Android
### Fixed
- 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 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
- Fixed delete button bug on symptom edit page
- Fixed of home screen centering
### Security
- Updates of node.js to fix security issue
## v0.2005.3-beta Android
- Adds arm64-v8a and x86_64 for supporting 64-bit architecture
- Adds Mariya & Sofiya as contributors &lt;3
- Fixed the error on app exiting on via the device back button
- Updates README.md
- Allows to enter note in the future
- Chart navigation bug fix.
- Changes clear to lowercase to make it case sensitive and executable
- fix 306 by setting other-note empty as contraception method 'other' is deactivated
- Don't show temperature chart part of chart when temp not tracked
- Bring in different shades for desire dots on chart
- Splits the rest of the tests without modifying them
- Moves out the test for getCyclesBefore method of cycle module
- Moves out the test for getPReviousCycle method of cycle module
- Lint rule react prop types addition
- Adds test and fixes getCycleByStartDate method of cycle module
- Moves out the tests for getCycleDayNumber and organises them
- Adds propTypes definition
- Gets rid of a top level prop passed down through a tree of components
- Cleanups symptom view
- Removes unnecessary prop and defines the missing propTypes
- Adds propTypes definition
- Gets rid of the redundant state on Home
- Moves out home helpers from the component
- Moves out HomeElement component
- Moves out IconText component
- Resets the date in store for today date when navigating home
- Sets initial value of date in the store
- Removes redundant state and corrects the cycle day prop
- Use new published sympto
- Fixed missing navigation state on exiting the app
- Adds e2e test device config for Nexus 5
- De-duplicate line
- Fixed navigation logic
- Adds go back functionality
- Adds navigation tree to define the hierarchy
- Moves navigation to the state
- Removes the lowercasing to the header title component
- Remove now superfluous check for bleeding symptom
- Adds remaining tests for maybeSetNewCycleStart
- Adds test for deleted bleeding value
- Extract maybeSetNewCycleStart into own module
- Set new cycle start when bleeding value excluded
- Changes the name of the main component
- Makes drip work on iOS
- Adds a handy script to clear builds/cache/etc
- Fixed bug - not showing maximum value of mucus in chart
- Moves calculations functions to helpers file
- Moves YAxis & HorizontalGrid components in a common conditional expression
- Moves auxiliary functions from day-column.js component file to helpers file
- Moves Surface element to TemperatureColumn component
- Introduces CycleDayLabel component
- Introduces TemperatureColumn component
- Introduces ChartLine component
- Formatting fix
- Introduces SymptomCell component
- Introduces HorizontalGrid component
- Moves out chart (data modelling) helpers to a separate file
- Introduces Tick & TickList components
- Introduces ChartLegend component
- Introduces SymptomIcon component
- Rafactors symptom color definition
- Introduces YAxis component
- Use updated sympto
- Fixed typo, and removes a redundant line
- Naming update: isFertile>isClosedAndHard, getSymptomColorIndex>symptomColorMethods; update of symptom index retrieval for the sake of readibility
- Naming update, change switch to object, fertility logic review
- make graph display for incomplete mucus and cervix values
- Fixed some warnings on build
- Updates the RN version to 0.59.10
- Re-add missing build script
- Updates the RN version to 0.59
- Moves metadata directory to root of project. So fdroid can find it.
- Cleans the console.log
- Adds test for data deletion
- Refactors the header
- Replaces the inheritance with composition pattern in the Symptom view
- Adds e2e symptom data input tests and necessary testIDs to the existing components
- Splits the temperature view to simplify it
- Updates README.md
- Fixed the cycle day data is not being passed to the symptom view
- Fixed the date not being set on changing cycle day, and adds a test for this case
- Starts using redux store for storing the date
- Redux initial setup
- Implements review feedback
- Splits &lt;CycleDayOverView /> to smaller components, to simplify it
- Adds e2e test setup to README
- Adding more tests
- Adds initial tests
- Introduces detox
- Moves app store metadata for here from fdroiddata repo
- Set minSdk to Marshmallow (earlier versions don't work)
- Only show timestamp when it has a value
- Refactors App wrapper component
- Fixed reopenning after back button
- Make home screen centered
- Adds release wizard
- Updates nodejs-mobile to fix security issue
## v0.1905.29-beta Android
### Changes
- Auto save functionality for all symptoms
- Adds donation section to about
- Clearer labels on cycle day overview
- Rename mucus to cervical mucus
- Set show more on homescreen to default and get rid of more/less switch
- Adds loading screen to data import
- Removes logo and adds header on the main login screen
- Nicer formatting for past bleeding prediction
- Removes permissions not required for debug or production
- Temperature screen styling update
### Fixed
- Styling
- Line width in chart
- Prediction range in drop on homescreen
## v0.1905.28-beta Android
- Displays all the text for Home Elements; Shortens margin btw Home Elements; Adds missing "visit" to text
- Adds donation section to about
- Gets rid of hidden icon in back button header
- Adds subcategories of cevix and mucus as labels
- Adds subcategory names to the selected options
- Changes fontSize of titles in SymptomBoxes;makes sure it stays in 1 line
- Fixed delete button
- Get rid of extra styling for non functional info icon
- Clean up
- Adds autosave for temperate
- Auto save whenever symptom view updates
- Fixed delete data bug
- Make uniform info icon and leave some space
- Align droplet text on homescreen
- Make info modal only as big as it needs to be
- Make sure info icon is always well pressable
- Specifying mucus as cervical mucus
- Make sure drop text is always positioned correctly
- Position icon text for droplet
- Styling for homescreen elements to breathe
- simple way to rearrange home screen
- Set show more on homescreen to default and get rid of more/less switch
- Don't render delete icon, instead of just setting it invisible
- Make isDeleteIconActive more readable
- Updates README.md
- Changes order of buttons in the import alert
- Remove formatting improvements that clutter up the diff
- Fixed cervix value display on overview
- Fixed mucus value display on overview
- Don't show delete icon just because symptom info is open
- Clean up markup
- Use own modal instead of alert for symptom info
- Gets rid of trailing spaces
- Gets rid of old info symptom screen
- \[WIP] Adds info button to body as alert for: \* mood, pain, temperature
- Adds info button to the body as alert
- Try out moving it to body
- For temperature, only show delete button when certain fields active
- Let symptom views overwrite isDeleteIconActive method
- Show or hide delete button based on entered data
- Remove unused style
- Ask before deleting entry
- Changes icon to trash can
- Replace info icon in header with delete
- Await alert result before navigating back
- Address MR change requests
- Reset inadvertently changed file
- Filter incomplete mucus values in sympto adapter
- Don't crash on missing temperature value
- Make header back arrow function for auto save
- Remove action button footer from symptom views
- When nothing entered, delete entry
- Adds symptom view component with back button listener
- Remove save button from footer
- Remove unused line
- Make saving incomplete value possible
- Filter out incomplete cervix value days in sympto adapter
- Updates sympto
- Adds migration making mucus and cervix values optional
- Don't compute nfp mucus value when data missing
- Adds test for missing mucus vaues
- excludes internet and system alert window from default permission
- Adds comment for bleeding prediction ranges
- Changes if statement with conditional operator
- changes action buttons color to teal, rounded corners for buttons in settings
- Fixed line width in chart
- makes the action button footer more like buttons
- Adds getTime function for bleedingPredictions reuse; minor style formatting
- Renames function to say what it 'does'
- Rename to predictedBleeding
- Nicer formatting for past bleeding prediction
- Fixed prediction range in drop on homescreen
## v0.1905.10-beta Android
- Filter release commits from changelog
- Adds update-changelog script
- Remove square brackets from CHANGELOG. They are parsed as links
- Adds commit-release and npm scripts
- Adds update version script from manyverse
- Updates RN to 58
- Remove superfluous try/catch
- Rename methods
- Adds loading screen to data import
- Improves readability of app page rendering
- Updates README.md
- adds maxLength to temperature input field
- Removes logo and adds header on the main login screen
- Adjust version name
- Don't build for x86
- Upgrade nodejs-mobile-rn to latest
- Remove unneeded maven repo and upgrade gradle to 4.10
- Lowercase values for sex, pain and mood
- Removes permissions not required for debug or production
- Adds proptypes to DeletePassword, ChangePassword and ConfirmWithPassword components
- Delete password button bug fix
- temperature screen styling update
## v0.0.3 - 2019-04-17 Android
### Changes
- Removes Google services from notification library and use fork of react-native-push-notification: <https://github.com/github:jfr3000/react-native-push-notification>
### Fixed
- Button functionality in settings for password
## v0.0.2 - 2019-04-09 Android
## Second updated beta release version Android
### Changes
- First day of the week in calendar is now Monday instead of Sunday - First day of the week in calendar is now Monday instead of Sunday
- Minor styling consistency - Minor styling consistency
### Fixed ### Fixed
- Typos - Typos
- Bleeding value is visible in shortcut from Homescreen - Bleeding value is visible in shortcut from Homescreen
- Delete button for sex, pain and mood - Delete button for sex, pain and mood
- Dates on chart - Dates on chart
## [0.0.1] - 2019-02-15 ## v0.0.1 - 2019-02-15 Android
## First beta release version
## First beta release version Android
### Added (list of core functionality) ### Added (list of core functionality)
- you can track your menstrual bleeding - you can track your menstrual bleeding
- you can track symptoms related to natural family planning (nfp), i.e. basal temperature and mucus or cervix - you can track symptoms related to natural family planning (nfp), i.e. basal temperature and mucus or cervix
- you can use nfp symptoms for fertility awareness (drip implements the sympto-thermal method) - you can use nfp symptoms for fertility awareness (drip implements the sympto-thermal method)
+26 -27
View File
@@ -1,58 +1,57 @@
# Contributing to drip aka CONDRIBUTING # 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 ## Table Of Contents
[TL;DR](#tl-dr) [TL;DR](#tldr)
[What should I know before I get started?](#what-should-i-know-before-i-get-started) [What should I know before I get started?](#what-should-i-know-before-i-get-started)
[How can I condribute?](#how-can-i-condribute) [How can I condripute?](#how-can-i-condripute)
[Thank you](#thank-you) [Thank you](#thank-you)
## TL;DR ## TL;DR
You just want to say hello? Send us a [nice email](mailto:bl00dyhealth@mailbox.org?Subject=Nice%20incoming%20mail) :postbox: or tweet :bird: at us [@bl00dyhealth](https://twitter.com/bl00dyhealth). You just want to say hello? Send us a [nice email](mailto:drip@mailbox.org?Subject=Nice%20incoming%20mail) :postbox:, toot :mammoth: [@dripapp@mastodon.social](https://mastodon.social/@dripapp) or tweet :bird: at us [@dripberlin](https://twitter.com/dripberlin).
## What should I know before I get started? ## What should I know before I get started?
We have prepared something for **you**: check out our [README](https://gitlab.com/bloodyhealth/drip/blob/master/README.md) for more information on how to set up and install everything you'll need. We have prepared something for **you**: check out our [README](https://gitlab.com/bloodyhealth/drip/blob/main/README.md) for more information on how to set up and install everything you'll need.
[Ping us](mailto:bl00dyhealth@mailbox.org) if you could need some help :helmet\_with\_cross: ! [Ping us](mailto:drip@mailbox.org) if you could need some help :helmet_with_cross: !
Let us know if you want to suggest improvements for the README and open a merge request (which is just like Github's pull request) 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 condribute? ## How can I condripute?
### Your First Code Condribution We are an open source project and we highly appreciate contributions. At the same time please keep some things in mind: :heart:
We are fans of labels, at least for our issues. You can find a list of `newbie` issues [here](https://gitlab.com/bloodyhealth/drip/issues?label_name%5B%5D=Newbie). - The drip maintainers are usually around 2-3 people and are responsible for everything from developing new features to answering press inquiries or fixing bugs. Most of this work is done unpaid. (If you write a nice email your chances to get an answer are much higher than if you behave like a tech bro.)
If you decide to work on an issue, please click on `Create branch` based on that issue. You can find this as a dropdown option right under `Create merge request`. - We have a plan for the direction in which drip should evolve. This means that even if it isn't always transparent on gitlab, we have a list of features that we are building and more importantly, which bugs need to be fixed and which dependencies need to be updated.
This allows us to keep track of the issues that are related to an existing branch and tells everyone "somebody is working on it". - drips core values are:
- 🔮 open source
- 🩸 feminist and gender inclusive
- 🔒 secure: data entered stays with that person/on their device
- 🔬 science based: we implemented the symptothermal method
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. 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.
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 would like to make a sustainable contribution to the project, we would be happy to join the game.
### Reporting Bugs ### Reporting Bugs or Making Suggestions
You found a bug :bug:? Please feel free to investigate and save logs for more specific details. If you found a bug or have suggestions, please :one: first review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure the bug/suggestion is unknown; :two: after that, take time to investigate and write a detailed issue report. Best you use our [templates for bug /chore/ feature](https://gitlab.com/bloodyhealth/drip/-/tree/main/.gitlab/issue_templates) (you can choose when creating a new issue) in gitlab or send us an email to our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with a description text taken from the body of your email. Please attach screenshots or other helpful things.
Before creating a new issue, please review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure the bug is unknown. You are invited to describe the bug in all its details e.g. in what context/settings has it occurred? ### Your First Condripution
To send us a new issue you can also use our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with a description text taken from the body of your email. - If you want to contribute to drip's code or translation, please get in touch with us. We can tell you if someone is already working on something similar, if your idea does (not) match drip's core values, etc. Of course, you can always create a drip version for your private use with anything you want, but please don't expect us to review and merge code that has not been discussed before.
- If you want to open a merge request, yeah :tada: exciting! We are using a template for merge requests to make sure we explain what we have done and why.
- Keep in mind that people who will review your merge request are more motivated to do so when the merge request is well explained and ideally not too big.
### Suggesting Enhancements
Do you have suggestions for enhancing the app or for cleaning up some code? Fantastic!
Before creating a new issue, please review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure nobody else had the same idea before you! You are then invited to open a new issue with a somewhat extensive description, you can use emojis or GIFs if it helps :)!
To send us a new issue you can also use our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with the title taken from the subject line and the description text for the issue taken from the body of your email.
### Thank you ### Thank you
![](https://media.giphy.com/media/kPA88elN9kYco/giphy.gif) ![](https://media.giphy.com/media/kPA88elN9kYco/giphy.gif)
Thank you for condributing to open source, thank you for condributing to drip! 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:
+4
View File
@@ -0,0 +1,4 @@
source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '2.7.4'
gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+181 -56
View File
@@ -1,106 +1,231 @@
# drip, the open-source cycle tracking app # drip, the open-source cycle tracking app
A menstrual cycle tracking app that's open-source and leaves your data on your phone. Use it to track your menstrual cycle and/or for fertility awareness! A menstrual cycle tracking app that's open-source and leaves your data on your phone. Use it to track your menstrual cycle and/or for fertility awareness!
Find more information on [our website](https://bloodyhealth.gitlab.io/). Find more information on [our website](https://dripapp.org/).
The app is build in React Native and currently developed for Android. [<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"
alt="Get it on F-Droid"
height="55">](https://dripapp.org/fdroid)
Here --> you will find our [contributing guide](https://gitlab.com/bloodyhealth/drip/blob/master/CONTRIBUTING.md). The app is built in React Native and developed for Android and iOS.
▶ [How to contribute to the project](https://gitlab.com/bloodyhealth/drip/blob/main/CONTRIBUTING.md)
▶ [How to release a new version](https://gitlab.com/bloodyhealth/drip/blob/main/RELEASE.md)
## Development setup ## Development setup
1. Install [Android Studio](https://developer.android.com/studio/) - you'll need it to install some dependencies. ### 1. Get this repository
1. Make sure you are running Node 8 (newer versions wont work). It's easiest to switch Node versions using `nvm`, heres how to do it: Clone it with SSH
``` git clone git@gitlab.com:bloodyhealth/drip.git
$ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
$ nvm install v8
```
1. Clone this repository: or clone it with HTTPS
``` git clone https://gitlab.com/bloodyhealth/drip.git
$ git clone git@gitlab.com:bloodyhealth/drip.git
$ cd drip
```
and run
```
$ npm install
```
1. 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. ### 2. Node & yarn version
1. 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. 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:
1. Open a terminal and run nvm install v14.19.3
```
$ npm run android
```
1. To see logging output, run the following command in another tab: use npm to install yarn:
```
$ npm run log
```
1. Run the following command and select enable hot reloading (see https://facebook.github.io/react-native/docs/debugging.html): npm install --global yarn
```
$ adb shell input keyevent 82
```
1. We recommend installing an [ESLint plugin in your editor](https://eslint.org/docs/user-guide/integrations#editors). There's an `.eslintrc` file in this project which will be used by the plugin to check your code for style errors and potential bugs. ## for Android
### 3.1 Android Studio
Install [Android Studio](https://developer.android.com/studio/) - you'll need it to install some dependencies.
### 3.2 More requirements from Android Studio
Open Android Studio. If the message "SDK location not found" appears when you try to start it, edit `.bashrc` in your home directory by adding:
export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
Check by typing in your terminal:
echo $ANDROID_SDK_ROOT
You should see the path of Sdk.
If you haven't installed [adb tools](https://developer.android.com/tools/adb) before, you will also have to do so and add to the .bashrc
PATH="$PATH:$HOME/Android/Sdk/platform-tools"
In Android Studio click on "Open an existing Android Studio project". Navigate to the drip repository you cloned and double click the android folder. It detects, downloads and cofigures requirements that might be missing, like the NDK and CMake to build the native code part of the project.
### 3.3 Run the app on Android
Either create and start a [virtual device in Android Studio](https://developer.android.com/studio/run/emulator) or [set your physical device like your Android phone up](https://developer.android.com/training/basics/firstapp/running-app) to run the app.
i. Open a terminal, navigate to the drip folder and run
yarn install
In a separate tab, that needs to keep running as long as you want to keep the app connected, run
yarn start
Also run in a new tab
yarn android
ii. To see logging output, run the following command in another tab:
yarn log
iii. If you had an older version of drip before and you are now trying to run a new drip version, clear cache by running
yarn clear
iv. Run the following command and select enable hot reloading (see https://facebook.github.io/react-native/docs/debugging.html):
adb shell input keyevent 82
iv. We recommend installing an [ESLint plugin in your editor](https://eslint.org/docs/user-guide/integrations#editors). There's an `.eslintrc` file in this project which will be used by the plugin to check your code for style errors and potential bugs.
## for iOS
### 4.1 Install Cocoapods
"CocoaPods manages library dependencies for your Xcode projects"
brew install cocoapods
### 4.2 Run app on iOS
Minimum system requirements to run iOS app are as follows:
- MacOS 10.15.7 for Mac users
- Xcode 13 (command line tools only might be enough)
i. Install XCode dependencies by running the following command from the root project directory:
cd ios && pod install && cd ..
ii. To run app either open drip workspace ('drip.xcworkspace' file) with XCode and run "Build" or run the following command:
yarn ios
iii. If you are building the app with XCode make sure you are running this as well:
yarn start
### Troubleshooting ### Troubleshooting
#### [MacOS] Java problems #### [MacOS] Java problems
Make sure that you have Java 1.8 by running `java -version`. Make sure that you have Java 1.8 by running `java -version`.
If you don't have Java installed, or your Java version is different, the app may not work. You can try just using Android Studio's Java by prepending it to your `$PATH` in your shell profile: If you don't have Java installed, or your Java version is different, the app may not work. You can try just using Android Studio's Java by prepending it to your `$PATH` in your shell profile:
`$ export PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin:${PATH}"`
```
$ export PATH="/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin:${PATH}"
```
Now, `which java` should output `/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin/java`, and the correct Java version should be used. Now, `which java` should output `/Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin/java`, and the correct Java version should be used.
#### [MacOS] Ninja #### [MacOS] Ninja
If `npm` says `CMake was unable to find a build program corresponding to "Ninja".`:
``` If `yarn` says `CMake was unable to find a build program corresponding to "Ninja".`:
$ brew install ninja
``` brew install ninja
### [MacOS] adb not on the path ### [MacOS] adb not on the path
If you get error messages about `adb` not being found on your path: If you get error messages about `adb` not being found on your path:
```
$ ln -s ~/Library/Android/sdk/platform-tools/adb /usr/local/bin/adb
```
### [Windows 10] react native problems ln -s ~/Library/Android/sdk/platform-tools/adb /usr/local/bin/adb
Unfortunately, the react native version we use doesn't work on Windows 10 it seems, find [more info here](https://github.com/facebook/react-native/issues/20015). ### Clearing project cache
If you would like to clear project cache and/or re-install project libraries, you can run clear script as follows:
yarn clear
Script accepts the following options:
"all" - script will delete all caches and re-install project libraries,
"ios" - script will delete ios-related cache
"android" - script will delete android-related cache
"cache" - script will purge Watchman, Metrobundler, Pachager and React caches
"npm" - script will reinstall project libraries.
For example, if you would like to clear android part of the project and re-install project libraries, you can run the following command:
yarn clear android npm
## Tests ## Tests
### Unit tests
You can run the tests with: You can run the tests with:
```
$ npm test yarn test
```
### End to end tests
1. Check what testing device is specified in [package.json](https://gitlab.com/bloodyhealth/drip/blob/main/package.json) under:
```
{"detox":
{"configurations":
{"name": "NEXUS_DEVICE_OR_WHATEVER_SPECIFIED_DEVICE"}
}
}
```
2. Check if the current device is already installed on your machine. Go to `cd ~/Android/sdk/emulator/` or wherever you have Android installed on your machine. Here you can run `./emulator -list-avds` and compare the devices with the one you found in step 1.
3. Open Android Studio and go to -> Tools -> AVD manager -> `+Create virtual device` and select the device checked in the previous step
4. Use the emulator on your machine to run it without heavy Android Studio, e.g. in `~/Android/Sdk/emulator` OR chose to run the emulator within Android Studio
4.1 Here run: `$ ./emulator -avd NEXUS_DEVICE_OR_WHATEVER_SPECIFIED_DEVICE`
4.2 You might need to specify the following environment variables in your zsh or bash file according to where you have it installed. You can find exact path in Android Studio (Android Studio Preferences → Appearance and Behavior → System Settings → Android SDK). After adding environment variables, you might need to restart your terminal or source the modified bash profile (i.e. "source ~/.bash_profile").
`export ANDROID_HOME="/home/myname/Android/Sdk" export ANDROID_SDK_ROOT="/home/myname/Android/Sdk" export ANDROID_AVD_HOME="/home/myname/.android/avd"`
5. For the first time you need to get the app on the phone or if you run into this error:
`'app-debug-androidTest.apk' could not be found`
--> open a new 2nd tab and run (in your drip folder): `cd android and ./gradlew assembleAndroidTest`
Otherwise just open a new 2nd tab to run (in your drip folder) `yarn android`
6. Open a new 3rd tab to run `./node_modules/.bin/detox test -c android.emu.debug`
Hopefully you see the magic happening clicking through the app and happy test results on your console :sun_with_face: !
### Manual testing
To ensure that core app functionality is working, we developed a [test protocol](https://gitlab.com/bloodyhealth/drip/-/snippets/2283405).
## Debugging ## Debugging
In order to see logging output from the app, run `npm run log` in a separate terminal. You can output specific code you want to see, with:
In order to see logging output from the app, run `yarn log` in a separate terminal. You can output specific code you want to see, with:
`console.log(theVariableIWantToSeeHere)` `console.log(theVariableIWantToSeeHere)`
or just a random string to check if this piece of code is actually running: or just a random string to check if this piece of code is actually running:
`console.log("HELLO")`. `console.log("HELLO")`.
## Known issues
### Android emulator
- Import/export to the local drive don't work.
- Email button on the Hamburger menu > About doesn't work - throws a yellow error message "Possible unhandled promise rejection...".
## NFP rules ## NFP rules
More information about how the app calculates fertility status and bleeding predictions in the [wiki on Gitlab](https://gitlab.com/bloodyhealth/drip/wikis/home)
More information about how the app calculates fertility status and bleeding predictions in the [wiki on Gitlab](https://gitlab.com/bloodyhealth/drip/wikis/home).
## Adding a new tracking icon ## Adding a new tracking icon
1. We use [fontello](http://fontello.com/) to create icon fonts for us. You need to upload the complete set of tracking icons (bleeding, mucus, ...) including the new icon you wish to add, all in SVG. 1. We use [fontello](http://fontello.com/) to create icon fonts for us. You need to upload the complete set of tracking icons (bleeding, cervical mucus, ...) including the new icon you wish to add, all in SVG.
2. Download webfont from fontello 2. Download webfont from fontello.
3. Copy both the content of `config.json` and `font.tff` into `assets/fonts`, replacing it with the current content of `config-drip-icon-font.json` and `drip-icon-font.tff`. 3. Copy both the content of `config.json` and `font.tff` into `assets/fonts`, replacing it with the current content of `config-drip-icon-font.json` and `drip-icon-font.tff`.
4. Now run the following command in your console: 4. Now run the following command in your console:
```
$ react-native link react-native link
```
5. You should be able to use the icon now within drip, e.g. in Cycle Day Overview and on the chart. 5. You should be able to use the icon now within drip, e.g. in Cycle Day Overview and on the chart.
+108
View File
@@ -0,0 +1,108 @@
# How to release a new app version for Android
_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._
# 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.
```
yarn release
```
The versionName and versionCode [are defined here](https://gitlab.com/bloodyhealth/drip/-/blob/5401789c46f4a02915ab900ef284581be420451c/android/app/build.gradle#L137-138) and in [package.json](https://gitlab.com/bloodyhealth/drip/-/blob/5401789c46f4a02915ab900ef284581be420451c/package.json#L3).
## Building in Android
APK versus AAB
> Android App Bundles (AAB) include all your apps compiled code and resources, but defer APK generation and signing to Google Play. Unlike an APK, you can't deploy an app bundle directly to a device. So, if you want to quickly test or share an APK with someone else, you should instead build an APK.
(https://developer.android.com/build/building-cmdline)
### APK
To build a release apk file, run the following command:
```
yarn build-android-apk-release
```
_which is a shortcut for:_ `cd android && ./gradlew clean && ./gradlew assembleRelease && cd ..`
This will create a new apk file named `app-release.apk` under `./android/app/build/outputs/apk/release/`.
For signing an apk you can run this command:
```
yarn sign-android-apk-release
```
_which is a shortcut for:_ `zipalign -v -p 4 ./android/app/build/outputs/apk/release/app-release.apk ./android/app/build/outputs/apk/release/app-release_signed.apk`
It adds a file name `app-release_signed.apk` in the same folder in `./android/app/build/outputs/apk/release/`
### AAB
To build a release aab file, run:
```
yarn build-android-aab-release
```
_which is a shortcut for:_ `cd android && ./gradlew clean && ./gradlew :app:bundleRelease && cd ..`
It creates a new aab file named `app-release.aab` under `./android/app/build/outputs/bundle/release`
For signing an aab you first need to configure the base modules build.gradle file with your apps 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
+101 -21
View File
@@ -15,9 +15,14 @@ import com.android.build.OutputFile
* // the name of the generated asset file containing your JS bundle * // the name of the generated asset file containing your JS bundle
* bundleAssetName: "index.android.bundle", * bundleAssetName: "index.android.bundle",
* *
* // the entry file for bundle generation * // the entry file for bundle generation. If none specified and
* // "index.android.js" exists, it will be used. Otherwise "index.js" is
* // default. Can be overridden with ENTRY_FILE environment variable.
* entryFile: "index.android.js", * entryFile: "index.android.js",
* *
* // https://reactnative.dev/docs/performance#enable-the-ram-format
* bundleCommand: "ram-bundle",
*
* // whether to bundle JS and assets in debug mode * // whether to bundle JS and assets in debug mode
* bundleInDebug: false, * bundleInDebug: false,
* *
@@ -73,7 +78,7 @@ import com.android.build.OutputFile
*/ */
project.ext.react = [ project.ext.react = [
entryFile: "index.js" enableHermes: false, // clean and rebuild if changing
] ]
apply from: "../../node_modules/react-native/react.gradle" apply from: "../../node_modules/react-native/react.gradle"
@@ -94,7 +99,34 @@ def enableSeparateBuildPerCPUArchitecture = false
*/ */
def enableProguardInReleaseBuilds = false def enableProguardInReleaseBuilds = false
/**
* The preferred build flavor of JavaScriptCore.
*
* For example, to use the international variant, you can use:
* `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
*
* The international variant includes ICU i18n library and necessary data
* allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
* give correct results when using with locales other than en-US. Note that
* this variant is about 6MiB larger per architecture than default.
*/
def jscFlavor = 'org.webkit:android-jsc:+'
/**
* Whether to enable the Hermes VM.
*
* This should be set on project.ext.react and that value will be read here. If it is not set
* on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
* and the benefits of using Hermes will therefore be sharply reduced.
*/
def enableHermes = project.ext.react.get("enableHermes", false);
/**
* Architectures to build native code for in debug.
*/
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
android { android {
ndkVersion rootProject.ext.ndkVersion
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion rootProject.ext.buildToolsVersion
@@ -102,13 +134,21 @@ android {
applicationId "com.drip" applicationId "com.drip"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1 versionCode 25
versionName "1.0" versionName "1.2311.14"
ndk { ndk {
abiFilters "armeabi-v7a", "x86" abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
} }
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
} }
signingConfigs { signingConfigs {
debug {
storeFile file('debug.keystore')
storePassword 'android'
keyAlias 'androiddebugkey'
keyPassword 'android'
}
release { release {
if (project.hasProperty('DRIP_RELEASE_STORE_FILE')) { if (project.hasProperty('DRIP_RELEASE_STORE_FILE')) {
storeFile file(DRIP_RELEASE_STORE_FILE) storeFile file(DRIP_RELEASE_STORE_FILE)
@@ -123,48 +163,88 @@ android {
reset() reset()
enable enableSeparateBuildPerCPUArchitecture enable enableSeparateBuildPerCPUArchitecture
universalApk false // If true, also generate a universal APK universalApk false // If true, also generate a universal APK
include "armeabi-v7a", "x86" include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
} }
} }
buildTypes { buildTypes {
debug {
signingConfig signingConfigs.debug
if (nativeArchitectures) {
ndk {
abiFilters nativeArchitectures.split(',')
}
}
}
release { release {
// Caution! In production, you need to generate your own keystore file.
// see https://reactnative.dev/docs/signed-apk-android.
signingConfig signingConfigs.debug
minifyEnabled enableProguardInReleaseBuilds minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
} }
packagingOptions {
pickFirst "lib/armeabi-v7a/libc++_shared.so"
pickFirst "lib/arm64-v8a/libc++_shared.so"
pickFirst "lib/x86/libc++_shared.so"
pickFirst "lib/x86_64/libc++_shared.so"
}
// applicationVariants are e.g. debug, release // applicationVariants are e.g. debug, release
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->
// For each separate APK per architecture, set a unique version code as described here: // For each separate APK per architecture, set a unique version code as described here:
// http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits // https://developer.android.com/studio/build/configure-apk-splits.html
def versionCodes = ["armeabi-v7a":1, "x86":2] // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
def abi = output.getFilter(OutputFile.ABI) def abi = output.getFilter(OutputFile.ABI)
if (abi != null) { // null for the universal-debug, universal-release variants if (abi != null) { // null for the universal-debug, universal-release variants
output.versionCodeOverride = output.versionCodeOverride =
versionCodes.get(abi) * 1048576 + defaultConfig.versionCode defaultConfig.versionCode * 1000 + versionCodes.get(abi)
} }
} }
} }
} }
dependencies { dependencies {
compile project(':nodejs-mobile-react-native') implementation fileTree(dir: "libs", include: ["*.jar"])
compile project(':react-native-restart') //noinspection GradleDynamicVersion
compile project(':react-native-push-notification') implementation "androidx.appcompat:appcompat:1.0.0"
compile project(':react-native-vector-icons') implementation "androidx.annotation:annotation:1.1.0"
compile project(':react-native-fs') implementation "androidx.work:work-runtime-ktx:2.7.1"
compile project(':react-native-document-picker') implementation "com.facebook.react:react-native:+" // From node_modules
compile project(':react-native-share') implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
compile project(':realm')
compile fileTree(dir: "libs", include: ["*.jar"]) debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}" exclude group:'com.facebook.fbjni'
compile "com.facebook.react:react-native:+" // From node_modules }
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
exclude group:'com.facebook.flipper'
exclude group:'com.squareup.okhttp3', module:'okhttp'
}
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
exclude group:'com.facebook.flipper'
}
if (enableHermes) {
def hermesPath = "../../node_modules/hermes-engine/android/";
debugImplementation files(hermesPath + "hermes-debug.aar")
releaseImplementation files(hermesPath + "hermes-release.aar")
} else {
implementation jscFlavor
}
androidTestImplementation('com.wix:detox:+') { transitive = true }
androidTestImplementation 'junit:junit:4.12'
} }
// Run this once to be able to run the application with BUCK // Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use // puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) { task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile from configurations.implementation
into 'libs' into 'libs'
} }
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
Binary file not shown.
@@ -0,0 +1,24 @@
package com.drip;
import com.wix.detox.Detox;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
@RunWith(AndroidJUnit4.class)
@LargeTest
public class DetoxTest {
@Rule
public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class, false, false);
@Test
public void runDetoxTests() {
Detox.runTests(mActivityRule);
}
}
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<application
android:usesCleartextTraffic="true"
tools:targetApi="28"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application>
</manifest>
@@ -0,0 +1,67 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates.
*
* <p>This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
*/
package com.rndiffapp;
import android.content.Context;
import com.facebook.flipper.android.AndroidFlipperClient;
import com.facebook.flipper.android.utils.FlipperUtils;
import com.facebook.flipper.core.FlipperClient;
import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
import com.facebook.flipper.plugins.inspector.DescriptorMapping;
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.network.NetworkingModule;
import okhttp3.OkHttpClient;
public class ReactNativeFlipper {
public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
if (FlipperUtils.shouldEnableFlipper(context)) {
final FlipperClient client = AndroidFlipperClient.getInstance(context);
client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
client.addPlugin(new ReactFlipperPlugin());
client.addPlugin(new DatabasesFlipperPlugin(context));
client.addPlugin(new SharedPreferencesFlipperPlugin(context));
client.addPlugin(CrashReporterPlugin.getInstance());
NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
NetworkingModule.setCustomClientBuilder(
new NetworkingModule.CustomClientBuilder() {
@Override
public void apply(OkHttpClient.Builder builder) {
builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
}
});
client.addPlugin(networkFlipperPlugin);
client.start();
// Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
// Hence we run if after all native modules have been initialized
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
if (reactContext == null) {
reactInstanceManager.addReactInstanceEventListener(
new ReactInstanceManager.ReactInstanceEventListener() {
@Override
public void onReactContextInitialized(ReactContext reactContext) {
reactInstanceManager.removeReactInstanceEventListener(this);
reactContext.runOnNativeModulesQueueThread(
new Runnable() {
@Override
public void run() {
client.addPlugin(new FrescoFlipperPlugin());
}
});
}
});
} else {
client.addPlugin(new FrescoFlipperPlugin());
}
}
}
}
+61 -39
View File
@@ -5,59 +5,81 @@
> >
<uses-permission android:name="android.permission.INTERNET" /> <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.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" />
<permission <permission
android:name="${applicationId}.permission.C2D_MESSAGE" android:name="${applicationId}.permission.C2D_MESSAGE"
android:protectionLevel="signature" /> android:protectionLevel="signature" />
<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<application <application
android:name=".MainApplication" android:name=".MainApplication"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher"
android:allowBackup="false"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize" android:icon="@mipmap/ic_launcher"
android:windowSoftInputMode="adjustResize"> android:roundIcon="@mipmap/ic_launcher_round"
<intent-filter> android:allowBackup="false"
<action android:name="android.intent.action.MAIN" /> android:theme="@style/AppTheme">
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter> <meta-data
</activity> android:name="com.dieam.reactnativepushnotification.notification_foreground"
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" /> android:value="false" />
<provider <meta-data
android:name="android.support.v4.content.FileProvider" android:name="com.dieam.reactnativepushnotification.notification_color"
android:resource="@color/purple" />
<meta-data
android:name="com.dieam.reactnativepushnotification.default_notification_channel_id"
android:value="..." />
<receiver
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions"
android:exported="false"
tools:ignore="MissingClass" />
<receiver
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher"
android:exported="false" />
<receiver
android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver"
android:exported="false" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.QUICKBOOT_POWERON" />
<action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
</intent-filter>
</receiver>
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustPan"
android:screenOrientation="sensorPortrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.drip.provider" android:authorities="com.drip.provider"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:exported="false"> android:exported="false" >
<meta-data <meta-data
tools:replace="android:resource" tools:replace="android:resource"
android:name="android.support.FILE_PROVIDER_PATHS" android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/filepaths" /> android:resource="@xml/filepaths" />
</provider> </provider>
<meta-data android:name="com.dieam.reactnativepushnotification.notification_channel_name"
android:value="drip-notification"/>
<meta-data android:name="com.dieam.reactnativepushnotification.notification_channel_description"
android:value="notifications from drip"/>
<!-- Change the resource name to your App's accent color - or any other color you want -->
<meta-data android:name="com.dieam.reactnativepushnotification.notification_color"
android:resource="@android:color/white"/>
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
<receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
</application> </application>
</manifest> </manifest>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 59 KiB

@@ -4,12 +4,12 @@ import com.facebook.react.ReactActivity;
public class MainActivity extends ReactActivity { public class MainActivity extends ReactActivity {
/** /**
* Returns the name of the main component registered from JavaScript. * Returns the name of the main component registered from JavaScript. This is used to schedule
* This is used to schedule rendering of the component. * rendering of the component.
*/ */
@Override @Override
protected String getMainComponentName() { protected String getMainComponentName() {
return "home"; return "drip";
} }
} }
@@ -1,53 +1,40 @@
package com.drip; package com.drip;
import android.app.Application; import android.app.Application;
import android.content.Context;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication; import com.facebook.react.ReactApplication;
import com.janeasystems.rn_nodejs_mobile.RNNodeJsMobilePackage; import com.facebook.react.ReactInstanceManager;
import com.avishayil.rnrestart.ReactNativeRestartPackage;
import com.dieam.reactnativepushnotification.ReactNativePushNotificationPackage;
import com.oblador.vectoricons.VectorIconsPackage;
import com.rnfs.RNFSPackage;
import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
import cl.json.RNSharePackage;
import cl.json.ShareApplication; import cl.json.ShareApplication;
import io.realm.react.RealmReactPackage;
import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage; import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class MainApplication extends Application implements ReactApplication, ShareApplication { public class MainApplication extends Application implements ReactApplication, ShareApplication {
private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) { private final ReactNativeHost mReactNativeHost =
@Override new ReactNativeHost(this) {
public boolean getUseDeveloperSupport() { @Override
return BuildConfig.DEBUG; public boolean getUseDeveloperSupport() {
} return BuildConfig.DEBUG;
}
@Override @Override
protected List<ReactPackage> getPackages() { protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList( @SuppressWarnings("UnnecessaryLocalVariable")
new MainReactPackage(), List<ReactPackage> packages = new PackageList(this).getPackages();
new RNNodeJsMobilePackage(), // Packages that cannot be autolinked yet can be added manually here, for example:
new ReactNativeRestartPackage(), // packages.add(new MyReactNativePackage());
new ReactNativePushNotificationPackage(), return packages;
new VectorIconsPackage(), }
new RNFSPackage(),
new ReactNativeDocumentPicker(),
new RNSharePackage(),
new RealmReactPackage()
);
}
@Override @Override
protected String getJSMainModuleName() { protected String getJSMainModuleName() {
return "index"; return "index";
} }
}; };
@Override @Override
public ReactNativeHost getReactNativeHost() { public ReactNativeHost getReactNativeHost() {
@@ -58,6 +45,37 @@ public class MainApplication extends Application implements ReactApplication, Sh
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
SoLoader.init(this, /* native exopackage */ false); SoLoader.init(this, /* native exopackage */ false);
initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
}
/**
* Loads Flipper in React Native templates. Call this in the onCreate method with something like
* initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
*
* @param context
* @param reactInstanceManager
*/
private static void initializeFlipper(
Context context, ReactInstanceManager reactInstanceManager) {
if (BuildConfig.DEBUG) {
try {
/*
We use reflection here to pick up the class that initializes Flipper,
since Flipper library is not available in release mode
*/
Class<?> aClass = Class.forName("com.rndiffapp.ReactNativeFlipper");
aClass
.getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
.invoke(null, context, reactInstanceManager);
} catch (ClassNotFoundException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
}
}
} }
@Override @Override
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
<selector>
<!--
This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
<item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
-->
<item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
<item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
</selector>
</inset>
Binary file not shown.
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:font="@font/jost400"
android:fontStyle="normal"
android:fontWeight="400" />
</font-family>
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 430 B

After

Width:  |  Height:  |  Size: 919 B

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 327 B

After

Width:  |  Height:  |  Size: 542 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 642 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 879 B

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

@@ -9,4 +9,10 @@
<!-- a secondary color for controls like checkboxes and text fields --> <!-- a secondary color for controls like checkboxes and text fields -->
<color name="colorAccent">#4FAFA7</color> <color name="colorAccent">#4FAFA7</color>
<!-- custom colors -->
<color name="grey">#A5A5A5</color>
<color name="orange">#F38337</color>
<color name="purple">#3A2671</color>
<color name="turquoiseDark">#69CBC1</color>
</resources> </resources>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="ic_launcher_background">#000D19</color> <color name="ic_launcher_background">#3A2671</color>
</resources> </resources>
+22 -1
View File
@@ -1,9 +1,30 @@
<resources> <resources>
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
</style> </style>
<style name="ButtonBarStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/grey</item>
</style>
<style name="PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
<item name="android:textSize">16sp</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@color/orange</item>
</style>
<style name="TitleStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
<item name="android:gravity">left</item>
<item name="android:textColor">@color/purple</item>
<item name="android:textSize">22sp</item>
<item name="android:textStyle">bold</item>
</style>
</resources> </resources>
@@ -0,0 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.drip"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission tools:node="remove" android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission tools:node="remove" android:name="android.permission.INTERNET" />
</manifest>
+27 -27
View File
@@ -2,53 +2,53 @@
buildscript { buildscript {
repositories { repositories {
jcenter()
google() google()
mavenCentral()
} }
ext.kotlinVersion = '1.3.40'
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.0' classpath('com.android.tools.build:gradle:7.0.3')
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
} }
} }
allprojects { allprojects {
repositories { repositories {
mavenLocal()
jcenter()
maven { maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android" url("$rootDir/../node_modules/react-native/android")
} }
maven {
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
mavenCentral {
// We don't want to fetch react-native from Maven Central as there are
// older versions over there.
content {
excludeGroup "com.facebook.react"
}
}
google()
maven { url 'https://www.jitpack.io' }
maven { maven {
url 'https://maven.google.com/' url 'https://maven.google.com/'
name 'Google' name 'Google'
} }
maven {
// All of Detox' artifacts are provided via the npm module
url "$rootDir/../node_modules/detox/Detox-android"
}
} }
} }
ext { ext {
buildToolsVersion = "26.0.3" buildToolsVersion = "33.0.2"
minSdkVersion = 16 minSdkVersion = 21
compileSdkVersion = 26 compileSdkVersion = 33
targetSdkVersion = 26 targetSdkVersion = 33
supportLibVersion = "26.1.0" ndkVersion = "21.4.7075529"
}
subprojects {project ->
buildscript {
repositories {
maven { url = 'https://dl.bintray.com/android/android-tools/' }
}
}
// https://stackoverflow.com/questions/52613089/getting-verifyreleaseresources-error-after-upgrading-react-native
afterEvaluate {
if (project.hasProperty("android")) {
android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
}
}
}
} }
+13 -2
View File
@@ -9,7 +9,7 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m # Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
@@ -17,4 +17,15 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
android.useDeprecatedNdk=true # AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
# 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
Binary file not shown.
+2 -2
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip zipStoreBase=GRADLE_USER_HOME
+186 -116
View File
@@ -1,79 +1,129 @@
#!/usr/bin/env bash #!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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.
#
############################################################################## ##############################################################################
## #
## Gradle start up script for UN*X # Gradle start up script for POSIX generated by Gradle.
## #
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
############################################################################## ##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Attempt to set APP_HOME
DEFAULT_JVM_OPTS=""
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle" APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD=maximum
warn ( ) { warn () {
echo "$*" echo "$*"
} } >&2
die ( ) { die () {
echo echo
echo "$*" echo "$*"
echo echo
exit 1 exit 1
} } >&2
# OS specific support (must be 'true' or 'false'). # OS specific support (must be 'true' or 'false').
cygwin=false cygwin=false
msys=false msys=false
darwin=false darwin=false
case "`uname`" in nonstop=false
CYGWIN* ) case "$( uname )" in #(
cygwin=true CYGWIN* ) cygwin=true ;; #(
;; Darwin* ) darwin=true ;; #(
Darwin* ) MSYS* | MINGW* ) msys=true ;; #(
darwin=true NONSTOP* ) nonstop=true ;;
;;
MINGW* )
msys=true
;;
esac esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables # IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java" JAVACMD=$JAVA_HOME/jre/sh/java
else else
JAVACMD="$JAVA_HOME/bin/java" JAVACMD=$JAVA_HOME/bin/java
fi fi
if [ ! -x "$JAVACMD" ] ; then if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi fi
else else
JAVACMD="java" JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
@@ -90,75 +140,95 @@ location of your Java installation."
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
MAX_FD_LIMIT=`ulimit -H -n` case $MAX_FD in #(
if [ $? -eq 0 ] ; then max*)
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then MAX_FD=$( ulimit -H -n ) ||
MAX_FD="$MAX_FD_LIMIT" warn "Could not query maximum file descriptor limit"
fi esac
ulimit -n $MAX_FD case $MAX_FD in #(
if [ $? -ne 0 ] ; then '' | soft) :;; #(
warn "Could not set maximum file descriptor limit: $MAX_FD" *)
fi ulimit -n "$MAX_FD" ||
else warn "Could not set maximum file descriptor limit to $MAX_FD"
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules # Collect all arguments for the java command, stacking in reverse order:
function splitJvmOpts() { # * args from the command line
JVM_OPTS=("$@") # * the main class name
} # * -classpath
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS # * -D...appname settings
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" # * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" # For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"
+24 -25
View File
@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@@ -9,19 +25,22 @@
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS= set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init if "%ERRORLEVEL%" == "0" goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init if exist "%JAVA_EXE%" goto execute
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,34 +64,14 @@ echo location of your Java installation.
goto fail goto fail
:init
@rem Get command-line arguments, handling Windowz variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
-8
View File
@@ -1,8 +0,0 @@
keystore(
name = "debug",
properties = "debug.keystore.properties",
store = "debug.keystore",
visibility = [
"PUBLIC",
],
)
@@ -1,4 +0,0 @@
key.store=debug.keystore
key.alias=androiddebugkey
key.store.password=android
key.alias.password=android
+9 -16
View File
@@ -1,19 +1,12 @@
rootProject.name = 'drip' rootProject.name = 'drip'
include ':nodejs-mobile-react-native'
project(':nodejs-mobile-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/nodejs-mobile-react-native/android') apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':react-native-restart'
project(':react-native-restart').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-restart/android')
include ':react-native-push-notification'
project(':react-native-push-notification').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-push-notification/android')
include ':react-native-vector-icons'
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
include ':react-native-fs'
project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
include ':react-native-document-picker'
project(':react-native-document-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-document-picker/android')
include ':react-native-share'
project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
include ':realm'
project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android')
include ':app' include ':app'
includeBuild('../node_modules/react-native-gradle-plugin')
if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
include(":ReactAndroid")
project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
}
+2 -2
View File
@@ -1,4 +1,4 @@
{ {
"name": "drip", "name": "drip.",
"displayName": "drip" "displayName": "drip."
} }
Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

+3
View File
@@ -0,0 +1,3 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
}
+43
View File
@@ -0,0 +1,43 @@
import React from 'react'
import PropTypes from 'prop-types'
import { BackHandler, StyleSheet, View } from 'react-native'
import { useTranslation } from 'react-i18next'
import License from './settings/License'
import Button from './common/button'
import { saveLicenseFlag } from '../local-storage'
import { Containers } from '../styles'
export default function AcceptLicense({ setLicense }) {
const onAcceptLicense = async () => {
await saveLicenseFlag()
setLicense()
}
const { t } = useTranslation()
return (
<License>
<View style={styles.container}>
<Button onPress={BackHandler.exitApp} testID="licenseCancelButton">
{t('labels.shared.cancel')}
</Button>
<Button isCTA onPress={onAcceptLicense} testID="licenseOkButton">
{t('labels.shared.ok')}
</Button>
</View>
</License>
)
}
AcceptLicense.propTypes = {
setLicense: PropTypes.func.isRequired,
}
const styles = StyleSheet.create({
container: {
...Containers.rowContainer,
},
})
+120
View File
@@ -0,0 +1,120 @@
import React from 'react'
import { ScrollView, StyleSheet, View } from 'react-native'
import PropTypes from 'prop-types'
import moment from 'moment'
import AppText from './common/app-text'
import Asterisk from './common/Asterisk'
import Button from './common/button'
import Footnote from './common/Footnote'
import cycleModule from '../lib/cycle'
import { getFertilityStatusForDay } from '../lib/sympto-adapter'
import {
determinePredictionText,
formatWithOrdinalSuffix,
} from './helpers/home'
import { periodPredictionObservable } from '../local-storage'
import { Colors, Fonts, Sizes, Spacing } from '../styles'
import { LocalDate } from '@js-joda/core'
import { useTranslation } from 'react-i18next'
const Home = ({ navigate, setDate }) => {
const { t } = useTranslation()
function navigateToCycleDayView() {
setDate(todayDateString)
navigate('CycleDay')
}
const todayDateString = LocalDate.now().toString()
const { getCycleDayNumber, getPredictedMenses } = cycleModule()
const cycleDayNumber = getCycleDayNumber(todayDateString)
const { status, phase, statusText } =
getFertilityStatusForDay(todayDateString)
const isPeriodPredictionEnabled = periodPredictionObservable.value
const prediction = determinePredictionText(getPredictedMenses(), t)
const cycleDayText = cycleDayNumber
? formatWithOrdinalSuffix(cycleDayNumber)
: ''
return (
<ScrollView
style={styles.container}
contentContainerStyle={styles.contentContainer}
>
<AppText style={styles.title}>{moment().format('MMM Do YYYY')}</AppText>
{cycleDayNumber && (
<View style={styles.line}>
<AppText style={styles.whiteSubtitle}>{cycleDayText}</AppText>
<AppText style={styles.turquoiseText}>
{t('labels.home.cycleDay')}
</AppText>
</View>
)}
{phase && (
<View style={styles.line}>
<AppText style={styles.whiteSubtitle}>
{formatWithOrdinalSuffix(phase)}
</AppText>
<AppText style={styles.turquoiseText}>
{t('labels.home.cyclePhase')}
</AppText>
<AppText style={styles.turquoiseText}>{status}</AppText>
<Asterisk />
</View>
)}
{isPeriodPredictionEnabled && (
<View style={styles.line}>
<AppText style={styles.turquoiseText}>{prediction}</AppText>
</View>
)}
<Button isCTA isSmall={false} onPress={navigateToCycleDayView}>
{t('labels.home.addDataForToday')}
</Button>
{phase && <Footnote colorLabel="greyLight">{statusText}</Footnote>}
</ScrollView>
)
}
const styles = StyleSheet.create({
container: {
backgroundColor: Colors.purple,
flex: 1,
},
contentContainer: {
padding: Spacing.base,
paddingTop: 0,
},
line: {
flexDirection: 'row',
flexWrap: 'wrap',
alignContent: 'flex-start',
marginBottom: Spacing.tiny,
marginTop: Spacing.small,
},
title: {
color: Colors.purpleLight,
fontFamily: Fonts.bold,
fontSize: Sizes.huge,
marginVertical: Spacing.small,
},
turquoiseText: {
color: Colors.turquoise,
fontSize: Sizes.subtitle,
},
whiteSubtitle: {
color: 'white',
fontSize: Sizes.subtitle,
},
})
Home.propTypes = {
navigate: PropTypes.func,
setDate: PropTypes.func,
}
export default Home
-40
View File
@@ -1,40 +0,0 @@
import React from 'react'
import { Text } from 'react-native'
import styles from "../styles"
import Link from './link'
export default function AppText(props) {
// we parse for links in case the text contains any
return (
<Link>
<Text
style={[styles.appText, props.style]}
onPress={props.onPress}
numberOfLines={props.numberOfLines}
>
{props.children}
</Text>
</Link>
)
}
export function ActionHint(props) {
if(props.isVisible) {
return (
<AppText
style={[styles.actionHint, props.style]}>
{props.children}
</AppText>
)
} else {
return null
}
}
export function SymptomSectionHeader(props) {
return (
<AppText style={styles.symptomViewHeading}>
{props.children}
</AppText>
)
}
+42 -34
View File
@@ -1,44 +1,52 @@
import React, { Component } from 'react' import React, { useState, useEffect } from 'react'
import { View } from 'react-native'
import nodejs from 'nodejs-mobile-react-native' import { getLicenseFlag, saveEncryptionFlag } from '../local-storage'
import { openDb } from '../db'
import App from './app' import App from './app'
import AppLoadingView from './common/app-loading'
import AppStatusBar from './common/app-status-bar'
import AcceptLicense from './AcceptLicense'
import PasswordPrompt from './password-prompt' import PasswordPrompt from './password-prompt'
import License from './license'
import { getLicenseFlag } from '../local-storage'
export default class AppWrapper extends Component { export default function AppWrapper() {
constructor() { const [isLoading, setIsLoading] = useState(true)
super() const [isLicenseAccepted, setIsLicenseAccepted] = useState(false)
this.state = { const [isDbEncrypted, setIsDbEncrypted] = useState(false)
retrievingLicenseSetting: true
} const checkIsLicenseAccepted = async () => {
nodejs.start('main.js') const isLicenseFlagSet = await getLicenseFlag()
this.checkLicenseAgreement() setIsLicenseAccepted(isLicenseFlagSet)
setIsLoading(false)
} }
async checkLicenseAgreement() { const checkIsDbEncrypted = async () => {
const agreed = await getLicenseFlag() const isEncrypted = !(await openDb())
this.setState({retrievingLicenseSetting: false}) if (isEncrypted) setIsDbEncrypted(true)
if (!agreed) this.setState({showLicense: true}) await saveEncryptionFlag(isEncrypted)
} }
render() { useEffect(() => {
const whiteScreen = <View style={{ flex: 1 }}></View> checkIsLicenseAccepted()
const licenseScreen = <License setLicense={() => { checkIsDbEncrypted()
this.setState({showLicense: false}) }, [])
}}/>
const passwordPrompt = <PasswordPrompt showApp={() => {
this.setState({showApp: true})
}}/>
if (this.state.retrievingLicenseSetting) { if (isLoading) {
return whiteScreen return <AppLoadingView />
} else if (this.state.showLicense) {
return licenseScreen
} else if (!this.state.showApp) {
return passwordPrompt
} else {
return <App/>
}
} }
if (!isLicenseAccepted) {
return <AcceptLicense setLicense={() => setIsLicenseAccepted(true)} />
}
return (
<>
<AppStatusBar />
{isDbEncrypted ? (
<PasswordPrompt enableShowApp={() => setIsDbEncrypted(false)} />
) : (
<App restartApp={() => checkIsDbEncrypted()} />
)}
</>
)
} }
+59 -138
View File
@@ -1,150 +1,71 @@
import React, { Component } from 'react' import React, { useState, useEffect } from 'react'
import { View, BackHandler } from 'react-native' import { BackHandler, StyleSheet, View } from 'react-native'
import PropTypes from 'prop-types'
import { LocalDate } from '@js-joda/core'
import Header from './header' import Header from './header'
import Menu from './menu' import Menu from './menu'
import Home from './home' import { viewsList } from './views'
import Calendar from './calendar' import { pages } from './pages'
import CycleDay from './cycle-day/cycle-day-overview'
import symptomViews from './cycle-day/symptoms'
import Chart from './chart/chart'
import SettingsMenu from './settings/settings-menu'
import settingsViews from './settings'
import Stats from './stats'
import {headerTitles, menuTitles} from '../i18n/en/labels'
import InfoSymptom from './cycle-day/symptoms/info-symptom'
import setupNotifications from '../lib/notifications' import setupNotifications from '../lib/notifications'
import { closeDb } from '../db'
// design wants everyhting lowercased, but we don't const App = ({ restartApp }) => {
// have CSS pseudo properties const [date, setDate] = useState(LocalDate.now().toString())
const headerTitlesLowerCase = Object.keys(headerTitles).reduce((acc, curr) => { const [currentPage, setCurrentPage] = useState('Home')
acc[curr] = headerTitles[curr].toLowerCase() const goBack = () => {
return acc if (currentPage === 'Home') {
}, {}) closeDb()
BackHandler.exitApp()
const HOME_PAGE = 'Home'
const INFO_SYMPTOM_PAGE = 'InfoSymptom'
const CYCLE_DAY_PAGE = 'CycleDay'
const SETTINGS_MENU_PAGE = 'SettingsMenu'
export default class App extends Component {
constructor(props) {
super(props)
this.state = {
currentPage: HOME_PAGE
}
this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.handleBackButtonPress)
setupNotifications(this.navigate)
}
componentWillUnmount() {
this.backHandler.remove()
}
navigate = (pageName, props) => {
const { currentPage } = this.state
// for the back button to work properly, we want to
// remember two origins: which menu item we came from
// and from where we navigated to the symptom view (day
// view or home page)
if (this.isMenuItem()) {
this.menuOrigin = currentPage
}
if (!this.isSymptomView() && !this.isInfoSymptomView()) {
this.originForSymptomView = currentPage
}
this.setState({ currentPage: pageName, currentProps: props })
}
handleBackButtonPress = () => {
const { currentPage, currentProps } = this.state
if (currentPage === HOME_PAGE) return false
if (this.isSymptomView()) {
this.navigate(
this.originForSymptomView, { date: currentProps.date }
)
} else if (this.isSettingsView()) {
this.navigate(SETTINGS_MENU_PAGE)
} else if (currentPage === CYCLE_DAY_PAGE) {
this.navigate(this.menuOrigin)
} else if (this.isInfoSymptomView()) {
const { date, cycleDay, symptomView } = currentProps
this.navigate(
symptomView, { date, cycleDay })
} else { } else {
this.navigate(HOME_PAGE) const { parent } = pages.find((p) => p.component === currentPage)
setCurrentPage(parent)
} }
return true return true
} }
isMenuItem() { useEffect(() => {
return Object.keys(menuTitles).includes(this.state.currentPage) const backHandler = BackHandler.addEventListener(
} 'hardwareBackPress',
goBack
isSymptomView() {
return Object.keys(symptomViews).includes(this.state.currentPage)
}
isInfoSymptomView() {
return this.state.currentPage === INFO_SYMPTOM_PAGE
}
isSettingsView() {
return Object.keys(settingsViews).includes(this.state.currentPage)
}
isDefaultView() {
const { currentPage } = this.state
return this.isMenuItem(currentPage) || currentPage === SETTINGS_MENU_PAGE
}
render() {
const { currentPage, currentProps } = this.state
const pages = {
Home,
Calendar,
CycleDay,
Chart,
InfoSymptom,
SettingsMenu,
...settingsViews,
Stats,
...symptomViews
}
const page = pages[currentPage]
const title = headerTitlesLowerCase[currentPage]
return (
<View style={{flex: 1}}>
{this.isDefaultView() &&
<Header title={title} />
}
{(this.isInfoSymptomView() || this.isSettingsView()) &&
<Header
title={title}
showBackButton={true}
goBack={this.handleBackButtonPress}
/>
}
{this.isSymptomView() &&
<Header
title={title}
isSymptomView={true}
goBack={this.handleBackButtonPress}
date={currentProps.date}
goToSymptomInfo={() => this.navigate(INFO_SYMPTOM_PAGE, {
symptomView: currentPage,
...currentProps
})}
/>}
{React.createElement(page, {
navigate: this.navigate,
...currentProps
})}
{!this.isSymptomView() &&
<Menu navigate={this.navigate} currentPage={currentPage} />
}
</View>
) )
return () => backHandler.remove()
})
useEffect(() => setupNotifications(setCurrentPage, setDate), [])
const Page = viewsList[currentPage]
const isTemperatureEditView = currentPage === 'TemperatureEditView'
const headerProps = { navigate: setCurrentPage }
const pageProps = {
date,
setDate,
isTemperatureEditView,
navigate: setCurrentPage,
} }
return (
<View style={styles.container}>
<Header {...headerProps} />
<Page {...pageProps} restartApp={restartApp} />
<Menu currentPage={currentPage} navigate={setCurrentPage} />
</View>
)
} }
App.propTypes = {
restartApp: PropTypes.func,
}
const styles = StyleSheet.create({
container: {
flex: 1,
},
})
export default App

Some files were not shown because too many files have changed in this diff Show More