diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md index 6cb32a8..a0c6929 100644 --- a/.gitlab/merge_request_templates/Default.md +++ b/.gitlab/merge_request_templates/Default.md @@ -1,7 +1,5 @@ ## Why this change? -Closes # - ## Description I have tested this MR: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index be35929..b03cccc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ So good to see you here, hello :wave_tone1: :wave_tone2: :wave_tone3: :wave_tone ## Table Of Contents -[TL;DR](#tl-dr) +[TL;DR](#tldr) [What should I know before I get started?](#what-should-i-know-before-i-get-started) @@ -14,7 +14,7 @@ So good to see you here, hello :wave_tone1: :wave_tone2: :wave_tone3: :wave_tone ## TL;DR -You just want to say hello? Send us a [nice email](mailto:drip@mailbox.org?Subject=Nice%20incoming%20mail) :postbox:, ask to [join our Slack](mailto:drip@mailbox.org?Subject=Join%20Slack), toot :mammoth: [@dripapp@mastodon.social](https://mastodon.social/@dripapp) or tweet :bird: at us [@dripberlin](https://twitter.com/dripberlin). +You just want to say hello? Send us a [nice email](mailto:drip@mailbox.org?Subject=Nice%20incoming%20mail) :postbox:, 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? @@ -25,30 +25,29 @@ Let us know if you want to suggest improvements for the README and open a merge ## How can I condripute? -### Your First Code Condripution +We are an open source project and we highly appreciate contributions. At the same time please keep some things in mind: :heart: -We are fans of labels, at least for our issues. You can find a list of `newbie` issues [here](https://gitlab.com/bloodyhealth/drip/issues?label_name%5B%5D=Newbie). -If you decide to work on an issue, please click on `Create branch` based on that issue. You can find this as a dropdown option right under `Create merge request`. -This allows us to keep track of the issues that are related to an existing branch and tells everyone "somebody is working on it". +- The drip maintainers are usually around 2-3 people and are responsible for everything from developing new features to answering press inquiries or fixing bugs. Most of this work is done unpaid. (If you write a nice email your chances to get an answer are much higher than if you behave like a tech bro.) +- We have a plan for the direction in which drip should evolve. This means that even if it isn't always transparent on gitlab, we have a list of features that we are building and more importantly, which bugs need to be fixed and which dependencies need to be updated. +- drips core values are: + - 🔮 open source + - 🩸 feminist and gender inclusive + - 🔒 secure: data entered stays with that person/on their device + - 🔬 science based: we implemented the symptothermal method + +This means that we will never implement anything that contradicts these core values. Some examples: We will never build a cloud integration, we will never make an ovulation prediction. +- If you would like to make a sustainable contribution to the project, we would be happy to join the game. -If you want to open a merge request, yeah :tada: exciting! We are using a template for merge requests to make sure we explain what we have done and why. -Keep in mind that people who will review your merge request are more motivated to do so when the merge request is well explained and ideally not too big. +### Reporting Bugs or Making Suggestions -### Reporting Bugs +If you found a bug or have suggestions, please :one: first review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure the bug/suggestion is unknown; :two: after that, take time to investigate and write a detailed issue report. Best you use our [templates for bug /chore/ feature](https://gitlab.com/bloodyhealth/drip/-/tree/main/.gitlab/issue_templates) (you can choose when creating a new issue) in gitlab or send us an email to our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with a description text taken from the body of your email. Please attach screenshots or other helpful things. -You found a bug :bug:? Please feel free to investigate and save logs for more specific details. +### Your First Condripution -Before creating a new issue, please review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure the bug is unknown. You are invited to describe the bug in all its details e.g. in what context/settings has it occurred? +- If you want to contribute to drip's code or translation, please get in touch with us. We can tell you if someone is already working on something similar, if your idea does (not) match drip's core values, etc. Of course, you can always create a drip version for your private use with anything you want, but please don't expect us to review and merge code that has not been discussed before. +- If you want to open a merge request, yeah :tada: exciting! We are using a template for merge requests to make sure we explain what we have done and why. +- Keep in mind that people who will review your merge request are more motivated to do so when the merge request is well explained and ideally not too big. -To send us a new issue you can also use our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with a description text taken from the body of your email. - -### Suggesting Enhancements - -Do you have suggestions for enhancing the app or for cleaning up some code? Fantastic! - -Before creating a new issue, please review the [list of existing issues](https://gitlab.com/bloodyhealth/drip/issues) to make sure nobody else had the same idea before you! You are then invited to open a new issue with a somewhat extensive description, you can use emojis or GIFs if it helps :)! - -To send us a new issue you can also use our [gitlab email](mailto:incoming+bloodyhealth/drip@incoming.gitlab.com). It will automagically add a new issue to the list with the title taken from the subject line and the description text for the issue taken from the body of your email. ### Thank you diff --git a/components/chart/dot-and-line.js b/components/chart/dot-and-line.js index 3d6b2e0..fcd2f22 100644 --- a/components/chart/dot-and-line.js +++ b/components/chart/dot-and-line.js @@ -65,7 +65,7 @@ const DotAndLine = ({ d={dot} stroke={dotColor} strokeWidth={CHART_STROKE_WIDTH} - fill={Colors.turquoiseDark} + fill={dotColor} key="dot" /> diff --git a/components/settings/License.js b/components/settings/License.js index 8e47147..c43809e 100644 --- a/components/settings/License.js +++ b/components/settings/License.js @@ -1,18 +1,20 @@ import React from 'react' import PropTypes from 'prop-types' import { useTranslation } from 'react-i18next' +import { StyleSheet } from 'react-native' import AppPage from '../common/app-page' import AppText from '../common/app-text' import AppLink from '../common/AppLink' import Segment from '../common/segment' +import { Spacing } from '../../styles' const License = ({ children }) => { const { t } = useTranslation(null, { keyPrefix: 'hamburgerMenu.license' }) const currentYear = new Date().getFullYear() const link = 'https://www.gnu.org/licenses/gpl-3.0.html' return ( - + {t('text', { currentYear })} {link} @@ -26,4 +28,10 @@ License.propTypes = { children: PropTypes.node, } +const styles = StyleSheet.create({ + contentContainer: { + marginTop: Spacing.large, + }, +}) + export default License diff --git a/metadata/en-US/images/phoneScreenshots/2023_sharepic_1_home.png b/metadata/en-US/images/phoneScreenshots/2023_sharepic_1_home.png new file mode 100644 index 0000000..718b7cd Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2023_sharepic_1_home.png differ diff --git a/metadata/en-US/images/phoneScreenshots/2023_sharepic_2_symptoms.png b/metadata/en-US/images/phoneScreenshots/2023_sharepic_2_symptoms.png new file mode 100644 index 0000000..3b08cc0 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2023_sharepic_2_symptoms.png differ diff --git a/metadata/en-US/images/phoneScreenshots/2023_sharepic_3_calender.png b/metadata/en-US/images/phoneScreenshots/2023_sharepic_3_calender.png new file mode 100644 index 0000000..55c4721 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2023_sharepic_3_calender.png differ diff --git a/metadata/en-US/images/phoneScreenshots/2023_sharepic_4_chart.png b/metadata/en-US/images/phoneScreenshots/2023_sharepic_4_chart.png new file mode 100644 index 0000000..017b6f6 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2023_sharepic_4_chart.png differ diff --git a/metadata/en-US/images/phoneScreenshots/2023_sharepic_5_stats.png b/metadata/en-US/images/phoneScreenshots/2023_sharepic_5_stats.png new file mode 100644 index 0000000..f7c1461 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2023_sharepic_5_stats.png differ diff --git a/metadata/en-US/images/phoneScreenshots/2023_sharepic_6_cycles.png b/metadata/en-US/images/phoneScreenshots/2023_sharepic_6_cycles.png new file mode 100644 index 0000000..60bdf78 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2023_sharepic_6_cycles.png differ diff --git a/metadata/en-US/images/phoneScreenshots/2023_sharepic_7_mucus.png b/metadata/en-US/images/phoneScreenshots/2023_sharepic_7_mucus.png new file mode 100644 index 0000000..83dd3e8 Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2023_sharepic_7_mucus.png differ diff --git a/metadata/en-US/images/phoneScreenshots/2023_sharepic_8_settings.png b/metadata/en-US/images/phoneScreenshots/2023_sharepic_8_settings.png new file mode 100644 index 0000000..a0e4b3b Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2023_sharepic_8_settings.png differ diff --git a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-calendar.png b/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-calendar.png deleted file mode 100644 index 0a1ef52..0000000 Binary files a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-calendar.png and /dev/null differ diff --git a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-chart.png b/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-chart.png deleted file mode 100644 index 5650463..0000000 Binary files a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-chart.png and /dev/null differ diff --git a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-cycleday.png b/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-cycleday.png deleted file mode 100644 index 4e6685e..0000000 Binary files a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-cycleday.png and /dev/null differ diff --git a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-home.png b/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-home.png deleted file mode 100644 index 44cd0e2..0000000 Binary files a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-home.png and /dev/null differ diff --git a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-manageData.png b/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-manageData.png deleted file mode 100644 index 7b2ea85..0000000 Binary files a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-manageData.png and /dev/null differ diff --git a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-mucus.png b/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-mucus.png deleted file mode 100644 index 3b2323f..0000000 Binary files a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-mucus.png and /dev/null differ diff --git a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-password.png b/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-password.png deleted file mode 100644 index 7e4b023..0000000 Binary files a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-password.png and /dev/null differ diff --git a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-stats.png b/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-stats.png deleted file mode 100644 index c2389b8..0000000 Binary files a/metadata/en-US/images/phoneScreenshots/Release-1.2102.28-stats.png and /dev/null differ diff --git a/package.json b/package.json index 6a7cc3b..0afa863 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "scripts": { "start": "react-native start", "android": "react-native run-android", - "ios": "react-native run-ios --simulator=\"iPhone 14\"", + "ios": "react-native run-ios --simulator=\"iPhone 8 Plus\"", + "ios14": "react-native run-ios --simulator=\"iPhone 14 Plus\"", "log": "react-native log-android", "test": "jest test && yarn lint", "test-watch": "jest --watch test", diff --git a/test/__snapshots__/License.spec.js.snap b/test/__snapshots__/License.spec.js.snap index 370a193..3d11134 100644 --- a/test/__snapshots__/License.spec.js.snap +++ b/test/__snapshots__/License.spec.js.snap @@ -16,7 +16,9 @@ exports[`License screen should match the snapshot 1`] = ` "backgroundColor": "#E9F2ED", "flexGrow": 1, }, - undefined, + { + "marginTop": 42.857142857142854, + }, ] } >