New build (#854)

* new project structure compatiable with Android Studio

.gitignore

@@ -1,17 +1,67 @@
-.buildozer
-.buildozer-downloads
+# OSX
+#
+.DS_Store
+
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+
+# Android/IntelliJ
+#
+build/
+.idea
 .gradle
-app/node_modules/
-bin
-buildozer.spec
-build.log
-recipes/**/*.pyc
-src/main/assets/blockchain/headers
-src/main/assets/index.android.bundle
-src/main/assets/index.android.bundle.meta
+local.properties
+*.iml
+
+# node.js
+#
+node_modules/
+npm-debug.log
+yarn-error.log
+
+# BUCK
+buck-out/
+\.buckd/
+*.keystore
+!debug.keystore
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/
+
+*/fastlane/report.xml
+*/fastlane/Preview.html
+*/fastlane/screenshots
+
+# Bundle artifact
+*.jsbundle
+
+# CocoaPods
+/ios/Pods/
+
+# Other Files
+app/google-services.json
 *.log
 .vagrant
-
-lbry-android.keystore
-p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json
-.gitsecret/keys/random_seed
+*.hprof
+app/build
+bin

.gitlab-ci.yml

@@ -1,81 +1,60 @@
 stages:
   - build
-  - build2
   - deploy
   - release
 
-build arm64 apk:
+build apk:
   stage: build
   image: lbry/android-base:platform-28
   before_script:
-    - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
-    - git submodule sync --recursive
-    - git submodule update --init --force --recursive
+    - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign
+    - wget -q https://nodejs.org/dist/latest-v10.x/node-v10.19.0-linux-x64.tar.gz && tar xf node-v10.19.0-linux-x64.tar.gz -C /opt
+    - ln -fs /opt/node-v10.19.0-linux-x64/bin/node /usr/bin/node
+    - ln -fs /opt/node-v10.19.0-linux-x64/bin/npm /usr/bin/npm
+    - ln -fs /opt/node-v10.19.0-linux-x64/bin/npx /usr/bin/npx
+    - chmod u+x $CI_PROJECT_DIR/gradlew
+    - export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23
+    - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1)  
   artifacts:
     paths:
+      - bin/browser-*-release__arm.apk
       - bin/browser-*-release__arm64.apk
     expire_in: 1 week
   script:
     - export PATH=/usr/bin:$PATH
     - echo "$PGP_PRIVATE_KEY" | gpg --batch --import
-    - cd app
-    - npm install
-    - cd ..
-    - wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/
-    - tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/
-    - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-    - ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-    - cp -f $CI_PROJECT_DIR/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
-    - cp -f $CI_PROJECT_DIR/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
-    - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz
+    - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+    - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+    - echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
+    - wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
+    - apt-get -y update && apt-get -y install yarn git-secret
     - git secret reveal
