From 3b45a32727bc0cd421d76bb4efdc1c2fcc055e97 Mon Sep 17 00:00:00 2001 From: Sofiya Tepikin Date: Sun, 10 Jul 2022 19:04:30 +0200 Subject: [PATCH 1/2] Cleanup donation button fork on iOS --- components/common/button.js | 9 +-------- components/settings/about.js | 17 +++++++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/components/common/button.js b/components/common/button.js index cfb73b4..4cf588b 100644 --- a/components/common/button.js +++ b/components/common/button.js @@ -11,21 +11,19 @@ const Button = ({ children, iconName, isCTA, - isVisible, isSmall, onPress, testID, ...props }) => { const buttonStyle = isCTA ? styles.cta : styles.regular - const buttonDisplay = isVisible ? styles.isVisible : null const textCTA = isCTA ? styles.buttonTextBold : styles.buttonTextRegular const textStyle = [textCTA, isSmall ? textSmall : text] return ( @@ -39,7 +37,6 @@ Button.propTypes = { children: PropTypes.node, iconName: PropTypes.string, isCTA: PropTypes.bool, - isVisible: PropTypes.bool, isSmall: PropTypes.bool, onPress: PropTypes.func, testID: PropTypes.string, @@ -79,10 +76,6 @@ const styles = StyleSheet.create({ borderRadius: 25, ...button, }, - isVisible: { - display: 'none', - ...button, - }, buttonTextBold: { color: 'white', fontFamily: Fonts.bold, diff --git a/components/settings/about.js b/components/settings/about.js index e9b8963..25ff929 100644 --- a/components/settings/about.js +++ b/components/settings/about.js @@ -36,14 +36,15 @@ const AboutSection = () => { {labels.donate.note} - + {Platform.OS !== 'ios' && ( + + )} {require('../../package.json').version} From 800b831958a0c9ef06a9124d2ea25df36aca7183 Mon Sep 17 00:00:00 2001 From: Sofiya Tepikin Date: Sun, 10 Jul 2022 19:22:30 +0200 Subject: [PATCH 2/2] Update the link to our website with the brand new domain --- README.md | 6 +++--- i18n/en/links.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b869b69..1587c81 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # drip, the open-source cycle tracking app A menstrual cycle tracking app that's open-source and leaves your data on your phone. Use it to track your menstrual cycle and/or for fertility awareness! -Find more information on [our website](https://bloodyhealth.gitlab.io/). +Find more information on [our website](http://dripapp.org/). -[Get it here](https://bloodyhealth.gitlab.io/release/8.apk) + height="55">](http://dripapp.org/release/8.apk) [Get it on F-Droid](https://f-droid.org/packages/com.drip/) diff --git a/i18n/en/links.js b/i18n/en/links.js index 16f839a..fd3e223 100644 --- a/i18n/en/links.js +++ b/i18n/en/links.js @@ -12,7 +12,7 @@ export default { text: 'our wiki', }, website: { - url: 'https://bloodyhealth.gitlab.io/', + url: 'http://dripapp.org/', text: 'Website', }, donate: {