Merge pull request #8 from TrustWallet/move_android_to_root

Move android library to root
trustwallet · Jun 1, 2018 · 3561e62 · 3561e62
2 parents 4707c91 + 30e8aaf
commit 3561e62
Show file tree

Hide file tree

Showing 41 changed files with 52 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,55 @@ JS/jspm_packages/
 JS/staging/
 *.swp
 *.swo
+
+# Android
+.idea
+.idea/*
+.DS_Store
+/captures
+.externalNativeBuild
+
+### Android ###
+# Built application files
+*.apk
+*.ap_
+*.iml
+*.swp
+*.swo
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+Trust-strings.zip
+
+# Gradle files
+.gradle/
+/build
+app/release
+
+# Fastlane
+fastlane/report.xml
+
+# Local configuration file (sdk path, etc)
+/local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+### Android Patch ###
+gen-external-apklibs
+
+
+tn/trustnative.aar
diff --git a/TrustWeb3Provider-android/.gitignore b/TrustWeb3Provider-android/.gitignore
diff --git a/TrustWeb3Provider-android/.idea/vcs.xml b/TrustWeb3Provider-android/.idea/vcs.xml
diff --git a/TrustWeb3Provider-android/app/.gitignore → app/.gitignore b/TrustWeb3Provider-android/app/.gitignore → app/.gitignore
diff --git a/TrustWeb3Provider-android/app/build.gradle → app/build.gradle b/TrustWeb3Provider-android/app/build.gradle → app/build.gradle
diff --git a/...b3Provider-android/app/proguard-rules.pro → app/proguard-rules.pro b/...b3Provider-android/app/proguard-rules.pro → app/proguard-rules.pro
diff --git a/...web3provider/ExampleInstrumentedTest.java → ...web3provider/ExampleInstrumentedTest.java b/...web3provider/ExampleInstrumentedTest.java → ...web3provider/ExampleInstrumentedTest.java
diff --git a/...-android/app/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml b/...-android/app/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml
diff --git a/...java/trust/web3provider/MainActivity.java → ...java/trust/web3provider/MainActivity.java b/...java/trust/web3provider/MainActivity.java → ...java/trust/web3provider/MainActivity.java
diff --git a/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml b/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml
diff --git a/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml b/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml
diff --git a/...app/src/main/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml b/...app/src/main/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml
diff --git a/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → app/src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png b/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → app/src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png b/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png b/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png b/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png b/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/...pp/src/main/res/raw/trust.js/trust-min.js → app/src/main/res/raw/trust.js/trust-min.js b/...pp/src/main/res/raw/trust.js/trust-min.js → app/src/main/res/raw/trust.js/trust-min.js
diff --git a/...ndroid/app/src/main/res/values/colors.xml → app/src/main/res/values/colors.xml b/...ndroid/app/src/main/res/values/colors.xml → app/src/main/res/values/colors.xml
diff --git a/...droid/app/src/main/res/values/strings.xml → app/src/main/res/values/strings.xml b/...droid/app/src/main/res/values/strings.xml → app/src/main/res/values/strings.xml
diff --git a/...ndroid/app/src/main/res/values/styles.xml → app/src/main/res/values/styles.xml b/...ndroid/app/src/main/res/values/styles.xml → app/src/main/res/values/styles.xml
diff --git a/...a/trust/web3provider/ExampleUnitTest.java → ...a/trust/web3provider/ExampleUnitTest.java b/...a/trust/web3provider/ExampleUnitTest.java → ...a/trust/web3provider/ExampleUnitTest.java
diff --git a/TrustWeb3Provider-android/build.gradle → build.gradle b/TrustWeb3Provider-android/build.gradle → build.gradle
diff --git a/TrustWeb3Provider-android/gradle.properties → gradle.properties b/TrustWeb3Provider-android/gradle.properties → gradle.properties
diff --git a/...android/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar b/...android/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties
diff --git a/TrustWeb3Provider-android/gradlew → gradlew b/TrustWeb3Provider-android/gradlew → gradlew
diff --git a/TrustWeb3Provider-android/gradlew.bat → gradlew.bat b/TrustWeb3Provider-android/gradlew.bat → gradlew.bat
diff --git a/TrustWeb3Provider-android/lib/.gitignore → lib/.gitignore b/TrustWeb3Provider-android/lib/.gitignore → lib/.gitignore
diff --git a/TrustWeb3Provider-android/lib/build.gradle → lib/build.gradle b/TrustWeb3Provider-android/lib/build.gradle → lib/build.gradle
diff --git a/...b3Provider-android/lib/proguard-rules.pro → lib/proguard-rules.pro b/...b3Provider-android/lib/proguard-rules.pro → lib/proguard-rules.pro
diff --git a/...-android/lib/src/main/AndroidManifest.xml → lib/src/main/AndroidManifest.xml b/...-android/lib/src/main/AndroidManifest.xml → lib/src/main/AndroidManifest.xml
diff --git a/...der-android/lib/src/main/res/raw/trust.js → lib/src/main/res/raw/trust.js b/...der-android/lib/src/main/res/raw/trust.js → lib/src/main/res/raw/trust.js
diff --git a/TrustWeb3Provider-android/settings.gradle → settings.gradle b/TrustWeb3Provider-android/settings.gradle → settings.gradle