From 2b3397bc85357db078288813e11104fffe43532a Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Wed, 18 Dec 2019 11:48:29 +0100 Subject: [PATCH 1/2] snackbar support --- app | 2 +- .../bootstraps/lbry/build/templates/build.tmpl.gradle | 1 + .../bootstraps/lbry/build/templates/build.tmpl.gradle.arm | 1 + .../bootstraps/lbry/build/templates/settings.gradle | 2 ++ src/main/java/io/lbry/browser/MainActivity.java | 2 ++ 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app b/app index 3662834f..f2317417 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit 3662834fbae588f4c000a2d95eb89891f7c81c3f +Subproject commit f23174178972c940679504d0e11da5e57f8ab506 diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle index 23c4e407..6a60da47 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle @@ -111,6 +111,7 @@ dependencies { compile project(':react-native-fs') compile project(':react-native-gesture-handler') compile project(':react-native-reanimated') + compile project(':react-native-snackbar') compile project(':react-native-video') compile project(':rn-fetch-blob') {%- for aar in aars %} 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 cbab6435..540104b9 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm @@ -111,6 +111,7 @@ dependencies { compile project(':react-native-fs') compile project(':react-native-gesture-handler') compile project(':react-native-reanimated') + compile project(':react-native-snackbar') compile project(':react-native-video') compile project(':rn-fetch-blob') {%- for aar in aars %} diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.gradle index b2010967..2d563176 100644 --- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.gradle +++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/settings.gradle @@ -13,6 +13,8 @@ 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-reanimated' project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, './react/node_modules/react-native-reanimated/android') +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 ':rn-fetch-blob' diff --git a/src/main/java/io/lbry/browser/MainActivity.java b/src/main/java/io/lbry/browser/MainActivity.java index 52f03728..2f2476e1 100644 --- a/src/main/java/io/lbry/browser/MainActivity.java +++ b/src/main/java/io/lbry/browser/MainActivity.java @@ -27,6 +27,7 @@ import android.telephony.SmsMessage; import android.telephony.TelephonyManager; import android.widget.Toast; +import com.azendoo.reactnativesnackbar.SnackbarPackage; import com.brentvatne.react.ReactVideoPackage; import com.dylanvann.fastimage.FastImageViewPackage; import com.facebook.react.common.LifecycleState; @@ -168,6 +169,7 @@ public class MainActivity extends Activity implements DefaultHardwareBackBtnHand .addPackage(new RNFetchBlobPackage()) .addPackage(new RNFSPackage()) .addPackage(new RNGestureHandlerPackage()) + .addPackage(new SnackbarPackage()) .addPackage(new LbryReactPackage()) .setUseDeveloperSupport(true) .setInitialLifecycleState(LifecycleState.RESUMED) From a58cc820efa167ed37ebc8d49e540bb5b6b1ac89 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Wed, 18 Dec 2019 16:51:07 +0100 Subject: [PATCH 2/2] app head: update master --- app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app b/app index f2317417..696ff616 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit f23174178972c940679504d0e11da5e57f8ab506 +Subproject commit 696ff616f7b1c72c56b37174cdb3d89fcc93e282