-    - mv buildozer.spec.arm64.ci buildozer.spec
-    - mkdir -p $CI_PROJECT_DIR/src/main/assets/blockchain && wget -q https://headers.lbry.io/blockchain_headers_latest -O $CI_PROJECT_DIR/src/main/assets/blockchain/headers
-    - "./release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered"
-    - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release.apk $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release__arm64.apk
-    - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release.apk /dev/null
-
-build arm apk:
-  stage: build2
-  image: lbry/android-base:platform-28
-  before_script:
-    - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
-    - git submodule sync --recursive
-    - git submodule update --init --force --recursive
-  artifacts:
-    paths:
-      - bin/browser-*-release__arm.apk
-    expire_in: 1 week
-  script:
-    - export PATH=/usr/bin:$PATH
-    - echo "$PGP_PRIVATE_KEY" | gpg --batch --import
-    - cd app
-    - npm install
-    - cd ..
-    - wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/
-    - tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/
-    - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-    - ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-    - cp -f $CI_PROJECT_DIR/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm $CI_PROJECT_DIR/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
-    - cp -f $CI_PROJECT_DIR/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
-    - cp -f $CI_PROJECT_DIR/scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
-    - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz
-    - git secret reveal
-    - mv buildozer.spec.arm.ci buildozer.spec
-    - mkdir -p $CI_PROJECT_DIR/src/main/assets/blockchain && wget -q https://headers.lbry.io/blockchain_headers_latest -O $CI_PROJECT_DIR/src/main/assets/blockchain/headers
-    - "./release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered"
-    - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release.apk $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release__arm.apk
-    - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release.apk /dev/null
-
+    - npm install -g react-native-cli
+    - cd ~/
+    - git clone https://github.com/lbryio/lbry-react-native
+    - cd lbry-react-native
+    - chmod u+x bundle-android.sh
+    - yarn
+    - rm -rf android # temporary, should be a submodule init?
+    - cp -rf $CI_PROJECT_DIR/ android/
+    - cd android
+    - chmod u+x ./release.sh
+    - ./release.sh
+    - mkdir -p $CI_PROJECT_DIR/bin/ && cp bin/*.apk $CI_PROJECT_DIR/bin/
+    - cd $CI_PROJECT_DIR
+    - cp bin/browser-$BUILD_VERSION-release__arm.apk /dev/null
+    - cp bin/browser-$BUILD_VERSION-release__arm64.apk /dev/null
+    
 deploy build.lbry.io:
-  image: python:latest
+  image: python:stretch
   stage: deploy
   dependencies:
-    - build arm apk
-    - build arm64 apk
+    - build apk
   before_script:
+    - apt-get -y update && apt-get -y install openjdk-8-jdk
     - pip install awscli
-    - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
+    - chmod u+x $CI_PROJECT_DIR/gradlew
+    - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1)
     - export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk
     - export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk
   script:
@@ -84,16 +63,17 @@ deploy build.lbry.io:
     - aws s3 cp bin/$BUILD_APK_FILENAME__64 s3://build.lbry.io/android/push.apk
 
 release apk:
-  image: python:latest
+  image: python:stretch
   stage: release
   only:
     - tags
   dependencies:
-    - build arm apk
-    - build arm64 apk
+    - build apk
   before_script:
+    - apt-get -y update && apt-get -y install openjdk-8-jdk
     - pip install awscli githubrelease
-    - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+')
+    - chmod u+x $CI_PROJECT_DIR/gradlew
+    - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1)
     - export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk
     - export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk
   script:

.gitmodules

@@ -1,3 +1 @@
-[submodule "app"]
-	path = app
-	url = https://github.com/lbryio/lbry-react-native
+

.gitsecret/paths/mapping.cfg

@@ -1,2 +1,2 @@
-lbry-android.keystore:
-p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json
+lbry-android.keystore:0d958c531870694624cc877ea98ca1c583485f8ebbb3a5acca58b1930c190d65
+app/google-services.json:2a2804bfa1bc5154e533fd9c40ad3ba29bcf0f0ad361b90900d9e3fe8851611e

BUILD.md

@@ -1,137 +0,0 @@
-## Linux Build Instructions
-
-This app has currently only been built on Ubuntu 14.04, 16.04, 17.10, and 18.04, but these instructions, or an analog of them, should work on most Linux or macOS environments. An abridged version of these instructions is available at [QUICKSTART.md](QUICKSTART.md).
-
-For instructions on how to build using a Docker image, please see [DOCKER.md](DOCKER.md).
-
-### Install Prerequisites
-
-#### Requirements
-* JDK 1.8
-* Android SDK
-* Crystax Android NDK
-* Buildozer
-* Node.js
-* npm
-* yarn
-
-#### apt Packages
-Install all apt packages required by running the following commands:
-```
-sudo dpkg --add-architecture i386
-sudo apt-get -y update
-sudo apt-get install -y curl ca-certificates software-properties-common gpg-agent wget
-sudo add-apt-repository ppa:deadsnakes/ppa -y && \
-     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-sudo apt-get -y update && apt-get -y install autoconf autogen automake libtool libffi-dev \
-     build-essential python3.7 python3.7-dev python3.7-venv python3-pip ccache git libncurses5:i386 libstdc++6:i386 \
-     libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
-     python-pip openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 yarn gawk nodejs npm
-```
-Alternatively, the JDK available from http://www.oracle.com/technetwork/java/javase/downloads/index.html can be installed instead of the `openjdk-8-jdk` package.
-
-#### Install Cython and Setuptools
-```
-sudo -H pip install --upgrade cython==0.28.1 setuptools
-```
-
-#### Install buildozer
-A forked version of `buildozer` needs to be installed in order to copy the React Native UI source files into the corresponding directories.
-```
-git clone https://github.com/lbryio/buildozer.git
-cd buildozer && python2.7 setup.py install && cd ..
-```
-
-#### Create buildozer.spec
-Assuming `lbry-android` as the current working folder:
-* Copy `buildozer.spec.sample` to `buildozer.spec` in the `lbry-android` folder. Running `buildozer init` instead will create a new `buildozer.spec` file.
-* Update `buildozer.spec` settings to match your environment. The basic recommended settings are outlined below.
-
-
-| Setting             | Description                  |
-|:------------------- |:-----------------------------|
-| title               | application title            |
-| package.name        | package name (e.g. browser)   |
-| package.domain      | package domain (e.g. io.lbry) |
-| source.dir          | the location of the application main.py |
-| version             | application version          |
-| requirements        | the Python module requirements for building the application |
-| services            | list of Android background services and their corresponding Python entry points |
-| android.permissions | Android manifest permissions required by the application. This should be set to `INTERNET` at the very least to enable internet connectivity |
-| android.api         | Android API version (Should be at least 23 for Gradle build support) |
-| android.sdk         | Android SDK version (Should be at least 23 for Gradle build support) |
-| android.ndk         | Android NDK version (not required when using crystax Android NDK) |
-| android.ndk_path    | Android NDK path. This should be set to the crystax Android NDK path) |
-| android.sdk_path    | Android SDK path. This should be set to the path where the Android SDK is manually set up (if not set up in the `.buildozer` path). |
-| p4a.source_dir      | Path to the python-for-android repository folder. Currently set to the included `p4a` folder |
-| p4a.local_recipes   | Path to a folder containing python_for_android recipes to be used in the build. The included `recipes` folder includes recipes for a successful build |
-
-#### Create google-services.json
-The `google-services.json` file is required for the build to be successful due to the Firebase implementation. Simply copy the provided sample file into the same destination folder.
-```
-cd lbry-android
-cp p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.sample.json p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json
-```
-
-#### Setup Android SDK for buildozer
-Download the Android SDK, platform and build tools archives.
-* Android API 23 SDK - https://dl.google.com/android/android-sdk_r23-linux.tgz
-* Android API 28 platform - https://dl.google.com/android/repository/platform-28_r06.zip
-* Android build tools 26.0.2 - https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip
-
-Create the `.buildozer` path (and the `android` sub-path) in your home folder if it doesn't already exist.
-`mkdir ~/.buildozer`
-`mkdir ~/.buildozer/android`
-
-Extract the API 23 SDK to the `~/.buildozer/android` path and rename the extracted folder.
-```
-tar -xf android-sdk_r23-linux.tgz ~/.buildozer/android/platform/
-mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk-23
-```
-
-Extract the API 28 platform archive into the `android-sdk-23` folder and rename the extracted folder.
-```
-unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms
-mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-9 ~/.buildozer/android/platform/android-sdk-23/platforms/android-2
-```
-
-Extract the build tools 26.0.2 build tools into the `android-sdk-23` folder and rename the extracted folder.
-```
-mkdir -p ~/.buildozer/android/platform/android-sdk-23/build-tools
-unzip ~/.buildozer/android/platform/build-tools_r26.0.2-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools
-mv ~/.buildozer/android/platform/android-sdk-23/build-tools/android-8.1.0 ~/.buildozer/android/platform/android-sdk-23/build-tools/26.0.2
-```
-
-Finally, create the Android SDK license file. This prevents being prompted to accept the SDK license during the build process.
-```
-mkdir -p ~/.buildozer/android/platform/android-sdk-23/licenses
-echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > ~/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license
-```
-
-#### Setup Crystax Android NDK for buildozer
-* Download the Crystax Android NDK from https://us.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz and extract. Remember to update `android.ndk_path` in your `buildozer.spec` to the path of the extracted Crystax NDK archive.
-* Copy `build-target-python.sh` from the `scripts` folder in the cloned `lbry-android` repository to the `crystax-ndk-10.3.2/build/tools/` folder.
-* Copy `mangled-glibc-syscalls.h` from the `scripts` folder in the cloned `lbry-android` repository to the `crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/` folder.
-* Delete the `android-9` folder in `crystax-ndk-10.3.2/platforms`, and create a symbolic link named `android-9` to the `android-21` folder.
-
-#### Build and Deploy
-Run `npm install -g react-native-cli` to install React Native CLI tools.
-
-Initialise git submodules by running `git submodule update --init --recursive` in the `lbry-android` folder.
-
-Run `npm i` in the `lbry-android/app` folder to install the necessary modules required by the React Native user interface, and then run `./bundle.sh`.
-
-Run `./build.sh` in `lbry-android` to build the APK. The output can be found in the `bin` subdirectory.
-
-To build and deploy, you can run `./deploy.sh`. This requires a connected device or a running Android emulator.
-
-#### Development
-If you already installed `Android SDK` and `adb`
-
-* Run `adb reverse tcp:8081 tcp:8081`
-* Then go to the `lbry-android/app` folder and run `npm start`
-
-Note: You need to have your device connected with USB debugging.
-
-Once the bundler is ready, run the LBRY Browser app on your device and then shake the device violently until you see the React Native dev menu. You can enable "Live Reloading" and "Hot Reloading" from this menu, so any changes you make to the React Native code will be visible as you save. This will only reload React Native Javascript files. Native Java code needs to be redeployed by running the command `./deploy.sh`

DOCKER-DEV.md

@@ -1,156 +0,0 @@
-# lbry-android development environment inside docker
-
-[scripts/lbry-android.sh](scripts/lbry-android.sh) is a bash script to create a
-docker container for lbry-android development. 
-
-This is a hybrid approach where the apk is built inside docker, but you run
-Android Studio, `adb`, and the app hot-reload bundler, directly on your host.
-
-## Features
-
- * Clones lbry-android source code to a directory on the host, and mounts it
-   inside the container.
- * Installs all build dependencies inside the container, leaving your host
-   computer clean.
- * Mounted `.buildozer` directory to save container space. (Docker containers
-   should stay under 10GB, and `.buildozer` is too big, so it has to stay in a
-   mounted host directory instead.)
- * The biggest downloads are cached in `.buildozer-downloads` directory so you
-   can easily remove `.buildozer` and not have to re-download the large cryostax
-   NDK more than once.
- * Instructions for installing on a real Android device, and for setting up
-   hot-reload.
- * Only a handful of commands to go from zero->hero.
-
-## Requirements
-
-Install all of the following on your host computer:
-
- * Tested on Linux x86_64 with BASH.
- * [Install Android Studio](https://developer.android.com/studio/).
-   * The normal install auto-creates a directory in `$HOME/Android/Sdk` to store
-     SDK downloads in your home directory.
- * [Install nodejs](https://nodejs.org/en/download/package-manager/).
- * [Install yarn](https://yarnpkg.com/lang/en/docs/install).
- * [Install Docker](https://docs.docker.com/install/).
- * Install `sudo` and give your user account access to run `sudo docker`. 
- 
-## Install
-
-Clone `lbry-android`:
-
-```
-LBRY_GIT=$HOME/git/vendor/lbryio/
-mkdir -p $LBRY_GIT
-git clone https://github.com/lbryio/lbry-android.git $LBRY_GIT/lbry-android
-cd $LBRY_GIT/lbry-android
-git submodule update --init --recursive
-```
-
-Install a bash alias to the [scripts/lbry-android.sh](scripts/lbry-android.sh)
-script:
-
-```
-echo "alias lbry-android=$LBRY_GIT/lbry-android/scripts/lbry-android.sh" >> $HOME/.bashrc
-
-source ~/.bashrc
-```
-
-## Usage
-
- * First create the base docker image:
- 
- ```
- lbry-android docker-build
- ```
- 
-(If anytime you change the docker build scripts in the [scripts](scripts)
-subdirectory, you should rebuild the image again.)
-
- * Setup buildozer and install dependencies:
- 
- ```
- lbry-android setup
- ```
-
- * Build the apk:
- 
- ```
- lbry-android build
- ```
-
-The apk will be built and end up in the `lbry-android/bin/` subdirectory.
-
-## Running on a real Android device
-
-Once you have the apk built, you can install it on a real Android device to
-start testing.
-
-Follow the Android documentation for [enabling USB
-debugging](https://developer.android.com/studio/command-line/adb#Enabling) on
-your device.
-
-Once you have enabled debugging, do the following:
-
- * Plug your device into a USB port on the host computer.
- * Run: 
-
- ```~/Android/Sdk/platform-tools/adb devices```
-
- * ADB should list your device like so:
- 
- ```
- [ryan@t440s lbry-android]$ adb devices
- List of devices attached
- HT71R0000000	device
- ```
-
- * The first time you connect, you should see a modal dialog on the device
-   asking to confirm the host id. You must approve it, or adb will fail to
-   connect. 
-   
- * If after trying several times, adb is still not connecting to your device,
-   and adb lists your device as `unauthorized`, you may need to [follow this
-   advice](https://stackoverflow.com/a/38380384/56560) and delete your
-   `$HOME/.android` directory.
-
- * Install the apk (whatever the current version is called) to the device:
- 
- ```
- ~/Android/Sdk/platform-tools/adb install ./bin/browser-0.7.5-debug.apk
- ```
-
- * Open the app on your device, and follow the initial steps to get to the main
-   lbry-android browser page.
-   
- * Create a tcp tunnel over the adb bridge, for the app to handle live-reload:
- 
- ```
- ~/Android/Sdk/platform-tools/adb reverse tcp:8081 tcp:8081
- ```
-
- * Start the live-reload server on the host:
- 
- ```
- cd app/
- yarn install
- yarn start
- ```
-
- * With your device currently running the lbry-android app, shake the device
-   from side to side, and a menu will appear. Choose `Enable Hot Reloading`.
-   
- * The app should reload itself.
- 
- * Now make a change to the source code to test hot reload. From the host, open
-   up the main page view source code: `app/src/component/uriBar/view.js`. Find
-   the line that reads `Search movies, music, and more` (This is the main search
-   bar at the top of the app.) - Change some of the text and save the file.
-   
- * If hot-reload is working, within a few seconds the phone should reload the
-   page automatically and show the change that you made.
-   
- * If the hot-reload does not work, try closing the app (dismiss the window from
-   the tab overview, via android square button) and reload the app.
-   
-

DOCKER.md

@@ -1,71 +0,0 @@
-# Introduction
-The purpose of this guide is to help whomever is interested in running the LBRY Android application from scratch on their device, but they're main computing platform is not Linux but macOS.
-
-## Estimated build time
-25 - 40 minutes (depending on Internet connection speeds)
-
-## What do you need?
-* A computer running the latest OS
-* Internet access to download modules and packages
-* At least 15GB of free disk space
-* Docker
-* Patience
-
-## Step 1/6
-Create an application on [Firebase](https://console.firebase.google.com). In the **Android package name** field, input `io.lbry.browser`. Download the resulting `google-services.json` file and keep it safe, you'll be needing it later.
-
-## Step 2/6
-Start the docker application and paste all of these lines into Terminal:
-
-```bash
-docker run -it lbry/android-base:latest /bin/bash
-wget "https://www.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz" -P ~/.buildozer/android/
-tar -xvf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/
-rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-git clone https://github.com/lbryio/lbry-android
-cd lbry-android
-git submodule update --init --recursive
-cp buildozer.spec.sample buildozer.spec
-cd app;npm i;cd ..
-cp scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
-cp scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
-cd p4a/pythonforandroid/bootstraps/lbry/build/templates
-apt install nano -y
-```
-
-## Step 3/6
-Copy the contents of the `google-services.json` you downloaded earlier and paste them into Terminal after running the next command:
-
-```bash
-nano google-services.json
-```
-
-Type `^X` to save and exit.
-
-## Step 4/6
-Paste more lines and I guess check your email, this will take some time:
-
-```bash
-cd /lbry-android/app
-./bundle.sh
-cd ..
-buildozer android debug
-```
-
-When the build is complete, you should see a message like: `[INFO]:    # APK renamed to browser-0.7.3-debug.apk`. You will need this filename for the next step.
-
-## Step 5/6
-In a separate Terminal window:
-
-```bash
-docker ps # get container name
-docker cp CONTAINER_NAME:/lbry-android/bin/STEP_4_FILENAME ~/Desktop/ # copies STEP_4_FILENAME to your Desktop
-```
-
-## Step 6/6
-- Download [Android File Transfer](https://www.android.com/filetransfer) and install it.
-- On your Android device, install [File Explorer](https://play.google.com/store/apps/details?id=com.mauriciotogneri.fileexplorer).
-- Plug in your Android device and swipe down from the top into the "USB for file transfer" settings (or similar name on your device) and make sure "Transfer files" is selected.
-- Open **Android File Transfer** on your computer and drag and drop `STEP_4_FILENAME` from your Desktop to the `Downloads` folder on the Android device.
-- Back on the Android device, navigate to `STEP_4_FILENAME` in the `Downloads` folder and tap it to begin installation.

QUICKSTART.md

@@ -1,113 +0,0 @@
-# Introduction
-If you would like to contribute to the Android app, but find the build documentation a little daunting, this guide lets you copy-paste your way to a successful APK build.
-
-### Estimated build time
-25 - 40 minutes (depending on Internet connection speeds)
-
-### What do you need?
-* A computer running [Ubuntu 18.04](https://ubuntu.com/download/desktop)
-* Internet access to download modules and packages.
-* At least 15GB of free disk space.
-* Alternatively, Docker. You can skip steps 1 through 5 if you make use of the `lbry/android-base` Docker base image. Scroll down to [Fast Track](#Fast-Track) at the bottom of the page if you would prefer to use Docker.
-
-### Step 1 of 10
-Install all the apt packages required by running the following commands. You can copy-paste this directly to your terminal.
-```
-sudo dpkg --add-architecture i386
-sudo apt-get -y update
-sudo apt-get install -y curl ca-certificates software-properties-common gpg-agent wget
-sudo add-apt-repository ppa:deadsnakes/ppa -y && \
-     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-sudo apt-get -y update && apt-get -y install autoconf autogen automake libtool libffi-dev \
-     build-essential python3.7 python3.7-dev python3.7-venv python3-pip ccache git libncurses5:i386 libstdc++6:i386 \
-     libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
-     python-pip openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 yarn gawk nodejs npm
-```
-
-### Step 2 of 10
-Install a couple of packages using the Python package installer
-```
-sudo -H pip install --upgrade cython==0.28.1 setuptools
-```
-
-### Step 3 of 10
-Install [buildozer](https://github.com/lbryio/buildozer.git), a tool for creating the apk package using the python for android toolchain.
-```
-git clone https://github.com/lbryio/buildozer.git
-cd buildozer && python2.7 setup.py install && cd ..
-```
-
-### Step 4 of 10
-The Android SDK needs to be setup for buildozer. This requires creating a few directories and downloading a number of files. Run the following commands to create the buildozer directory, download the required archives and extract them into their proper destination folders.
-
-```
-mkdir -p ~/.buildozer/android/platform
-wget 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P ~/.buildozer/android/platform/ && \
-  wget 'https://dl.google.com/android/repository/platform-28_r06.zip' -P ~/.buildozer/android/platform/ && \
-  wget 'https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip' -P ~/.buildozer/android/platform/
-tar -xvf ~/.buildozer/android/platform/android-sdk_r23-linux.tgz -C ~/.buildozer/android/platform/ && \
-  mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk-23 && \
-  unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms && \
-  mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-9 ~/.buildozer/android/platform/android-sdk-23/platforms/android-28 && \
-  mkdir -p ~/.buildozer/android/platform/android-sdk-23/build-tools && \
-  unzip ~/.buildozer/android/platform/build-tools_r26.0.2-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools && \
-  mkdir -p ~/.buildozer/android/platform/android-sdk-23/licenses && \
-  echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > ~/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license
-```
-
-### Step 5 of 10
-Install the react-native-cli npm package.
-```
-sudo npm install -g react-native-cli
-```
-
-### Step 6 of 10
-Install the Crystax NDK which is required for building Python 3.7 for the mobile app, and a number of native C / C++ modules and packages used by the app. Run the following commands to download and extract the NDK.
-```
-wget 'https://www.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ && \
-  tar -xvf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ && \
-  rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 && \
-  ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-```
-
-### Step 7 of 10
-Clone the [lbryio/lbry-android git repository](https://github.com/lbryio/lbry-android), initialise submodules and create your `buildozer.spec` and `google-services.json` files. The provided `buildozer.spec.sample` contains defaults provided you followed steps 1 through 5 exactly as described. You can also customise the spec file if you want to. The `google-services.sample.json` can be used to ensure the build completes successfully.
-```
-git clone https://github.com/lbryio/lbry-android
-cd lbry-android
-git submodule update --init --recursive
-cp buildozer.spec.sample buildozer.spec
-cp p4a/pythonforandroid/bootstraps/lbry/templates/google-services.sample.json p4a/pythonforandroid/bootstraps/lbry/templates/google-services.json
-```
-
-### Step 8 of 10
-Install the npm packages required for the app's React Native code, and create the React Native app bundle.
-```
-cd app
-npm install
-./bundle.sh
-cd ..
-```
-
-### Step 9 of 10
-Copy a couple of required files from the repository for the build to be successful.
-```
-cp scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
-cp scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
-```
-
-### Step 10 of 10
-If you made it this far, you're finally ready to build the package! You just have to run a single command to generate the APK.
-```
-buildozer android debug
-```
-
-### Fast Track {#Fast-Track}
-Install Docker and start a container using the `lbry/android-base` image, which is about 1.72GB in size. Run the following commands for Ubuntu and then follow steps 6 through 10 in the container's bash prompt.
-```
-sudo apt-get install docker-ce
-docker run -it lbry/android-base:latest /bin/bash
-```
-
-**Pro Tip:** You can also make use of Docker to run your builds on macOS or Windows.

Vagrantfile

@@ -1,100 +0,0 @@
-echoed=false
-
-Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/bionic64"
-  #config.disksize.size = "20GB"
-
-  config.vm.provider "virtualbox" do |v|
-    host = RbConfig::CONFIG['host_os']
-
-    # Give VM 1/4 system memory & access to all cpu cores on the host
-    if host =~ /darwin/
-      cpus = `sysctl -n hw.ncpu`.to_i
-      # sysctl returns Bytes and we need to convert to MB
-      mem = `sysctl -n hw.memsize`.to_i / 1024 / 1024 / 4
-    elsif host =~ /linux/
-      cpus = `nproc`.to_i
-      # meminfo shows KB and we need to convert to MB
-      mem = `grep 'MemTotal' /proc/meminfo | sed -e 's/MemTotal://' -e 's/ kB//'`.to_i / 1024 / 4
-    else
-      cpus = `wmic cpu get NumberOfCores`.split("\n")[2].to_i
-      mem = `wmic OS get TotalVisibleMemorySize`.split("\n")[2].to_i / 1024 /4
-    end
-
-    mem = mem / 1024 / 4
-    mem = [mem, 2048].max # Minimum 2048
-
-	if echoed === false
-	  echoed=true
-      puts("Memory", mem)
-      puts("CPUs", cpus)
-	end
-
-	#v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/home_vagrant_lbry-android", "1"]
-	#v.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/vagrant", "1"]
-    v.customize ["modifyvm", :id, "--memory", mem]
-    v.customize ["modifyvm", :id, "--cpus", cpus]
-  end
-
-  config.vm.synced_folder "./", "/home/vagrant/lbry-android"
-
-
-  config.vm.provision "shell", inline: <<-SHELL
-    dpkg --add-architecture i386
-	apt-get update
-	apt-get install -y libssl-dev
-	apt-get install -y python3.6 python3.6-dev python3-pip autoconf libffi-dev pkg-config libtool build-essential ccache git libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 python-pip
-	pip install -f --upgrade setuptools pyopenssl
-	git clone https://github.com/lbryio/buildozer.git
-    cd buildozer
-    python2.7 setup.py install
-	cd ../
-	rm -rf ./buildozer
-
-	# Install additonal buildozer dependencies
-	sudo apt-get install cython
-
-	# Install node
-	curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
-	sudo apt-get install -y nodejs
-
-	export HOME=/home/vagrant
-
-	cp $HOME/lbry-android/buildozer.spec.vagrant $HOME/lbry-android/buildozer.spec
-
-	mkdir -p cd $HOME/.buildozer/android/platform/
-	wget -q 'https://us.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P $HOME/.buildozer/android/
-	wget -q 'https://dl.google.com/android/android-sdk_r23-linux.tgz' -P $HOME/.buildozer/android/platform/
-	wget -q 'https://dl.google.com/android/repository/platform-27_r01.zip' -P $HOME/.buildozer/android/platform/
-	wget -q 'https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip' -P $HOME/.buildozer/android/platform/
-	tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C $HOME/.buildozer/android/
-	rm $HOME/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz
-	ln -s $HOME/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 $HOME/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-	cp -f $HOME/lbry-android/scripts/build-target-python.sh $HOME/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
-	rm -rf $HOME/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
-	tar -xf $HOME/.buildozer/android/platform/android-sdk_r23-linux.tgz -C $HOME/.buildozer/android/platform/
-	rm $HOME/.buildozer/android/platform/android-sdk_r23-linux.tgz
-	mv $HOME/.buildozer/android/platform/android-sdk-linux $HOME/.buildozer/android/platform/android-sdk-23
-	unzip -qq $HOME/.buildozer/android/platform/android-23_r02.zip -d $HOME/.buildozer/android/platform/android-sdk-23/platforms
-	rm $HOME/.buildozer/android/platform/platform-27_r01.zip
-	mv $HOME/.buildozer/android/platform/android-sdk-23/platforms/android-8.1.0 $HOME/.buildozer/android/platform/android-sdk-23/platforms/android-27
-	mkdir -p $HOME/.buildozer/android/platform/android-sdk-23/build-tools
-	unzip -qq $HOME/.buildozer/android/platform/build-tools_r26.0.1-linux.zip -d $HOME/.buildozer/android/platform/android-sdk-23/build-tools
-	rm $HOME/.buildozer/android/platform/build-tools_r26.0.1-linux.zip
-	mv $HOME/.buildozer/android/platform/android-sdk-23/build-tools/android-8.0.0 $HOME/.buildozer/android/platform/android-sdk-23/build-tools/26.0.1
-	mkdir -p $HOME/.buildozer/android/platform/android-sdk-23/licenses
-
-	rm -rf $HOME/.buildozer/android/platform/android-sdk-23/tools
-	#  https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip
-	wget -q https://dl.google.com/android/repository/tools_r25.2.5-linux.zip
-	unzip -o -q ./tools_r25.2.5-linux.zip -d $HOME/.buildozer/android/platform/android-sdk-23/
-	rm sdk-tools-linux-3859397.zip
-
-	echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > $HOME/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license
-
-	sudo chown -r vagrant $HOME
-
-	echo "Installing React Native via NPM..."
-	sudo npm install -g react-native-cli
-  SHELL
-end

app

@@ -1 +0,0 @@
-Subproject commit 19d3d8cd9486ae67f64dc3ed84959d3cce94d099

app/BUCK

@@ -0,0 +1,55 @@
+# To learn about Buck see [Docs](https://buckbuild.com/).
+# To run your application with Buck:
+# - install Buck
+# - `npm start` - to start the packager
+# - `cd android`
+# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US"`
+# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
+# - `buck install -r android/app` - compile, install and run application
+#
+
+load(":build_defs.bzl", "create_aar_targets", "create_jar_targets")
+
+lib_deps = []
+
+create_aar_targets(glob(["libs/*.aar"]))
+
+create_jar_targets(glob(["libs/*.jar"]))
+
+android_library(
+    name = "all-libs",
+    exported_deps = lib_deps,
+)
+
+android_library(
+    name = "app-code",
+    srcs = glob([
+        "src/main/java/**/*.java",
+    ]),
+    deps = [
+        ":all-libs",
+        ":build_config",
+        ":res",
+    ],
+)
+
+android_build_config(
+    name = "build_config",
+    package = "com.lbryandroid",
+)
+
+android_resource(
+    name = "res",
+    package = "com.lbryandroid",
+    res = "src/main/res",
+)
+
+android_binary(
+    name = "app",
+    keystore = "//android/keystores:debug",
+    manifest = "src/main/AndroidManifest.xml",
+    package_type = "debug",
+    deps = [
+        ":app-code",
+    ],
+)

