Rewards screen swipe transition from hamburger menu (#154)

* Clean up * Removed rewards stack * Updated drawer spacing
calblueprint · May 11, 2020 · e681415 · e681415
1 parent e2d901d
commit e681415
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 56 deletions.
diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js
@@ -8,7 +8,6 @@ import AuthLoadingScreen from '../screens/auth/AuthLoadingScreen';
 import DrawerContent from './DrawerContent';
 import AuthStackNavigator from './stack_navigators/AuthStack';
 import ResourcesStackNavigator from './stack_navigators/ResourcesStack';
-import RewardsStackNavigator from './stack_navigators/RewardsStack';
 import StoresStackNavigator from './stack_navigators/StoresStack';
 
 const Drawer = createDrawerNavigator();
@@ -45,14 +44,6 @@ function DrawerNavigator() {
         component={StoresStackNavigator}
         options={{ title: 'Map', swipeEnabled: false }}
       />
-      <Drawer.Screen
-        name="Rewards"
-        component={RewardsStackNavigator}
-        options={{
-          title: 'Rewards',
-          drawerLockMode: 'locked-closed',
-        }}
-      />
       <Drawer.Screen
         name="Resources"
         component={ResourcesStackNavigator}

diff --git a/navigation/DrawerContent.js b/navigation/DrawerContent.js
@@ -5,7 +5,6 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { AsyncStorage, Linking, TouchableOpacity, View } from 'react-native';
 import * as Sentry from 'sentry-expo';
-
 import { Title } from '../components/BaseComponents';
 import Colors from '../constants/Colors';
 import { getCustomersById } from '../lib/airtable/request';
@@ -109,9 +108,17 @@ function DrawerContent(props) {
       </View>
       <DrawerItemList {...props} />
       <TouchableOpacity
-        style={{ padding: 8, height: 114 }}
+        style={{ paddingHorizontal: 8, paddingVertical: 13 }}
+        onPress={() => {
+          props.navigation.goBack();
+          props.navigation.navigate('RewardsOverlay');
+        }}>
+        <Title style={{ height: 30 }}>Rewards</Title>
+      </TouchableOpacity>
+      <TouchableOpacity
+        style={{ paddingHorizontal: 8, paddingVertical: 13 }}
         onPress={() => Linking.openURL(link)}>
-        <Title>Feedback</Title>
+        <Title style={{ height: 30 }}>Feedback</Title>
       </TouchableOpacity>
       <View
         style={{

diff --git a/navigation/stack_navigators/RewardsStack.js b/navigation/stack_navigators/RewardsStack.js