Merge pull request #506 from zooniverse/issue-497-android-policy-comp…

…liance Issue 497 Android policy compliance
zooniverse · Feb 3, 2024 · 5358a74 · 5358a74
2 parents 7fb04de + fdf451f
commit 5358a74
Show file tree

Hide file tree

Showing 12 changed files with 331 additions and 138 deletions.
diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json
@@ -0,0 +1,21 @@
+{
+  "migIndex": 1,
+  "data": [
+    {
+      "path": "assets/fonts/Karla-Bold.ttf",
+      "sha1": "487058030d1b878884eb61ae0d0fd8ec5d506f99"
+    },
+    {
+      "path": "assets/fonts/Karla-BoldItalic.ttf",
+      "sha1": "e3e3ccb6fb1f80e7a3a730fe7d0ea1b900fd97b4"
+    },
+    {
+      "path": "assets/fonts/Karla-Italic.ttf",
+      "sha1": "e75b9b09097b4122068844291b9c220a1ef53612"
+    },
+    {
+      "path": "assets/fonts/Karla-Regular.ttf",
+      "sha1": "bf625e46311c6b71174dffced388ec963ddceacf"
+    }
+  ]
+}
diff --git a/images/zooni-nav-logo.png b/images/zooni-nav-logo.png
diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json
@@ -0,0 +1,21 @@
+{
+  "migIndex": 1,
+  "data": [
+    {
+      "path": "assets/fonts/Karla-Bold.ttf",
+      "sha1": "487058030d1b878884eb61ae0d0fd8ec5d506f99"
+    },
+    {
+      "path": "assets/fonts/Karla-BoldItalic.ttf",
+      "sha1": "e3e3ccb6fb1f80e7a3a730fe7d0ea1b900fd97b4"
+    },
+    {
+      "path": "assets/fonts/Karla-Italic.ttf",
+      "sha1": "e75b9b09097b4122068844291b9c220a1ef53612"
+    },
+    {
+      "path": "assets/fonts/Karla-Regular.ttf",
+      "sha1": "bf625e46311c6b71174dffced388ec963ddceacf"
+    }
+  ]
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -61,6 +61,7 @@
     "react-native-splash-screen": "^3.3.0",
     "react-native-svg": "^13.13.0",
     "react-native-swiper": "^1.6.0",
+    "react-native-toggle-element": "^2.0.1",
     "react-native-vector-icons": "^10.0.0",
     "react-native-video": "^5.2.1",
     "react-native-webview": "^13.6.0",

diff --git a/react-native.config.js b/react-native.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  project: {
+    ios: {},
+    android: {},
+  },
+  assets: ['./assets/fonts'],
+};
diff --git a/src/components/NavBar.js b/src/components/NavBar.js
@@ -155,13 +155,13 @@ const styles = EStyleSheet.create({
     flex: 1,
   },
   leftIcon: {
-    paddingLeft: 25,
+    paddingLeft: 16,
     paddingRight: 15,
     fontSize: 26
   },
   rightIcon: {
     paddingLeft: 15,
-    paddingRight: 25,
+    paddingRight: 16,
     alignContent: 'flex-end',
     fontSize: 26
   },

diff --git a/src/components/SideDrawerContent.js b/src/components/SideDrawerContent.js
@@ -8,7 +8,10 @@ import {
 } from 'react-native'
 import EStyleSheet from 'react-native-extended-stylesheet'
 import Icon from 'react-native-vector-icons/FontAwesome'
-import SimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'
+import Feather from 'react-native-vector-icons/Feather'
+import Fontisto from 'react-native-vector-icons/Fontisto'
+import LinearGradient from 'react-native-linear-gradient';
+import DeviceInfo from 'react-native-device-info'
 import FontedText from './common/FontedText'
 import Separator from './common/Separator'
 import { signOut } from '../actions/auth'
@@ -80,6 +83,18 @@ export class SideDrawerContent extends Component {
     this.props.navigation.navigate(PageKeys.NotificationLandingPageScreen)
   }
 
+  openLink(link) {
+    Linking.canOpenURL(link).then(supported => {
+      if (supported) {
+        Linking.openURL(link);
+      } else {
+        Alert.alert(
+          'Error', 'Sorry, but it looks like you are unable to open the link ' + link + ' in your default browser.',
+        )
+      }
+    });
+  }
+
   render() {
     return (
       <View style={styles.container}>
@@ -89,14 +104,16 @@ export class SideDrawerContent extends Component {
             style={styles.logoStyle} 
           />
           <TouchableOpacity onPress={this.close} >
-            <SimpleLineIcons name="close" style={styles.closeIcon} />
+            <Fontisto name="close" style={styles.closeIcon} />
           </TouchableOpacity>
         </View>
-
-        <Separator
-            color="white"
-            style={styles.separatorPadding}
-          />
+
+        <LinearGradient
+          colors={['rgba(0,93,105,1)', '#FFFFFF', 'rgba(0,93,105,1)']}
+          style={styles.linearGradient}
+          start={{ x: 0, y: 0 }}
+          end={{ x: 1, y: 0 }}
+        />
 
         <MenuButton 
           onPress={this.goHome} 
@@ -113,7 +130,7 @@ export class SideDrawerContent extends Component {
 
         <MenuButton 
           onPress={this.goToAbout} 
-          text={'About'} 
+          text={'About the Zooniverse'} 
         />
 
         <MenuButton 
@@ -131,52 +148,62 @@ export class SideDrawerContent extends Component {
           text={'Notifications'} 
         />
 
-        <FontedText style={styles.connextText}>
-          CONNECT
-        </FontedText>
+        <Menuheader title="ABOUT" />
+
+        <MenuButton 
+          onPress={() => this.openLink('https://www.zooniverse.org/privacy')} 
+          text={'Privacy'}
+          externalOpenIcon={true}
+        />
 
+        <MenuButton 
+          text={`Version ${DeviceInfo.getVersion()}/${DeviceInfo.getBuildNumber()}`}
+        />
 
-        <View style={styles.socialMediaContainer}>
-          <SocialMediaLink 
-            mediaLink="https://twitter.com/the_zooniverse"
-            iconName="twitter"
-          />
-          <SocialMediaLink 
-            mediaLink="http://www.facebook.com/therealzooniverse"
-            iconName="facebook-f"
-          />
-          <SocialMediaLink 
-            mediaLink="http://dailyzooniverse.tumblr.com/"
-            iconName="tumblr"
-          />
-          <SocialMediaLink 
-            mediaLink="https://plus.google.com/+ZooniverseOrgReal/"
-            iconName="google-plus"
-          />
-        </View>
+        <Menuheader title="HELP" />
 
-        <View style={styles.signOutView}>
-          { this.props.isGuestUser ? null :
-            <MenuButton 
-              onPress={this.signOut}
-              text={'Sign Out'}
-            />
-          }
-        </View>
+        <MenuButton 
+          onPress={() => this.openLink('https://www.zooniverse.org/about/contact')} 
+          text={'Contact us'}
+          externalOpenIcon={true}
+        />
+
+        { this.props.isGuestUser ? null :
+          <MenuButton 
+            onPress={this.signOut}
+            text={'Sign Out'}
+          />
+        }
 
       </View>
     )
   }
 }
 
-const MenuButton = ({onPress, text}) => 
-  <View style={styles.linkContainer}>
-    <TouchableOpacity onPress={onPress}>
+const Menuheader = ({ title }) => (
+  <View>
+    <FontedText style={styles.menuHeader}>{title}</FontedText>
+  </View>
+)
+
+const MenuButton = ({ onPress = false, text, externalOpenIcon = false }) => {
+  return onPress ? (
+    <TouchableOpacity onPress={onPress} style={styles.linkContainer}>
       <FontedText style={styles.menuButtonText}>
         {text}
       </FontedText>
+      {externalOpenIcon && (
+        <Feather name="external-link" color="#fff" size={18} style={{marginLeft: 8, marginTop: 4}} />
+      )}
     </TouchableOpacity>
-  </View>
+  ) : (
+      <View style={styles.linkContainer}>
+        <FontedText style={styles.menuButtonText}>
+          {text}
+        </FontedText>
+      </View>
+  )
+}
 
 const SocialMediaLink = ({mediaLink, iconName}) => 
   <TouchableOpacity onPress={() => openSocialMediaLink(mediaLink)}>
@@ -200,7 +227,6 @@ const styles = EStyleSheet.create({
   container: {
     backgroundColor: 'rgba(0,93,105,1)',
     flex: 1,
-    paddingTop: 15,
     paddingLeft: 25,
     zIndex: 200,
   },
@@ -209,13 +235,27 @@ const styles = EStyleSheet.create({
     fontSize: 24,
     padding: 10
   },
+  linearGradient: {
+    height: 1,
+    width: '90%',
+  },
   linkContainer: {
-    paddingTop: 17.5,
-    paddingBottom: 17.5
+    paddingTop: 8,
+    paddingBottom: 8,
+    flexDirection: 'row',
+    alignItems: 'center',
   },
   menuButtonText: {
-    fontSize: 22,
-    color: 'white'
+    fontSize: 24,
+    lineHeight: 28.06,
+    color: '#fff',
+  },
+  menuHeader: {
+    fontSize: 16,
+    lineHeight: 18.7,
+    letterSpacing: 1.5,
+    color: '#fff',
+    paddingVertical: 8,
   },
   socialMediaContainer: {
     flexDirection: 'row',
@@ -237,19 +277,19 @@ const styles = EStyleSheet.create({
     marginRight: 25,
     alignItems: 'center',
     flexDirection: 'row',
-    justifyContent: 'space-between'
+    justifyContent: 'space-between',
   },
   logoStyle: {
-    width: 125,
-    height: 15,
-    resizeMode: 'contain'
+    width: 173.77,
+    height: 20,
+    resizeMode: 'contain',
   },
   closeIcon: {
     fontSize: 20,
     color: 'white'
   },
   separatorPadding: {
-    marginBottom: 18
+    marginBottom: 8
   },
   connextText: {
     marginTop: 45,

diff --git a/src/components/common/FontedText.js b/src/components/common/FontedText.js
@@ -22,7 +22,7 @@ export default FontedText;
 
 const styles = {
     fontStyle: {
-        fontFamily: 'Karla',
+        fontFamily: 'Karla-Regular',
     }
 }