From 37f33e9943bfe446a94557829028ec10c027d737 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Tue, 7 Jan 2020 08:35:06 +0100 Subject: [PATCH] fix WebView package --- app | 2 +- .../bootstraps/lbry/build/templates/build.tmpl.gradle | 1 + .../bootstraps/lbry/build/templates/build.tmpl.gradle.arm | 3 ++- .../bootstraps/lbry/build/templates/settings.gradle | 4 +++- src/main/java/io/lbry/browser/MainActivity.java | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app b/app index 673d6dc0..c47c7cd9 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit 673d6dc0f5f9044405def32b3a4809472708c907 +Subproject commit c47c7cd925293dfa4d7eb00bf4fd19b0a9003908 diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle index 69a7e195..b6568a27 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle @@ -125,6 +125,7 @@ dependencies { compile project(':react-native-reanimated') compile project(':react-native-snackbar') compile project(':react-native-video') + compile project(':react-native-webview') compile project(':rn-fetch-blob') {%- for aar in aars %} compile(name: '{{ aar }}', ext: 'aar') diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm index 486c94ac..8b1c005c 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm @@ -34,7 +34,7 @@ allprojects { apply plugin: 'com.android.application' project.ext.react = [ - enableHermes: true, + enableHermes: false, entryFile: "index.js" ] @@ -125,6 +125,7 @@ dependencies { compile project(':react-native-reanimated') compile project(':react-native-snackbar') compile project(':react-native-video') + compile project(':react-native-webview') compile project(':rn-fetch-blob') {%- for aar in aars %} compile(name: '{{ aar }}', ext: 'aar') diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.gradle index 2d563176..de59e58a 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.gradle +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.gradle @@ -17,5 +17,7 @@ include ':react-native-snackbar' project(':react-native-snackbar').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-snackbar/android') include ':react-native-video' project(':react-native-video').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-video/android-exoplayer') +include ':react-native-webview' +project(':react-native-webview').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-webview/android') include ':rn-fetch-blob' -project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, './react/node_modules/rn-fetch-blob/android') +project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, './react/node_modules/rn-fetch-blob/android') \ No newline at end of file diff --git a/src/main/java/io/lbry/browser/MainActivity.java b/src/main/java/io/lbry/browser/MainActivity.java index 77f462c2..d4f269b7 100644 --- a/src/main/java/io/lbry/browser/MainActivity.java +++ b/src/main/java/io/lbry/browser/MainActivity.java @@ -49,6 +49,7 @@ import com.facebook.react.ReactRootView; import com.facebook.soloader.SoLoader; import com.google.firebase.analytics.FirebaseAnalytics; import com.reactnativecommunity.asyncstorage.AsyncStoragePackage; +import com.reactnativecommunity.webview.RNCWebViewPackage; import com.rnfs.RNFSPackage; import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView; import com.swmansion.gesturehandler.react.RNGestureHandlerPackage; @@ -162,6 +163,7 @@ public class MainActivity extends FragmentActivity implements DefaultHardwareBac .addPackage(new MainReactPackage()) .addPackage(new AsyncStoragePackage()) .addPackage(new FastImageViewPackage()) + .addPackage(new RNCWebViewPackage()) .addPackage(new ReactVideoPackage()) .addPackage(new ReanimatedPackage()) .addPackage(new RNCameraPackage())