app/.babelrc

@@ -1,6 +1,7 @@
 {
-  "presets": ["react-native"],
+  "presets": ["module:metro-react-native-babel-preset"],
   "plugins": [
+    "@babel/plugin-proposal-nullish-coalescing-operator",
     ["module-resolver", {
       root: ["./src"],
     }],

app/package.json

@@ -13,18 +13,19 @@
         "lodash": ">=4.17.11",
         "merge": ">=1.2.1",
         "moment": "^2.22.1",
-        "react": "16.2.0",
-        "react-native": "0.55.3",
+        "react": "16.8.6",
+        "react-native": "0.59.3",
+        "@react-native-community/async-storage": "^1.2.2",
         "react-native-country-picker-modal": "^0.6.2",
         "react-native-exception-handler": "2.9.0",
         "react-native-fast-image": "^5.0.3",
-        "rn-fetch-blob": "^0.10.15",
+        "react-native-gesture-handler": "^1.1.0",
         "react-native-image-zoom-viewer": "^2.2.5",
         "react-native-phone-input": "lbryio/react-native-phone-input",
         "react-native-vector-icons": "^5.0.0",
         "react-native-video": "lbryio/react-native-video#exoplayer-lbry-android",
-        "react-navigation": "^2.18.3",
-        "react-navigation-redux-helpers": "^2.0.9",
+        "react-navigation": "^3.6.1",
+        "react-navigation-redux-helpers": "^3.0.0",
         "react-redux": "^5.0.3",
         "redux": "^3.6.0",
         "redux-logger": "3.0.6",
@@ -32,10 +33,13 @@
         "redux-persist-filesystem-storage": "^1.3.2",
         "redux-persist-transform-compress": "^4.2.0",
         "redux-persist-transform-filter": "0.0.10",
-        "redux-thunk": "^2.2.0"
+        "redux-thunk": "^2.2.0",
+        "rn-fetch-blob": "^0.10.15"
     },
     "devDependencies": {
+        "@babel/core": "^7.4.3",
         "babel-preset-env": "^1.6.1",
+        "babel-preset-react-native": "5.0.2",
         "babel-preset-stage-2": "^6.18.0",
         "babel-plugin-module-resolver": "^3.1.1",
         "flow-babel-webpack-plugin": "^1.1.1"

app/src/component/AppNavigator.js

@@ -14,19 +14,19 @@ import TransactionHistoryPage from 'page/transactionHistory';
 import WalletPage from 'page/wallet';
 import SearchInput from 'component/searchInput';
 import {
+  createAppContainer,
   createDrawerNavigator,
   createStackNavigator,
   NavigationActions
 } from 'react-navigation';
 import {
   addListener,
-  reduxifyNavigator,
+  createReduxContainer,
   createReactNavigationReduxMiddleware,
 } from 'react-navigation-redux-helpers';
 import { connect } from 'react-redux';
 import {
   AppState,
-  AsyncStorage,
   BackHandler,
   Linking,
   NativeModules,
@@ -48,6 +48,7 @@ import {
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import { decode as atob } from 'base-64';
 import { dispatchNavigateBack, dispatchNavigateToUri } from 'utils/helper';
+import AsyncStorage from '@react-native-community/async-storage';
 import Colors from 'styles/colors';
 import Constants from 'constants';
 import Icon from 'react-native-vector-icons/FontAwesome5';
@@ -195,7 +196,7 @@ const drawer = createDrawerNavigator({
   }
 });
 
-export const AppNavigator = new createStackNavigator({
+const mainStackNavigator = new createStackNavigator({
   FirstRun: {
     screen: FirstRunScreen,
     navigationOptions: {
@@ -214,12 +215,11 @@ export const AppNavigator = new createStackNavigator({
 }, {
   headerMode: 'none'
 });
-
+export const AppNavigator = mainStackNavigator;
 export const reactNavigationMiddleware = createReactNavigationReduxMiddleware(
-  "root",
   state => state.nav,
 );
-const App = reduxifyNavigator(AppNavigator, "root");
+const App = createReduxContainer(mainStackNavigator, "root");
 const appMapStateToProps = (state) => ({
   state: state.nav,
 });

app/src/component/emailRewardSubcard/index.js

@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
 import {
   doUserEmailNew,
+  doUserEmailToVerify,
   doUserResendVerificationEmail,
   selectEmailNewErrorMessage,
   selectEmailNewIsPending,
@@ -17,6 +18,7 @@ const select = state => ({
 
 const perform = dispatch => ({
   addUserEmail: email => dispatch(doUserEmailNew(email)),
+  setEmailToVerify: email => dispatch(doUserEmailToVerify(email)),
   notify: data => dispatch(doToast(data)),
   resendVerificationEmail: email => dispatch(doUserResendVerificationEmail(email))
 });

app/src/component/emailRewardSubcard/view.js

@@ -2,42 +2,43 @@
 import React from 'react';
 import {
   ActivityIndicator,
-  AsyncStorage,
   Text,
   TextInput,
   TouchableOpacity,
   View
 } from 'react-native';
+import AsyncStorage from '@react-native-community/async-storage';
 import Icon from 'react-native-vector-icons/FontAwesome5';
-import Button from '../button';
-import Colors from '../../styles/colors';
-import Constants from '../../constants';
-import Link from '../link';
-import rewardStyle from '../../styles/reward';
+import Button from 'component/button';
+import Colors from 'styles/colors';
+import Constants from 'constants';
+import Link from 'component/link';
+import rewardStyle from 'styles/reward';
 
 class EmailRewardSubcard extends React.PureComponent {
-  state = {
+  constructor(props) {
+    super(props);
+    this.state = {
       email: null,
       emailAlreadySet: false,
       previousEmail: null,
       verfiyStarted: false
     };
+  }
 
   componentDidMount() {
-    const { emailToVerify } = this.props;
-    AsyncStorage.getItem(Constants.KEY_FIRST_RUN_EMAIL).then(email => {
-      if (email && email.trim().length > 0) {
-        this.setState({ email, emailAlreadySet: true, previousEmail: email });
-      } else {
-        this.setState({ email: emailToVerify, previousEmail: emailToVerify });
-      }
-    });
+    const { setEmailToVerify } = this.props;
+    AsyncStorage.getItem(Constants.KEY_FIRST_RUN_EMAIL).then(email => setEmailToVerify(email));
   }
 
   componentWillReceiveProps(nextProps) {
-    const { emailNewErrorMessage, emailNewPending } = nextProps;
+    const { emailNewErrorMessage, emailNewPending, emailToVerify } = nextProps;
     const { notify } = this.props;
 
+    if (emailToVerify && emailToVerify.trim().length > 0 && !this.state.email && !this.state.previousEmail) {
+      this.setState({ email: emailToVerify, previousEmail: emailToVerify, emailAlreadySet: true });
+    }
+
     if (this.state.verifyStarted && !emailNewPending) {
       if (emailNewErrorMessage) {
         notify({ message: String(emailNewErrorMessage), isError: true });

app/src/component/phoneNumberRewardSubcard/view.js

@@ -2,7 +2,6 @@
 import React from 'react';
 import {
   ActivityIndicator,
-  AsyncStorage,
   DeviceEventEmitter,
   NativeModules,
   StyleSheet,
@@ -11,6 +10,7 @@ import {
   TouchableOpacity,
   View
 } from 'react-native';
+import AsyncStorage from '@react-native-community/async-storage';
 import Button from 'component/button';
 import Colors from 'styles/colors';
 import Constants from 'constants';

app/src/component/rewardSummary/view.js

@@ -1,7 +1,8 @@
 import React from 'react';
-import { AsyncStorage, NativeModules, Text, TouchableOpacity, View } from 'react-native';
-import Button from '../../component/button';
-import rewardStyle from '../../styles/reward';
+import { NativeModules, Text, TouchableOpacity, View } from 'react-native';
+import AsyncStorage from '@react-native-community/async-storage';
+import Button from 'component/button';
+import rewardStyle from 'styles/reward';
 
 class RewardSummary extends React.Component {
   static itemKey = 'rewardSummaryDismissed';

app/src/index.js

@@ -4,7 +4,6 @@ import { Provider, connect } from 'react-redux';
 import {
   AppRegistry,
   AppState,
-  AsyncStorage,
   Text,
   View,
   NativeModules
@@ -32,6 +31,7 @@ import { createLogger } from 'redux-logger';
 import { AppNavigator } from 'component/AppNavigator';
 import { persistStore, autoRehydrate } from 'redux-persist';
 import AppWithNavigationState, { reactNavigationMiddleware } from './component/AppNavigator';
+import AsyncStorage from '@react-native-community/async-storage';
 import FilesystemStorage from 'redux-persist-filesystem-storage';
 import createCompressor from 'redux-persist-transform-compress';
 import createFilter from 'redux-persist-transform-filter';

app/src/page/discover/view.js

@@ -3,7 +3,6 @@ import NavigationActions from 'react-navigation';
 import {
   Alert,
   ActivityIndicator,
-  AsyncStorage,
   Linking,
   NativeModules,
   SectionList,
@@ -11,6 +10,7 @@ import {
   View
 } from 'react-native';
 import { Lbry, normalizeURI, parseURI } from 'lbry-redux';
+import AsyncStorage from '@react-native-community/async-storage';
 import moment from 'moment';
 import Constants from 'constants';
 import Colors from 'styles/colors';

app/src/page/firstRun/internal/email-collect-page.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { Lbry } from 'lbry-redux';
 import {
   ActivityIndicator,
-  AsyncStorage,
   Linking,
   NativeModules,
   Platform,
@@ -10,9 +9,10 @@ import {
   TextInput,
   View
 } from 'react-native';
-import Colors from '../../../styles/colors';
-import Constants from '../../../constants';
-import firstRunStyle from '../../../styles/firstRun';
+import AsyncStorage from '@react-native-community/async-storage';
+import Colors from 'styles/colors';
+import Constants from 'constants';
+import firstRunStyle from 'styles/firstRun';
 
 class EmailCollectPage extends React.PureComponent {
   static MAX_STATUS_TRIES = 30;

app/src/page/firstRun/view.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { Lbry } from 'lbry-redux';
 import {
   ActivityIndicator,
-  AsyncStorage,
   Linking,
   NativeModules,
   Text,
@@ -10,11 +9,12 @@ import {
   View
 } from 'react-native';
 import { NavigationActions, StackActions } from 'react-navigation';
-import Colors from '../../styles/colors';
-import Constants from '../../constants';
+import AsyncStorage from '@react-native-community/async-storage';
+import Colors from 'styles/colors';
+import Constants from 'constants';
 import WelcomePage from './internal/welcome-page';
 import EmailCollectPage from './internal/email-collect-page';
-import firstRunStyle from '../../styles/firstRun';
+import firstRunStyle from 'styles/firstRun';
 
 class FirstRunScreen extends React.PureComponent {
   static pages = [

app/src/page/splash/view.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { Lbry } from 'lbry-redux';
 import {
   ActivityIndicator,
-  AsyncStorage,
   Linking,
   NativeModules,
   Platform,
@@ -13,10 +12,11 @@ import {
 import { NavigationActions, StackActions } from 'react-navigation';
 import { decode as atob } from 'base-64';
 import { navigateToUri } from '../../utils/helper';
+import AsyncStorage from '@react-native-community/async-storage';
 import PropTypes from 'prop-types';
-import Colors from '../../styles/colors';
-import Constants from '../../constants';
-import splashStyle from '../../styles/splash';
+import Colors from 'styles/colors';
+import Constants from 'constants';
+import splashStyle from 'styles/splash';
 
 const BLOCK_HEIGHT_INTERVAL = 1000 * 60 * 2.5; // every 2.5 minutes
 

app/src/page/subscriptions/view.js

@@ -2,7 +2,6 @@ import React from 'react';
 import NavigationActions from 'react-navigation';
 import {
   ActivityIndicator,
-  AsyncStorage,
   FlatList,
   NativeModules,
   SectionList,
@@ -12,6 +11,7 @@ import {
 } from 'react-native';
 import { buildURI, parseURI } from 'lbry-redux';
 import { uriFromFileInfo } from 'utils/helper';
+import AsyncStorage from '@react-native-community/async-storage';
 import moment from 'moment';
 import Button from 'component/button';
 import Colors from 'styles/colors';

app/src/page/trending/view.js

@@ -2,13 +2,13 @@ import React from 'react';
 import NavigationActions from 'react-navigation';
 import {
   ActivityIndicator,
-  AsyncStorage,
   NativeModules,
   FlatList,
   Text,
   View
 } from 'react-native';
 import { normalizeURI } from 'lbry-redux';
+import AsyncStorage from '@react-native-community/async-storage';
 import moment from 'moment';
 import FileItem from '/component/fileItem';
 import discoverStyle from 'styles/discover';

buildozer.spec.sample

@@ -89,7 +89,7 @@ fullscreen = 0
 android.permissions = ACCESS_NETWORK_STATE,BLUETOOTH,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE
 
 # (int) Android API to use
-android.api = 27
+android.api = 28
 
 # (int) Minimum API required
 android.minapi = 21
@@ -148,7 +148,7 @@ android.react_src = ./app
 
 # (list) Gradle dependencies to add (currently works only with sdl2_gradle
 # bootstrap)
-android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828
+android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828
 
 # (str) python-for-android branch to use, defaults to master
 #p4a.branch = stable

buildozer.spec.travis

@@ -89,7 +89,7 @@ fullscreen = 0
 android.permissions = ACCESS_NETWORK_STATE,BLUETOOTH,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE
 
 # (int) Android API to use
-android.api = 27
+android.api = 28
 
 # (int) Minimum API required
 android.minapi = 21
@@ -148,7 +148,7 @@ android.react_src = ./app
 
 # (list) Gradle dependencies to add (currently works only with sdl2_gradle
 # bootstrap)
-android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828
+android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828
 
 # (str) python-for-android branch to use, defaults to master
 #p4a.branch = stable

buildozer.spec.vagrant

@@ -89,7 +89,7 @@ fullscreen = 0
 android.permissions = ACCESS_NETWORK_STATE,BLUETOOTH,INTERNET,READ_EXTERNAL_STORAGE,WRITE_EXTERNAL_STORAGE
 
 # (int) Android API to use
-android.api = 27
+android.api = 28
 
 # (int) Minimum API required
 android.minapi = 21
@@ -148,7 +148,7 @@ android.react_src = ./app
 
 # (list) Gradle dependencies to add (currently works only with sdl2_gradle
 # bootstrap)
-android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.55.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828
+android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.3, com.mixpanel.android:mixpanel-android:5+, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828
 
 # (str) python-for-android branch to use, defaults to master
 #p4a.branch = stable

p4a/pythonforandroid/bootstraps/lbry/build/templates/AndroidManifest.tmpl.xml

@@ -25,6 +25,7 @@
     <!-- OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" />
 
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     {% for perm in args.permissions %}
     {% if '.' in perm %}
     <uses-permission android:name="{{ perm }}" />
@@ -54,7 +55,8 @@
                  android:icon="@drawable/icon"
                  android:allowBackup="true"
                  android:theme="@style/LbryAppTheme"
-                 android:hardwareAccelerated="true">
+                 android:hardwareAccelerated="true"
+                 android:usesCleartextTraffic="true">
 
         {% for m in args.meta_data %}
         <meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %}

p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle

@@ -92,10 +92,12 @@ subprojects {
 }
 
 dependencies {
+    compile project(':@react-native-community_async-storage')
     compile project(':react-native-exception-handler')
     compile project(':react-native-fast-image')
-    compile project(':rn-fetch-blob')
+    compile project(':react-native-gesture-handler')
     compile project(':react-native-video')
+    compile project(':rn-fetch-blob')
     {%- for aar in aars %}
     compile(name: '{{ aar }}', ext: 'aar')
     {%- endfor -%}

p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.tmpl.gradle

@@ -1,9 +1,13 @@
 rootProject.name = 'browser'
+include ':@react-native-community_async-storage'
+project(':@react-native-community_async-storage').projectDir = new File(rootProject.projectDir, './react/node_modules/@react-native-community/async-storage/android')
 include ':react-native-exception-handler'
 project(':react-native-exception-handler').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-exception-handler/android')
 include ':react-native-fast-image'
 project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-fast-image/android')
-include ':rn-fetch-blob'
-project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, './react/node_modules/rn-fetch-blob/android')
+include ':react-native-gesture-handler'
+project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-gesture-handler/android')
 include ':react-native-video'
 project(':react-native-video').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-video/android-exoplayer')
+include ':rn-fetch-blob'
+project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, './react/node_modules/rn-fetch-blob/android')

src/main/java/io/lbry/browser/MainActivity.java

@@ -31,6 +31,10 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.ReactRootView;
+import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
+import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
 import com.RNFetchBlob.RNFetchBlobPackage;
 
 import io.lbry.browser.reactpackages.LbryReactPackage;
@@ -116,15 +120,17 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand
             ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice");
         }
 
-        mReactRootView = new ReactRootView(this);
+        mReactRootView = new RNGestureHandlerEnabledRootView(this);
         mReactInstanceManager = ReactInstanceManager.builder()
                 .setApplication(getApplication())
                 .setBundleAssetName("index.android.bundle")
                 .setJSMainModulePath("index")
                 .addPackage(new MainReactPackage())
+                .addPackage(new AsyncStoragePackage())
                 .addPackage(new FastImageViewPackage())
                 .addPackage(new ReactVideoPackage())
                 .addPackage(new RNFetchBlobPackage())
+                .addPackage(new RNGestureHandlerPackage())
                 .addPackage(new LbryReactPackage())
                 .setUseDeveloperSupport(true)
                 .setInitialLifecycleState(LifecycleState.RESUMED)