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

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/).
 
-[<img src="https://bloodyhealth.gitlab.io/assets/get.png"
+[<img src="http://dripapp.org/assets/get.png"
      alt="Get it here"
-     height="55">](https://bloodyhealth.gitlab.io/release/8.apk)
+     height="55">](http://dripapp.org/release/8.apk)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/packages/com.drip/)

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 (
     <TouchableOpacity
       onPress={onPress}
-      style={[buttonStyle, buttonDisplay]}
+      style={buttonStyle}
       testID={testID}
       {...props}
     >
@@ -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,

components/settings/about.js

@@ -36,14 +36,15 @@ const AboutSection = () => {
       </Segment>
       <Segment title={labels.donate.title}>
         <AppText>{labels.donate.note}</AppText>
+        {Platform.OS !== 'ios' && (
           <Button
-          isVisible={Platform.OS === 'ios' ? true : false}
             isCTA
             isSmall
             onPress={() => Linking.openURL(links.donate.url)}
           >
             {links.donate.text}
           </Button>
+        )}
       </Segment>
       <Segment title={labels.version.title} last>
         <AppText>{require('../../package.json').version}</AppText>

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: {