app/build.gradle

@@ -0,0 +1,250 @@
+apply plugin: "com.android.application"
+
+import com.android.build.OutputFile
+
+/**
+ * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
+ * and bundleReleaseJsAndAssets).
+ * These basically call `react-native bundle` with the correct arguments during the Android build
+ * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
+ * bundle directly from the development server. Below you can see all the possible configurations
+ * and their defaults. If you decide to add a configuration block, make sure to add it before the
+ * `apply from: "../../node_modules/react-native/react.gradle"` line.
+ *
+ * project.ext.react = [
+ *   // the name of the generated asset file containing your JS bundle
+ *   bundleAssetName: "index.android.bundle",
+ *
+ *   // the entry file for bundle generation
+ *   entryFile: "index.android.js",
+ *
+ *   // https://facebook.github.io/react-native/docs/performance#enable-the-ram-format
+ *   bundleCommand: "ram-bundle",
+ *
+ *   // whether to bundle JS and assets in debug mode
+ *   bundleInDebug: false,
+ *
+ *   // whether to bundle JS and assets in release mode
+ *   bundleInRelease: true,
+ *
+ *   // whether to bundle JS and assets in another build variant (if configured).
+ *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
+ *   // The configuration property can be in the following formats
+ *   //         'bundleIn${productFlavor}${buildType}'
+ *   //         'bundleIn${buildType}'
+ *   // bundleInFreeDebug: true,
+ *   // bundleInPaidRelease: true,
+ *   // bundleInBeta: true,
+ *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
+ *   // the root of your project, i.e. where "package.json" lives
+ *   root: "../../",
+ *
+ *   // where to put the JS bundle asset in debug mode
+ *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
+ *
+ *   // where to put the JS bundle asset in release mode
+ *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in debug mode
+ *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in release mode
+ *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
+ *
+ *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
+ *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
+ *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
+ *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
+ *   // for example, you might want to remove it from here.
+ *   inputExcludes: ["android/**", "ios/**"],
+ *
+ *   // override which node gets called and with what additional arguments
+ *   nodeExecutableAndArgs: ["node"],
+ *
+ *   // supply additional arguments to the packager
+ *   extraPackagerArgs: []
+ * ]
+ */
+
+task buildReactNativeBundle(type:Exec) {
+    println("Building React Native bundle")
+    workingDir new File(rootProject.projectDir, '../')
+    commandLine './bundle-android.sh'
+}
+preBuild.dependsOn buildReactNativeBundle
+
+task printVersionName {
+    doLast {
+        println android.defaultConfig.versionName
+    }
+}
+
+project.ext.react = [
+    entryFile: "index.js",
+    enableHermes: false,  // clean and rebuild if changing
+]
+
+/**
+ * Set this to true to create two separate APKs instead of one:
+ *   - An APK that only works on ARM devices
+ *   - An APK that only works on x86 devices
+ * The advantage is the size of the APK is reduced by about 4MB.
+ * Upload all the APKs to the Play Store and people will download
+ * the correct one based on the CPU architecture of their device.
+ */
+def enableSeparateBuildPerCPUArchitecture = false
+
+/**
+ * Run Proguard to shrink the Java bytecode in release builds.
+ */
+def enableProguardInReleaseBuilds = false
+
+/**
+ * The preferred build flavor of JavaScriptCore.
+ *
+ * For example, to use the international variant, you can use:
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ *
+ * The international variant includes ICU i18n library and necessary data
+ * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
+ * give correct results when using with locales other than en-US.  Note that
+ * this variant is about 6MiB larger per architecture than default.
+ */
+def jscFlavor = 'org.webkit:android-jsc:+'
+
+/**
+ * Whether to enable the Hermes VM.
+ *
+ * This should be set on project.ext.react and mirrored here.  If it is not set
+ * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
+ * and the benefits of using Hermes will therefore be sharply reduced.
+ */
+def enableHermes = project.ext.react.get("enableHermes", false);
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    flavorDimensions "default"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        applicationId "io.lbry.browser"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 1302
+        versionName "0.13.2"
+        missingDimensionStrategy 'react-native-camera', 'general'
+        multiDexEnabled true
+    }
+    dexOptions {
+        javaMaxHeapSize "2048M"
+        preDexLibraries false
+        jumboMode true
+    }
+    productFlavors {
+        __32bit {
+            ndk {
+                abiFilter "armeabi-v7a"
+            }
+        }
+        __64bit {
+            ndk {
+                abiFilter "arm64-v8a"
+            }
+        }
+    }
+    signingConfigs {
+        debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
+    }
+    buildTypes {
+        debug {
+            signingConfig signingConfigs.debug
+        }
+        release {
+            // Caution! In production, you need to generate your own keystore file.
+            // see https://facebook.github.io/react-native/docs/signed-apk-android.
+            signingConfig signingConfigs.debug
+            minifyEnabled enableProguardInReleaseBuilds
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+        }
+    }
+    // applicationVariants are e.g. debug, release
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            // For each separate APK per architecture, set a unique version code as described here:
+            // https://developer.android.com/studio/build/configure-apk-splits.html
+            def versionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2]
+            def abi = output.getFilter(OutputFile.ABI)
+            if (abi != null) {  // null for the universal-debug, universal-release variants
+                output.versionCodeOverride =
+                        defaultConfig.versionCode * 10 + versionCodes.get(abi)
+            }
+
+        }
+    }
+}
+
+dependencies {
+    implementation project(':@react-native-community_async-storage')
+    implementation project(':react-native-camera')
+    implementation project(':react-native-exception-handler')
+    implementation project(':react-native-fast-image')
+    implementation project(':react-native-fs')
+    implementation project(':react-native-gesture-handler')
+    implementation project(':react-native-reanimated')
+    implementation project(':react-native-snackbar')
+    implementation project(':react-native-video')
+    implementation project(':react-native-webview')
+    implementation project(':rn-fetch-blob')
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.media:media:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.facebook.react:react-native:0.61.5'
+    implementation 'com.facebook.fresco:fresco:1.9.0'
+    implementation 'com.facebook.fresco:animated-gif:1.9.0'
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.google.firebase:firebase-analytics:17.2.1'
+    implementation 'com.google.android.gms:play-services-base:17.1.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'com.facebook.fresco:animated-base-support:1.3.0'
+    implementation 'com.facebook.fresco:animated-gif:1.10.0'
+    implementation 'com.google.firebase:firebase-messaging:20.1.0'
+
+    __32bitImplementation files('libs/lbrysdk-0.61.0-release__arm.aar')
+    __64bitImplementation files('libs/lbrysdk-0.61.0-release__arm64.aar')
+
+    if (enableHermes) {
+        def hermesPath = "../../node_modules/hermes-engine/android/";
+        debugImplementation files(hermesPath + "hermes-debug.aar")
+        releaseImplementation files(hermesPath + "hermes-release.aar")
+    } else {
+        implementation jscFlavor
+    }
+}
+
+// Run this once to be able to run the application with BUCK
+// puts all compile dependencies into folder libs for BUCK to use
+task copyDownloadableDepsToLibs(type: Copy) {
+    from configurations.compile
+    into 'libs'
+}
+
+apply plugin: 'com.google.gms.google-services'
+com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true

