Merge pull request #1 from tobiasviehweger/feature/android

Feature/android
bitpay · Jul 28, 2016 · fbcd2f2 · fbcd2f2
2 parents 7e589ef + 2c26f31
commit fbcd2f2
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 207 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -31,7 +31,6 @@
  android:name="com.google.android.gms.vision.DEPENDENCIES"
  android:value="barcode" />
  </config-file>
- <source-file src="src/android/CameraPreview.java" target-dir="src/com/bitpay/cordova/qrscanner"/>
  <source-file src="src/android/QRScanner.java" target-dir="src/com/bitpay/cordova/qrscanner"/>
  <dependency id="cordova-plugin-compat" version="^1.0.0" />
  <framework src="src/android/qrscanner.gradle" custom="true" type="gradleReference"/>

diff --git a/src/android/CameraPreview.java b/src/android/CameraPreview.java