Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewards screen swipe transition from hamburger menu #154

Merged
merged 4 commits into from
May 11, 2020
Merged

Rewards screen swipe transition from hamburger menu #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5907905
clean up
thumn May 11, 2020
aef295c
removed rewards stack
thumn May 11, 2020
f363bd5
Removed rewards stack import
wangannie May 11, 2020
eabfaac
Updated drawer
wangannie May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions navigation/AppNavigator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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}
Expand Down
13 changes: 10 additions & 3 deletions navigation/DrawerContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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={{
Expand Down
44 changes: 0 additions & 44 deletions navigation/stack_navigators/RewardsStack.js
View file
Open in desktop

This file was deleted.