app/build_defs.bzl

@@ -0,0 +1,19 @@
+"""Helper definitions to glob .aar and .jar targets"""
+
+def create_aar_targets(aarfiles):
+    for aarfile in aarfiles:
+        name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
+        lib_deps.append(":" + name)
+        android_prebuilt_aar(
+            name = name,
+            aar = aarfile,
+        )
+
+def create_jar_targets(jarfiles):
+    for jarfile in jarfiles:
+        name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
+        lib_deps.append(":" + name)
+        prebuilt_jar(
+            name = name,
+            binary_jar = jarfile,
+        )

app/proguard-rules.pro

@@ -0,0 +1,10 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:

app/src/main/AndroidManifest.xml

@@ -0,0 +1,85 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="io.lbry.browser"
+    android:installLocation="auto">
+
+    <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:anyDensity="true"
+        android:xlargeScreens="true"
+        />
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application android:label="@string/app_name"
+        android:icon="@drawable/icon"
+        android:allowBackup="true"
+        android:theme="@style/LbryAppTheme"
+        android:hardwareAccelerated="true"
+        android:usesCleartextTraffic="true">
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/ic_lbry" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/lbryGreen" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="@string/default_notification_channel_id"/>
+
+        <meta-data android:name="wakelock" android:value="0"/>
+
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+
+        <activity android:name="io.lbry.browser.MainActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/LbryAppTheme"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="portrait"
+            android:launchMode="singleInstance"
+            >
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="lbry" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <receiver android:name="io.lbry.browser.receivers.NotificationDeletedReceiver" />
+
+        <service
+            android:name="io.lbry.browser.LbrynetMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name="io.lbry.browser.LocalFileProvider"
+            android:authorities="io.lbry.browser.fileprovider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths" />
+        </provider>
+    </application>
+
+</manifest>

