diff --git a/package-lock.json b/package-lock.json index 3ee9e26..9d020e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5562,8 +5562,8 @@ } }, "lbry-redux": { - "version": "github:lbryio/lbry-redux#4e5e51b99b730cc834747edb9fd7d87d47a7d4f9", - "from": "github:lbryio/lbry-redux#4e5e51b99b730cc834747edb9fd7d87d47a7d4f9", + "version": "github:lbryio/lbry-redux#1a8ce5ee1397e101f2a015f1c3a9050c15ca6157", + "from": "github:lbryio/lbry-redux#1a8ce5ee1397e101f2a015f1c3a9050c15ca6157", "requires": { "proxy-polyfill": "0.1.6", "reselect": "^3.0.0", @@ -8110,6 +8110,11 @@ "prop-types": "^15.5.10" } }, + "react-native-reanimated": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-1.2.0.tgz", + "integrity": "sha512-vkWRHrPK5qfHP/ZawlRoo38oeYe9NZaaOH/lmFxRcsKzaSK6x3H5ZPXI8lK6MfTLveqwo1QhJje3zIKXO4nQQw==" + }, "react-native-safe-area-view": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/react-native-safe-area-view/-/react-native-safe-area-view-0.7.0.tgz", @@ -8394,15 +8399,22 @@ "react-navigation-drawer": "~1.2.1", "react-navigation-stack": "~1.4.0", "react-navigation-tabs": "~1.1.4" + }, + "dependencies": { + "react-navigation-drawer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/react-navigation-drawer/-/react-navigation-drawer-1.2.1.tgz", + "integrity": "sha512-T2kaBjY2c4/3I6noWFnaf/c18ntNH5DsST38i+pdc2NPxn5Yi5lkK+ZZTeKuHSFD4a7G0jWY9OGf1iRkHWLMAQ==", + "requires": { + "react-native-tab-view": "^1.2.0" + } + } } }, "react-navigation-drawer": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/react-navigation-drawer/-/react-navigation-drawer-1.2.1.tgz", - "integrity": "sha512-T2kaBjY2c4/3I6noWFnaf/c18ntNH5DsST38i+pdc2NPxn5Yi5lkK+ZZTeKuHSFD4a7G0jWY9OGf1iRkHWLMAQ==", - "requires": { - "react-native-tab-view": "^1.2.0" - } + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/react-navigation-drawer/-/react-navigation-drawer-2.0.0.tgz", + "integrity": "sha512-M9Ov4kOj0nh9HDMYoYJtd6ZaIKYLlC3y2LmGr4kNIPZ1zj4fIXi8ibaolZOe28xmZakWFZzN7bbUf2f+Rbc8Og==" }, "react-navigation-redux-helpers": { "version": "3.0.2", diff --git a/package.json b/package.json index 70d0b63..1cecaf2 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,12 @@ "react-native-image-zoom-viewer": "^2.2.5", "react-native-password-strength-meter": "^0.0.2", "react-native-phone-input": "lbryio/react-native-phone-input", + "react-native-reanimated": "^1.2.0", "react-native-super-grid": "^3.0.4", "react-native-vector-icons": "^6.6.0", "react-native-video": "lbryio/react-native-video#exoplayer-lbry-android", "react-navigation": "^3.11.0", + "react-navigation-drawer": "^2.0.0", "react-navigation-redux-helpers": "^3.0.2", "react-redux": "^5.0.3", "redux": "^4.0.4", diff --git a/src/component/AppNavigator.js b/src/component/AppNavigator.js index 4530686..14ac36e 100644 --- a/src/component/AppNavigator.js +++ b/src/component/AppNavigator.js @@ -17,7 +17,8 @@ import SubscriptionsPage from 'page/subscriptions'; import TransactionHistoryPage from 'page/transactionHistory'; import VerificationScreen from 'page/verification'; import WalletPage from 'page/wallet'; -import { createDrawerNavigator, createStackNavigator, NavigationActions } from 'react-navigation'; +import { createStackNavigator, NavigationActions } from 'react-navigation'; +import { createDrawerNavigator } from 'react-navigation-drawer'; import { createReduxContainer, createReactNavigationReduxMiddleware,