From bc62580aaeacb9cf9fec805946587a6f6f3d3ef8 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Tue, 7 Jan 2020 11:21:01 +0100 Subject: [PATCH] downgrade drawer navigator because it's still being weird --- package-lock.json | 19 ++++++++++++++++--- package.json | 2 +- src/component/AppNavigator.js | 15 ++++++++------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2c85fd3..f1bf389 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10136,9 +10136,22 @@ } }, "react-navigation-drawer": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/react-navigation-drawer/-/react-navigation-drawer-2.3.3.tgz", - "integrity": "sha512-d/rA8Slqv7HoMfONKVDBQUrRF7YQH796Gzal/KOhaY4VOwUUqIwfxMRJ3WrsdL2OkDPixtkXJE2Fz6KAj658uA==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/react-navigation-drawer/-/react-navigation-drawer-1.4.0.tgz", + "integrity": "sha512-ZyWBozcjB2aZ7vwCALv90cYA2NpDjM+WALaiYRshvPvue8l7cqynePbHK8GhlMGyJDwZqp4MxQmu8u1XAKp3Bw==", + "requires": { + "react-native-tab-view": "^1.2.0" + }, + "dependencies": { + "react-native-tab-view": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/react-native-tab-view/-/react-native-tab-view-1.4.1.tgz", + "integrity": "sha512-Bke8KkDcDhvB/z0AS7MnQKMD2p6Kwfc1rSKlMOvg9CC5CnClQ2QEnhPSbwegKDYhUkBI92iH/BYy7hNSm5kbUQ==", + "requires": { + "prop-types": "^15.6.1" + } + } + } }, "react-navigation-redux-helpers": { "version": "3.0.2", diff --git a/package.json b/package.json index f4ae5db..a211509 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "react-native-video": "lbryio/react-native-video#7992ff945872f9bd00a3736d9ff1318f343abf47", "react-native-webview": "^8.0.2", "react-navigation": "^4.0.10", - "react-navigation-drawer": "^2.3.3", + "react-navigation-drawer": "^1.4.0", "react-navigation-redux-helpers": "^3.0.2", "react-navigation-tabs": "^2.7.0", "react-navigation-stack": "^1.10.3", diff --git a/src/component/AppNavigator.js b/src/component/AppNavigator.js index 9c83ca0..c6c6780 100644 --- a/src/component/AppNavigator.js +++ b/src/component/AppNavigator.js @@ -108,7 +108,7 @@ const discoverStack = createStackNavigator( { headerMode: 'screen', transitionConfig: () => ({ screenInterpolator: () => null }), - } + }, ); discoverStack.navigationOptions = ({ navigation }) => { @@ -142,7 +142,7 @@ const walletStack = createStackNavigator( { headerMode: 'screen', transitionConfig: () => ({ screenInterpolator: () => null }), - } + }, ); const drawerIconSize = 18; @@ -231,11 +231,12 @@ const drawer = createDrawerNavigator( backBehavior: 'none', unmountInactiveRoutes: true, contentComponent: DrawerContent, + overlayColor: 'rgba(0, 0, 0, 0.7)', contentOptions: { activeTintColor: Colors.LbryGreen, labelStyle: discoverStyle.menuText, }, - } + }, ); const mainStackNavigator = new createStackNavigator( @@ -264,7 +265,7 @@ const mainStackNavigator = new createStackNavigator( }, { headerMode: 'none', - } + }, ); export const AppNavigator = mainStackNavigator; @@ -303,7 +304,7 @@ class AppWithNavigationState extends React.Component { } return false; - }.bind(this) + }.bind(this), ); } @@ -346,7 +347,7 @@ class AppWithNavigationState extends React.Component { }, error => { /* failed */ - } + }, ); }; @@ -519,7 +520,7 @@ class AppWithNavigationState extends React.Component { dispatch( doToast({ message: 'Invalid Verification URI', - }) + }), ); } } else {