app/src/main/java/io/lbry/browser/DownloadManager.java

@@ -17,6 +17,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 
 import io.lbry.browser.receivers.NotificationDeletedReceiver;
+import io.lbry.lbrysdk.LbrynetService;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;

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

@@ -58,6 +58,8 @@ import com.RNFetchBlob.RNFetchBlobPackage;
 
 import io.lbry.browser.reactpackages.LbryReactPackage;
 import io.lbry.browser.reactmodules.BackgroundMediaModule;
+import io.lbry.lbrysdk.LbrynetService;
+import io.lbry.lbrysdk.ServiceHelper;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;

app/src/main/java/io/lbry/browser/reactmodules/BackgroundMediaModule.java

@@ -18,9 +18,9 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 
-import io.lbry.browser.LbrynetService;
 import io.lbry.browser.MainActivity;
 import io.lbry.browser.R;
+import io.lbry.lbrysdk.LbrynetService;
 
 public class BackgroundMediaModule extends ReactContextBaseJavaModule {
 

app/src/main/java/io/lbry/browser/reactmodules/DaemonServiceControlModule.java

@@ -10,9 +10,9 @@ import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 
-import io.lbry.browser.LbrynetService;
 import io.lbry.browser.MainActivity;
-import io.lbry.browser.ServiceHelper;
+import io.lbry.lbrysdk.LbrynetService;
+import io.lbry.lbrysdk.ServiceHelper;
 
 public class DaemonServiceControlModule extends ReactContextBaseJavaModule {
 

app/src/main/java/io/lbry/browser/reactmodules/FirebaseModule.java

@@ -18,7 +18,7 @@ import com.google.firebase.iid.InstanceIdResult;
 
 import io.lbry.browser.BuildConfig;
 import io.lbry.browser.MainActivity;
-import io.lbry.browser.Utils;
+import io.lbry.lbrysdk.Utils;
 
 import java.util.Date;
 import java.util.HashMap;

app/src/main/java/io/lbry/browser/reactmodules/GalleryModule.java

@@ -21,7 +21,7 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
 import io.lbry.browser.MainActivity;
-import io.lbry.browser.Utils;
+import io.lbry.lbrysdk.Utils;
 
 import java.io.File;
 import java.io.FileInputStream;

app/src/main/java/io/lbry/browser/reactmodules/RequestsModule.java

@@ -16,7 +16,7 @@ import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.WritableMap;
 
 import io.lbry.browser.MainActivity;
-import io.lbry.browser.Utils;
+import io.lbry.lbrysdk.Utils;
 
 import java.util.List;
 import java.util.ArrayList;

app/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java

@@ -41,9 +41,9 @@ import java.security.KeyStore;
 
 import io.lbry.browser.DownloadManager;
 import io.lbry.browser.MainActivity;
-import io.lbry.browser.LbrynetService;
 import io.lbry.browser.R;
-import io.lbry.browser.Utils;
+import io.lbry.lbrysdk.LbrynetService;
+import io.lbry.lbrysdk.Utils;
 
 public class UtilityModule extends ReactContextBaseJavaModule {
     private static final Map<String, Integer> activeNotifications = new HashMap<String, Integer>();