From 154c0d4980dec0e6e7bad6f70ce20f81d19a9b9c Mon Sep 17 00:00:00 2001
From: Veli <veli.tasali@gmail.com>
Date: Fri, 23 Feb 2018 20:13:26 +0300
Subject: [PATCH] Remove custom binary for consistency, missing translations

---
 app/build.gradle                              |   7 +-
 app/src/main/AndroidManifest.xml              |   8 +-
 .../activity/QRScannerActivity.java           |  79 ++
 .../TrebleShot/activity/ShareActivity.java    |   2 +-
 .../TrebleShot/app/ShareableListFragment.java |   3 +-
 .../fragment/NetworkDeviceListFragment.java   |   1 -
 .../TrebleShot/util/NetworkUtils.java         |   3 +-
 .../main/res/layout/activity_qrscanner.xml    |  12 +
 .../main/res/menu/actions_activity_share.xml  |   2 +-
 .../main/res/menu/actions_network_device.xml  |   2 +-
 app/src/main/res/values-tr/strings.xml        |   2 +
 app/src/main/res/values/strings.xml           |   2 +
 app/src/main/res/values/styles.xml            |   5 +
 qrcode/.gitignore                             |   1 -
 qrcode/build.gradle                           |  63 --
 qrcode/proguard-rules.pro                     |  21 -
 .../qrcode/ExampleInstrumentedTest.java       |  28 -
 qrcode/src/main/AndroidManifest.xml           |  37 -
 .../client/android/AmbientLightManager.java   |  98 --
 .../zxing/client/android/BeepManager.java     | 128 ---
 .../client/android/DecodeFormatManager.java   |  99 --
 .../client/android/DecodeHintManager.java     | 236 -----
 .../zxing/client/android/InactivityTimer.java | 120 ---
 .../google/zxing/client/android/Intents.java  | 191 ----
 .../camera/CameraConfigurationUtils.java      | 366 --------
 .../camera/open/OpenCameraInterface.java      |  86 --
 .../integration/android/IntentIntegrator.java | 347 -------
 .../integration/android/IntentResult.java     | 103 ---
 .../barcodescanner/BarcodeEncoder.java        |  73 --
 .../barcodescanner/BarcodeResult.java         | 156 ----
 .../barcodescanner/BarcodeView.java           | 231 -----
 .../barcodescanner/CameraPreview.java         | 870 ------------------
 .../barcodescanner/CaptureActivity.java       |  74 --
 .../barcodescanner/CaptureManager.java        | 429 ---------
 .../barcodescanner/CompoundBarcodeView.java   |  21 -
 .../journeyapps/barcodescanner/Decoder.java   | 104 ---
 .../barcodescanner/DecoderFactory.java        |  24 -
 .../DecoderResultPointCallback.java           |  33 -
 .../barcodescanner/DecoderThread.java         | 175 ----
 .../barcodescanner/DecoratedBarcodeView.java  | 273 ------
 .../barcodescanner/DefaultDecoderFactory.java |  54 --
 .../barcodescanner/InvertedDecoder.java       |  36 -
 .../barcodescanner/RotationListener.java      |  76 --
 .../com/journeyapps/barcodescanner/Size.java  | 117 ---
 .../barcodescanner/SourceData.java            | 237 -----
 .../com/journeyapps/barcodescanner/Util.java  |  14 -
 .../barcodescanner/ViewfinderView.java        | 249 -----
 .../camera/AutoFocusManager.java              | 137 ---
 .../barcodescanner/camera/CameraInstance.java | 279 ------
 .../barcodescanner/camera/CameraManager.java  | 505 ----------
 .../barcodescanner/camera/CameraSettings.java | 163 ----
 .../barcodescanner/camera/CameraSurface.java  |  53 --
 .../barcodescanner/camera/CameraThread.java   | 110 ---
 .../camera/CenterCropStrategy.java            |  78 --
 .../camera/DisplayConfiguration.java          |  98 --
 .../camera/FitCenterStrategy.java             |  78 --
 .../barcodescanner/camera/FitXYStrategy.java  |  62 --
 .../camera/LegacyPreviewScalingStrategy.java  | 155 ----
 .../camera/PreviewCallback.java               |  11 -
 .../camera/PreviewScalingStrategy.java        |  96 --
 .../main/res/layout/zxing_barcode_scanner.xml |  23 -
 qrcode/src/main/res/layout/zxing_capture.xml  |  30 -
 qrcode/src/main/res/raw/zxing_beep.ogg        | Bin 6401 -> 0 bytes
 .../src/main/res/values-ar/zxing_strings.xml  |  22 -
 .../src/main/res/values-bg/zxing_strings.xml  |  22 -
 .../src/main/res/values-ca/zxing_strings.xml  |  22 -
 .../src/main/res/values-cs/zxing_strings.xml  |  22 -
 .../src/main/res/values-da/zxing_strings.xml  |  22 -
 .../src/main/res/values-de/zxing_strings.xml  |  22 -
 .../src/main/res/values-el/zxing_strings.xml  |  22 -
 .../src/main/res/values-es/zxing_strings.xml  |  22 -
 .../src/main/res/values-eu/zxing_strings.xml  |  22 -
 .../src/main/res/values-fi/zxing_strings.xml  |  22 -
 .../src/main/res/values-fr/zxing_strings.xml  |  22 -
 .../src/main/res/values-he/zxing_strings.xml  |  22 -
 .../src/main/res/values-hi/zxing_strings.xml  |  22 -
 .../src/main/res/values-hu/zxing_strings.xml  |  22 -
 .../src/main/res/values-id/zxing_strings.xml  |  22 -
 .../src/main/res/values-it/zxing_strings.xml  |  22 -
 qrcode/src/main/res/values-iw                 |   1 -
 .../src/main/res/values-ja/zxing_strings.xml  |  22 -
 .../src/main/res/values-ko/zxing_strings.xml  |  22 -
 .../src/main/res/values-nl/zxing_strings.xml  |  22 -
 .../src/main/res/values-pl/zxing_strings.xml  |  22 -
 .../src/main/res/values-pt/zxing_strings.xml  |  22 -
 .../src/main/res/values-ro/zxing_strings.xml  |  22 -
 .../src/main/res/values-ru/zxing_strings.xml  |  22 -
 .../src/main/res/values-sk/zxing_strings.xml  |  22 -
 .../src/main/res/values-sl/zxing_strings.xml  |  22 -
 .../src/main/res/values-sv/zxing_strings.xml  |  22 -
 .../src/main/res/values-th/zxing_strings.xml  |  22 -
 .../src/main/res/values-tr/zxing_strings.xml  |  22 -
 .../src/main/res/values-uk/zxing_strings.xml  |  22 -
 .../main/res/values-zh-rCN/zxing_strings.xml  |  22 -
 qrcode/src/main/res/values-zh-rHK             |   1 -
 .../main/res/values-zh-rTW/zxing_strings.xml  |  22 -
 qrcode/src/main/res/values/strings.xml        |   3 -
 qrcode/src/main/res/values/zxing_attrs.xml    |  26 -
 qrcode/src/main/res/values/zxing_colors.xml   |  29 -
 qrcode/src/main/res/values/zxing_ids.xml      |  27 -
 qrcode/src/main/res/values/zxing_strings.xml  |  22 -
 qrcode/src/main/res/values/zxing_themes.xml   |   7 -
 .../com/genonbeta/qrcode/ExampleUnitTest.java |  19 -
 settings.gradle                               |   2 +-
 104 files changed, 116 insertions(+), 7879 deletions(-)
 create mode 100644 app/src/main/java/com/genonbeta/TrebleShot/activity/QRScannerActivity.java
 create mode 100644 app/src/main/res/layout/activity_qrscanner.xml
 delete mode 100644 qrcode/.gitignore
 delete mode 100644 qrcode/build.gradle
 delete mode 100644 qrcode/proguard-rules.pro
 delete mode 100644 qrcode/src/androidTest/java/com/genonbeta/qrcode/ExampleInstrumentedTest.java
 delete mode 100644 qrcode/src/main/AndroidManifest.xml
 delete mode 100644 qrcode/src/main/java/com/google/zxing/client/android/AmbientLightManager.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/client/android/BeepManager.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/client/android/DecodeFormatManager.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/client/android/DecodeHintManager.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/client/android/InactivityTimer.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/client/android/Intents.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationUtils.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java
 delete mode 100644 qrcode/src/main/java/com/google/zxing/integration/android/IntentResult.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeEncoder.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeResult.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeView.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/CameraPreview.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/CaptureActivity.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/CaptureManager.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/CompoundBarcodeView.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/Decoder.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderFactory.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderResultPointCallback.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderThread.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/DecoratedBarcodeView.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/DefaultDecoderFactory.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/InvertedDecoder.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/RotationListener.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/Size.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/SourceData.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/Util.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/ViewfinderView.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/AutoFocusManager.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraInstance.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraManager.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraSettings.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraSurface.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraThread.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CenterCropStrategy.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/DisplayConfiguration.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/FitCenterStrategy.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/FitXYStrategy.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/LegacyPreviewScalingStrategy.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/PreviewCallback.java
 delete mode 100644 qrcode/src/main/java/com/journeyapps/barcodescanner/camera/PreviewScalingStrategy.java
 delete mode 100644 qrcode/src/main/res/layout/zxing_barcode_scanner.xml
 delete mode 100644 qrcode/src/main/res/layout/zxing_capture.xml
 delete mode 100644 qrcode/src/main/res/raw/zxing_beep.ogg
 delete mode 100644 qrcode/src/main/res/values-ar/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-bg/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-ca/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-cs/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-da/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-de/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-el/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-es/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-eu/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-fi/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-fr/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-he/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-hi/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-hu/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-id/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-it/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-iw
 delete mode 100644 qrcode/src/main/res/values-ja/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-ko/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-nl/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-pl/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-pt/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-ro/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-ru/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-sk/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-sl/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-sv/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-th/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-tr/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-uk/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-zh-rCN/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values-zh-rHK
 delete mode 100644 qrcode/src/main/res/values-zh-rTW/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values/strings.xml
 delete mode 100644 qrcode/src/main/res/values/zxing_attrs.xml
 delete mode 100644 qrcode/src/main/res/values/zxing_colors.xml
 delete mode 100644 qrcode/src/main/res/values/zxing_ids.xml
 delete mode 100644 qrcode/src/main/res/values/zxing_strings.xml
 delete mode 100644 qrcode/src/main/res/values/zxing_themes.xml
 delete mode 100644 qrcode/src/test/java/com/genonbeta/qrcode/ExampleUnitTest.java

diff --git a/app/build.gradle b/app/build.gradle
index 10d743e2..6d47e545 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,14 +29,13 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation project(path: ':gdatabase')
-    implementation project(path: ':qrcode')
-    implementation project(path: ':updatewithgithub')
+    implementation project(':gdatabase')
+    implementation project(':updatewithgithub')
 
     implementation 'com.android.support:design:26.1.0'
     implementation 'com.android.support:cardview-v7:26.1.0'
     implementation 'com.android.support:appcompat-v7:26.1.0'
 
+    implementation 'com.journeyapps:zxing-android-embedded:3.5.0'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    implementation 'com.google.zxing:core:3.3.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cbe6245c..8bceaf1f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,9 +58,11 @@
         </activity>
 
         <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="fullSensor"
-            tools:replace="screenOrientation" />
+            android:name=".activity.QRScannerActivity"
+            android:clearTaskOnLaunch="true"
+            android:stateNotNeeded="true"
+            android:theme="@style/AppTheme.QRScannerTheme"
+            android:windowSoftInputMode="stateAlwaysHidden"/>
 
         <activity
             android:name=".activity.FilePickerActivity"
diff --git a/app/src/main/java/com/genonbeta/TrebleShot/activity/QRScannerActivity.java b/app/src/main/java/com/genonbeta/TrebleShot/activity/QRScannerActivity.java
new file mode 100644
index 00000000..274555a0
--- /dev/null
+++ b/app/src/main/java/com/genonbeta/TrebleShot/activity/QRScannerActivity.java
@@ -0,0 +1,79 @@
+package com.genonbeta.TrebleShot.activity;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.view.KeyEvent;
+
+import com.journeyapps.barcodescanner.CaptureManager;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
+
+/**
+ * created by: Veli
+ * date: 23.02.2018 19:50
+ */
+
+public class QRScannerActivity extends AppCompatActivity
+{
+	private CaptureManager mManager;
+	private DecoratedBarcodeView mScannerView;
+
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState)
+	{
+		super.onCreate(savedInstanceState);
+
+		mScannerView = initializeContent();
+
+		mManager = new CaptureManager(this, mScannerView);
+		mManager.initializeFromIntent(getIntent(), savedInstanceState);
+		mManager.decode();
+	}
+
+	protected DecoratedBarcodeView initializeContent()
+	{
+		setContentView(com.google.zxing.client.android.R.layout.zxing_capture);
+		return (DecoratedBarcodeView) findViewById(com.google.zxing.client.android.R.id.zxing_barcode_scanner);
+	}
+
+	@Override
+	protected void onResume()
+	{
+		super.onResume();
+		mManager.onResume();
+	}
+
+	@Override
+	protected void onPause()
+	{
+		super.onPause();
+		mManager.onPause();
+	}
+
+	@Override
+	protected void onDestroy()
+	{
+		super.onDestroy();
+		mManager.onDestroy();
+	}
+
+	@Override
+	protected void onSaveInstanceState(Bundle outState)
+	{
+		super.onSaveInstanceState(outState);
+		mManager.onSaveInstanceState(outState);
+	}
+
+	@Override
+	public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults)
+	{
+		mManager.onRequestPermissionsResult(requestCode, permissions, grantResults);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)
+	{
+		return mScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
+	}
+}
diff --git a/app/src/main/java/com/genonbeta/TrebleShot/activity/ShareActivity.java b/app/src/main/java/com/genonbeta/TrebleShot/activity/ShareActivity.java
index ebbc883a..5f13bba7 100644
--- a/app/src/main/java/com/genonbeta/TrebleShot/activity/ShareActivity.java
+++ b/app/src/main/java/com/genonbeta/TrebleShot/activity/ShareActivity.java
@@ -21,7 +21,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.TabHost;
 import android.widget.Toast;
 
 import com.genonbeta.CoolSocket.CoolSocket;
@@ -681,6 +680,7 @@ private void requestQRScan()
 		mQRScanRequested = false;
 
 		IntentIntegrator integrator = new IntentIntegrator(this)
+				.setCaptureActivity(QRScannerActivity.class)
 				.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES)
 				.setPrompt(getString(R.string.text_scanQRCodeHelp))
 				.setOrientationLocked(false)
diff --git a/app/src/main/java/com/genonbeta/TrebleShot/app/ShareableListFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/app/ShareableListFragment.java
index 7f62658e..9073cd3c 100644
--- a/app/src/main/java/com/genonbeta/TrebleShot/app/ShareableListFragment.java
+++ b/app/src/main/java/com/genonbeta/TrebleShot/app/ShareableListFragment.java
@@ -84,7 +84,8 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
 			inflater.inflate(R.menu.actions_search, menu);
 
 			SearchView searchView = ((SearchView) menu.findItem(R.id.search)
-					.getActionView());
+					.getActionView()
+			);
 
 			searchView.setOnQueryTextListener(mSearchComposer);
 			searchView.setMaxWidth(500);
diff --git a/app/src/main/java/com/genonbeta/TrebleShot/fragment/NetworkDeviceListFragment.java b/app/src/main/java/com/genonbeta/TrebleShot/fragment/NetworkDeviceListFragment.java
index 29f00788..966422a6 100644
--- a/app/src/main/java/com/genonbeta/TrebleShot/fragment/NetworkDeviceListFragment.java
+++ b/app/src/main/java/com/genonbeta/TrebleShot/fragment/NetworkDeviceListFragment.java
@@ -26,7 +26,6 @@
 import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/app/src/main/java/com/genonbeta/TrebleShot/util/NetworkUtils.java b/app/src/main/java/com/genonbeta/TrebleShot/util/NetworkUtils.java
index f66dc59c..ff815d2c 100644
--- a/app/src/main/java/com/genonbeta/TrebleShot/util/NetworkUtils.java
+++ b/app/src/main/java/com/genonbeta/TrebleShot/util/NetworkUtils.java
@@ -118,7 +118,8 @@ public static int getAllowedKeyManagement(WifiConfiguration wifiConfiguration)
 
 		try {
 			return Integer.valueOf(keyManagement.substring(1, keyManagement.length() - 1));
-		} catch (Exception e) {}
+		} catch (Exception e) {
+		}
 
 		return -1;
 	}
diff --git a/app/src/main/res/layout/activity_qrscanner.xml b/app/src/main/res/layout/activity_qrscanner.xml
new file mode 100644
index 00000000..e1c3ca85
--- /dev/null
+++ b/app/src/main/res/layout/activity_qrscanner.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.journeyapps.barcodescanner.DecoratedBarcodeView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/zxing_barcode_scanner"
+        app:zxing_preview_scaling_strategy="centerCrop"
+        app:zxing_use_texture_view="false"/>
+
+</merge>
diff --git a/app/src/main/res/menu/actions_activity_share.xml b/app/src/main/res/menu/actions_activity_share.xml
index 880f240e..e9f51f13 100644
--- a/app/src/main/res/menu/actions_activity_share.xml
+++ b/app/src/main/res/menu/actions_activity_share.xml
@@ -5,7 +5,7 @@
         android:id="@+id/actions_activity_share_scan_barcode"
         android:icon="@drawable/ic_qrcode_scan_white_24dp"
         android:orderInCategory="0"
-        android:title="Scan QR to send"
+        android:title="@string/butn_qrScanToSend"
         app:showAsAction="always"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/actions_network_device.xml b/app/src/main/res/menu/actions_network_device.xml
index d3fd374b..1280676b 100644
--- a/app/src/main/res/menu/actions_network_device.xml
+++ b/app/src/main/res/menu/actions_network_device.xml
@@ -5,7 +5,7 @@
         android:id="@+id/network_devices_barcode_generate"
         android:icon="@drawable/ic_qrcode_white_24dp"
         android:orderInCategory="0"
-        android:title="Receive using QR Code"
+        android:title="@string/butn_qrToggle"
         app:showAsAction="always"/>
 
     <item
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 7266d38f..2de83d99 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -337,4 +337,6 @@
     <string name="text_qrCodeAvailableHelp">Göndericiye bu QR kodunu TrebleShot üzerinde taramasını söyleyin</string>
     <string name="text_qrCodeHotspotDisabledHelp">TrebleShot Hotspot\'u başlatın</string>
     <string name="text_scanQRCodeHelp">Alıcının ekranı üzerindeki QR kodunu tarayın</string>
+    <string name="butn_qrScanToSend">Göndermek için QR tara</string>
+    <string name="butn_qrToggle">QR Kod gösterimi</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1674f51b..684b436b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -333,4 +333,6 @@
     <string name="text_qrCodeAvailableHelp">Tell sender to scan this QR code using TrebleShot</string>
     <string name="text_qrCodeHotspotDisabledHelp">Start TrebleShot hotspot first</string>
     <string name="text_scanQRCodeHelp">Scan the QR code on the receiver\'s screen</string>
+    <string name="butn_qrScanToSend">Scan QR Code to send</string>
+    <string name="butn_qrToggle">Toggle QR Code showing</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4f4faebf..b64a17a6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,6 +24,11 @@
         <item name="android:windowBackground">@color/windowBackground</item>
     </style>
 
+    <style name="AppTheme.QRScannerTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
+
     <style name="AppTheme.NoActionBar.GreyStatusBar" parent="@style/AppTheme.NoActionBar">
         <item name="colorPrimaryDark">#bbb</item>
         <item name="colorPrimary">#bbb</item>
diff --git a/qrcode/.gitignore b/qrcode/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/qrcode/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/qrcode/build.gradle b/qrcode/build.gradle
deleted file mode 100644
index 5929f28e..00000000
--- a/qrcode/build.gradle
+++ /dev/null
@@ -1,63 +0,0 @@
-apply plugin: 'com.android.library'
-
-buildscript {
-    repositories {
-        jcenter()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-android {
-    compileSdkVersion 26
-
-    resourcePrefix 'zxing_'
-
-    defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError false
-    }
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-    implementation 'com.google.zxing:core:3.3.0'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-}
-
-
-subprojects {
-    repositories {
-        jcenter()
-        mavenLocal()
-    }
-
-    group = 'com.journeyapps'
-}
diff --git a/qrcode/proguard-rules.pro b/qrcode/proguard-rules.pro
deleted file mode 100644
index f1b42451..00000000
--- a/qrcode/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/qrcode/src/androidTest/java/com/genonbeta/qrcode/ExampleInstrumentedTest.java b/qrcode/src/androidTest/java/com/genonbeta/qrcode/ExampleInstrumentedTest.java
deleted file mode 100644
index 9d8cb025..00000000
--- a/qrcode/src/androidTest/java/com/genonbeta/qrcode/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.genonbeta.qrcode;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest
-{
-	@Test
-	public void useAppContext() throws Exception
-	{
-		// Context of the app under test.
-		Context appContext = InstrumentationRegistry.getTargetContext();
-
-		assertEquals("com.genonbeta.qrcode.test", appContext.getPackageName());
-	}
-}
diff --git a/qrcode/src/main/AndroidManifest.xml b/qrcode/src/main/AndroidManifest.xml
deleted file mode 100644
index 3974ac71..00000000
--- a/qrcode/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.zxing.client.android">
-
-    <uses-permission android:name="android.permission.CAMERA"/>
-
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false"/>
-    <uses-feature
-        android:name="android.hardware.camera.front"
-        android:required="false"/>
-    <!-- TODO replace above two with next line after Android 4.2 -->
-    <!-- <uses-feature android:name="android.hardware.camera.any"/> -->
-    <uses-feature
-        android:name="android.hardware.camera.autofocus"
-        android:required="false"/>
-    <uses-feature
-        android:name="android.hardware.camera.flash"
-        android:required="false"/>
-    <uses-feature
-        android:name="android.hardware.screen.landscape"
-        android:required="false"/>
-    <uses-feature
-        android:name="android.hardware.wifi"
-        android:required="false"/>
-
-    <application>
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:clearTaskOnLaunch="true"
-            android:screenOrientation="sensorLandscape"
-            android:stateNotNeeded="true"
-            android:theme="@style/zxing_CaptureTheme"
-            android:windowSoftInputMode="stateAlwaysHidden"/>
-    </application>
-</manifest>
\ No newline at end of file
diff --git a/qrcode/src/main/java/com/google/zxing/client/android/AmbientLightManager.java b/qrcode/src/main/java/com/google/zxing/client/android/AmbientLightManager.java
deleted file mode 100644
index dc967e0f..00000000
--- a/qrcode/src/main/java/com/google/zxing/client/android/AmbientLightManager.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.android;
-
-import android.content.Context;
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
-import android.os.Handler;
-
-import com.journeyapps.barcodescanner.camera.CameraManager;
-import com.journeyapps.barcodescanner.camera.CameraSettings;
-
-/**
- * Detects ambient light and switches on the front light when very dark, and off again when sufficiently light.
- *
- * @author Sean Owen
- * @author Nikolaus Huber
- */
-public final class AmbientLightManager implements SensorEventListener {
-
-    private static final float TOO_DARK_LUX = 45.0f;
-    private static final float BRIGHT_ENOUGH_LUX = 450.0f;
-
-    private CameraManager cameraManager;
-    private CameraSettings cameraSettings;
-    private Sensor lightSensor;
-    private Context context;
-
-    private Handler handler;
-
-    public AmbientLightManager(Context context, CameraManager cameraManager, CameraSettings settings) {
-        this.context = context;
-        this.cameraManager = cameraManager;
-        this.cameraSettings = settings;
-
-        this.handler = new Handler();
-    }
-
-    public void start() {
-        if (cameraSettings.isAutoTorchEnabled()) {
-            SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-            lightSensor = sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
-            if (lightSensor != null) {
-                sensorManager.registerListener(this, lightSensor, SensorManager.SENSOR_DELAY_NORMAL);
-            }
-        }
-    }
-
-    public void stop() {
-        if (lightSensor != null) {
-            SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-            sensorManager.unregisterListener(this);
-            lightSensor = null;
-        }
-    }
-
-    private void setTorch(final boolean on) {
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                cameraManager.setTorch(on);
-            }
-        });
-    }
-
-    @Override
-    public void onSensorChanged(SensorEvent sensorEvent) {
-        float ambientLightLux = sensorEvent.values[0];
-        if (cameraManager != null) {
-            if (ambientLightLux <= TOO_DARK_LUX) {
-                setTorch(true);
-            } else if (ambientLightLux >= BRIGHT_ENOUGH_LUX) {
-                setTorch(false);
-            }
-        }
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-        // do nothing
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/client/android/BeepManager.java b/qrcode/src/main/java/com/google/zxing/client/android/BeepManager.java
deleted file mode 100644
index 89956316..00000000
--- a/qrcode/src/main/java/com/google/zxing/client/android/BeepManager.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.android;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.AssetFileDescriptor;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.os.Vibrator;
-import android.util.Log;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * Manages beeps and vibrations.
- */
-public final class BeepManager {
-
-    private static final String TAG = BeepManager.class.getSimpleName();
-
-    private static final float BEEP_VOLUME = 0.10f;
-    private static final long VIBRATE_DURATION = 200L;
-
-    private final Context context;
-
-    private boolean beepEnabled = true;
-    private boolean vibrateEnabled = false;
-
-    public BeepManager(Activity activity) {
-        activity.setVolumeControlStream(AudioManager.STREAM_MUSIC);
-
-        // We do not keep a reference to the Activity itself, to prevent leaks
-        this.context = activity.getApplicationContext();
-    }
-
-    public boolean isBeepEnabled() {
-        return beepEnabled;
-    }
-
-    /**
-     * Call updatePrefs() after setting this.
-     *
-     * If the device is in silent mode, it will not beep.
-     *
-     * @param beepEnabled true to enable beep
-     */
-    public void setBeepEnabled(boolean beepEnabled) {
-        this.beepEnabled = beepEnabled;
-    }
-
-    public boolean isVibrateEnabled() {
-        return vibrateEnabled;
-    }
-
-    /**
-     * Call updatePrefs() after setting this.
-     *
-     * @param vibrateEnabled true to enable vibrate
-     */
-    public void setVibrateEnabled(boolean vibrateEnabled) {
-        this.vibrateEnabled = vibrateEnabled;
-    }
-
-    public synchronized void playBeepSoundAndVibrate() {
-        if (beepEnabled) {
-            playBeepSound();
-        }
-        if (vibrateEnabled) {
-            Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
-            vibrator.vibrate(VIBRATE_DURATION);
-        }
-    }
-
-
-    public MediaPlayer playBeepSound() {
-        MediaPlayer mediaPlayer = new MediaPlayer();
-        mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
-        mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
-            @Override
-            public void onCompletion(MediaPlayer mp) {
-                mp.stop();
-                mp.release();
-            }
-        });
-        mediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
-            @Override
-            public boolean onError(MediaPlayer mp, int what, int extra) {
-                Log.w(TAG, "Failed to beep " + what + ", " + extra);
-                // possibly media player error, so release and recreate
-                mp.stop();
-                mp.release();
-                return true;
-            }
-        });
-        try {
-            AssetFileDescriptor file = context.getResources().openRawResourceFd(R.raw.zxing_beep);
-            try {
-                mediaPlayer.setDataSource(file.getFileDescriptor(), file.getStartOffset(), file.getLength());
-            } finally {
-                file.close();
-            }
-            mediaPlayer.setVolume(BEEP_VOLUME, BEEP_VOLUME);
-            mediaPlayer.prepare();
-            mediaPlayer.start();
-            return mediaPlayer;
-        } catch (IOException ioe) {
-            Log.w(TAG, ioe);
-            mediaPlayer.release();
-            return null;
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/client/android/DecodeFormatManager.java b/qrcode/src/main/java/com/google/zxing/client/android/DecodeFormatManager.java
deleted file mode 100644
index 331492b4..00000000
--- a/qrcode/src/main/java/com/google/zxing/client/android/DecodeFormatManager.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.android;
-
-import android.content.Intent;
-
-import com.google.zxing.BarcodeFormat;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-public final class DecodeFormatManager {
-
-    private static final Pattern COMMA_PATTERN = Pattern.compile(",");
-
-    static final Set<BarcodeFormat> PRODUCT_FORMATS;
-    static final Set<BarcodeFormat> INDUSTRIAL_FORMATS;
-    private static final Set<BarcodeFormat> ONE_D_FORMATS;
-    static final Set<BarcodeFormat> QR_CODE_FORMATS = EnumSet.of(BarcodeFormat.QR_CODE);
-    static final Set<BarcodeFormat> DATA_MATRIX_FORMATS = EnumSet.of(BarcodeFormat.DATA_MATRIX);
-    static final Set<BarcodeFormat> AZTEC_FORMATS = EnumSet.of(BarcodeFormat.AZTEC);
-    static final Set<BarcodeFormat> PDF417_FORMATS = EnumSet.of(BarcodeFormat.PDF_417);
-
-    static {
-        PRODUCT_FORMATS = EnumSet.of(BarcodeFormat.UPC_A,
-                BarcodeFormat.UPC_E,
-                BarcodeFormat.EAN_13,
-                BarcodeFormat.EAN_8,
-                BarcodeFormat.RSS_14,
-                BarcodeFormat.RSS_EXPANDED);
-        INDUSTRIAL_FORMATS = EnumSet.of(BarcodeFormat.CODE_39,
-                BarcodeFormat.CODE_93,
-                BarcodeFormat.CODE_128,
-                BarcodeFormat.ITF,
-                BarcodeFormat.CODABAR);
-        ONE_D_FORMATS = EnumSet.copyOf(PRODUCT_FORMATS);
-        ONE_D_FORMATS.addAll(INDUSTRIAL_FORMATS);
-    }
-
-    private static final Map<String, Set<BarcodeFormat>> FORMATS_FOR_MODE;
-
-    static {
-        FORMATS_FOR_MODE = new HashMap<>();
-        FORMATS_FOR_MODE.put(Intents.Scan.ONE_D_MODE, ONE_D_FORMATS);
-        FORMATS_FOR_MODE.put(Intents.Scan.PRODUCT_MODE, PRODUCT_FORMATS);
-        FORMATS_FOR_MODE.put(Intents.Scan.QR_CODE_MODE, QR_CODE_FORMATS);
-        FORMATS_FOR_MODE.put(Intents.Scan.DATA_MATRIX_MODE, DATA_MATRIX_FORMATS);
-        FORMATS_FOR_MODE.put(Intents.Scan.AZTEC_MODE, AZTEC_FORMATS);
-        FORMATS_FOR_MODE.put(Intents.Scan.PDF417_MODE, PDF417_FORMATS);
-    }
-
-    private DecodeFormatManager() {
-    }
-
-    public static Set<BarcodeFormat> parseDecodeFormats(Intent intent) {
-        Iterable<String> scanFormats = null;
-        CharSequence scanFormatsString = intent.getStringExtra(Intents.Scan.FORMATS);
-        if (scanFormatsString != null) {
-            scanFormats = Arrays.asList(COMMA_PATTERN.split(scanFormatsString));
-        }
-        return parseDecodeFormats(scanFormats, intent.getStringExtra(Intents.Scan.MODE));
-    }
-
-    private static Set<BarcodeFormat> parseDecodeFormats(Iterable<String> scanFormats, String decodeMode) {
-        if (scanFormats != null) {
-            Set<BarcodeFormat> formats = EnumSet.noneOf(BarcodeFormat.class);
-            try {
-                for (String format : scanFormats) {
-                    formats.add(BarcodeFormat.valueOf(format));
-                }
-                return formats;
-            } catch (IllegalArgumentException iae) {
-                // ignore it then
-            }
-        }
-        if (decodeMode != null) {
-            return FORMATS_FOR_MODE.get(decodeMode);
-        }
-        return null;
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/client/android/DecodeHintManager.java b/qrcode/src/main/java/com/google/zxing/client/android/DecodeHintManager.java
deleted file mode 100644
index 02c230c4..00000000
--- a/qrcode/src/main/java/com/google/zxing/client/android/DecodeHintManager.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2013 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.android;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-
-import com.google.zxing.DecodeHintType;
-
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * @author Lachezar Dobrev
- */
-public final class DecodeHintManager {
-
-    private static final String TAG = DecodeHintManager.class.getSimpleName();
-
-    // This pattern is used in decoding integer arrays.
-    private static final Pattern COMMA = Pattern.compile(",");
-
-    private DecodeHintManager() {
-    }
-
-    /**
-     * <p>Split a query string into a list of name-value pairs.</p>
-     *
-     * <p>This is an alternative to the {@link Uri#getQueryParameterNames()} and
-     * {@link Uri#getQueryParameters(String)}, which are quirky and not suitable
-     * for exist-only Uri parameters.</p>
-     *
-     * <p>This method ignores multiple parameters with the same name and returns the
-     * first one only. This is technically incorrect, but should be acceptable due
-     * to the method of processing Hints: no multiple values for a hint.</p>
-     *
-     * @param query query to split
-     * @return name-value pairs
-     */
-    private static Map<String, String> splitQuery(String query) {
-        Map<String, String> map = new HashMap<>();
-        int pos = 0;
-        while (pos < query.length()) {
-            if (query.charAt(pos) == '&') {
-                // Skip consecutive ampersand separators.
-                pos++;
-                continue;
-            }
-            int amp = query.indexOf('&', pos);
-            int equ = query.indexOf('=', pos);
-            if (amp < 0) {
-                // This is the last element in the query, no more ampersand elements.
-                String name;
-                String text;
-                if (equ < 0) {
-                    // No equal sign
-                    name = query.substring(pos);
-                    name = name.replace('+', ' '); // Preemptively decode +
-                    name = Uri.decode(name);
-                    text = "";
-                } else {
-                    // Split name and text.
-                    name = query.substring(pos, equ);
-                    name = name.replace('+', ' '); // Preemptively decode +
-                    name = Uri.decode(name);
-                    text = query.substring(equ + 1);
-                    text = text.replace('+', ' '); // Preemptively decode +
-                    text = Uri.decode(text);
-                }
-                if (!map.containsKey(name)) {
-                    map.put(name, text);
-                }
-                break;
-            }
-            if (equ < 0 || equ > amp) {
-                // No equal sign until the &: this is a simple parameter with no value.
-                String name = query.substring(pos, amp);
-                name = name.replace('+', ' '); // Preemptively decode +
-                name = Uri.decode(name);
-                if (!map.containsKey(name)) {
-                    map.put(name, "");
-                }
-                pos = amp + 1;
-                continue;
-            }
-            String name = query.substring(pos, equ);
-            name = name.replace('+', ' '); // Preemptively decode +
-            name = Uri.decode(name);
-            String text = query.substring(equ + 1, amp);
-            text = text.replace('+', ' '); // Preemptively decode +
-            text = Uri.decode(text);
-            if (!map.containsKey(name)) {
-                map.put(name, text);
-            }
-            pos = amp + 1;
-        }
-        return map;
-    }
-
-    static Map<DecodeHintType, ?> parseDecodeHints(Uri inputUri) {
-        String query = inputUri.getEncodedQuery();
-        if (query == null || query.isEmpty()) {
-            return null;
-        }
-
-        // Extract parameters
-        Map<String, String> parameters = splitQuery(query);
-
-        Map<DecodeHintType, Object> hints = new EnumMap<>(DecodeHintType.class);
-
-        for (DecodeHintType hintType : DecodeHintType.values()) {
-
-            if (hintType == DecodeHintType.CHARACTER_SET ||
-                    hintType == DecodeHintType.NEED_RESULT_POINT_CALLBACK ||
-                    hintType == DecodeHintType.POSSIBLE_FORMATS) {
-                continue; // This hint is specified in another way
-            }
-
-            String parameterName = hintType.name();
-            String parameterText = parameters.get(parameterName);
-            if (parameterText == null) {
-                continue;
-            }
-            if (hintType.getValueType().equals(Object.class)) {
-                // This is an unspecified type of hint content. Use the value as is.
-                // TODO: Can we make a different assumption on this?
-                hints.put(hintType, parameterText);
-                continue;
-            }
-            if (hintType.getValueType().equals(Void.class)) {
-                // Void hints are just flags: use the constant specified by DecodeHintType
-                hints.put(hintType, Boolean.TRUE);
-                continue;
-            }
-            if (hintType.getValueType().equals(String.class)) {
-                // A string hint: use the decoded value.
-                hints.put(hintType, parameterText);
-                continue;
-            }
-            if (hintType.getValueType().equals(Boolean.class)) {
-                // A boolean hint: a few values for false, everything else is true.
-                // An empty parameter is simply a flag-style parameter, assuming true
-                if (parameterText.isEmpty()) {
-                    hints.put(hintType, Boolean.TRUE);
-                } else if ("0".equals(parameterText) ||
-                        "false".equalsIgnoreCase(parameterText) ||
-                        "no".equalsIgnoreCase(parameterText)) {
-                    hints.put(hintType, Boolean.FALSE);
-                } else {
-                    hints.put(hintType, Boolean.TRUE);
-                }
-
-                continue;
-            }
-            if (hintType.getValueType().equals(int[].class)) {
-                // An integer array. Used to specify valid lengths.
-                // Strip a trailing comma as in Java style array initialisers.
-                if (!parameterText.isEmpty() && parameterText.charAt(parameterText.length() - 1) == ',') {
-                    parameterText = parameterText.substring(0, parameterText.length() - 1);
-                }
-                String[] values = COMMA.split(parameterText);
-                int[] array = new int[values.length];
-                for (int i = 0; i < values.length; i++) {
-                    try {
-                        array[i] = Integer.parseInt(values[i]);
-                    } catch (NumberFormatException ignored) {
-                        Log.w(TAG, "Skipping array of integers hint " + hintType + " due to invalid numeric value: '" + values[i] + '\'');
-                        array = null;
-                        break;
-                    }
-                }
-                if (array != null) {
-                    hints.put(hintType, array);
-                }
-                continue;
-            }
-            Log.w(TAG, "Unsupported hint type '" + hintType + "' of type " + hintType.getValueType());
-        }
-
-        Log.i(TAG, "Hints from the URI: " + hints);
-        return hints;
-    }
-
-    public static Map<DecodeHintType, Object> parseDecodeHints(Intent intent) {
-        Bundle extras = intent.getExtras();
-        if (extras == null || extras.isEmpty()) {
-            return null;
-        }
-        Map<DecodeHintType, Object> hints = new EnumMap<>(DecodeHintType.class);
-
-        for (DecodeHintType hintType : DecodeHintType.values()) {
-
-            if (hintType == DecodeHintType.CHARACTER_SET ||
-                    hintType == DecodeHintType.NEED_RESULT_POINT_CALLBACK ||
-                    hintType == DecodeHintType.POSSIBLE_FORMATS) {
-                continue; // This hint is specified in another way
-            }
-
-            String hintName = hintType.name();
-            if (extras.containsKey(hintName)) {
-                if (hintType.getValueType().equals(Void.class)) {
-                    // Void hints are just flags: use the constant specified by the DecodeHintType
-                    hints.put(hintType, Boolean.TRUE);
-                } else {
-                    Object hintData = extras.get(hintName);
-                    if (hintType.getValueType().isInstance(hintData)) {
-                        hints.put(hintType, hintData);
-                    } else {
-                        Log.w(TAG, "Ignoring hint " + hintType + " because it is not assignable from " + hintData);
-                    }
-                }
-            }
-        }
-
-        Log.i(TAG, "Hints from the Intent: " + hints);
-        return hints;
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/client/android/InactivityTimer.java b/qrcode/src/main/java/com/google/zxing/client/android/InactivityTimer.java
deleted file mode 100644
index 3b7ab4b1..00000000
--- a/qrcode/src/main/java/com/google/zxing/client/android/InactivityTimer.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2010 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.android;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.BatteryManager;
-import android.os.Handler;
-
-/**
- * Finishes an context after a period of inactivity if the device is on battery power.
- */
-public final class InactivityTimer {
-
-    private static final String TAG = InactivityTimer.class.getSimpleName();
-
-    private static final long INACTIVITY_DELAY_MS = 5 * 60 * 1000L;
-
-    private final Context context;
-    private final BroadcastReceiver powerStatusReceiver;
-    private boolean registered = false;
-    private Handler handler;
-    private Runnable callback;
-    private boolean onBattery;
-
-    public InactivityTimer(Context context, Runnable callback) {
-        this.context = context;
-        this.callback = callback;
-
-        powerStatusReceiver = new PowerStatusReceiver();
-        handler = new Handler();
-    }
-
-    /**
-     * Trigger activity, resetting the timer.
-     */
-    public void activity() {
-        cancelCallback();
-        if (onBattery) {
-            handler.postDelayed(callback, INACTIVITY_DELAY_MS);
-        }
-    }
-
-    /**
-     * Start the activity timer.
-     */
-    public void start() {
-        registerReceiver();
-        activity();
-    }
-
-    /**
-     * Cancel the activity timer.
-     */
-    public void cancel() {
-        cancelCallback();
-        unregisterReceiver();
-    }
-
-    private void unregisterReceiver() {
-        if (registered) {
-            context.unregisterReceiver(powerStatusReceiver);
-            registered = false;
-        }
-    }
-
-    private void registerReceiver() {
-        if (!registered) {
-            context.registerReceiver(powerStatusReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-            registered = true;
-        }
-    }
-
-    private void cancelCallback() {
-        handler.removeCallbacksAndMessages(null);
-    }
-
-    private void onBattery(boolean onBattery) {
-        this.onBattery = onBattery;
-
-        // To make sure we're still running
-        if (registered) {
-            // This will either cancel or reschedule, depending on the battery status.
-            activity();
-        }
-    }
-
-    private final class PowerStatusReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) {
-                // 0 indicates that we're on battery
-                final boolean onBatteryNow = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) <= 0;
-                // post on handler to run in main thread
-                handler.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        onBattery(onBatteryNow);
-                    }
-                });
-            }
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/client/android/Intents.java b/qrcode/src/main/java/com/google/zxing/client/android/Intents.java
deleted file mode 100644
index 7ccb7a94..00000000
--- a/qrcode/src/main/java/com/google/zxing/client/android/Intents.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.android;
-
-/**
- * This class provides the constants to use when sending an Intent to Barcode Scanner.
- * These strings are effectively API and cannot be changed.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public final class Intents {
-    private Intents() {
-    }
-
-    public static final class Scan {
-        /**
-         * Send this intent to open the Barcodes app in scanning mode, find a barcode, and return
-         * the results.
-         */
-        public static final String ACTION = "com.google.zxing.client.android.SCAN";
-
-        /**
-         * By default, sending this will decode all barcodes that we understand. However it
-         * may be useful to limit scanning to certain formats. Use
-         * {@link android.content.Intent#putExtra(String, String)} with one of the values below.
-         *
-         * Setting this is effectively shorthand for setting explicit formats with {@link #FORMATS}.
-         * It is overridden by that setting.
-         */
-        public static final String MODE = "SCAN_MODE";
-
-        /**
-         * Decode only UPC and EAN barcodes. This is the right choice for shopping apps which get
-         * prices, reviews, etc. for products.
-         */
-        public static final String PRODUCT_MODE = "PRODUCT_MODE";
-
-        /**
-         * Decode only 1D barcodes.
-         */
-        public static final String ONE_D_MODE = "ONE_D_MODE";
-
-        /**
-         * Decode only QR codes.
-         */
-        public static final String QR_CODE_MODE = "QR_CODE_MODE";
-
-        /**
-         * Decode only Data Matrix codes.
-         */
-        public static final String DATA_MATRIX_MODE = "DATA_MATRIX_MODE";
-
-        /**
-         * Decode only Aztec.
-         */
-        public static final String AZTEC_MODE = "AZTEC_MODE";
-
-        /**
-         * Decode only PDF417.
-         */
-        public static final String PDF417_MODE = "PDF417_MODE";
-
-        /**
-         * Comma-separated list of formats to scan for. The values must match the names of
-         * {@link com.google.zxing.BarcodeFormat}s, e.g. {@link com.google.zxing.BarcodeFormat#EAN_13}.
-         * Example: "EAN_13,EAN_8,QR_CODE". This overrides {@link #MODE}.
-         */
-        public static final String FORMATS = "SCAN_FORMATS";
-
-        /**
-         * Optional parameter to specify the id of the camera from which to recognize barcodes.
-         * Overrides the default camera that would otherwise would have been selected.
-         * If provided, should be an int.
-         */
-        public static final String CAMERA_ID = "SCAN_CAMERA_ID";
-
-        /**
-         * @see com.google.zxing.DecodeHintType#CHARACTER_SET
-         */
-        public static final String CHARACTER_SET = "CHARACTER_SET";
-
-        /**
-         * Set to false to disable beep. Defaults to true.
-         */
-        public static final String BEEP_ENABLED = "BEEP_ENABLED";
-
-        /**
-         * Set to true to return a path to the barcode's image as it was captured. Defaults to false.
-         */
-        public static final String BARCODE_IMAGE_ENABLED = "BARCODE_IMAGE_ENABLED";
-
-        /**
-         * Set the time to finish the scan screen.
-         */
-        public static final String TIMEOUT = "TIMEOUT";
-
-        /**
-         * Whether or not the orientation should be locked when the activity is first started.
-         * Defaults to true.
-         */
-        public static final String ORIENTATION_LOCKED = "SCAN_ORIENTATION_LOCKED";
-
-        /**
-         * Prompt to show on-screen when scanning by intent. Specified as a {@link String}.
-         */
-        public static final String PROMPT_MESSAGE = "PROMPT_MESSAGE";
-
-        /**
-         * If a barcode is found, Barcodes returns {@link android.app.Activity#RESULT_OK} to
-         * {@link android.app.Activity#onActivityResult(int, int, android.content.Intent)}
-         * of the app which requested the scan via
-         * {@link android.app.Activity#startActivityForResult(android.content.Intent, int)}
-         * The barcodes contents can be retrieved with
-         * {@link android.content.Intent#getStringExtra(String)}.
-         * If the user presses Back, the result code will be {@link android.app.Activity#RESULT_CANCELED}.
-         */
-        public static final String RESULT = "SCAN_RESULT";
-
-        /**
-         * Call {@link android.content.Intent#getStringExtra(String)} with {@link #RESULT_FORMAT}
-         * to determine which barcode format was found.
-         * See {@link com.google.zxing.BarcodeFormat} for possible values.
-         */
-        public static final String RESULT_FORMAT = "SCAN_RESULT_FORMAT";
-
-        /**
-         * Call {@link android.content.Intent#getStringExtra(String)} with {@link #RESULT_UPC_EAN_EXTENSION}
-         * to return the content of any UPC extension barcode that was also found. Only applicable
-         * to {@link com.google.zxing.BarcodeFormat#UPC_A} and {@link com.google.zxing.BarcodeFormat#EAN_13}
-         * formats.
-         */
-        public static final String RESULT_UPC_EAN_EXTENSION = "SCAN_RESULT_UPC_EAN_EXTENSION";
-
-        /**
-         * Call {@link android.content.Intent#getByteArrayExtra(String)} with {@link #RESULT_BYTES}
-         * to get a {@code byte[]} of raw bytes in the barcode, if available.
-         */
-        public static final String RESULT_BYTES = "SCAN_RESULT_BYTES";
-
-        /**
-         * Key for the value of {@link com.google.zxing.ResultMetadataType#ORIENTATION}, if available.
-         * Call {@link android.content.Intent#getIntArrayExtra(String)} with {@link #RESULT_ORIENTATION}.
-         */
-        public static final String RESULT_ORIENTATION = "SCAN_RESULT_ORIENTATION";
-
-        /**
-         * Key for the value of {@link com.google.zxing.ResultMetadataType#ERROR_CORRECTION_LEVEL}, if available.
-         * Call {@link android.content.Intent#getStringExtra(String)} with {@link #RESULT_ERROR_CORRECTION_LEVEL}.
-         */
-        public static final String RESULT_ERROR_CORRECTION_LEVEL = "SCAN_RESULT_ERROR_CORRECTION_LEVEL";
-
-        /**
-         * Prefix for keys that map to the values of {@link com.google.zxing.ResultMetadataType#BYTE_SEGMENTS},
-         * if available. The actual values will be set under a series of keys formed by adding 0, 1, 2, ...
-         * to this prefix. So the first byte segment is under key "SCAN_RESULT_BYTE_SEGMENTS_0" for example.
-         * Call {@link android.content.Intent#getByteArrayExtra(String)} with these keys.
-         */
-        public static final String RESULT_BYTE_SEGMENTS_PREFIX = "SCAN_RESULT_BYTE_SEGMENTS_";
-
-        /**
-         * Call {@link android.content.Intent#getStringExtra(String)} with {@link #RESULT_BARCODE_IMAGE_PATH}
-         * to get a {@code String} path to a cropped and compressed png file of the barcode's image
-         * as it was displayed. Only available if
-         * {@link com.google.zxing.integration.android.IntentIntegrator#setBarcodeImageEnabled(boolean)}
-         * is called with true.
-         */
-        public static final String RESULT_BARCODE_IMAGE_PATH = "SCAN_RESULT_IMAGE_PATH";
-
-        /***
-         * The scan should be inverted. White becomes black, black becomes white.
-         */
-        public static final String INVERTED_SCAN = "INVERTED_SCAN";
-
-        private Scan() {
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationUtils.java b/qrcode/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationUtils.java
deleted file mode 100644
index 811bbb01..00000000
--- a/qrcode/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationUtils.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- * Copyright (C) 2014 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.android.camera;
-
-import android.annotation.TargetApi;
-import android.graphics.Rect;
-import android.hardware.Camera;
-import android.os.Build;
-import android.util.Log;
-
-import com.journeyapps.barcodescanner.camera.CameraSettings;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * Utility methods for configuring the Android camera.
- *
- * @author Sean Owen
- */
-public final class CameraConfigurationUtils {
-
-    private static final String TAG = "CameraConfiguration";
-
-    private static final Pattern SEMICOLON = Pattern.compile(";");
-
-    private static final float MAX_EXPOSURE_COMPENSATION = 1.5f;
-    private static final float MIN_EXPOSURE_COMPENSATION = 0.0f;
-    private static final int MIN_FPS = 10;
-    private static final int MAX_FPS = 20;
-    private static final int AREA_PER_1000 = 400;
-
-    private CameraConfigurationUtils() {
-    }
-
-    public static void setFocus(Camera.Parameters parameters,
-								CameraSettings.FocusMode focusModeSetting,
-                                boolean safeMode) {
-        List<String> supportedFocusModes = parameters.getSupportedFocusModes();
-        String focusMode = null;
-
-		if (safeMode || focusModeSetting == CameraSettings.FocusMode.AUTO) {
-			focusMode = findSettableValue("focus mode",
-					supportedFocusModes,
-					Camera.Parameters.FOCUS_MODE_AUTO);
-		} else if (focusModeSetting == CameraSettings.FocusMode.CONTINUOUS) {
-			focusMode = findSettableValue("focus mode",
-					supportedFocusModes,
-					Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE,
-					Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO,
-					Camera.Parameters.FOCUS_MODE_AUTO);
-		} else if (focusModeSetting == CameraSettings.FocusMode.INFINITY) {
-			focusMode = findSettableValue("focus mode",
-					supportedFocusModes,
-					Camera.Parameters.FOCUS_MODE_INFINITY);
-		} else if (focusModeSetting == CameraSettings.FocusMode.MACRO) {
-			focusMode = findSettableValue("focus mode",
-					supportedFocusModes,
-					Camera.Parameters.FOCUS_MODE_MACRO);
-		}
-
-        // Maybe selected auto-focus but not available, so fall through here:
-        if (!safeMode && focusMode == null) {
-            focusMode = findSettableValue("focus mode",
-                    supportedFocusModes,
-                    Camera.Parameters.FOCUS_MODE_MACRO,
-                    Camera.Parameters.FOCUS_MODE_EDOF);
-        }
-        if (focusMode != null) {
-            if (focusMode.equals(parameters.getFocusMode())) {
-                Log.i(TAG, "Focus mode already set to " + focusMode);
-            } else {
-                parameters.setFocusMode(focusMode);
-            }
-        }
-    }
-
-    public static void setTorch(Camera.Parameters parameters, boolean on) {
-        List<String> supportedFlashModes = parameters.getSupportedFlashModes();
-        String flashMode;
-        if (on) {
-            flashMode = findSettableValue("flash mode",
-                    supportedFlashModes,
-                    Camera.Parameters.FLASH_MODE_TORCH,
-                    Camera.Parameters.FLASH_MODE_ON);
-        } else {
-            flashMode = findSettableValue("flash mode",
-                    supportedFlashModes,
-                    Camera.Parameters.FLASH_MODE_OFF);
-        }
-        if (flashMode != null) {
-            if (flashMode.equals(parameters.getFlashMode())) {
-                Log.i(TAG, "Flash mode already set to " + flashMode);
-            } else {
-                Log.i(TAG, "Setting flash mode to " + flashMode);
-                parameters.setFlashMode(flashMode);
-            }
-        }
-    }
-
-    public static void setBestExposure(Camera.Parameters parameters, boolean lightOn) {
-        int minExposure = parameters.getMinExposureCompensation();
-        int maxExposure = parameters.getMaxExposureCompensation();
-        float step = parameters.getExposureCompensationStep();
-        if ((minExposure != 0 || maxExposure != 0) && step > 0.0f) {
-            // Set low when light is on
-            float targetCompensation = lightOn ? MIN_EXPOSURE_COMPENSATION : MAX_EXPOSURE_COMPENSATION;
-            int compensationSteps = Math.round(targetCompensation / step);
-            float actualCompensation = step * compensationSteps;
-            // Clamp value:
-            compensationSteps = Math.max(Math.min(compensationSteps, maxExposure), minExposure);
-            if (parameters.getExposureCompensation() == compensationSteps) {
-                Log.i(TAG, "Exposure compensation already set to " + compensationSteps + " / " + actualCompensation);
-            } else {
-                Log.i(TAG, "Setting exposure compensation to " + compensationSteps + " / " + actualCompensation);
-                parameters.setExposureCompensation(compensationSteps);
-            }
-        } else {
-            Log.i(TAG, "Camera does not support exposure compensation");
-        }
-    }
-
-    public static void setBestPreviewFPS(Camera.Parameters parameters) {
-        setBestPreviewFPS(parameters, MIN_FPS, MAX_FPS);
-    }
-
-    public static void setBestPreviewFPS(Camera.Parameters parameters, int minFPS, int maxFPS) {
-        List<int[]> supportedPreviewFpsRanges = parameters.getSupportedPreviewFpsRange();
-        Log.i(TAG, "Supported FPS ranges: " + toString(supportedPreviewFpsRanges));
-        if (supportedPreviewFpsRanges != null && !supportedPreviewFpsRanges.isEmpty()) {
-            int[] suitableFPSRange = null;
-            for (int[] fpsRange : supportedPreviewFpsRanges) {
-                int thisMin = fpsRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX];
-                int thisMax = fpsRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX];
-                if (thisMin >= minFPS * 1000 && thisMax <= maxFPS * 1000) {
-                    suitableFPSRange = fpsRange;
-                    break;
-                }
-            }
-            if (suitableFPSRange == null) {
-                Log.i(TAG, "No suitable FPS range?");
-            } else {
-                int[] currentFpsRange = new int[2];
-                parameters.getPreviewFpsRange(currentFpsRange);
-                if (Arrays.equals(currentFpsRange, suitableFPSRange)) {
-                    Log.i(TAG, "FPS range already set to " + Arrays.toString(suitableFPSRange));
-                } else {
-                    Log.i(TAG, "Setting FPS range to " + Arrays.toString(suitableFPSRange));
-                    parameters.setPreviewFpsRange(suitableFPSRange[Camera.Parameters.PREVIEW_FPS_MIN_INDEX],
-                            suitableFPSRange[Camera.Parameters.PREVIEW_FPS_MAX_INDEX]);
-                }
-            }
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
-    public static void setFocusArea(Camera.Parameters parameters) {
-        if (parameters.getMaxNumFocusAreas() > 0) {
-            Log.i(TAG, "Old focus areas: " + toString(parameters.getFocusAreas()));
-            List<Camera.Area> middleArea = buildMiddleArea(AREA_PER_1000);
-            Log.i(TAG, "Setting focus area to : " + toString(middleArea));
-            parameters.setFocusAreas(middleArea);
-        } else {
-            Log.i(TAG, "Device does not support focus areas");
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
-    public static void setMetering(Camera.Parameters parameters) {
-        if (parameters.getMaxNumMeteringAreas() > 0) {
-            Log.i(TAG, "Old metering areas: " + parameters.getMeteringAreas());
-            List<Camera.Area> middleArea = buildMiddleArea(AREA_PER_1000);
-            Log.i(TAG, "Setting metering area to : " + toString(middleArea));
-            parameters.setMeteringAreas(middleArea);
-        } else {
-            Log.i(TAG, "Device does not support metering areas");
-        }
-    }
-
-    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
-    private static List<Camera.Area> buildMiddleArea(int areaPer1000) {
-        return Collections.singletonList(
-                new Camera.Area(new Rect(-areaPer1000, -areaPer1000, areaPer1000, areaPer1000), 1));
-    }
-
-    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
-    public static void setVideoStabilization(Camera.Parameters parameters) {
-        if (parameters.isVideoStabilizationSupported()) {
-            if (parameters.getVideoStabilization()) {
-                Log.i(TAG, "Video stabilization already enabled");
-            } else {
-                Log.i(TAG, "Enabling video stabilization...");
-                parameters.setVideoStabilization(true);
-            }
-        } else {
-            Log.i(TAG, "This device does not support video stabilization");
-        }
-    }
-
-    public static void setBarcodeSceneMode(Camera.Parameters parameters) {
-        if (Camera.Parameters.SCENE_MODE_BARCODE.equals(parameters.getSceneMode())) {
-            Log.i(TAG, "Barcode scene mode already set");
-            return;
-        }
-        String sceneMode = findSettableValue("scene mode",
-                parameters.getSupportedSceneModes(),
-                Camera.Parameters.SCENE_MODE_BARCODE);
-        if (sceneMode != null) {
-            parameters.setSceneMode(sceneMode);
-        }
-    }
-
-    public static void setZoom(Camera.Parameters parameters, double targetZoomRatio) {
-        if (parameters.isZoomSupported()) {
-            Integer zoom = indexOfClosestZoom(parameters, targetZoomRatio);
-            if (zoom == null) {
-                return;
-            }
-            if (parameters.getZoom() == zoom) {
-                Log.i(TAG, "Zoom is already set to " + zoom);
-            } else {
-                Log.i(TAG, "Setting zoom to " + zoom);
-                parameters.setZoom(zoom);
-            }
-        } else {
-            Log.i(TAG, "Zoom is not supported");
-        }
-    }
-
-    private static Integer indexOfClosestZoom(Camera.Parameters parameters, double targetZoomRatio) {
-        List<Integer> ratios = parameters.getZoomRatios();
-        Log.i(TAG, "Zoom ratios: " + ratios);
-        int maxZoom = parameters.getMaxZoom();
-        if (ratios == null || ratios.isEmpty() || ratios.size() != maxZoom + 1) {
-            Log.w(TAG, "Invalid zoom ratios!");
-            return null;
-        }
-        double target100 = 100.0 * targetZoomRatio;
-        double smallestDiff = Double.POSITIVE_INFINITY;
-        int closestIndex = 0;
-        for (int i = 0; i < ratios.size(); i++) {
-            double diff = Math.abs(ratios.get(i) - target100);
-            if (diff < smallestDiff) {
-                smallestDiff = diff;
-                closestIndex = i;
-            }
-        }
-        Log.i(TAG, "Chose zoom ratio of " + (ratios.get(closestIndex) / 100.0));
-        return closestIndex;
-    }
-
-    public static void setInvertColor(Camera.Parameters parameters) {
-        if (Camera.Parameters.EFFECT_NEGATIVE.equals(parameters.getColorEffect())) {
-            Log.i(TAG, "Negative effect already set");
-            return;
-        }
-        String colorMode = findSettableValue("color effect",
-                parameters.getSupportedColorEffects(),
-                Camera.Parameters.EFFECT_NEGATIVE);
-        if (colorMode != null) {
-            parameters.setColorEffect(colorMode);
-        }
-    }
-
-    private static String findSettableValue(String name,
-                                            Collection<String> supportedValues,
-                                            String... desiredValues) {
-        Log.i(TAG, "Requesting " + name + " value from among: " + Arrays.toString(desiredValues));
-        Log.i(TAG, "Supported " + name + " values: " + supportedValues);
-        if (supportedValues != null) {
-            for (String desiredValue : desiredValues) {
-                if (supportedValues.contains(desiredValue)) {
-                    Log.i(TAG, "Can set " + name + " to: " + desiredValue);
-                    return desiredValue;
-                }
-            }
-        }
-        Log.i(TAG, "No supported values match");
-        return null;
-    }
-
-    private static String toString(Collection<int[]> arrays) {
-        if (arrays == null || arrays.isEmpty()) {
-            return "[]";
-        }
-        StringBuilder buffer = new StringBuilder();
-        buffer.append('[');
-        Iterator<int[]> it = arrays.iterator();
-        while (it.hasNext()) {
-            buffer.append(Arrays.toString(it.next()));
-            if (it.hasNext()) {
-                buffer.append(", ");
-            }
-        }
-        buffer.append(']');
-        return buffer.toString();
-    }
-
-    @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
-    private static String toString(Iterable<Camera.Area> areas) {
-        if (areas == null) {
-            return null;
-        }
-        StringBuilder result = new StringBuilder();
-        for (Camera.Area area : areas) {
-            result.append(area.rect).append(':').append(area.weight).append(' ');
-        }
-        return result.toString();
-    }
-
-    public static String collectStats(Camera.Parameters parameters) {
-        return collectStats(parameters.flatten());
-    }
-
-    public static String collectStats(CharSequence flattenedParams) {
-        StringBuilder result = new StringBuilder(1000);
-
-        result.append("BOARD=").append(Build.BOARD).append('\n');
-        result.append("BRAND=").append(Build.BRAND).append('\n');
-        result.append("CPU_ABI=").append(Build.CPU_ABI).append('\n');
-        result.append("DEVICE=").append(Build.DEVICE).append('\n');
-        result.append("DISPLAY=").append(Build.DISPLAY).append('\n');
-        result.append("FINGERPRINT=").append(Build.FINGERPRINT).append('\n');
-        result.append("HOST=").append(Build.HOST).append('\n');
-        result.append("ID=").append(Build.ID).append('\n');
-        result.append("MANUFACTURER=").append(Build.MANUFACTURER).append('\n');
-        result.append("MODEL=").append(Build.MODEL).append('\n');
-        result.append("PRODUCT=").append(Build.PRODUCT).append('\n');
-        result.append("TAGS=").append(Build.TAGS).append('\n');
-        result.append("TIME=").append(Build.TIME).append('\n');
-        result.append("TYPE=").append(Build.TYPE).append('\n');
-        result.append("USER=").append(Build.USER).append('\n');
-        result.append("VERSION.CODENAME=").append(Build.VERSION.CODENAME).append('\n');
-        result.append("VERSION.INCREMENTAL=").append(Build.VERSION.INCREMENTAL).append('\n');
-        result.append("VERSION.RELEASE=").append(Build.VERSION.RELEASE).append('\n');
-        result.append("VERSION.SDK_INT=").append(Build.VERSION.SDK_INT).append('\n');
-
-        if (flattenedParams != null) {
-            String[] params = SEMICOLON.split(flattenedParams);
-            Arrays.sort(params);
-            for (String param : params) {
-                result.append(param).append('\n');
-            }
-        }
-
-        return result.toString();
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/client/android/camera/open/OpenCameraInterface.java b/qrcode/src/main/java/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
deleted file mode 100644
index 17a5513c..00000000
--- a/qrcode/src/main/java/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.client.android.camera.open;
-
-import android.hardware.Camera;
-import android.util.Log;
-
-public final class OpenCameraInterface {
-
-    private static final String TAG = OpenCameraInterface.class.getName();
-
-    private OpenCameraInterface() {
-    }
-
-    /**
-     * For {@link #open(int)}, means no preference for which camera to open.
-     */
-    public static final int NO_REQUESTED_CAMERA = -1;
-
-    public static int getCameraId(int requestedId) {
-        int numCameras = Camera.getNumberOfCameras();
-        if (numCameras == 0) {
-            Log.w(TAG, "No cameras!");
-            return -1;
-        }
-
-        int cameraId = requestedId;
-
-        boolean explicitRequest = cameraId >= 0;
-
-        if (!explicitRequest) {
-            // Select a camera if no explicit camera requested
-            int index = 0;
-            while (index < numCameras) {
-                Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
-                Camera.getCameraInfo(index, cameraInfo);
-                if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
-                    break;
-                }
-                index++;
-            }
-
-            cameraId = index;
-        }
-
-        if (cameraId < numCameras) {
-            return cameraId;
-        } else {
-            if (explicitRequest) {
-                return -1;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    /**
-     * Opens the requested camera with {@link Camera#open(int)}, if one exists.
-     *
-     * @param requestedId camera ID of the camera to use. A negative value
-     *                    or {@link #NO_REQUESTED_CAMERA} means "no preference"
-     * @return handle to {@link Camera} that was opened
-     */
-    public static Camera open(int requestedId) {
-        int cameraId = getCameraId(requestedId);
-        if (cameraId == -1) {
-            return null;
-        } else {
-            return Camera.open(cameraId);
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java b/qrcode/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java
deleted file mode 100644
index 3cf54326..00000000
--- a/qrcode/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.integration.android;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.Fragment;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-
-import com.google.zxing.client.android.Intents;
-import com.journeyapps.barcodescanner.CaptureActivity;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Sean Owen
- * @author Fred Lin
- * @author Isaac Potoczny-Jones
- * @author Brad Drehmer
- * @author gcstang
- */
-@SuppressWarnings("unused")
-public class IntentIntegrator {
-
-    public static int REQUEST_CODE = 0x0000c0de; // Only use bottom 16 bits
-    private static final String TAG = IntentIntegrator.class.getSimpleName();
-
-    // supported barcode formats
-    public static final Collection<String> PRODUCT_CODE_TYPES = list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "RSS_14");
-    public static final Collection<String> ONE_D_CODE_TYPES =
-            list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "CODE_39", "CODE_93", "CODE_128",
-                    "ITF", "RSS_14", "RSS_EXPANDED");
-    public static final Collection<String> QR_CODE_TYPES = Collections.singleton("QR_CODE");
-    public static final Collection<String> DATA_MATRIX_TYPES = Collections.singleton("DATA_MATRIX");
-
-    public static final Collection<String> ALL_CODE_TYPES = null;
-
-    private final Activity activity;
-    private android.app.Fragment fragment;
-    private android.support.v4.app.Fragment supportFragment;
-
-    private final Map<String, Object> moreExtras = new HashMap<>(3);
-
-    private Collection<String> desiredBarcodeFormats;
-
-    private Class<?> captureActivity;
-
-    protected Class<?> getDefaultCaptureActivity() {
-        return CaptureActivity.class;
-    }
-    /**
-     * @param activity {@link Activity} invoking the integration
-     */
-    public IntentIntegrator(Activity activity) {
-        this.activity = activity;
-    }
-
-    public Class<?> getCaptureActivity() {
-        if (captureActivity == null) {
-            captureActivity = getDefaultCaptureActivity();
-        }
-        return captureActivity;
-    }
-
-    /**
-     * Set the Activity class to use. It can be any activity, but should handle the intent extras
-     * as used here.
-     *
-     * @param captureActivity the class
-     */
-    public IntentIntegrator setCaptureActivity(Class<?> captureActivity) {
-        this.captureActivity = captureActivity;
-        return this;
-    }
-
-    /**
-     * @param fragment {@link Fragment} invoking the integration.
-     *                 {@link #startActivityForResult(Intent, int)} will be called on the {@link Fragment} instead
-     *                 of an {@link Activity}
-     */
-    public static IntentIntegrator forSupportFragment(android.support.v4.app.Fragment fragment) {
-        IntentIntegrator integrator = new IntentIntegrator(fragment.getActivity());
-        integrator.supportFragment = fragment;
-        return integrator;
-    }
-
-    /**
-     * @param fragment {@link Fragment} invoking the integration.
-     *                 {@link #startActivityForResult(Intent, int)} will be called on the {@link Fragment} instead
-     *                 of an {@link Activity}
-     */
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public static IntentIntegrator forFragment(Fragment fragment) {
-        IntentIntegrator integrator = new IntentIntegrator(fragment.getActivity());
-        integrator.fragment = fragment;
-        return integrator;
-    }
-
-    public Map<String, ?> getMoreExtras() {
-        return moreExtras;
-    }
-
-    public final IntentIntegrator addExtra(String key, Object value) {
-        moreExtras.put(key, value);
-        return this;
-    }
-
-    /**
-     * Set a prompt to display on the capture screen, instead of using the default.
-     *
-     * @param prompt the prompt to display
-     */
-    public final IntentIntegrator setPrompt(String prompt) {
-        if (prompt != null) {
-            addExtra(Intents.Scan.PROMPT_MESSAGE, prompt);
-        }
-        return this;
-    }
-
-    /**
-     * By default, the orientation is locked. Set to false to not lock.
-     *
-     * @param locked true to lock orientation
-     */
-    public IntentIntegrator setOrientationLocked(boolean locked) {
-        addExtra(Intents.Scan.ORIENTATION_LOCKED, locked);
-        return this;
-    }
-
-    /**
-     * Use the specified camera ID.
-     *
-     * @param cameraId camera ID of the camera to use. A negative value means "no preference".
-     * @return this
-     */
-    public IntentIntegrator setCameraId(int cameraId) {
-        if (cameraId >= 0) {
-            addExtra(Intents.Scan.CAMERA_ID, cameraId);
-        }
-        return this;
-    }
-
-    /**
-     * Set to false to disable beep on scan.
-     *
-     * @param enabled false to disable beep
-     * @return this
-     */
-    public IntentIntegrator setBeepEnabled(boolean enabled) {
-        addExtra(Intents.Scan.BEEP_ENABLED, enabled);
-        return this;
-    }
-
-    /**
-     * Set to true to enable saving the barcode image and sending its path in the result Intent.
-     *
-     * @param enabled true to enable barcode image
-     * @return this
-     */
-    public IntentIntegrator setBarcodeImageEnabled(boolean enabled) {
-        addExtra(Intents.Scan.BARCODE_IMAGE_ENABLED, enabled);
-        return this;
-    }
-
-    /**
-     * Set the desired barcode formats to scan.
-     *
-     * @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
-     * @return this
-     */
-    public IntentIntegrator setDesiredBarcodeFormats(Collection<String> desiredBarcodeFormats) {
-        this.desiredBarcodeFormats = desiredBarcodeFormats;
-        return this;
-    }
-
-    /**
-     * Initiates a scan for all known barcode types with the default camera.
-     */
-    public final void initiateScan() {
-        startActivityForResult(createScanIntent(), REQUEST_CODE);
-    }
-
-    /**
-     * Initiates a scan for all known barcode types with the default camera.
-     * And starts a timer to finish on timeout
-     * @return Activity.RESULT_CANCELED and true on parameter TIMEOUT.
-     */
-    public IntentIntegrator setTimeout(long timeout) {
-        addExtra(Intents.Scan.TIMEOUT, timeout);
-        return this;
-    }
-
-    /**
-     * Create an scan intent with the specified options.
-     *
-     * @return the intent
-     */
-    public Intent createScanIntent() {
-        Intent intentScan = new Intent(activity, getCaptureActivity());
-        intentScan.setAction(Intents.Scan.ACTION);
-
-        // check which types of codes to scan for
-        if (desiredBarcodeFormats != null) {
-            // set the desired barcode types
-            StringBuilder joinedByComma = new StringBuilder();
-            for (String format : desiredBarcodeFormats) {
-                if (joinedByComma.length() > 0) {
-                    joinedByComma.append(',');
-                }
-                joinedByComma.append(format);
-            }
-            intentScan.putExtra(Intents.Scan.FORMATS, joinedByComma.toString());
-        }
-
-        intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        attachMoreExtras(intentScan);
-        return intentScan;
-    }
-
-    /**
-     * Initiates a scan, only for a certain set of barcode types, given as strings corresponding
-     * to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
-     * like {@link #PRODUCT_CODE_TYPES} for example.
-     *
-     * @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
-     */
-    public final void initiateScan(Collection<String> desiredBarcodeFormats) {
-        setDesiredBarcodeFormats(desiredBarcodeFormats);
-        initiateScan();
-    }
-
-    /**
-     * Start an activity. This method is defined to allow different methods of activity starting for
-     * newer versions of Android and for compatibility library.
-     *
-     * @param intent Intent to start.
-     * @param code   Request code for the activity
-     * @see android.app.Activity#startActivityForResult(Intent, int)
-     * @see android.app.Fragment#startActivityForResult(Intent, int)
-     */
-    protected void startActivityForResult(Intent intent, int code) {
-        if (fragment != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                fragment.startActivityForResult(intent, code);
-            }
-        } else if (supportFragment != null) {
-            supportFragment.startActivityForResult(intent, code);
-        } else {
-            activity.startActivityForResult(intent, code);
-        }
-    }
-
-    protected void startActivity(Intent intent) {
-        if (fragment != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                fragment.startActivity(intent);
-            }
-        } else if (supportFragment != null) {
-            supportFragment.startActivity(intent);
-        } else {
-            activity.startActivity(intent);
-        }
-    }
-
-    /**
-     * <p>Call this from your {@link Activity}'s
-     * {@link Activity#onActivityResult(int, int, Intent)} method.</p>
-     *
-     * @param requestCode request code from {@code onActivityResult()}
-     * @param resultCode  result code from {@code onActivityResult()}
-     * @param intent      {@link Intent} from {@code onActivityResult()}
-     * @return null if the event handled here was not related to this class, or
-     * else an {@link IntentResult} containing the result of the scan. If the user cancelled scanning,
-     * the fields will be null.
-     */
-    public static IntentResult parseActivityResult(int requestCode, int resultCode, Intent intent) {
-        if (requestCode == REQUEST_CODE) {
-            if (resultCode == Activity.RESULT_OK) {
-                String contents = intent.getStringExtra(Intents.Scan.RESULT);
-                String formatName = intent.getStringExtra(Intents.Scan.RESULT_FORMAT);
-                byte[] rawBytes = intent.getByteArrayExtra(Intents.Scan.RESULT_BYTES);
-                int intentOrientation = intent.getIntExtra(Intents.Scan.RESULT_ORIENTATION, Integer.MIN_VALUE);
-                Integer orientation = intentOrientation == Integer.MIN_VALUE ? null : intentOrientation;
-                String errorCorrectionLevel = intent.getStringExtra(Intents.Scan.RESULT_ERROR_CORRECTION_LEVEL);
-                String barcodeImagePath = intent.getStringExtra(Intents.Scan.RESULT_BARCODE_IMAGE_PATH);
-                return new IntentResult(contents,
-                        formatName,
-                        rawBytes,
-                        orientation,
-                        errorCorrectionLevel,
-                        barcodeImagePath);
-            }
-            return new IntentResult();
-        }
-        return null;
-    }
-
-    private static List<String> list(String... values) {
-        return Collections.unmodifiableList(Arrays.asList(values));
-    }
-
-    private void attachMoreExtras(Intent intent) {
-        for (Map.Entry<String, Object> entry : moreExtras.entrySet()) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
-            // Kind of hacky
-            if (value instanceof Integer) {
-                intent.putExtra(key, (Integer) value);
-            } else if (value instanceof Long) {
-                intent.putExtra(key, (Long) value);
-            } else if (value instanceof Boolean) {
-                intent.putExtra(key, (Boolean) value);
-            } else if (value instanceof Double) {
-                intent.putExtra(key, (Double) value);
-            } else if (value instanceof Float) {
-                intent.putExtra(key, (Float) value);
-            } else if (value instanceof Bundle) {
-                intent.putExtra(key, (Bundle) value);
-            } else {
-                intent.putExtra(key, value.toString());
-            }
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/google/zxing/integration/android/IntentResult.java b/qrcode/src/main/java/com/google/zxing/integration/android/IntentResult.java
deleted file mode 100644
index 91e1ae6d..00000000
--- a/qrcode/src/main/java/com/google/zxing/integration/android/IntentResult.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2009 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.zxing.integration.android;
-
-/**
- * <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>
- *
- * @author Sean Owen
- */
-public final class IntentResult {
-
-    private final String contents;
-    private final String formatName;
-    private final byte[] rawBytes;
-    private final Integer orientation;
-    private final String errorCorrectionLevel;
-    private final String barcodeImagePath;
-
-    IntentResult() {
-        this(null, null, null, null, null, null);
-    }
-
-    IntentResult(String contents,
-                 String formatName,
-                 byte[] rawBytes,
-                 Integer orientation,
-                 String errorCorrectionLevel,
-                 String barcodeImagePath) {
-        this.contents = contents;
-        this.formatName = formatName;
-        this.rawBytes = rawBytes;
-        this.orientation = orientation;
-        this.errorCorrectionLevel = errorCorrectionLevel;
-        this.barcodeImagePath = barcodeImagePath;
-    }
-
-    /**
-     * @return raw content of barcode
-     */
-    public String getContents() {
-        return contents;
-    }
-
-    /**
-     * @return name of format, like "QR_CODE", "UPC_A". See {@code BarcodeFormat} for more format names.
-     */
-    public String getFormatName() {
-        return formatName;
-    }
-
-    /**
-     * @return raw bytes of the barcode content, if applicable, or null otherwise
-     */
-    public byte[] getRawBytes() {
-        return rawBytes;
-    }
-
-    /**
-     * @return rotation of the image, in degrees, which resulted in a successful scan. May be null.
-     */
-    public Integer getOrientation() {
-        return orientation;
-    }
-
-    /**
-     * @return name of the error correction level used in the barcode, if applicable
-     */
-    public String getErrorCorrectionLevel() {
-        return errorCorrectionLevel;
-    }
-
-    /**
-     * @return path to a temporary file containing the barcode image, if applicable, or null otherwise
-     */
-    public String getBarcodeImagePath() {
-        return barcodeImagePath;
-    }
-
-    @Override
-    public String toString() {
-        int rawBytesLength = rawBytes == null ? 0 : rawBytes.length;
-        return "Format: " + formatName + '\n' +
-            "Contents: " + contents + '\n' +
-            "Raw bytes: (" + rawBytesLength + " bytes)\n" +
-            "Orientation: " + orientation + '\n' +
-            "EC level: " + errorCorrectionLevel + '\n' +
-            "Barcode image: " + barcodeImagePath + '\n';
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeEncoder.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeEncoder.java
deleted file mode 100644
index ed1729ec..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeEncoder.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.graphics.Bitmap;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.MultiFormatWriter;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
-
-import java.util.Map;
-
-/**
- * Helper class for encoding barcodes as a Bitmap.
- *
- * Adapted from QRCodeEncoder, from the zxing project:
- * https://github.com/zxing/zxing
- *
- * Licensed under the Apache License, Version 2.0.
- */
-public class BarcodeEncoder {
-    private static final int WHITE = 0xFFFFFFFF;
-    private static final int BLACK = 0xFF000000;
-
-
-    public BarcodeEncoder() {
-    }
-
-    public Bitmap createBitmap(BitMatrix matrix) {
-        int width = matrix.getWidth();
-        int height = matrix.getHeight();
-        int[] pixels = new int[width * height];
-        for (int y = 0; y < height; y++) {
-            int offset = y * width;
-            for (int x = 0; x < width; x++) {
-                pixels[offset + x] = matrix.get(x, y) ? BLACK : WHITE;
-            }
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
-        return bitmap;
-    }
-
-    public BitMatrix encode(String contents, BarcodeFormat format, int width, int height) throws WriterException {
-        try {
-            return new MultiFormatWriter().encode(contents, format, width, height);
-        } catch (WriterException e) {
-            throw e;
-        } catch (Exception e) {
-            // ZXing sometimes throws an IllegalArgumentException
-            throw new WriterException(e);
-        }
-    }
-
-    public BitMatrix encode(String contents, BarcodeFormat format, int width, int height, Map<EncodeHintType, ?> hints) throws WriterException {
-        try {
-            return new MultiFormatWriter().encode(contents, format, width, height, hints);
-        } catch (WriterException e) {
-            throw e;
-        } catch (Exception e) {
-            throw new WriterException(e);
-        }
-    }
-
-    public Bitmap encodeBitmap(String contents, BarcodeFormat format, int width, int height) throws WriterException {
-        return createBitmap(encode(contents, format, width, height));
-    }
-
-    public Bitmap encodeBitmap(String contents, BarcodeFormat format, int width, int height, Map<EncodeHintType, ?> hints) throws WriterException {
-        return createBitmap(encode(contents, format, width, height, hints));
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeResult.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeResult.java
deleted file mode 100644
index 2818f060..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeResult.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.Result;
-import com.google.zxing.ResultMetadataType;
-import com.google.zxing.ResultPoint;
-
-import java.util.Map;
-
-/**
- * This contains the result of a barcode scan.
- *
- * This class delegate all read-only fields of {@link com.google.zxing.Result},
- * and adds a bitmap with scanned barcode.
- */
-public class BarcodeResult {
-    private static final float PREVIEW_LINE_WIDTH = 4.0f;
-    private static final float PREVIEW_DOT_WIDTH = 10.0f;
-
-    protected Result mResult;
-    protected SourceData sourceData;
-
-    private final int mScaleFactor = 2;
-
-    public BarcodeResult(Result result, SourceData sourceData) {
-        this.mResult = result;
-        this.sourceData = sourceData;
-    }
-
-    private static void drawLine(Canvas canvas, Paint paint, ResultPoint a, ResultPoint b, int scaleFactor) {
-        if (a != null && b != null) {
-            canvas.drawLine(a.getX() / scaleFactor,
-                    a.getY() / scaleFactor,
-                    b.getX() / scaleFactor,
-                    b.getY() / scaleFactor,
-                    paint);
-        }
-    }
-
-    /**
-     * @return wrapped {@link com.google.zxing.Result}
-     */
-    public Result getResult() {
-        return mResult;
-    }
-
-    /**
-     * @return {@link Bitmap} with barcode preview
-     * @see #getBitmapWithResultPoints(int)
-     */
-    public Bitmap getBitmap() {
-        return sourceData.getBitmap(mScaleFactor);
-    }
-
-    /**
-     * @param color Color of result points
-     * @return {@link Bitmap} with result points on it, or plain bitmap, if no result points
-     */
-    public Bitmap getBitmapWithResultPoints(int color) {
-        Bitmap bitmap = getBitmap();
-        Bitmap barcode = bitmap;
-        ResultPoint[] points = mResult.getResultPoints();
-
-        if (points != null && points.length > 0 && bitmap != null) {
-            barcode = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-            Canvas canvas = new Canvas(barcode);
-            canvas.drawBitmap(bitmap, 0, 0, null);
-            Paint paint = new Paint();
-            paint.setColor(color);
-            if (points.length == 2) {
-                paint.setStrokeWidth(PREVIEW_LINE_WIDTH);
-                drawLine(canvas, paint, points[0], points[1], mScaleFactor);
-            } else if (points.length == 4 &&
-                    (mResult.getBarcodeFormat() == BarcodeFormat.UPC_A ||
-                            mResult.getBarcodeFormat() == BarcodeFormat.EAN_13)) {
-                // Hacky special case -- draw two lines, for the barcode and metadata
-                drawLine(canvas, paint, points[0], points[1], mScaleFactor);
-                drawLine(canvas, paint, points[2], points[3], mScaleFactor);
-            } else {
-                paint.setStrokeWidth(PREVIEW_DOT_WIDTH);
-                for (ResultPoint point : points) {
-                    if (point != null) {
-                        canvas.drawPoint(point.getX() / mScaleFactor, point.getY() / mScaleFactor, paint);
-                    }
-                }
-            }
-        }
-        return barcode;
-    }
-
-    /**
-     *
-     * @return Bitmap preview scale factor
-     */
-    public int getBitmapScaleFactor(){
-        return mScaleFactor;
-    }
-
-    /**
-     * @return raw text encoded by the barcode
-     * @see Result#getText()
-     */
-    public String getText() {
-        return mResult.getText();
-    }
-
-    /**
-     * @return raw bytes encoded by the barcode, if applicable, otherwise {@code null}
-     * @see Result#getRawBytes()
-     */
-    public byte[] getRawBytes() {
-        return mResult.getRawBytes();
-    }
-
-    /**
-     * @return points related to the barcode in the image. These are typically points
-     * identifying finder patterns or the corners of the barcode. The exact meaning is
-     * specific to the type of barcode that was decoded.
-     * @see Result#getResultPoints()
-     */
-    public ResultPoint[] getResultPoints() {
-        return mResult.getResultPoints();
-    }
-
-    /**
-     * @return {@link BarcodeFormat} representing the format of the barcode that was decoded
-     * @see Result#getBarcodeFormat()
-     */
-    public BarcodeFormat getBarcodeFormat() {
-        return mResult.getBarcodeFormat();
-    }
-
-    /**
-     * @return {@link Map} mapping {@link ResultMetadataType} keys to values. May be
-     * {@code null}. This contains optional metadata about what was detected about the barcode,
-     * like orientation.
-     * @see Result#getResultMetadata()
-     */
-    public Map<ResultMetadataType, Object> getResultMetadata() {
-        return mResult.getResultMetadata();
-    }
-
-    public long getTimestamp() {
-        return mResult.getTimestamp();
-    }
-
-    @Override
-    public String toString() {
-        return mResult.getText();
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeView.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeView.java
deleted file mode 100644
index cc0d66a5..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/BarcodeView.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.util.AttributeSet;
-
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.R;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A view for scanning barcodes.
- *
- * Two methods MUST be called to manage the state:
- * 1. resume() - initialize the camera and start the preview. Call from the Activity's onResume().
- * 2. pause() - stop the preview and release any resources. Call from the Activity's onPause().
- *
- * Start decoding with decodeSingle() or decodeContinuous(). Stop decoding with stopDecoding().
- *
- * @see CameraPreview for more details on the preview lifecycle.
- */
-public class BarcodeView extends CameraPreview {
-
-    private enum DecodeMode {
-        NONE,
-        SINGLE,
-        CONTINUOUS
-    }
-
-    private DecodeMode decodeMode = DecodeMode.NONE;
-    private Callback callback = null;
-    private DecoderThread decoderThread;
-
-    private DecoderFactory decoderFactory;
-
-
-    private Handler resultHandler;
-
-    private final Handler.Callback resultCallback = new Handler.Callback() {
-        @Override
-        public boolean handleMessage(Message message) {
-            if (message.what == R.id.zxing_decode_succeeded) {
-                BarcodeResult result = (BarcodeResult) message.obj;
-
-                if (result != null) {
-                    if (callback != null && decodeMode != DecodeMode.NONE) {
-                        callback.barcodeResult(result);
-                        if (decodeMode == DecodeMode.SINGLE) {
-                            stopDecoding();
-                        }
-                    }
-                }
-                return true;
-            } else if (message.what == R.id.zxing_decode_failed) {
-                // Failed. Next preview is automatically tried.
-                return true;
-            } else if (message.what == R.id.zxing_possible_result_points) {
-                //noinspection unchecked
-                List<ResultPoint> resultPoints = (List<ResultPoint>) message.obj;
-                if (callback != null && decodeMode != DecodeMode.NONE) {
-                    callback.possibleResultPoints(resultPoints);
-                }
-                return true;
-            }
-            return false;
-        }
-    };
-
-
-    public BarcodeView(Context context) {
-        super(context);
-        initialize();
-    }
-
-    public BarcodeView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initialize();
-    }
-
-    public BarcodeView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initialize();
-    }
-
-    private void initialize() {
-        decoderFactory = new DefaultDecoderFactory();
-        resultHandler = new Handler(resultCallback);
-    }
-
-    /**
-     * Set the DecoderFactory to use. Use this to specify the formats to decode.
-     *
-     * Call this from UI thread only.
-     *
-     * @param decoderFactory the DecoderFactory creating Decoders.
-     * @see DefaultDecoderFactory
-     */
-    public void setDecoderFactory(DecoderFactory decoderFactory) {
-        Util.validateMainThread();
-
-        this.decoderFactory = decoderFactory;
-        if (this.decoderThread != null) {
-            this.decoderThread.setDecoder(createDecoder());
-        }
-    }
-
-    private Decoder createDecoder() {
-        if (decoderFactory == null) {
-            decoderFactory = createDefaultDecoderFactory();
-        }
-        DecoderResultPointCallback callback = new DecoderResultPointCallback();
-        Map<DecodeHintType, Object> hints = new HashMap<>();
-        hints.put(DecodeHintType.NEED_RESULT_POINT_CALLBACK, callback);
-        Decoder decoder = this.decoderFactory.createDecoder(hints);
-        callback.setDecoder(decoder);
-        return decoder;
-    }
-
-    /**
-     *
-     * @return the current DecoderFactory in use.
-     */
-    public DecoderFactory getDecoderFactory() {
-        return decoderFactory;
-    }
-
-    /**
-     * Decode a single barcode, then stop decoding.
-     *
-     * The callback will only be called on the UI thread.
-     *
-     * @param callback called with the barcode result, as well as possible ResultPoints
-     */
-    public void decodeSingle(Callback callback) {
-        this.decodeMode = DecodeMode.SINGLE;
-        this.callback = callback;
-        startDecoderThread();
-    }
-
-    /**
-     * Continuously decode barcodes. The same barcode may be returned multiple times per second.
-     *
-     * The callback will only be called on the UI thread.
-     *
-     * @param callback called with the barcode result, as well as possible ResultPoints
-     */
-    public void decodeContinuous(Callback callback) {
-        this.decodeMode = DecodeMode.CONTINUOUS;
-        this.callback = callback;
-        startDecoderThread();
-    }
-
-    /**
-     * Stop decoding, but do not stop the preview.
-     */
-    public void stopDecoding() {
-        this.decodeMode = DecodeMode.NONE;
-        this.callback = null;
-        stopDecoderThread();
-    }
-
-    protected DecoderFactory createDefaultDecoderFactory() {
-        return new DefaultDecoderFactory();
-    }
-
-    private void startDecoderThread() {
-        stopDecoderThread(); // To be safe
-
-        if (decodeMode != DecodeMode.NONE && isPreviewActive()) {
-            // We only start the thread if both:
-            // 1. decoding was requested
-            // 2. the preview is active
-            decoderThread = new DecoderThread(getCameraInstance(), createDecoder(), resultHandler);
-            decoderThread.setCropRect(getPreviewFramingRect());
-            decoderThread.start();
-        }
-    }
-
-    @Override
-    protected void previewStarted() {
-        super.previewStarted();
-
-        startDecoderThread();
-    }
-
-    private void stopDecoderThread() {
-        if (decoderThread != null) {
-            decoderThread.stop();
-            decoderThread = null;
-        }
-    }
-    /**
-     * Stops the live preview and decoding.
-     *
-     * Call from the Activity's onPause() method.
-     */
-    @Override
-    public void pause() {
-        stopDecoderThread();
-
-        super.pause();
-    }
-
-    /**
-     * Callback that is notified when a barcode is scanned.
-     */
-    public interface Callback {
-        /**
-         * Barcode was successfully scanned.
-         *
-         * @param result the result
-         */
-        void barcodeResult(BarcodeResult result);
-
-        /**
-         * ResultPoints are detected. This may be called whether or not the scanning was successful.
-         *
-         * This is mainly useful to give some feedback to the user while scanning.
-         *
-         * Do not depend on this being called at any specific point in the decode cycle.
-         *
-         * @param resultPoints points potentially identifying a barcode
-         */
-        void possibleResultPoints(List<ResultPoint> resultPoints);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/CameraPreview.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/CameraPreview.java
deleted file mode 100644
index 64776117..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/CameraPreview.java
+++ /dev/null
@@ -1,870 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.TextureView;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-
-import com.google.zxing.client.android.R;
-import com.journeyapps.barcodescanner.camera.CameraInstance;
-import com.journeyapps.barcodescanner.camera.CameraSettings;
-import com.journeyapps.barcodescanner.camera.CameraSurface;
-import com.journeyapps.barcodescanner.camera.CenterCropStrategy;
-import com.journeyapps.barcodescanner.camera.FitCenterStrategy;
-import com.journeyapps.barcodescanner.camera.DisplayConfiguration;
-import com.journeyapps.barcodescanner.camera.FitXYStrategy;
-import com.journeyapps.barcodescanner.camera.PreviewScalingStrategy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * CameraPreview is a view that handles displaying of a camera preview on a SurfaceView. It is
- * intended to be used as a base for realtime processing of camera images, e.g. barcode decoding
- * or OCR, although none of this happens in CameraPreview itself.
- *
- * The camera is managed on a separate thread, using CameraInstance.
- *
- * Two methods MUST be called on CameraPreview to manage its state:
- * 1. resume() - initialize the camera and start the preview. Call from the Activity's onResume().
- * 2. pause() - stop the preview and release any resources. Call from the Activity's onPause().
- *
- * Startup sequence:
- *
- * 1. Create SurfaceView.
- * 2. open camera.
- * 2. layout this container, to get size
- * 3. set display config, according to the container size
- * 4. configure()
- * 5. wait for preview size to be ready
- * 6. set surface size according to preview size
- * 7. set surface and start preview
- */
-public class CameraPreview extends ViewGroup {
-    public interface StateListener {
-        /**
-         * Preview and frame sizes are determined.
-         */
-        void previewSized();
-
-        /**
-         * Preview has started.
-         */
-        void previewStarted();
-
-        /**
-         * Preview has stopped.
-         */
-        void previewStopped();
-
-        /**
-         * The camera has errored, and cannot display a preview.
-         *
-         * @param error the error
-         */
-        void cameraError(Exception error);
-
-        /**
-         * The camera has been closed.
-         */
-        void cameraClosed();
-    }
-
-    private static final String TAG = CameraPreview.class.getSimpleName();
-
-    private CameraInstance cameraInstance;
-
-    private WindowManager windowManager;
-
-    private Handler stateHandler;
-
-    private boolean useTextureView = false;
-
-    private SurfaceView surfaceView;
-    private TextureView textureView;
-
-    private boolean previewActive = false;
-
-    private RotationListener rotationListener;
-    private int openedOrientation = -1;
-
-    // Delay after rotation change is detected before we reorientate ourselves.
-    // This is to avoid double-reinitialization when the Activity is destroyed and recreated.
-    private static final int ROTATION_LISTENER_DELAY_MS = 250;
-
-    private List<StateListener> stateListeners = new ArrayList<>();
-
-    private DisplayConfiguration displayConfiguration;
-    private CameraSettings cameraSettings = new CameraSettings();
-
-    // Size of this container, non-null after layout is performed
-    private Size containerSize;
-
-    // Size of the preview resolution
-    private Size previewSize;
-
-    // Rect placing the preview surface
-    private Rect surfaceRect;
-
-    // Size of the current surface. non-null if the surface is ready
-    private Size currentSurfaceSize;
-
-    // Framing rectangle relative to this view
-    private Rect framingRect = null;
-
-    // Framing rectangle relative to the preview resolution
-    private Rect previewFramingRect = null;
-
-    // Size of the framing rectangle. If null, defaults to using a margin percentage.
-    private Size framingRectSize = null;
-
-    // Fraction of the width / heigth to use as a margin. This fraction is used on each size, so
-    // must be smaller than 0.5;
-    private double marginFraction = 0.1d;
-
-    private PreviewScalingStrategy previewScalingStrategy = null;
-
-    private boolean torchOn = false;
-
-    @TargetApi(14)
-    private TextureView.SurfaceTextureListener surfaceTextureListener() {
-        // Cannot initialize automatically, since we may be API < 14
-        return new TextureView.SurfaceTextureListener() {
-            @Override
-            public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-                onSurfaceTextureSizeChanged(surface, width, height);
-            }
-
-            @Override
-            public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
-                currentSurfaceSize = new Size(width, height);
-                startPreviewIfReady();
-            }
-
-            @Override
-            public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
-                return false;
-            }
-
-            @Override
-            public void onSurfaceTextureUpdated(SurfaceTexture surface) {
-
-            }
-        };
-    }
-
-    private final SurfaceHolder.Callback surfaceCallback = new SurfaceHolder.Callback() {
-
-        @Override
-        public void surfaceCreated(SurfaceHolder holder) {
-
-        }
-
-        @Override
-        public void surfaceDestroyed(SurfaceHolder holder) {
-            currentSurfaceSize = null;
-        }
-
-        @Override
-        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-            if (holder == null) {
-                Log.e(TAG, "*** WARNING *** surfaceChanged() gave us a null surface!");
-                return;
-            }
-            currentSurfaceSize = new Size(width, height);
-            startPreviewIfReady();
-        }
-    };
-
-    private final Handler.Callback stateCallback = new Handler.Callback() {
-        @Override
-        public boolean handleMessage(Message message) {
-            if (message.what == R.id.zxing_prewiew_size_ready) {
-                previewSized((Size) message.obj);
-                return true;
-            } else if (message.what == R.id.zxing_camera_error) {
-                Exception error = (Exception) message.obj;
-
-                if (isActive()) {
-                    // This check prevents multiple errors from begin passed through.
-                    pause();
-                    fireState.cameraError(error);
-                }
-            } else if(message.what == R.id.zxing_camera_closed) {
-                fireState.cameraClosed();
-            }
-            return false;
-        }
-    };
-
-    private RotationListener.Callback rotationCallback = new RotationListener.Callback() {
-        @Override
-        public void onRotationChanged(int rotation) {
-            // Make sure this is run on the main thread.
-            stateHandler.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    rotationChanged();
-                }
-            }, ROTATION_LISTENER_DELAY_MS);
-        }
-    };
-
-    public CameraPreview(Context context) {
-        super(context);
-        initialize(context, null, 0, 0);
-    }
-
-    public CameraPreview(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initialize(context, attrs, 0, 0);
-    }
-
-    public CameraPreview(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initialize(context, attrs, defStyleAttr, 0);
-    }
-
-    private void initialize(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        if (getBackground() == null) {
-            // Default to SurfaceView colour, so that there are less changes.
-            setBackgroundColor(Color.BLACK);
-        }
-
-        initializeAttributes(attrs);
-
-        windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-
-        stateHandler = new Handler(stateCallback);
-
-        rotationListener = new RotationListener();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-
-        setupSurfaceView();
-    }
-
-    /**
-     * Initialize from XML attributes.
-     *
-     * @param attrs the attributes
-     */
-    protected void initializeAttributes(AttributeSet attrs) {
-        TypedArray styledAttributes = getContext().obtainStyledAttributes(attrs, R.styleable.zxing_camera_preview);
-
-        int framingRectWidth = (int) styledAttributes.getDimension(R.styleable.zxing_camera_preview_zxing_framing_rect_width, -1);
-        int framingRectHeight = (int) styledAttributes.getDimension(R.styleable.zxing_camera_preview_zxing_framing_rect_height, -1);
-
-        if (framingRectWidth > 0 && framingRectHeight > 0) {
-            this.framingRectSize = new Size(framingRectWidth, framingRectHeight);
-        }
-
-        this.useTextureView = styledAttributes.getBoolean(R.styleable.zxing_camera_preview_zxing_use_texture_view, true);
-
-        // See zxing_attrs.xml for the enum values
-        int scalingStrategyNumber = styledAttributes.getInteger(R.styleable.zxing_camera_preview_zxing_preview_scaling_strategy, -1);
-        if(scalingStrategyNumber == 1) {
-            previewScalingStrategy = new CenterCropStrategy();
-        } else if(scalingStrategyNumber == 2) {
-            previewScalingStrategy = new FitCenterStrategy();
-        } else if(scalingStrategyNumber == 3) {
-            previewScalingStrategy = new FitXYStrategy();
-        }
-
-        styledAttributes.recycle();
-    }
-
-    private void rotationChanged() {
-        // Confirm that it did actually change
-        if(isActive() && getDisplayRotation() != openedOrientation) {
-            pause();
-            resume();
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    @SuppressLint("NewAPI")
-    private void setupSurfaceView() {
-        if(useTextureView && Build.VERSION.SDK_INT >= 14) {
-            textureView = new TextureView(getContext());
-            textureView.setSurfaceTextureListener(surfaceTextureListener());
-            addView(textureView);
-        } else {
-            surfaceView = new SurfaceView(getContext());
-            if (Build.VERSION.SDK_INT < 11) {
-                surfaceView.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-            }
-            surfaceView.getHolder().addCallback(surfaceCallback);
-            addView(surfaceView);
-        }
-    }
-
-    /**
-     * Add a listener to be notified of changes to the preview state, as well as camera errors.
-     *
-     * @param listener the listener
-     */
-    public void addStateListener(StateListener listener) {
-        stateListeners.add(listener);
-    }
-
-    private final StateListener fireState = new StateListener() {
-        @Override
-        public void previewSized() {
-            for (StateListener listener : stateListeners) {
-                listener.previewSized();
-            }
-        }
-
-        @Override
-        public void previewStarted() {
-            for (StateListener listener : stateListeners) {
-                listener.previewStarted();
-            }
-
-        }
-
-        @Override
-        public void previewStopped() {
-            for (StateListener listener : stateListeners) {
-                listener.previewStopped();
-            }
-        }
-
-        @Override
-        public void cameraError(Exception error) {
-            for (StateListener listener : stateListeners) {
-                listener.cameraError(error);
-            }
-        }
-
-        @Override
-        public void cameraClosed() {
-            for (StateListener listener : stateListeners) {
-                listener.cameraClosed();
-            }
-        }
-    };
-
-    private void calculateFrames() {
-        if (containerSize == null || previewSize == null || displayConfiguration == null) {
-            previewFramingRect = null;
-            framingRect = null;
-            surfaceRect = null;
-            throw new IllegalStateException("containerSize or previewSize is not set yet");
-        }
-
-        int previewWidth = previewSize.width;
-        int previewHeight = previewSize.height;
-
-        int width = containerSize.width;
-        int height = containerSize.height;
-
-        surfaceRect = displayConfiguration.scalePreview(previewSize);
-
-        Rect container = new Rect(0, 0, width, height);
-        framingRect = calculateFramingRect(container, surfaceRect);
-        Rect frameInPreview = new Rect(framingRect);
-        frameInPreview.offset(-surfaceRect.left, -surfaceRect.top);
-
-        previewFramingRect = new Rect(frameInPreview.left * previewWidth / surfaceRect.width(),
-                frameInPreview.top * previewHeight / surfaceRect.height(),
-                frameInPreview.right * previewWidth / surfaceRect.width(),
-                frameInPreview.bottom * previewHeight / surfaceRect.height());
-
-        if (previewFramingRect.width() <= 0 || previewFramingRect.height() <= 0) {
-            previewFramingRect = null;
-            framingRect = null;
-            Log.w(TAG, "Preview frame is too small");
-        } else {
-            fireState.previewSized();
-        }
-    }
-
-    /**
-     * Call this on the main thread, while the preview is running.
-     *
-     * @param on true to turn on the torch
-     */
-    public void setTorch(boolean on) {
-        torchOn = on;
-        if (cameraInstance != null) {
-            cameraInstance.setTorch(on);
-        }
-    }
-
-    private void containerSized(Size containerSize) {
-        this.containerSize = containerSize;
-        if (cameraInstance != null) {
-            if (cameraInstance.getDisplayConfiguration() == null) {
-                displayConfiguration = new DisplayConfiguration(getDisplayRotation(), containerSize);
-                displayConfiguration.setPreviewScalingStrategy(getPreviewScalingStrategy());
-                cameraInstance.setDisplayConfiguration(displayConfiguration);
-                cameraInstance.configureCamera();
-                if(torchOn) {
-                    cameraInstance.setTorch(torchOn);
-                }
-            }
-        }
-    }
-
-    /**
-     * Override the preview scaling strategy.
-     *
-     * @param previewScalingStrategy null for the default
-     */
-    public void setPreviewScalingStrategy(PreviewScalingStrategy previewScalingStrategy) {
-        this.previewScalingStrategy = previewScalingStrategy;
-    }
-
-    /**
-     * Override this to specify a different preview scaling strategy.
-     */
-    public PreviewScalingStrategy getPreviewScalingStrategy() {
-        if(previewScalingStrategy != null) {
-            return previewScalingStrategy;
-        }
-
-        // If we are using SurfaceTexture, it is safe to use centerCrop.
-        // For SurfaceView, it's better to use fitCenter, otherwise the preview may overlap to
-        // other views.
-        if(textureView != null) {
-            return new CenterCropStrategy();
-        } else {
-            return new FitCenterStrategy();
-        }
-
-    }
-
-    private void previewSized(Size size) {
-        this.previewSize = size;
-        if (containerSize != null) {
-            calculateFrames();
-            requestLayout();
-            startPreviewIfReady();
-        }
-    }
-
-    /**
-     * Calculate transformation for the TextureView.
-     *
-     * An identity matrix would cause the preview to be scaled up/down to fill the TextureView.
-     *
-     * @param textureSize the size of the textureView
-     * @param previewSize the camera preview resolution
-     * @return the transform matrix for the TextureView
-     */
-    protected Matrix calculateTextureTransform(Size textureSize, Size previewSize) {
-        float ratioTexture = (float) textureSize.width / (float) textureSize.height;
-        float ratioPreview = (float) previewSize.width / (float) previewSize.height;
-
-        float scaleX;
-        float scaleY;
-
-        // We scale so that either width or height fits exactly in the TextureView, and the other
-        // is bigger (cropped).
-        if (ratioTexture < ratioPreview) {
-            scaleX = ratioPreview / ratioTexture;
-            scaleY = 1;
-        } else {
-            scaleX = 1;
-            scaleY = ratioTexture / ratioPreview;
-        }
-
-        Matrix matrix = new Matrix();
-
-        matrix.setScale(scaleX, scaleY);
-
-        // Center the preview
-        float scaledWidth = textureSize.width * scaleX;
-        float scaledHeight = textureSize.height * scaleY;
-        float dx = (textureSize.width - scaledWidth) / 2;
-        float dy = (textureSize.height - scaledHeight) / 2;
-
-        // Perform the translation on the scaled preview
-        matrix.postTranslate(dx, dy);
-
-        return matrix;
-    }
-
-    private void startPreviewIfReady() {
-        if (currentSurfaceSize != null && previewSize != null && surfaceRect != null) {
-            if (surfaceView != null && currentSurfaceSize.equals(new Size(surfaceRect.width(), surfaceRect.height()))) {
-                startCameraPreview(new CameraSurface(surfaceView.getHolder()));
-            } else if(textureView != null && Build.VERSION.SDK_INT >= 14 && textureView.getSurfaceTexture() != null) {
-                if(previewSize != null) {
-                    Matrix transform = calculateTextureTransform(new Size(textureView.getWidth(), textureView.getHeight()), previewSize);
-                    textureView.setTransform(transform);
-                }
-
-                startCameraPreview(new CameraSurface(textureView.getSurfaceTexture()));
-            } else {
-                // Surface is not the correct size yet
-            }
-        }
-    }
-
-    @SuppressLint("DrawAllocation")
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        containerSized(new Size(r - l, b - t));
-
-        if(surfaceView != null) {
-            if (surfaceRect == null) {
-                // Match the container, to reduce the risk of issues. The preview should never be drawn
-                // while the surface has this size.
-                surfaceView.layout(0, 0, getWidth(), getHeight());
-            } else {
-                surfaceView.layout(surfaceRect.left, surfaceRect.top, surfaceRect.right, surfaceRect.bottom);
-            }
-        } else if(textureView != null && Build.VERSION.SDK_INT >= 14) {
-            textureView.layout(0, 0, getWidth(), getHeight());
-        }
-    }
-
-    /**
-     * The framing rectangle, relative to this view. Use to draw the rectangle.
-     *
-     * Will never be null while the preview is active.
-     *
-     * @return the framing rect, or null
-     * @see #isPreviewActive()
-     */
-    public Rect getFramingRect() {
-        return framingRect;
-    }
-
-    /**
-     * The framing rect, relative to the camera preview resolution.
-     *
-     * Will never be null while the preview is active.
-     *
-     * @return the preview rect, or null
-     * @see #isPreviewActive()
-     */
-    public Rect getPreviewFramingRect() {
-        return previewFramingRect;
-    }
-
-    /**
-     * @return the CameraSettings currently in use
-     */
-    public CameraSettings getCameraSettings() {
-        return cameraSettings;
-    }
-
-    /**
-     * Set the CameraSettings. Use this to select a different camera, change exposure and torch
-     * settings, and some other options.
-     *
-     * This has no effect if the camera is already open.
-     *
-     * @param cameraSettings the new settings
-     */
-    public void setCameraSettings(CameraSettings cameraSettings) {
-        this.cameraSettings = cameraSettings;
-    }
-
-    /**
-     * Start the camera preview and decoding. Typically this should be called from the Activity's
-     * onResume() method.
-     *
-     * Call from UI thread only.
-     */
-    public void resume() {
-        // This must be safe to call multiple times
-        Util.validateMainThread();
-        Log.d(TAG, "resume()");
-
-        // initCamera() does nothing if called twice, but does log a warning
-        initCamera();
-
-        if (currentSurfaceSize != null) {
-            // The activity was paused but not stopped, so the surface still exists. Therefore
-            // surfaceCreated() won't be called, so init the camera here.
-            startPreviewIfReady();
-        } else if(surfaceView != null) {
-            // Install the callback and wait for surfaceCreated() to init the camera.
-            surfaceView.getHolder().addCallback(surfaceCallback);
-        } else if(textureView != null && Build.VERSION.SDK_INT >= 14) {
-            if(textureView.isAvailable()) {
-                surfaceTextureListener().onSurfaceTextureAvailable(textureView.getSurfaceTexture(), textureView.getWidth(), textureView.getHeight());
-            } else {
-                textureView.setSurfaceTextureListener(surfaceTextureListener());
-            }
-        }
-
-        // To trigger surfaceSized again
-        requestLayout();
-        rotationListener.listen(getContext(), rotationCallback);
-    }
-
-    /**
-     * Pause scanning and the camera preview. Typically this should be called from the Activity's
-     * onPause() method.
-     *
-     * Call from UI thread only.
-     */
-    public void pause() {
-        // This must be safe to call multiple times.
-        Util.validateMainThread();
-        Log.d(TAG, "pause()");
-
-        openedOrientation = -1;
-        if (cameraInstance != null) {
-            cameraInstance.close();
-            cameraInstance = null;
-            previewActive = false;
-        } else {
-            stateHandler.sendEmptyMessage(R.id.zxing_camera_closed);
-        }
-        if (currentSurfaceSize == null && surfaceView != null) {
-            SurfaceHolder surfaceHolder = surfaceView.getHolder();
-            surfaceHolder.removeCallback(surfaceCallback);
-        }
-        if(currentSurfaceSize == null && textureView != null && Build.VERSION.SDK_INT >= 14) {
-            textureView.setSurfaceTextureListener(null);
-        }
-
-        this.containerSize = null;
-        this.previewSize = null;
-        this.previewFramingRect = null;
-        rotationListener.stop();
-
-        fireState.previewStopped();
-    }
-
-    /**
-     * Pause scanning and preview; waiting for the Camera to be closed.
-     *
-     * This blocks the main thread.
-     */
-    public void pauseAndWait() {
-        CameraInstance instance = getCameraInstance();
-        pause();
-        long startTime = System.nanoTime();
-        while(instance != null && !instance.isCameraClosed()) {
-            if(System.nanoTime() - startTime > 2000000000) {
-                // Don't wait for longer than 2 seconds
-                break;
-            }
-            try {
-                Thread.sleep(1);
-            } catch (InterruptedException e) {
-                break;
-            }
-        }
-    }
-
-    public Size getFramingRectSize() {
-        return framingRectSize;
-    }
-
-    /**
-     * Set an exact size for the framing rectangle. It will be centered in the view.
-     *
-     * @param framingRectSize the size
-     */
-    public void setFramingRectSize(Size framingRectSize) {
-        this.framingRectSize = framingRectSize;
-    }
-
-    public double getMarginFraction() {
-        return marginFraction;
-    }
-
-    /**
-     * The the fraction of the width/height of view to be used as a margin for the framing rect.
-     * This is ignored if framingRectSize is specified.
-     *
-     * @param marginFraction the fraction
-     */
-    public void setMarginFraction(double marginFraction) {
-        if(marginFraction >= 0.5d) {
-            throw new IllegalArgumentException("The margin fraction must be less than 0.5");
-        }
-        this.marginFraction = marginFraction;
-    }
-
-    public boolean isUseTextureView() {
-        return useTextureView;
-    }
-
-    /**
-     * Set to true to use TextureView instead of SurfaceView.
-     *
-     * Will only have an effect on API >= 14.
-     *
-     * @param useTextureView true to use TextureView.
-     */
-    public void setUseTextureView(boolean useTextureView) {
-        this.useTextureView = useTextureView;
-    }
-
-    /**
-     * Considered active if between resume() and pause().
-     *
-     * @return true if active
-     */
-    protected boolean isActive() {
-        return cameraInstance != null;
-    }
-
-    private int getDisplayRotation() {
-        return windowManager.getDefaultDisplay().getRotation();
-    }
-
-    private void initCamera() {
-        if (cameraInstance != null) {
-            Log.w(TAG, "initCamera called twice");
-            return;
-        }
-
-        cameraInstance = createCameraInstance();
-
-        cameraInstance.setReadyHandler(stateHandler);
-        cameraInstance.open();
-
-        // Keep track of the orientation we opened at, so that we don't reopen the camera if we
-        // don't need to.
-        openedOrientation = getDisplayRotation();
-    }
-
-    /**
-     * Create a new CameraInstance.
-     *
-     * Override to use a custom CameraInstance.
-     *
-     * @return a new CameraInstance
-     */
-    protected CameraInstance createCameraInstance() {
-        CameraInstance cameraInstance = new CameraInstance(getContext());
-        cameraInstance.setCameraSettings(cameraSettings);
-        return cameraInstance;
-    }
-
-    private void startCameraPreview(CameraSurface surface) {
-        if (!previewActive && cameraInstance != null) {
-            Log.i(TAG, "Starting preview");
-            cameraInstance.setSurface(surface);
-            cameraInstance.startPreview();
-            previewActive = true;
-
-            previewStarted();
-            fireState.previewStarted();
-        }
-    }
-
-    /**
-     * Called when the preview is started. Override this to start decoding work.
-     */
-    protected void previewStarted() {
-
-    }
-
-    /**
-     * Get the current CameraInstance. This may be null, and may change when
-     * pausing / resuming the preview.
-     *
-     * While the preview is active, getCameraInstance() will never be null.
-     *
-     * @return the current CameraInstance
-     * @see #isPreviewActive()
-     */
-    public CameraInstance getCameraInstance() {
-        return cameraInstance;
-    }
-
-    /**
-     * The preview typically starts being active a while after calling resume(), and stops
-     * when calling pause().
-     *
-     * @return true if the preview is active
-     */
-    public boolean isPreviewActive() {
-        return previewActive;
-    }
-
-    /**
-     * Calculate framing rectangle, relative to the preview frame.
-     *
-     * Note that the SurfaceView may be larger than the container.
-     *
-     * Override this for more control over the framing rect calculations.
-     *
-     * @param container this container, with left = top = 0
-     * @param surface   the SurfaceView, relative to this container
-     * @return the framing rect, relative to this container
-     */
-    protected Rect calculateFramingRect(Rect container, Rect surface) {
-        // intersection is the part of the container that is used for the preview
-        Rect intersection = new Rect(container);
-        boolean intersects = intersection.intersect(surface);
-
-        if(framingRectSize != null) {
-            // Specific size is specified. Make sure it's not larger than the container or surface.
-            int horizontalMargin = Math.max(0, (intersection.width() - framingRectSize.width) / 2);
-            int verticalMargin = Math.max(0, (intersection.height() - framingRectSize.height) / 2);
-            intersection.inset(horizontalMargin, verticalMargin);
-            return intersection;
-        }
-        // margin as 10% (default) of the smaller of width, height
-        int margin = (int)Math.min(intersection.width() * marginFraction, intersection.height() * marginFraction);
-        intersection.inset(margin, margin);
-        if (intersection.height() > intersection.width()) {
-            // We don't want a frame that is taller than wide.
-            intersection.inset(0, (intersection.height() - intersection.width()) / 2);
-        }
-        return intersection;
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-
-        Bundle myState = new Bundle();
-        myState.putParcelable("super", superState);
-        myState.putBoolean("torch", torchOn);
-        return myState;
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if(!(state instanceof Bundle)) {
-            super.onRestoreInstanceState(state);
-            return;
-        }
-        Bundle myState = (Bundle)state;
-        Parcelable superState = myState.getParcelable("super");
-        super.onRestoreInstanceState(superState);
-        boolean torch = myState.getBoolean("torch");
-        setTorch(torch);
-    }
-
-    /**
-     *
-     * @return true if the camera has been closed in a background thread.
-     */
-    public boolean isCameraClosed() {
-        return cameraInstance == null || cameraInstance.isCameraClosed();
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/CaptureActivity.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/CaptureActivity.java
deleted file mode 100644
index 47dfb6d0..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/CaptureActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.view.KeyEvent;
-
-import com.google.zxing.client.android.R;
-
-/**
- *
- */
-public class CaptureActivity extends AppCompatActivity
-{
-    private CaptureManager capture;
-    private DecoratedBarcodeView barcodeScannerView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        barcodeScannerView = initializeContent();
-
-        capture = new CaptureManager(this, barcodeScannerView);
-        capture.initializeFromIntent(getIntent(), savedInstanceState);
-        capture.decode();
-    }
-
-    /**
-     * Override to use a different layout.
-     *
-     * @return the DecoratedBarcodeView
-     */
-    protected DecoratedBarcodeView initializeContent() {
-        setContentView(R.layout.zxing_capture);
-        return (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        capture.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        capture.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        capture.onDestroy();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        capture.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
-        capture.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/CaptureManager.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/CaptureManager.java
deleted file mode 100644
index aec45509..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/CaptureManager.java
+++ /dev/null
@@ -1,429 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.Manifest;
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.graphics.Bitmap;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.util.Log;
-import android.view.Display;
-import android.view.Surface;
-import android.view.Window;
-import android.view.WindowManager;
-
-import com.google.zxing.ResultMetadataType;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.BeepManager;
-import com.google.zxing.client.android.InactivityTimer;
-import com.google.zxing.client.android.Intents;
-import com.google.zxing.client.android.R;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Manages barcode scanning for a CaptureActivity. This class may be used to have a custom Activity
- * (e.g. with a customized look and feel, or a different superclass), but not the barcode scanning
- * process itself.
- *
- * This is intended for an Activity that is dedicated to capturing a single barcode and returning
- * it via setResult(). For other use cases, use DefaultBarcodeScannerView or BarcodeView directly.
- *
- * The following is managed by this class:
- * - Orientation lock
- * - InactivityTimer
- * - BeepManager
- * - Initializing from an Intent (via IntentIntegrator)
- * - Setting the result and finishing the Activity when a barcode is scanned
- * - Displaying camera errors
- */
-public class CaptureManager {
-    private static final String TAG = CaptureManager.class.getSimpleName();
-
-    private static int cameraPermissionReqCode = 250;
-
-    private Activity activity;
-    private DecoratedBarcodeView barcodeView;
-    private int orientationLock = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-    private static final String SAVED_ORIENTATION_LOCK = "SAVED_ORIENTATION_LOCK";
-    private boolean returnBarcodeImagePath = false;
-
-    private boolean destroyed = false;
-
-    private InactivityTimer inactivityTimer;
-    private BeepManager beepManager;
-
-    private Handler handler;
-
-    private boolean finishWhenClosed = false;
-
-    private BarcodeView.Callback callback = new BarcodeView.Callback() {
-        @Override
-        public void barcodeResult(final BarcodeResult result) {
-            barcodeView.pause();
-            beepManager.playBeepSoundAndVibrate();
-
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    returnResult(result);
-                }
-            });
-
-        }
-
-        @Override
-        public void possibleResultPoints(List<ResultPoint> resultPoints) {
-
-        }
-    };
-
-    private final CameraPreview.StateListener stateListener = new CameraPreview.StateListener() {
-        @Override
-        public void previewSized() {
-
-        }
-
-        @Override
-        public void previewStarted() {
-
-        }
-
-        @Override
-        public void previewStopped() {
-
-        }
-
-        @Override
-        public void cameraError(Exception error) {
-            displayFrameworkBugMessageAndExit();
-        }
-
-        @Override
-        public void cameraClosed() {
-            if(finishWhenClosed) {
-                Log.d(TAG, "Camera closed; finishing activity");
-                finish();
-            }
-        }
-    };
-
-    public CaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
-        this.activity = activity;
-        this.barcodeView = barcodeView;
-        barcodeView.getBarcodeView().addStateListener(stateListener);
-
-        handler = new Handler();
-
-        inactivityTimer = new InactivityTimer(activity, new Runnable() {
-            @Override
-            public void run() {
-                Log.d(TAG, "Finishing due to inactivity");
-                finish();
-            }
-        });
-
-        beepManager = new BeepManager(activity);
-    }
-
-    /**
-     * Perform initialization, according to preferences set in the intent.
-     *
-     * @param intent the intent containing the scanning preferences
-     * @param savedInstanceState saved state, containing orientation lock
-     */
-    public void initializeFromIntent(Intent intent, Bundle savedInstanceState) {
-        Window window = activity.getWindow();
-        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        if (savedInstanceState != null) {
-            // If the screen was locked and unlocked again, we may start in a different orientation
-            // (even one not allowed by the manifest). In this case we restore the orientation we were
-            // previously locked to.
-            this.orientationLock = savedInstanceState.getInt(SAVED_ORIENTATION_LOCK, ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-        }
-
-        if(intent != null) {
-            // Only lock the orientation if it's not locked to something else yet
-            boolean orientationLocked = intent.getBooleanExtra(Intents.Scan.ORIENTATION_LOCKED, true);
-            if (orientationLocked) {
-                lockOrientation();
-            }
-
-            if (Intents.Scan.ACTION.equals(intent.getAction())) {
-                barcodeView.initializeFromIntent(intent);
-            }
-
-            if (!intent.getBooleanExtra(Intents.Scan.BEEP_ENABLED, true)) {
-                beepManager.setBeepEnabled(false);
-            }
-
-            if (intent.hasExtra(Intents.Scan.TIMEOUT)) {
-                Runnable runnable = new Runnable() {
-                    @Override
-                    public void run() {
-                        returnResultTimeout();
-                    }
-                };
-                handler.postDelayed(runnable, intent.getLongExtra(Intents.Scan.TIMEOUT, 0L));
-            }
-
-            if (intent.getBooleanExtra(Intents.Scan.BARCODE_IMAGE_ENABLED, false)) {
-                returnBarcodeImagePath = true;
-            }
-        }
-    }
-
-    /**
-     * Lock display to current orientation.
-     */
-    protected void lockOrientation() {
-        // Only get the orientation if it's not locked to one yet.
-        if (this.orientationLock == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
-            // Adapted from http://stackoverflow.com/a/14565436
-            Display display = activity.getWindowManager().getDefaultDisplay();
-            int rotation = display.getRotation();
-            int baseOrientation = activity.getResources().getConfiguration().orientation;
-            int orientation = 0;
-            if (baseOrientation == Configuration.ORIENTATION_LANDSCAPE) {
-                if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_90) {
-                    orientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
-                } else {
-                    orientation = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
-                }
-            } else if (baseOrientation == Configuration.ORIENTATION_PORTRAIT) {
-                if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_270) {
-                    orientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-                } else {
-                    orientation = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
-                }
-            }
-
-            this.orientationLock = orientation;
-        }
-        //noinspection ResourceType
-        activity.setRequestedOrientation(this.orientationLock);
-    }
-
-    /**
-     * Start decoding.
-     */
-    public void decode() {
-        barcodeView.decodeSingle(callback);
-    }
-
-    /**
-     * Call from Activity#onResume().
-     */
-    public void onResume() {
-        if(Build.VERSION.SDK_INT >= 23) {
-            openCameraWithPermission();
-        } else {
-            barcodeView.resume();
-        }
-        inactivityTimer.start();
-    }
-
-    private boolean askedPermission = false;
-
-    @TargetApi(23)
-    private void openCameraWithPermission() {
-        if (ContextCompat.checkSelfPermission(this.activity, Manifest.permission.CAMERA)
-                == PackageManager.PERMISSION_GRANTED) {
-            barcodeView.resume();
-        } else if(!askedPermission) {
-            ActivityCompat.requestPermissions(this.activity,
-                    new String[]{Manifest.permission.CAMERA},
-                    cameraPermissionReqCode);
-            askedPermission = true;
-        } else {
-            // Wait for permission result
-        }
-    }
-
-    /**
-     * Call from Activity#onRequestPermissionsResult
-     * @param requestCode The request code passed in {@link android.support.v4.app.ActivityCompat#requestPermissions(Activity, String[], int)}.
-     * @param permissions The requested permissions.
-     * @param grantResults The grant results for the corresponding permissions
-     *     which is either {@link android.content.pm.PackageManager#PERMISSION_GRANTED}
-     *     or {@link android.content.pm.PackageManager#PERMISSION_DENIED}. Never null.
-     */
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
-        if(requestCode == cameraPermissionReqCode) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                // permission was granted
-                barcodeView.resume();
-            } else {
-                // TODO: display better error message.
-                displayFrameworkBugMessageAndExit();
-            }
-        }
-    }
-
-    /**
-     * Call from Activity#onPause().
-     */
-    public void onPause() {
-
-        inactivityTimer.cancel();
-        barcodeView.pauseAndWait();
-    }
-
-    /**
-     * Call from Activity#onDestroy().
-     */
-    public void onDestroy() {
-        destroyed = true;
-        inactivityTimer.cancel();
-        handler.removeCallbacksAndMessages(null);
-    }
-
-    /**
-     * Call from Activity#onSaveInstanceState().
-     */
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(SAVED_ORIENTATION_LOCK, this.orientationLock);
-    }
-
-    /**
-     * Create a intent to return as the Activity result.
-     *
-     * @param rawResult the BarcodeResult, must not be null.
-     * @param barcodeImagePath a path to an exported file of the Barcode Image, can be null.
-     * @return the Intent
-     */
-    public static Intent resultIntent(BarcodeResult rawResult, String barcodeImagePath) {
-        Intent intent = new Intent(Intents.Scan.ACTION);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
-        intent.putExtra(Intents.Scan.RESULT, rawResult.toString());
-        intent.putExtra(Intents.Scan.RESULT_FORMAT, rawResult.getBarcodeFormat().toString());
-        byte[] rawBytes = rawResult.getRawBytes();
-        if (rawBytes != null && rawBytes.length > 0) {
-            intent.putExtra(Intents.Scan.RESULT_BYTES, rawBytes);
-        }
-        Map<ResultMetadataType, ?> metadata = rawResult.getResultMetadata();
-        if (metadata != null) {
-            if (metadata.containsKey(ResultMetadataType.UPC_EAN_EXTENSION)) {
-                intent.putExtra(Intents.Scan.RESULT_UPC_EAN_EXTENSION,
-                        metadata.get(ResultMetadataType.UPC_EAN_EXTENSION).toString());
-            }
-            Number orientation = (Number) metadata.get(ResultMetadataType.ORIENTATION);
-            if (orientation != null) {
-                intent.putExtra(Intents.Scan.RESULT_ORIENTATION, orientation.intValue());
-            }
-            String ecLevel = (String) metadata.get(ResultMetadataType.ERROR_CORRECTION_LEVEL);
-            if (ecLevel != null) {
-                intent.putExtra(Intents.Scan.RESULT_ERROR_CORRECTION_LEVEL, ecLevel);
-            }
-            @SuppressWarnings("unchecked")
-            Iterable<byte[]> byteSegments = (Iterable<byte[]>) metadata.get(ResultMetadataType.BYTE_SEGMENTS);
-            if (byteSegments != null) {
-                int i = 0;
-                for (byte[] byteSegment : byteSegments) {
-                    intent.putExtra(Intents.Scan.RESULT_BYTE_SEGMENTS_PREFIX + i, byteSegment);
-                    i++;
-                }
-            }
-        }
-        if (barcodeImagePath != null) {
-            intent.putExtra(Intents.Scan.RESULT_BARCODE_IMAGE_PATH, barcodeImagePath);
-        }
-        return intent;
-    }
-
-    /**
-     * Save the barcode image to a temporary file stored in the application's cache, and return its path.
-     * Only does so if returnBarcodeImagePath is enabled.
-     *
-     * @param rawResult the BarcodeResult, must not be null
-     * @return the path or null
-     */
-    private String getBarcodeImagePath(BarcodeResult rawResult) {
-        String barcodeImagePath = null;
-        if (returnBarcodeImagePath) {
-            Bitmap bmp = rawResult.getBitmap();
-            try {
-                File bitmapFile = File.createTempFile("barcodeimage", ".jpg", activity.getCacheDir());
-                FileOutputStream outputStream = new FileOutputStream(bitmapFile);
-                bmp.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
-                outputStream.close();
-                barcodeImagePath = bitmapFile.getAbsolutePath();
-            } catch (IOException e) {
-                Log.w(TAG, "Unable to create temporary file and store bitmap! " + e);
-            }
-        }
-        return barcodeImagePath;
-    }
-
-    private void finish() {
-        activity.finish();
-    }
-
-    protected void closeAndFinish() {
-        if(barcodeView.getBarcodeView().isCameraClosed()) {
-            finish();
-        } else {
-            finishWhenClosed = true;
-        }
-
-        barcodeView.pause();
-        inactivityTimer.cancel();
-    }
-
-    protected void returnResultTimeout() {
-        Intent intent = new Intent(Intents.Scan.ACTION);
-        intent.putExtra(Intents.Scan.TIMEOUT, true);
-        activity.setResult(Activity.RESULT_CANCELED, intent);
-        closeAndFinish();
-    }
-
-    protected void returnResult(BarcodeResult rawResult) {
-        Intent intent = resultIntent(rawResult, getBarcodeImagePath(rawResult));
-        activity.setResult(Activity.RESULT_OK, intent);
-        closeAndFinish();
-    }
-
-    protected void displayFrameworkBugMessageAndExit() {
-        if (activity.isFinishing() || this.destroyed || finishWhenClosed) {
-            return;
-        }
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-        builder.setTitle(activity.getString(R.string.zxing_app_name));
-        builder.setMessage(activity.getString(R.string.zxing_msg_camera_framework_bug));
-        builder.setPositiveButton(R.string.zxing_button_ok, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                finish();
-            }
-        });
-        builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
-            @Override
-            public void onCancel(DialogInterface dialog) {
-                finish();
-            }
-        });
-        builder.show();
-    }
-
-    public static int getCameraPermissionReqCode() {
-        return cameraPermissionReqCode;
-    }
-
-    public static void setCameraPermissionReqCode(int cameraPermissionReqCode) {
-        CaptureManager.cameraPermissionReqCode = cameraPermissionReqCode;
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/CompoundBarcodeView.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/CompoundBarcodeView.java
deleted file mode 100644
index a9b9050b..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/CompoundBarcodeView.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-/**
- * Used as an alias for DecoratedBarcodeView, for backwards-compatibility.
- */
-public class CompoundBarcodeView extends DecoratedBarcodeView {
-    public CompoundBarcodeView(Context context) {
-        super(context);
-    }
-
-    public CompoundBarcodeView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public CompoundBarcodeView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/Decoder.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/Decoder.java
deleted file mode 100644
index 8649ab8d..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/Decoder.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.LuminanceSource;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.Reader;
-import com.google.zxing.Result;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.ResultPointCallback;
-import com.google.zxing.common.HybridBinarizer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A class for decoding images.
- *
- * A decoder contains all the configuration required for the binarization and decoding process.
- *
- * The actual decoding should happen on a dedicated thread.
- */
-public class Decoder implements ResultPointCallback {
-    private Reader reader;
-
-    /**
-     * Create a new Decoder with the specified Reader.
-     *
-     * It is recommended to use an instance of MultiFormatReader in most cases.
-     *
-     * @param reader the reader
-     */
-    public Decoder(Reader reader) {
-        this.reader = reader;
-    }
-
-    protected Reader getReader() {
-        return reader;
-    }
-
-    /**
-     * Given an image source, attempt to decode the barcode.
-     *
-     * Must not raise an exception.
-     *
-     * @param source the image source
-     * @return a Result or null
-     */
-    public Result decode(LuminanceSource source) {
-        return decode(toBitmap(source));
-    }
-
-    /**
-     * Given an image source, convert to a binary bitmap.
-     *
-     * Override this to use a custom binarizer.
-     *
-     * @param source the image source
-     * @return a BinaryBitmap
-     */
-    protected BinaryBitmap toBitmap(LuminanceSource source) {
-        return new BinaryBitmap(new HybridBinarizer(source));
-    }
-
-    /**
-     * Decode a binary bitmap.
-     *
-     * @param bitmap the binary bitmap
-     * @return a Result or null
-     */
-    protected Result decode(BinaryBitmap bitmap) {
-        possibleResultPoints.clear();
-        try {
-            if (reader instanceof MultiFormatReader) {
-                // Optimization - MultiFormatReader's normal decode() method is slow.
-                return ((MultiFormatReader) reader).decodeWithState(bitmap);
-            } else {
-                return reader.decode(bitmap);
-            }
-        } catch (Exception e) {
-            // Decode error, try again next frame
-            return null;
-        } finally {
-            reader.reset();
-        }
-    }
-
-    private List<ResultPoint> possibleResultPoints = new ArrayList<>();
-
-    /**
-     * Call immediately after decode(), from the same thread.
-     *
-     * The result is undefined while decode() is running.
-     *
-     * @return possible ResultPoints from the last decode.
-     */
-    public List<ResultPoint> getPossibleResultPoints() {
-        return new ArrayList<>(possibleResultPoints);
-    }
-
-    @Override
-    public void foundPossibleResultPoint(ResultPoint point) {
-        possibleResultPoints.add(point);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderFactory.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderFactory.java
deleted file mode 100644
index bff7c250..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import com.google.zxing.DecodeHintType;
-
-import java.util.Map;
-
-/**
- * Factory to create Decoder instances. Typically one instance will be created per DecoderThread.
- *
- * @see DefaultDecoderFactory
- */
-public interface DecoderFactory {
-
-    /**
-     * Create a new Decoder.
-     *
-     * While this method will only be called from a single thread, the created Decoder will
-     * be used from a different thread. Each decoder will only be used from a single thread.
-     *
-     * @param baseHints default hints. Typically specifies DecodeHintType.NEED_RESULT_POINT_CALLBACK.
-     * @return a new Decoder
-     */
-    Decoder createDecoder(Map<DecodeHintType, ?> baseHints);
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderResultPointCallback.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderResultPointCallback.java
deleted file mode 100644
index 674d41e1..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderResultPointCallback.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import com.google.zxing.ResultPoint;
-import com.google.zxing.ResultPointCallback;
-
-/**
- * ResultPointCallback delegating the ResultPoints to a decoder.
- */
-public class DecoderResultPointCallback implements ResultPointCallback {
-    private Decoder decoder;
-
-    public DecoderResultPointCallback(Decoder decoder) {
-        this.decoder = decoder;
-    }
-
-    public DecoderResultPointCallback() {
-    }
-
-    public Decoder getDecoder() {
-        return decoder;
-    }
-
-    public void setDecoder(Decoder decoder) {
-        this.decoder = decoder;
-    }
-
-    @Override
-    public void foundPossibleResultPoint(ResultPoint point) {
-        if(decoder != null) {
-            decoder.foundPossibleResultPoint(point);
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderThread.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderThread.java
deleted file mode 100644
index 28120e02..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoderThread.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.graphics.Rect;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Message;
-import android.util.Log;
-
-import com.google.zxing.LuminanceSource;
-import com.google.zxing.Result;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.R;
-import com.journeyapps.barcodescanner.camera.CameraInstance;
-import com.journeyapps.barcodescanner.camera.PreviewCallback;
-
-import java.util.List;
-
-/**
- *
- */
-public class DecoderThread {
-    private static final String TAG = DecoderThread.class.getSimpleName();
-
-    private CameraInstance cameraInstance;
-    private HandlerThread thread;
-    private Handler handler;
-    private Decoder decoder;
-    private Handler resultHandler;
-    private Rect cropRect;
-    private boolean running = false;
-    private final Object LOCK = new Object();
-
-    private final Handler.Callback callback = new Handler.Callback() {
-        @Override
-        public boolean handleMessage(Message message) {
-            if (message.what == R.id.zxing_decode) {
-                decode((SourceData) message.obj);
-            } else if(message.what == R.id.zxing_preview_failed) {
-                // Error already logged. Try again.
-                requestNextPreview();
-            }
-            return true;
-        }
-    };
-
-    public DecoderThread(CameraInstance cameraInstance, Decoder decoder, Handler resultHandler) {
-        Util.validateMainThread();
-
-        this.cameraInstance = cameraInstance;
-        this.decoder = decoder;
-        this.resultHandler = resultHandler;
-    }
-
-    public Decoder getDecoder() {
-        return decoder;
-    }
-
-    public void setDecoder(Decoder decoder) {
-        this.decoder = decoder;
-    }
-
-    public Rect getCropRect() {
-        return cropRect;
-    }
-
-    public void setCropRect(Rect cropRect) {
-        this.cropRect = cropRect;
-    }
-
-    /**
-     * Start decoding.
-     *
-     * This must be called from the UI thread.
-     */
-    public void start() {
-        Util.validateMainThread();
-
-        thread = new HandlerThread(TAG);
-        thread.start();
-        handler = new Handler(thread.getLooper(), callback);
-        running = true;
-        requestNextPreview();
-    }
-
-    /**
-     * Stop decoding.
-     *
-     * This must be called from the UI thread.
-     */
-    public void stop() {
-        Util.validateMainThread();
-
-        synchronized (LOCK) {
-            running = false;
-            handler.removeCallbacksAndMessages(null);
-            thread.quit();
-        }
-    }
-
-    private final PreviewCallback previewCallback = new PreviewCallback() {
-        @Override
-        public void onPreview(SourceData sourceData) {
-            // Only post if running, to prevent a warning like this:
-            //   java.lang.RuntimeException: Handler (android.os.Handler) sending message to a Handler on a dead thread
-
-            // synchronize to handle cases where this is called concurrently with stop()
-            synchronized (LOCK) {
-                if (running) {
-                    // Post to our thread.
-                    handler.obtainMessage(R.id.zxing_decode, sourceData).sendToTarget();
-                }
-            }
-        }
-
-        @Override
-        public void onPreviewError(Exception e) {
-            synchronized (LOCK) {
-                if (running) {
-                    // Post to our thread.
-                    handler.obtainMessage(R.id.zxing_preview_failed).sendToTarget();
-                }
-            }
-        }
-    };
-
-    private void requestNextPreview() {
-        if (cameraInstance.isOpen()) {
-            cameraInstance.requestPreview(previewCallback);
-        }
-    }
-
-    protected LuminanceSource createSource(SourceData sourceData) {
-        if (this.cropRect == null) {
-            return null;
-        } else {
-            return sourceData.createSource();
-        }
-    }
-
-    private void decode(SourceData sourceData) {
-        long start = System.currentTimeMillis();
-        Result rawResult = null;
-        sourceData.setCropRect(cropRect);
-        LuminanceSource source = createSource(sourceData);
-
-        if(source != null) {
-            rawResult = decoder.decode(source);
-        }
-
-        if (rawResult != null) {
-            // Don't log the barcode contents for security.
-            long end = System.currentTimeMillis();
-            Log.d(TAG, "Found barcode in " + (end - start) + " ms");
-            if (resultHandler != null) {
-                BarcodeResult barcodeResult = new BarcodeResult(rawResult, sourceData);
-                Message message = Message.obtain(resultHandler, R.id.zxing_decode_succeeded, barcodeResult);
-                Bundle bundle = new Bundle();
-                message.setData(bundle);
-                message.sendToTarget();
-            }
-        } else {
-            if (resultHandler != null) {
-                Message message = Message.obtain(resultHandler, R.id.zxing_decode_failed);
-                message.sendToTarget();
-            }
-        }
-        if (resultHandler != null) {
-            List<ResultPoint> resultPoints = decoder.getPossibleResultPoints();
-            Message message = Message.obtain(resultHandler, R.id.zxing_possible_result_points, resultPoints);
-            message.sendToTarget();
-        }
-        requestNextPreview();
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoratedBarcodeView.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoratedBarcodeView.java
deleted file mode 100644
index e0c8b74b..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/DecoratedBarcodeView.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.MultiFormatReader;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.DecodeFormatManager;
-import com.google.zxing.client.android.DecodeHintManager;
-import com.google.zxing.client.android.Intents;
-import com.google.zxing.client.android.R;
-import com.journeyapps.barcodescanner.camera.CameraSettings;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Encapsulates BarcodeView, ViewfinderView and status text.
- *
- * To customize the UI, use BarcodeView and ViewfinderView directly.
- */
-public class DecoratedBarcodeView extends FrameLayout {
-    private BarcodeView barcodeView;
-    private ViewfinderView viewFinder;
-    private TextView statusView;
-
-    /**
-     * The instance of @link TorchListener to send events callback.
-     */
-    private TorchListener torchListener;
-
-    private class WrappedCallback implements BarcodeView.Callback {
-        private BarcodeView.Callback delegate;
-
-        public WrappedCallback(BarcodeView.Callback delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public void barcodeResult(BarcodeResult result) {
-            delegate.barcodeResult(result);
-        }
-
-        @Override
-        public void possibleResultPoints(List<ResultPoint> resultPoints) {
-            for (ResultPoint point : resultPoints) {
-                viewFinder.addPossibleResultPoint(point);
-            }
-            delegate.possibleResultPoints(resultPoints);
-        }
-    }
-
-    public DecoratedBarcodeView(Context context) {
-        super(context);
-        initialize();
-    }
-
-    public DecoratedBarcodeView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initialize(attrs);
-    }
-
-    public DecoratedBarcodeView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initialize(attrs);
-    }
-
-    /**
-     * Initialize the view with the xml configuration based on styleable attributes.
-     *
-     * @param attrs The attributes to use on view.
-     */
-    private void initialize(AttributeSet attrs) {
-        // Get attributes set on view
-        TypedArray attributes = getContext().obtainStyledAttributes(attrs, R.styleable.zxing_view);
-
-        int scannerLayout = attributes.getResourceId(
-                R.styleable.zxing_view_zxing_scanner_layout, R.layout.zxing_barcode_scanner);
-
-        attributes.recycle();
-
-        inflate(getContext(), scannerLayout, this);
-
-        barcodeView = (BarcodeView) findViewById(R.id.zxing_barcode_surface);
-
-        if (barcodeView == null) {
-            throw new IllegalArgumentException(
-                "There is no a com.journeyapps.barcodescanner.BarcodeView on provided layout " +
-                "with the id \"zxing_barcode_surface\".");
-        }
-
-        // Pass on any preview-related attributes
-        barcodeView.initializeAttributes(attrs);
-
-
-        viewFinder = (ViewfinderView) findViewById(R.id.zxing_viewfinder_view);
-
-        if (viewFinder == null) {
-            throw new IllegalArgumentException(
-                "There is no a com.journeyapps.barcodescanner.ViewfinderView on provided layout " +
-                "with the id \"zxing_viewfinder_view\".");
-        }
-
-        viewFinder.setCameraPreview(barcodeView);
-
-        // statusView is optional
-        statusView = (TextView) findViewById(R.id.zxing_status_view);
-    }
-
-    /**
-     * Initialize with no custom attributes setted.
-     */
-    private void initialize() {
-        initialize(null);
-    }
-
-    /**
-     * Convenience method to initialize camera id, decode formats and prompt message from an intent.
-     *
-     * @param intent the intent, as generated by IntentIntegrator
-     */
-    public void initializeFromIntent(Intent intent) {
-        // Scan the formats the intent requested, and return the result to the calling activity.
-        Set<BarcodeFormat> decodeFormats = DecodeFormatManager.parseDecodeFormats(intent);
-        Map<DecodeHintType, Object> decodeHints = DecodeHintManager.parseDecodeHints(intent);
-
-        CameraSettings settings = new CameraSettings();
-
-        if (intent.hasExtra(Intents.Scan.CAMERA_ID)) {
-            int cameraId = intent.getIntExtra(Intents.Scan.CAMERA_ID, -1);
-            if (cameraId >= 0) {
-                settings.setRequestedCameraId(cameraId);
-            }
-        }
-
-        String customPromptMessage = intent.getStringExtra(Intents.Scan.PROMPT_MESSAGE);
-        if (customPromptMessage != null) {
-            setStatusText(customPromptMessage);
-        }
-
-        // Check to see if the scan should be inverted.
-        boolean inverted = intent.getBooleanExtra(Intents.Scan.INVERTED_SCAN, false);
-
-        String characterSet = intent.getStringExtra(Intents.Scan.CHARACTER_SET);
-
-        MultiFormatReader reader = new MultiFormatReader();
-        reader.setHints(decodeHints);
-
-        barcodeView.setCameraSettings(settings);
-        barcodeView.setDecoderFactory(new DefaultDecoderFactory(decodeFormats, decodeHints, characterSet, inverted));
-    }
-
-    public void setStatusText(String text) {
-        // statusView is optional when using a custom layout
-        if(statusView != null) {
-            statusView.setText(text);
-        }
-    }
-
-    /**
-     * @see BarcodeView#pause()
-     */
-    public void pause() {
-        barcodeView.pause();
-    }
-
-    /**
-     * @see BarcodeView#pauseAndWait()
-     */
-    public void pauseAndWait() {
-        barcodeView.pauseAndWait();
-    }
-
-    /**
-     * @see BarcodeView#resume()
-     */
-    public void resume() {
-        barcodeView.resume();
-    }
-
-    public BarcodeView getBarcodeView() {
-        return (BarcodeView) findViewById(R.id.zxing_barcode_surface);
-    }
-
-    public ViewfinderView getViewFinder() {
-        return viewFinder;
-    }
-
-    public TextView getStatusView() {
-        return statusView;
-    }
-
-    /**
-     * @see BarcodeView#decodeSingle(BarcodeView.Callback)
-     */
-    public void decodeSingle(BarcodeView.Callback callback) {
-        barcodeView.decodeSingle(new WrappedCallback(callback));
-    }
-
-    /**
-     * @see BarcodeView#BarcodeView.Callback(BarcodeView.Callback)
-     */
-    public void decodeContinuous(BarcodeView.Callback callback) {
-        barcodeView.decodeContinuous(new WrappedCallback(callback));
-    }
-
-    /**
-     * Turn on the device's flashlight.
-     */
-    public void setTorchOn() {
-        barcodeView.setTorch(true);
-
-        if (torchListener != null) {
-            torchListener.onTorchOn();
-        }
-    }
-
-    /**
-     * Turn off the device's flashlight.
-     */
-    public void setTorchOff() {
-        barcodeView.setTorch(false);
-
-        if (torchListener != null) {
-            torchListener.onTorchOff();
-        }
-    }
-
-    /**
-     * Handles focus, camera, volume up and volume down keys.
-     *
-     * Note that this view is not usually focused, so the Activity should call this directly.
-     */
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_FOCUS:
-            case KeyEvent.KEYCODE_CAMERA:
-                // Handle these events so they don't launch the Camera app
-                return true;
-            // Use volume up/down to turn on light
-            case KeyEvent.KEYCODE_VOLUME_DOWN:
-                setTorchOff();
-                return true;
-            case KeyEvent.KEYCODE_VOLUME_UP:
-                setTorchOn();
-                return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    public void setTorchListener(TorchListener listener) {
-        this.torchListener = listener;
-    }
-
-    /**
-     * The Listener to torch/fflashlight events (turn on, turn off).
-     */
-    public interface TorchListener {
-
-        void onTorchOn();
-
-        void onTorchOff();
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/DefaultDecoderFactory.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/DefaultDecoderFactory.java
deleted file mode 100644
index 0eeec3d7..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/DefaultDecoderFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.DecodeHintType;
-import com.google.zxing.MultiFormatReader;
-
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.Map;
-
-/**
- * DecoderFactory that creates a MultiFormatReader with specified hints.
- */
-public class DefaultDecoderFactory implements DecoderFactory {
-    private Collection<BarcodeFormat> decodeFormats;
-    private Map<DecodeHintType, ?> hints;
-    private String characterSet;
-    private boolean inverted;
-
-    public DefaultDecoderFactory() {
-    }
-
-    public DefaultDecoderFactory(Collection<BarcodeFormat> decodeFormats, Map<DecodeHintType, ?> hints, String characterSet, boolean inverted) {
-        this.decodeFormats = decodeFormats;
-        this.hints = hints;
-        this.characterSet = characterSet;
-        this.inverted = inverted;
-    }
-
-    @Override
-    public Decoder createDecoder(Map<DecodeHintType, ?> baseHints) {
-        Map<DecodeHintType, Object> hints = new EnumMap<>(DecodeHintType.class);
-
-        hints.putAll(baseHints);
-
-        if(this.hints != null) {
-            hints.putAll(this.hints);
-        }
-
-        if(this.decodeFormats != null) {
-            hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);
-        }
-
-        if (characterSet != null) {
-            hints.put(DecodeHintType.CHARACTER_SET, characterSet);
-        }
-
-        MultiFormatReader reader = new MultiFormatReader();
-        reader.setHints(hints);
-
-        return inverted ? new InvertedDecoder(reader) : new Decoder(reader);
-
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/InvertedDecoder.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/InvertedDecoder.java
deleted file mode 100644
index 48d2325c..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/InvertedDecoder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.LuminanceSource;
-import com.google.zxing.Reader;
-import com.google.zxing.common.HybridBinarizer;
-
-/**
- * Created by leighmd on 11/2/16.
- */
-public class InvertedDecoder extends Decoder {
-
-    /**
-     * Create a new Decoder with the specified Reader.
-     * <p/>
-     * It is recommended to use an instance of MultiFormatReader in most cases.
-     *
-     * @param reader the reader
-     */
-    public InvertedDecoder(Reader reader) {
-        super(reader);
-    }
-
-    /**
-     * Given an image source, convert to a binary bitmap.
-     *
-     * Override this to use a custom binarizer.
-     *
-     * @param source the image source
-     * @return a BinaryBitmap
-     */
-    protected BinaryBitmap toBitmap(LuminanceSource source) {
-
-        return new BinaryBitmap(new HybridBinarizer(source.invert()));
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/RotationListener.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/RotationListener.java
deleted file mode 100644
index 35d7a632..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/RotationListener.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.content.Context;
-import android.hardware.SensorManager;
-import android.view.OrientationEventListener;
-import android.view.WindowManager;
-
-/**
- * Hack to detect when screen rotation is reversed, since that does not cause a configuration change.
- *
- * If it is changed through something other than the sensor (e.g. programmatically), this may not work.
- *
- * See http://stackoverflow.com/q/9909037
- */
-public class RotationListener {
-    private int lastRotation;
-
-    private WindowManager windowManager;
-    private OrientationEventListener orientationEventListener;
-    private RotationListener.Callback callback;
-
-    public RotationListener() {
-    }
-
-    public void listen(Context context, RotationListener.Callback callback) {
-        // Stop to make sure we're not registering the listening twice.
-        stop();
-
-        // Only use the ApplicationContext. In case of a memory leak (e.g. from a framework bug),
-        // this will result in less being leaked.
-        context = context.getApplicationContext();
-
-        this.callback = callback;
-
-        this.windowManager = (WindowManager) context
-                .getSystemService(Context.WINDOW_SERVICE);
-
-        this.orientationEventListener = new OrientationEventListener(context, SensorManager.SENSOR_DELAY_NORMAL) {
-            @Override
-            public void onOrientationChanged(int orientation) {
-                WindowManager localWindowManager = windowManager;
-				RotationListener.Callback localCallback = RotationListener.this.callback;
-                if(windowManager != null && localCallback != null) {
-                    int newRotation = localWindowManager.getDefaultDisplay().getRotation();
-                    if (newRotation != lastRotation) {
-                        lastRotation = newRotation;
-                        localCallback.onRotationChanged(newRotation);
-                    }
-                }
-            }
-        };
-        this.orientationEventListener.enable();
-
-        lastRotation = windowManager.getDefaultDisplay().getRotation();
-    }
-
-    public void stop() {
-        // To reduce the effect of possible leaks, we clear any references we have to external
-        // objects.
-        if(this.orientationEventListener != null) {
-            this.orientationEventListener.disable();
-        }
-        this.orientationEventListener = null;
-        this.windowManager = null;
-        this.callback = null;
-    }
-
-    public interface Callback {
-        /**
-         * Rotation changed.
-         *
-         * @param rotation the current value of windowManager.getDefaultDisplay().getRotation()
-         */
-        void onRotationChanged(int rotation);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/Size.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/Size.java
deleted file mode 100644
index a0239920..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/Size.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.support.annotation.NonNull;
-
-/**
- *
- */
-public class Size implements Comparable<Size> {
-    public final int width;
-    public final int height;
-
-    public Size(int width, int height) {
-        this.width = width;
-        this.height = height;
-    }
-
-    /**
-     * Swap width and height.
-     *
-     * @return a new Size with swapped width and height
-     */
-    public Size rotate() {
-        //noinspection SuspiciousNameCombination
-        return new Size(height, width);
-    }
-
-    /**
-     * Scale by n / d.
-     *
-     * @param n numerator
-     * @param d denominator
-     * @return the scaled size
-     */
-    public Size scale(int n, int d) {
-        return new Size(width * n / d, height * n / d);
-    }
-
-    /**
-     * Scales the dimensions so that it fits entirely inside the parent.One of width or height will
-     * fit exactly. Aspect ratio is preserved.
-     *
-     * @param into the parent to fit into
-     * @return the scaled size
-     */
-    public Size scaleFit(Size into) {
-        if(width * into.height >= into.width * height) {
-            // match width
-            return new Size(into.width, height * into.width / width);
-        } else {
-            // match height
-            return new Size(width * into.height / height, into.height);
-        }
-    }
-    /**
-     * Scales the size so that both dimensions will be greater than or equal to the corresponding
-     * dimension of the parent. One of width or height will fit exactly. Aspect ratio is preserved.
-     *
-     * @param into the parent to fit into
-     * @return the scaled size
-     */
-    public Size scaleCrop(Size into) {
-        if(width * into.height <= into.width * height) {
-            // match width
-            return new Size(into.width, height * into.width / width);
-        } else {
-            // match height
-            return new Size(width * into.height / height, into.height);
-        }
-    }
-
-    /**
-     * Checks if both dimensions of the other size are at least as large as this size.
-     *
-     * @param other the size to compare with
-     * @return true if this size fits into the other size
-     */
-    public boolean fitsIn(Size other) {
-        return width <= other.width && height <= other.height;
-    }
-
-    /**
-     * Default sort order is ascending by size.
-     */
-    @Override
-    public int compareTo(@NonNull Size other) {
-        int aPixels = this.height * this.width;
-        int bPixels = other.height * other.width;
-        if (bPixels < aPixels) {
-            return 1;
-        }
-        if (bPixels > aPixels) {
-            return -1;
-        }
-        return 0;
-    }
-
-    public String toString() {
-        return width + "x" + height;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Size size = (Size) o;
-
-        return width == size.width && height == size.height;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = width;
-        result = 31 * result + height;
-        return result;
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/SourceData.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/SourceData.java
deleted file mode 100644
index c77ad0e9..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/SourceData.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.ImageFormat;
-import android.graphics.Matrix;
-import android.graphics.Rect;
-import android.graphics.YuvImage;
-
-import com.google.zxing.PlanarYUVLuminanceSource;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * Raw preview data from a camera.
- */
-public class SourceData {
-    /** Raw YUV data */
-    private byte[] data;
-
-    /** Source data width */
-    private int dataWidth;
-
-    /** Source data height */
-    private int dataHeight;
-
-    /** The format of the image data. ImageFormat.NV21 and ImageFormat.YUY2 are supported. */
-    private int imageFormat;
-
-    /** Rotation in degrees (0, 90, 180 or 270). This is camera rotation relative to display rotation. */
-    private int rotation;
-
-    /** Crop rectangle, in display orientation. */
-    private Rect cropRect;
-
-    /**
-     *
-     * @param data the image data
-     * @param dataWidth width of the data
-     * @param dataHeight height of the data
-     * @param imageFormat ImageFormat.NV21 or ImageFormat.YUY2
-     * @param rotation camera rotation relative to display rotation, in degrees (0, 90, 180 or 270).
-     */
-    public SourceData(byte[] data, int dataWidth, int dataHeight, int imageFormat, int rotation) {
-        this.data = data;
-        this.dataWidth = dataWidth;
-        this.dataHeight = dataHeight;
-        this.rotation = rotation;
-        this.imageFormat = imageFormat;
-        if(dataWidth * dataHeight > data.length) {
-            throw new IllegalArgumentException("Image data does not match the resolution. " + dataWidth + "x" + dataHeight + " > " + data.length);
-        }
-
-    }
-
-    public Rect getCropRect() {
-        return cropRect;
-    }
-
-    /**
-     * Set the crop rectangle.
-     *
-     * @param cropRect the new crop rectangle.
-     */
-    public void setCropRect(Rect cropRect) {
-        this.cropRect = cropRect;
-    }
-
-    public byte[] getData() {
-        return data;
-    }
-
-    /**
-     *
-     * @return width of the data
-     */
-    public int getDataWidth() {
-        return dataWidth;
-    }
-
-    /**
-     *
-     * @return height of the data
-     */
-    public int getDataHeight() {
-        return dataHeight;
-    }
-
-    /**
-     *
-     * @return true if the preview image is rotated orthogonal to the display
-     */
-    public boolean isRotated() {
-        return rotation % 180 != 0;
-    }
-
-    public int getImageFormat() {
-        return imageFormat;
-    }
-
-    public PlanarYUVLuminanceSource createSource() {
-        byte[] rotated = rotateCameraPreview(rotation, data, dataWidth, dataHeight);
-        // TODO: handle mirrored (front) camera. Probably only the ResultPoints should be mirrored,
-        // not the preview for decoding.
-        if (isRotated()) {
-            //noinspection SuspiciousNameCombination
-            return new PlanarYUVLuminanceSource(rotated, dataHeight, dataWidth, cropRect.left, cropRect.top, cropRect.width(), cropRect.height(), false);
-        } else {
-            return new PlanarYUVLuminanceSource(rotated, dataWidth, dataHeight, cropRect.left, cropRect.top, cropRect.width(), cropRect.height(), false);
-        }
-    }
-
-    /**
-     * Return the source bitmap (cropped; in display orientation).
-     *
-     * @return the bitmap
-     */
-    public Bitmap getBitmap() {
-        return getBitmap(1);
-    }
-
-    /**
-     * Return the source bitmap (cropped; in display orientation).
-     *
-     * @param scaleFactor factor to scale down by. Must be a power of 2.
-     * @return the bitmap
-     */
-    public Bitmap getBitmap(int scaleFactor) {
-        return getBitmap(cropRect, scaleFactor);
-    }
-
-    private Bitmap getBitmap(Rect cropRect, int scaleFactor) {
-        if(isRotated()) {
-            //noinspection SuspiciousNameCombination
-            cropRect = new Rect(cropRect.top, cropRect.left, cropRect.bottom, cropRect.right);
-        }
-
-        // TODO: there should be a way to do this without JPEG compression / decompression cycle.
-        YuvImage img = new YuvImage(data, imageFormat, dataWidth, dataHeight, null);
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        img.compressToJpeg(cropRect, 90, buffer);
-        byte[] jpegData = buffer.toByteArray();
-
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inSampleSize = scaleFactor;
-        Bitmap bitmap = BitmapFactory.decodeByteArray(jpegData, 0, jpegData.length, options);
-
-        // Rotate if required
-        if (rotation != 0) {
-            Matrix imageMatrix = new Matrix();
-            imageMatrix.postRotate(rotation);
-            bitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), imageMatrix, false);
-        }
-
-        return bitmap;
-    }
-
-    public static byte[] rotateCameraPreview(int cameraRotation, byte[] data, int imageWidth, int imageHeight) {
-        switch (cameraRotation) {
-            case 0:
-                return data;
-            case 90:
-                return rotateCW(data, imageWidth, imageHeight);
-            case 180:
-                return rotate180(data, imageWidth, imageHeight);
-            case 270:
-                return rotateCCW(data, imageWidth, imageHeight);
-            default:
-                // Should not happen
-                return data;
-        }
-    }
-
-    /**
-     * Rotate an image by 90 degrees CW.
-     *
-     * @param data        the image data, in with the first width * height bytes being the luminance data.
-     * @param imageWidth  the width of the image
-     * @param imageHeight the height of the image
-     * @return the rotated bytes
-     */
-    public static byte[] rotateCW(byte[] data, int imageWidth, int imageHeight) {
-        // Adapted from http://stackoverflow.com/a/15775173
-        // data may contain more than just y (u and v), but we are only interested in the y section.
-
-        byte[] yuv = new byte[imageWidth * imageHeight];
-        int i = 0;
-        for (int x = 0; x < imageWidth; x++) {
-            for (int y = imageHeight - 1; y >= 0; y--) {
-                yuv[i] = data[y * imageWidth + x];
-                i++;
-            }
-        }
-        return yuv;
-    }
-
-    /**
-     * Rotate an image by 180 degrees.
-     *
-     * @param data        the image data, in with the first width * height bytes being the luminance data.
-     * @param imageWidth  the width of the image
-     * @param imageHeight the height of the image
-     * @return the rotated bytes
-     */
-    public static byte[] rotate180(byte[] data, int imageWidth, int imageHeight) {
-        int n = imageWidth * imageHeight;
-        byte[] yuv = new byte[n];
-
-        int i = n - 1;
-        for (int j = 0; j < n; j++) {
-            yuv[i] = data[j];
-            i--;
-        }
-        return yuv;
-    }
-
-    /**
-     * Rotate an image by 90 degrees CCW.
-     *
-     * @param data        the image data, in with the first width * height bytes being the luminance data.
-     * @param imageWidth  the width of the image
-     * @param imageHeight the height of the image
-     * @return the rotated bytes
-     */
-    public static byte[] rotateCCW(byte[] data, int imageWidth, int imageHeight) {
-        int n = imageWidth * imageHeight;
-        byte[] yuv = new byte[n];
-        int i = n - 1;
-        for (int x = 0; x < imageWidth; x++) {
-            for (int y = imageHeight - 1; y >= 0; y--) {
-                yuv[i] = data[y * imageWidth + x];
-                i--;
-            }
-        }
-        return yuv;
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/Util.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/Util.java
deleted file mode 100644
index 40827dc1..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/Util.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.journeyapps.barcodescanner;
-
-import android.os.Looper;
-
-/**
- *
- */
-public class Util {
-    public static void validateMainThread() {
-        if (Looper.getMainLooper() != Looper.myLooper()) {
-            throw new IllegalStateException("Must be called from the main thread.");
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/ViewfinderView.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/ViewfinderView.java
deleted file mode 100644
index 26f53a0f..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/ViewfinderView.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (C) 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.journeyapps.barcodescanner;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This view is overlaid on top of the camera preview. It adds the viewfinder rectangle and partial
- * transparency outside it, as well as the laser scanner animation and result points.
- *
- * @author dswitkin@google.com (Daniel Switkin)
- */
-public class ViewfinderView extends View {
-    protected static final String TAG = ViewfinderView.class.getSimpleName();
-
-    protected static final int[] SCANNER_ALPHA = {0, 64, 128, 192, 255, 192, 128, 64};
-    protected static final long ANIMATION_DELAY = 80L;
-    protected static final int CURRENT_POINT_OPACITY = 0xA0;
-    protected static final int MAX_RESULT_POINTS = 20;
-    protected static final int POINT_SIZE = 6;
-
-    protected final Paint paint;
-    protected Bitmap resultBitmap;
-    protected final int maskColor;
-    protected final int resultColor;
-    protected final int laserColor;
-    protected final int resultPointColor;
-    protected int scannerAlpha;
-    protected List<ResultPoint> possibleResultPoints;
-    protected List<ResultPoint> lastPossibleResultPoints;
-    protected CameraPreview cameraPreview;
-
-    // Cache the framingRect and previewFramingRect, so that we can still draw it after the preview
-    // stopped.
-    protected Rect framingRect;
-    protected Rect previewFramingRect;
-
-    // This constructor is used when the class is built from an XML resource.
-    public ViewfinderView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        // Initialize these once for performance rather than calling them every time in onDraw().
-        paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-
-        Resources resources = getResources();
-
-        // Get setted attributes on view
-        TypedArray attributes = getContext().obtainStyledAttributes(attrs, R.styleable.zxing_finder);
-
-        this.maskColor = attributes.getColor(R.styleable.zxing_finder_zxing_viewfinder_mask,
-                resources.getColor(R.color.zxing_viewfinder_mask));
-        this.resultColor = attributes.getColor(R.styleable.zxing_finder_zxing_result_view,
-                resources.getColor(R.color.zxing_result_view));
-        this.laserColor = attributes.getColor(R.styleable.zxing_finder_zxing_viewfinder_laser,
-                resources.getColor(R.color.zxing_viewfinder_laser));
-        this.resultPointColor = attributes.getColor(R.styleable.zxing_finder_zxing_possible_result_points,
-                resources.getColor(R.color.zxing_possible_result_points));
-
-        attributes.recycle();
-
-        scannerAlpha = 0;
-        possibleResultPoints = new ArrayList<>(MAX_RESULT_POINTS);
-        lastPossibleResultPoints = new ArrayList<>(MAX_RESULT_POINTS);
-    }
-
-    public void setCameraPreview(CameraPreview view) {
-        this.cameraPreview = view;
-        view.addStateListener(new CameraPreview.StateListener() {
-            @Override
-            public void previewSized() {
-                refreshSizes();
-                invalidate();
-            }
-
-            @Override
-            public void previewStarted() {
-
-            }
-
-            @Override
-            public void previewStopped() {
-
-            }
-
-            @Override
-            public void cameraError(Exception error) {
-
-            }
-
-            @Override
-            public void cameraClosed() {
-
-            }
-        });
-    }
-
-    protected void refreshSizes() {
-        if(cameraPreview == null) {
-            return;
-        }
-        Rect framingRect = cameraPreview.getFramingRect();
-        Rect previewFramingRect = cameraPreview.getPreviewFramingRect();
-        if(framingRect != null && previewFramingRect != null) {
-            this.framingRect = framingRect;
-            this.previewFramingRect = previewFramingRect;
-        }
-    }
-
-    @Override
-    public void onDraw(Canvas canvas) {
-        refreshSizes();
-        if (framingRect == null || previewFramingRect == null) {
-            return;
-        }
-
-        final Rect frame = framingRect;
-        final Rect previewFrame = previewFramingRect;
-
-        final int width = canvas.getWidth();
-        final int height = canvas.getHeight();
-
-        // Draw the exterior (i.e. outside the framing rect) darkened
-        paint.setColor(resultBitmap != null ? resultColor : maskColor);
-        canvas.drawRect(0, 0, width, frame.top, paint);
-        canvas.drawRect(0, frame.top, frame.left, frame.bottom + 1, paint);
-        canvas.drawRect(frame.right + 1, frame.top, width, frame.bottom + 1, paint);
-        canvas.drawRect(0, frame.bottom + 1, width, height, paint);
-
-        if (resultBitmap != null) {
-            // Draw the opaque result bitmap over the scanning rectangle
-            paint.setAlpha(CURRENT_POINT_OPACITY);
-            canvas.drawBitmap(resultBitmap, null, frame, paint);
-        } else {
-
-            // Draw a red "laser scanner" line through the middle to show decoding is active
-            paint.setColor(laserColor);
-            paint.setAlpha(SCANNER_ALPHA[scannerAlpha]);
-            scannerAlpha = (scannerAlpha + 1) % SCANNER_ALPHA.length;
-            final int middle = frame.height() / 2 + frame.top;
-            canvas.drawRect(frame.left + 2, middle - 1, frame.right - 1, middle + 2, paint);
-
-            final float scaleX = frame.width() / (float) previewFrame.width();
-            final float scaleY = frame.height() / (float) previewFrame.height();
-
-            final int frameLeft = frame.left;
-            final int frameTop = frame.top;
-
-            // draw the last possible result points
-            if (!lastPossibleResultPoints.isEmpty()) {
-                paint.setAlpha(CURRENT_POINT_OPACITY / 2);
-                paint.setColor(resultPointColor);
-                float radius = POINT_SIZE / 2.0f;
-                for (final ResultPoint point : lastPossibleResultPoints) {
-                    canvas.drawCircle(
-                            frameLeft + (int) (point.getX() * scaleX),
-                            frameTop + (int) (point.getY() * scaleY),
-                            radius, paint
-                    );
-                }
-                lastPossibleResultPoints.clear();
-            }
-
-            // draw current possible result points
-            if (!possibleResultPoints.isEmpty()) {
-                paint.setAlpha(CURRENT_POINT_OPACITY);
-                paint.setColor(resultPointColor);
-                for (final ResultPoint point : possibleResultPoints) {
-                    canvas.drawCircle(
-                            frameLeft + (int) (point.getX() * scaleX),
-                            frameTop + (int) (point.getY() * scaleY),
-                            POINT_SIZE, paint
-                    );
-                }
-
-                // swap and clear buffers
-                final List<ResultPoint> temp = possibleResultPoints;
-                possibleResultPoints = lastPossibleResultPoints;
-                lastPossibleResultPoints = temp;
-                possibleResultPoints.clear();
-            }
-
-            // Request another update at the animation interval, but only repaint the laser line,
-            // not the entire viewfinder mask.
-            postInvalidateDelayed(ANIMATION_DELAY,
-                    frame.left - POINT_SIZE,
-                    frame.top - POINT_SIZE,
-                    frame.right + POINT_SIZE,
-                    frame.bottom + POINT_SIZE);
-        }
-    }
-
-    public void drawViewfinder() {
-        Bitmap resultBitmap = this.resultBitmap;
-        this.resultBitmap = null;
-        if (resultBitmap != null) {
-            resultBitmap.recycle();
-        }
-        invalidate();
-    }
-
-    /**
-     * Draw a bitmap with the result points highlighted instead of the live scanning display.
-     *
-     * @param result An image of the result.
-     */
-    public void drawResultBitmap(Bitmap result) {
-        resultBitmap = result;
-        invalidate();
-    }
-
-    /**
-     * Only call from the UI thread.
-     *
-     * @param point a point to draw, relative to the preview frame
-     */
-    public void addPossibleResultPoint(ResultPoint point) {
-        if (possibleResultPoints.size() < MAX_RESULT_POINTS)
-            possibleResultPoints.add(point);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/AutoFocusManager.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/AutoFocusManager.java
deleted file mode 100644
index c4011575..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/AutoFocusManager.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2012 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.journeyapps.barcodescanner.camera;
-
-import android.hardware.Camera;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * This should be created and used from the camera thread only. The thread message queue is used
- * to run all operations on the same thread.
- */
-public final class AutoFocusManager {
-
-    private static final String TAG = AutoFocusManager.class.getSimpleName();
-
-    private static final long AUTO_FOCUS_INTERVAL_MS = 2000L;
-
-    private boolean stopped;
-    private boolean focusing;
-    private final boolean useAutoFocus;
-    private final Camera camera;
-    private Handler handler;
-
-    private int MESSAGE_FOCUS = 1;
-
-    private static final Collection<String> FOCUS_MODES_CALLING_AF;
-
-    static {
-        FOCUS_MODES_CALLING_AF = new ArrayList<>(2);
-        FOCUS_MODES_CALLING_AF.add(Camera.Parameters.FOCUS_MODE_AUTO);
-        FOCUS_MODES_CALLING_AF.add(Camera.Parameters.FOCUS_MODE_MACRO);
-    }
-
-    private final Handler.Callback focusHandlerCallback = new Handler.Callback() {
-        @Override
-        public boolean handleMessage(Message msg) {
-            if (msg.what == MESSAGE_FOCUS) {
-                focus();
-                return true;
-            }
-            return false;
-        }
-    };
-
-    private final Camera.AutoFocusCallback autoFocusCallback = new Camera.AutoFocusCallback() {
-        @Override
-        public void onAutoFocus(boolean success, Camera theCamera) {
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    focusing = false;
-                    autoFocusAgainLater();
-                }
-            });
-        }
-    };
-
-    public AutoFocusManager(Camera camera, CameraSettings settings) {
-        this.handler = new Handler(focusHandlerCallback);
-        this.camera = camera;
-        String currentFocusMode = camera.getParameters().getFocusMode();
-        useAutoFocus = settings.isAutoFocusEnabled() && FOCUS_MODES_CALLING_AF.contains(currentFocusMode);
-        Log.i(TAG, "Current focus mode '" + currentFocusMode + "'; use auto focus? " + useAutoFocus);
-        start();
-    }
-
-    private synchronized void autoFocusAgainLater() {
-        if (!stopped && !handler.hasMessages(MESSAGE_FOCUS)) {
-            handler.sendMessageDelayed(handler.obtainMessage(MESSAGE_FOCUS), AUTO_FOCUS_INTERVAL_MS);
-        }
-    }
-
-    /**
-     * Start auto-focus. The first focus will happen now, then repeated every two seconds.
-     */
-    public void start() {
-        stopped = false;
-        focus();
-    }
-
-    private void focus() {
-        if (useAutoFocus) {
-            if (!stopped && !focusing) {
-                try {
-                    camera.autoFocus(autoFocusCallback);
-                    focusing = true;
-                } catch (RuntimeException re) {
-                    // Have heard RuntimeException reported in Android 4.0.x+; continue?
-                    Log.w(TAG, "Unexpected exception while focusing", re);
-                    // Try again later to keep cycle going
-                    autoFocusAgainLater();
-                }
-            }
-        }
-    }
-
-    private void cancelOutstandingTask() {
-        handler.removeMessages(MESSAGE_FOCUS);
-    }
-
-    /**
-     * Stop auto-focus.
-     */
-    public void stop() {
-        stopped = true;
-        focusing = false;
-        cancelOutstandingTask();
-        if (useAutoFocus) {
-            // Doesn't hurt to call this even if not focusing
-            try {
-                camera.cancelAutoFocus();
-            } catch (RuntimeException re) {
-                // Have heard RuntimeException reported in Android 4.0.x+; continue?
-                Log.w(TAG, "Unexpected exception while cancelling focusing", re);
-            }
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraInstance.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraInstance.java
deleted file mode 100644
index d86ed174..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraInstance.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.content.Context;
-import android.os.Handler;
-import android.util.Log;
-import android.view.SurfaceHolder;
-
-import com.google.zxing.client.android.R;
-import com.journeyapps.barcodescanner.Size;
-import com.journeyapps.barcodescanner.Util;
-
-/**
- * Manage a camera instance using a background thread.
- *
- * All methods must be called from the main thread.
- */
-public class CameraInstance {
-    private static final String TAG = CameraInstance.class.getSimpleName();
-
-    private CameraThread cameraThread;
-    private CameraSurface surface;
-
-    private CameraManager cameraManager;
-    private Handler readyHandler;
-    private DisplayConfiguration displayConfiguration;
-    private boolean open = false;
-    private boolean cameraClosed = true;
-
-    private CameraSettings cameraSettings = new CameraSettings();
-
-    /**
-     * Construct a new CameraInstance.
-     *
-     * A new CameraManager is created.
-     *
-     * @param context the Android Context
-     */
-    public CameraInstance(Context context) {
-        Util.validateMainThread();
-
-        this.cameraThread = CameraThread.getInstance();
-        this.cameraManager = new CameraManager(context);
-        this.cameraManager.setCameraSettings(cameraSettings);
-    }
-
-    /**
-     * Construct a new CameraInstance with a specific CameraManager.
-     *
-     * @param cameraManager the CameraManager to use
-     */
-    public CameraInstance(CameraManager cameraManager) {
-        Util.validateMainThread();
-
-        this.cameraManager = cameraManager;
-    }
-
-    public void setDisplayConfiguration(DisplayConfiguration configuration) {
-        this.displayConfiguration = configuration;
-        cameraManager.setDisplayConfiguration(configuration);
-    }
-
-    public DisplayConfiguration getDisplayConfiguration() {
-        return displayConfiguration;
-    }
-
-    public void setReadyHandler(Handler readyHandler) {
-        this.readyHandler = readyHandler;
-    }
-
-    public void setSurfaceHolder(SurfaceHolder surfaceHolder) {
-        setSurface(new CameraSurface(surfaceHolder));
-    }
-
-    public void setSurface(CameraSurface surface) {
-        this.surface = surface;
-    }
-
-    public CameraSettings getCameraSettings() {
-        return cameraSettings;
-    }
-
-    /**
-     * This only has an effect if the camera is not opened yet.
-     *
-     * @param cameraSettings the new camera settings
-     */
-    public void setCameraSettings(CameraSettings cameraSettings) {
-        if (!open) {
-            this.cameraSettings = cameraSettings;
-            this.cameraManager.setCameraSettings(cameraSettings);
-        }
-    }
-
-    /**
-     * Actual preview size in current rotation. null if not determined yet.
-     *
-     * @return preview size
-     */
-    private Size getPreviewSize() {
-        return cameraManager.getPreviewSize();
-    }
-
-    /**
-     *
-     * @return the camera rotation relative to display rotation, in degrees. Typically 0 if the
-     *    display is in landscape orientation.
-     */
-    public int getCameraRotation() {
-        return cameraManager.getCameraRotation();
-    }
-
-    public void open() {
-        Util.validateMainThread();
-
-        open = true;
-        cameraClosed = false;
-
-        cameraThread.incrementAndEnqueue(opener);
-    }
-
-    public void configureCamera() {
-        Util.validateMainThread();
-        validateOpen();
-
-        cameraThread.enqueue(configure);
-    }
-
-    public void startPreview() {
-        Util.validateMainThread();
-        validateOpen();
-
-        cameraThread.enqueue(previewStarter);
-    }
-
-    public void setTorch(final boolean on) {
-        Util.validateMainThread();
-
-        if (open) {
-            cameraThread.enqueue(new Runnable() {
-                @Override
-                public void run() {
-                    cameraManager.setTorch(on);
-                }
-            });
-        }
-    }
-
-    public void close() {
-        Util.validateMainThread();
-
-        if (open) {
-            cameraThread.enqueue(closer);
-        } else {
-            cameraClosed = true;
-        }
-
-        open = false;
-    }
-
-    public boolean isOpen() {
-        return open;
-    }
-
-    public boolean isCameraClosed() {
-        return cameraClosed;
-    }
-
-    public void requestPreview(final PreviewCallback callback) {
-        validateOpen();
-
-        cameraThread.enqueue(new Runnable() {
-            @Override
-            public void run() {
-                cameraManager.requestPreviewFrame(callback);
-            }
-        });
-    }
-
-    private void validateOpen() {
-        if (!open) {
-            throw new IllegalStateException("CameraInstance is not open");
-        }
-    }
-
-    private Runnable opener = new Runnable() {
-        @Override
-        public void run() {
-            try {
-                Log.d(TAG, "Opening camera");
-                cameraManager.open();
-            } catch (Exception e) {
-                notifyError(e);
-                Log.e(TAG, "Failed to open camera", e);
-            }
-        }
-    };
-
-    private Runnable configure = new Runnable() {
-        @Override
-        public void run() {
-            try {
-                Log.d(TAG, "Configuring camera");
-                cameraManager.configure();
-                if (readyHandler != null) {
-                    readyHandler.obtainMessage(R.id.zxing_prewiew_size_ready, getPreviewSize()).sendToTarget();
-                }
-            } catch (Exception e) {
-                notifyError(e);
-                Log.e(TAG, "Failed to configure camera", e);
-            }
-        }
-    };
-
-    private Runnable previewStarter = new Runnable() {
-        @Override
-        public void run() {
-            try {
-                Log.d(TAG, "Starting preview");
-                cameraManager.setPreviewDisplay(surface);
-                cameraManager.startPreview();
-            } catch (Exception e) {
-                notifyError(e);
-                Log.e(TAG, "Failed to start preview", e);
-            }
-        }
-    };
-
-    private Runnable closer = new Runnable() {
-        @Override
-        public void run() {
-            try {
-                Log.d(TAG, "Closing camera");
-                cameraManager.stopPreview();
-                cameraManager.close();
-            } catch (Exception e) {
-                Log.e(TAG, "Failed to close camera", e);
-            }
-
-            cameraClosed = true;
-
-            readyHandler.sendEmptyMessage(R.id.zxing_camera_closed);
-
-            cameraThread.decrementInstances();
-        }
-    };
-
-    private void notifyError(Exception error) {
-        if (readyHandler != null) {
-            readyHandler.obtainMessage(R.id.zxing_camera_error, error).sendToTarget();
-        }
-    }
-
-    /**
-     * Returns the CameraManager used to control the camera.
-     *
-     * The CameraManager is not thread-safe, and must only be used from the CameraThread.
-     *
-     * @return the CameraManager used
-     */
-    protected CameraManager getCameraManager() {
-        return cameraManager;
-    }
-
-    /**
-     *
-     * @return the CameraThread used to manage the camera
-     */
-    protected CameraThread getCameraThread() {
-        return cameraThread;
-    }
-
-    /**
-     *
-     * @return the surface om which the preview is displayed
-     */
-    protected CameraSurface getSurface() {
-        return surface;
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraManager.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraManager.java
deleted file mode 100644
index 310278ee..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraManager.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*
- * Copyright (C) 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.journeyapps.barcodescanner.camera;
-
-import android.content.Context;
-import android.hardware.Camera;
-import android.os.Build;
-import android.util.Log;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-
-import com.google.zxing.client.android.AmbientLightManager;
-import com.google.zxing.client.android.camera.CameraConfigurationUtils;
-import com.google.zxing.client.android.camera.open.OpenCameraInterface;
-import com.journeyapps.barcodescanner.Size;
-import com.journeyapps.barcodescanner.SourceData;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Wrapper to manage the Camera. This is not thread-safe, and the methods must always be called
- * from the same thread.
- *
- *
- * Call order:
- *
- * 1. setCameraSettings()
- * 2. open(), set desired preview size (any order)
- * 3. configure(), setPreviewDisplay(holder) (any order)
- * 4. startPreview()
- * 5. requestPreviewFrame (repeat)
- * 6. stopPreview()
- * 7. close()
- */
-public final class CameraManager {
-
-    private static final String TAG = CameraManager.class.getSimpleName();
-
-    private Camera camera;
-    private Camera.CameraInfo cameraInfo;
-
-    private AutoFocusManager autoFocusManager;
-    private AmbientLightManager ambientLightManager;
-
-    private boolean previewing;
-    private String defaultParameters;
-
-    // User parameters
-    private CameraSettings settings = new CameraSettings();
-
-    private DisplayConfiguration displayConfiguration;
-
-    // Actual chosen preview size
-    private Size requestedPreviewSize;
-    private Size previewSize;
-
-    private int rotationDegrees = -1;    // camera rotation vs display rotation
-
-    private Context context;
-
-
-    private final class CameraPreviewCallback implements Camera.PreviewCallback {
-        private PreviewCallback callback;
-
-        private Size resolution;
-
-        public CameraPreviewCallback() {
-        }
-
-        public void setResolution(Size resolution) {
-            this.resolution = resolution;
-        }
-
-        public void setCallback(PreviewCallback callback) {
-            this.callback = callback;
-        }
-
-        @Override
-        public void onPreviewFrame(byte[] data, Camera camera) {
-            Size cameraResolution = resolution;
-            PreviewCallback callback = this.callback;
-            if (cameraResolution != null && callback != null) {
-                try {
-                    if(data == null) {
-                        throw new NullPointerException("No preview data received");
-                    }
-                    int format = camera.getParameters().getPreviewFormat();
-                    SourceData source = new SourceData(data, cameraResolution.width, cameraResolution.height, format, getCameraRotation());
-                    callback.onPreview(source);
-                } catch (RuntimeException e) {
-                    // Could be:
-                    // java.lang.RuntimeException: getParameters failed (empty parameters)
-                    // IllegalArgumentException: Image data does not match the resolution
-                    Log.e(TAG, "Camera preview failed", e);
-                    callback.onPreviewError(e);
-                }
-            } else {
-                Log.d(TAG, "Got preview callback, but no handler or resolution available");
-                if(callback != null) {
-                    // Should generally not happen
-                    callback.onPreviewError(new Exception("No resolution available"));
-                }
-            }
-        }
-    }
-
-    /**
-     * Preview frames are delivered here, which we pass on to the registered handler. Make sure to
-     * clear the handler so it will only receive one message.
-     */
-    private final CameraPreviewCallback cameraPreviewCallback;
-
-    public CameraManager(Context context) {
-        this.context = context;
-        cameraPreviewCallback = new CameraPreviewCallback();
-    }
-
-    /**
-     * Must be called from camera thread.
-     */
-    public void open() {
-        camera = OpenCameraInterface.open(settings.getRequestedCameraId());
-        if (camera == null) {
-            throw new RuntimeException("Failed to open camera");
-        }
-
-        int cameraId = OpenCameraInterface.getCameraId(settings.getRequestedCameraId());
-        cameraInfo = new Camera.CameraInfo();
-        Camera.getCameraInfo(cameraId, cameraInfo);
-    }
-
-    /**
-     * Configure the camera parameters, including preview size.
-     *
-     * The camera must be opened before calling this.
-     *
-     * Must be called from camera thread.
-     */
-    public void configure() {
-        if(camera == null) {
-            throw new RuntimeException("Camera not open");
-        }
-        setParameters();
-    }
-
-    /**
-     * Must be called from camera thread.
-     */
-    public void setPreviewDisplay(SurfaceHolder holder) throws IOException {
-        setPreviewDisplay(new CameraSurface(holder));
-    }
-
-    public void setPreviewDisplay(CameraSurface surface) throws IOException {
-        surface.setPreview(camera);
-    }
-
-    /**
-     * Asks the camera hardware to begin drawing preview frames to the screen.
-     *
-     * Must be called from camera thread.
-     */
-    public void startPreview() {
-        Camera theCamera = camera;
-        if (theCamera != null && !previewing) {
-            theCamera.startPreview();
-            previewing = true;
-            autoFocusManager = new AutoFocusManager(camera, settings);
-            ambientLightManager = new AmbientLightManager(context, this, settings);
-            ambientLightManager.start();
-        }
-    }
-
-    /**
-     * Tells the camera to stop drawing preview frames.
-     *
-     * Must be called from camera thread.
-     */
-    public void stopPreview() {
-        if (autoFocusManager != null) {
-            autoFocusManager.stop();
-            autoFocusManager = null;
-        }
-        if (ambientLightManager != null) {
-            ambientLightManager.stop();
-            ambientLightManager = null;
-        }
-        if (camera != null && previewing) {
-            camera.stopPreview();
-            cameraPreviewCallback.setCallback(null);
-            previewing = false;
-        }
-    }
-
-    /**
-     * Closes the camera driver if still in use.
-     *
-     * Must be called from camera thread.
-     */
-    public void close() {
-        if (camera != null) {
-            camera.release();
-            camera = null;
-        }
-    }
-
-    /**
-     * @return true if the camera rotation is perpendicular to the current display rotation.
-     */
-    public boolean isCameraRotated() {
-        if(rotationDegrees == -1) {
-            throw new IllegalStateException("Rotation not calculated yet. Call configure() first.");
-        }
-        return rotationDegrees % 180 != 0;
-    }
-
-    /**
-     *
-     * @return the camera rotation relative to display rotation, in degrees. Typically 0 if the
-     *    display is in landscape orientation.
-     */
-    public int getCameraRotation() {
-        return rotationDegrees;
-    }
-
-    private Camera.Parameters getDefaultCameraParameters() {
-        Camera.Parameters parameters = camera.getParameters();
-        if (defaultParameters == null) {
-            defaultParameters = parameters.flatten();
-        } else {
-            parameters.unflatten(defaultParameters);
-        }
-        return parameters;
-    }
-
-    private void setDesiredParameters(boolean safeMode) {
-        Camera.Parameters parameters = getDefaultCameraParameters();
-
-        //noinspection ConstantConditions
-        if (parameters == null) {
-            Log.w(TAG, "Device error: no camera parameters are available. Proceeding without configuration.");
-            return;
-        }
-
-        Log.i(TAG, "Initial camera parameters: " + parameters.flatten());
-
-        if (safeMode) {
-            Log.w(TAG, "In camera config safe mode -- most settings will not be honored");
-        }
-
-        CameraConfigurationUtils.setFocus(parameters, settings.getFocusMode(), safeMode);
-
-        if (!safeMode) {
-            CameraConfigurationUtils.setTorch(parameters, false);
-
-            if (settings.isScanInverted()) {
-                CameraConfigurationUtils.setInvertColor(parameters);
-            }
-
-            if (settings.isBarcodeSceneModeEnabled()) {
-                CameraConfigurationUtils.setBarcodeSceneMode(parameters);
-            }
-
-            if (settings.isMeteringEnabled()) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-                    CameraConfigurationUtils.setVideoStabilization(parameters);
-                    CameraConfigurationUtils.setFocusArea(parameters);
-                    CameraConfigurationUtils.setMetering(parameters);
-                }
-            }
-
-        }
-
-        List<Size> previewSizes = getPreviewSizes(parameters);
-        if (previewSizes.size() == 0) {
-            requestedPreviewSize = null;
-        } else {
-            requestedPreviewSize = displayConfiguration.getBestPreviewSize(previewSizes, isCameraRotated());
-
-            parameters.setPreviewSize(requestedPreviewSize.width, requestedPreviewSize.height);
-        }
-
-        if (Build.DEVICE.equals("glass-1")) {
-            // We need to set the FPS on Google Glass devices, otherwise the preview is scrambled.
-            // FIXME - can/should we do this for other devices as well?
-            CameraConfigurationUtils.setBestPreviewFPS(parameters);
-        }
-
-        Log.i(TAG, "Final camera parameters: " + parameters.flatten());
-
-        camera.setParameters(parameters);
-    }
-
-    private static List<Size> getPreviewSizes(Camera.Parameters parameters) {
-        List<Camera.Size> rawSupportedSizes = parameters.getSupportedPreviewSizes();
-        List<Size> previewSizes = new ArrayList<>();
-        if (rawSupportedSizes == null) {
-            Camera.Size defaultSize = parameters.getPreviewSize();
-            if (defaultSize != null) {
-                // Work around potential platform bugs
-                previewSizes.add(new Size(defaultSize.width, defaultSize.height));
-            }
-            return previewSizes;
-        }
-        for (Camera.Size size : rawSupportedSizes) {
-            previewSizes.add(new Size(size.width, size.height));
-        }
-        return previewSizes;
-    }
-
-    private int calculateDisplayRotation() {
-        // http://developer.android.com/reference/android/hardware/Camera.html#setDisplayOrientation(int)
-        int rotation = displayConfiguration.getRotation();
-        int degrees = 0;
-        switch (rotation) {
-            case Surface.ROTATION_0:
-                degrees = 0;
-                break;
-            case Surface.ROTATION_90:
-                degrees = 90;
-                break;
-            case Surface.ROTATION_180:
-                degrees = 180;
-                break;
-            case Surface.ROTATION_270:
-                degrees = 270;
-                break;
-        }
-
-        int result;
-        if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-            result = (cameraInfo.orientation + degrees) % 360;
-            result = (360 - result) % 360;  // compensate the mirror
-        } else {  // back-facing
-            result = (cameraInfo.orientation - degrees + 360) % 360;
-        }
-        Log.i(TAG, "Camera Display Orientation: " + result);
-        return result;
-    }
-
-    private void setCameraDisplayOrientation(int rotation) {
-        camera.setDisplayOrientation(rotation);
-    }
-
-    private void setParameters() {
-        try {
-            this.rotationDegrees = calculateDisplayRotation();
-            setCameraDisplayOrientation(rotationDegrees);
-        } catch (Exception e) {
-            Log.w(TAG, "Failed to set rotation.");
-        }
-        try {
-            setDesiredParameters(false);
-        } catch (Exception e) {
-            // Failed, use safe mode
-            try {
-                setDesiredParameters(true);
-            } catch (Exception e2) {
-                // Well, darn. Give up
-                Log.w(TAG, "Camera rejected even safe-mode parameters! No configuration");
-            }
-        }
-
-        Camera.Size realPreviewSize = camera.getParameters().getPreviewSize();
-        if (realPreviewSize == null) {
-            previewSize = requestedPreviewSize;
-        } else {
-            previewSize = new Size(realPreviewSize.width, realPreviewSize.height);
-        }
-        cameraPreviewCallback.setResolution(previewSize);
-    }
-
-    /**
-     * This returns false if the camera is not opened yet, failed to open, or has
-     * been closed.
-     */
-    public boolean isOpen() {
-        return camera != null;
-    }
-
-    /**
-     * Actual preview size in *natural camera* orientation. null if not determined yet.
-     *
-     * @return preview size
-     */
-    public Size getNaturalPreviewSize() {
-        return previewSize;
-    }
-
-    /**
-     * Actual preview size in *current display* rotation. null if not determined yet.
-     *
-     * @return preview size
-     */
-    public Size getPreviewSize() {
-        if (previewSize == null) {
-            return null;
-        } else if (this.isCameraRotated()) {
-            return previewSize.rotate();
-        } else {
-            return previewSize;
-        }
-    }
-
-    /**
-     * A single preview frame will be returned to the supplied callback.
-     *
-     * The thread on which this called is undefined, so a Handler should be used to post the result
-     * to the correct thread.
-     *
-     * @param callback The callback to receive the preview.
-     */
-    public void requestPreviewFrame(PreviewCallback callback) {
-        Camera theCamera = camera;
-        if (theCamera != null && previewing) {
-            cameraPreviewCallback.setCallback(callback);
-            theCamera.setOneShotPreviewCallback(cameraPreviewCallback);
-        }
-    }
-
-    public CameraSettings getCameraSettings() {
-        return settings;
-    }
-
-    public void setCameraSettings(CameraSettings settings) {
-        this.settings = settings;
-    }
-
-    public DisplayConfiguration getDisplayConfiguration() {
-        return displayConfiguration;
-    }
-
-    public void setDisplayConfiguration(DisplayConfiguration displayConfiguration) {
-        this.displayConfiguration = displayConfiguration;
-    }
-
-    public void setTorch(boolean on) {
-        if (camera != null) {
-            try {
-                boolean isOn = isTorchOn();
-                if (on != isOn) {
-                    if (autoFocusManager != null) {
-                        autoFocusManager.stop();
-                    }
-
-                    Camera.Parameters parameters = camera.getParameters();
-                    CameraConfigurationUtils.setTorch(parameters, on);
-                    if (settings.isExposureEnabled()) {
-                        CameraConfigurationUtils.setBestExposure(parameters, on);
-                    }
-                    camera.setParameters(parameters);
-
-                    if (autoFocusManager != null) {
-                        autoFocusManager.start();
-                    }
-                }
-            } catch(RuntimeException e) {
-                // Camera error. Could happen if the camera is being closed.
-                Log.e(TAG, "Failed to set torch", e);
-            }
-        }
-    }
-
-    /**
-     *
-     * @return true if the torch is on
-     * @throws RuntimeException if there is a camera error
-     */
-    public boolean isTorchOn() {
-        Camera.Parameters parameters = camera.getParameters();
-        if (parameters != null) {
-            String flashMode = parameters.getFlashMode();
-            return flashMode != null &&
-                    (Camera.Parameters.FLASH_MODE_ON.equals(flashMode) ||
-                            Camera.Parameters.FLASH_MODE_TORCH.equals(flashMode));
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the Camera. This returns null if the camera is not opened yet, failed to open, or has
-     * been closed.
-     *
-     * @return the Camera
-     */
-    public Camera getCamera() {
-        return camera;
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraSettings.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraSettings.java
deleted file mode 100644
index 33fe97ba..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraSettings.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import com.google.zxing.client.android.camera.open.OpenCameraInterface;
-
-/**
- *
- */
-public class CameraSettings {
-    private int requestedCameraId = OpenCameraInterface.NO_REQUESTED_CAMERA;
-    private boolean scanInverted = false;
-    private boolean barcodeSceneModeEnabled = false;
-    private boolean meteringEnabled = false;
-    private boolean autoFocusEnabled = true;
-    private boolean continuousFocusEnabled = false;
-    private boolean exposureEnabled = false;
-    private boolean autoTorchEnabled = false;
-    private FocusMode focusMode = FocusMode.AUTO;
-
-    public enum FocusMode {
-        AUTO,
-        CONTINUOUS,
-        INFINITY,
-        MACRO
-    }
-
-    public int getRequestedCameraId() {
-        return requestedCameraId;
-    }
-
-    /**
-     * Allows third party apps to specify the camera ID, rather than determine
-     * it automatically based on available cameras and their orientation.
-     *
-     * @param requestedCameraId camera ID of the camera to use. A negative value means "no preference".
-     */
-    public void setRequestedCameraId(int requestedCameraId) {
-        this.requestedCameraId = requestedCameraId;
-    }
-
-    /**
-     * Default to false.
-     *
-     * Inverted means dark & light colors are inverted.
-     *
-     * @return true if scan is inverted
-     */
-    public boolean isScanInverted() {
-        return scanInverted;
-    }
-
-    public void setScanInverted(boolean scanInverted) {
-        this.scanInverted = scanInverted;
-    }
-
-    /**
-     * Default to false.
-     *
-     * @return true if barcode scene mode is enabled
-     */
-    public boolean isBarcodeSceneModeEnabled() {
-        return barcodeSceneModeEnabled;
-    }
-
-    public void setBarcodeSceneModeEnabled(boolean barcodeSceneModeEnabled) {
-        this.barcodeSceneModeEnabled = barcodeSceneModeEnabled;
-    }
-
-    /**
-     * Default to false.
-     *
-     * @return true if exposure is enabled.
-     */
-    public boolean isExposureEnabled() {
-        return exposureEnabled;
-    }
-
-    public void setExposureEnabled(boolean exposureEnabled) {
-        this.exposureEnabled = exposureEnabled;
-    }
-
-    /**
-     * Default to false.
-     *
-     * If enabled, metering is performed to determine focus area.
-     *
-     * @return true if metering is enabled
-     */
-    public boolean isMeteringEnabled() {
-        return meteringEnabled;
-    }
-
-    public void setMeteringEnabled(boolean meteringEnabled) {
-        this.meteringEnabled = meteringEnabled;
-    }
-
-    /**
-     * Default to true.
-     *
-     * @return true if auto-focus is enabled
-     */
-    public boolean isAutoFocusEnabled() {
-        return autoFocusEnabled;
-    }
-
-    public void setAutoFocusEnabled(boolean autoFocusEnabled) {
-        this.autoFocusEnabled = autoFocusEnabled;
-
-        if (autoFocusEnabled && continuousFocusEnabled) {
-            focusMode = FocusMode.CONTINUOUS;
-        } else if (autoFocusEnabled) {
-            focusMode = FocusMode.AUTO;
-        } else {
-            focusMode = null;
-        }
-    }
-
-    /**
-     * Default to false.
-     *
-     * @return true if continuous focus is enabled
-     */
-    public boolean isContinuousFocusEnabled() {
-        return continuousFocusEnabled;
-    }
-
-    public void setContinuousFocusEnabled(boolean continuousFocusEnabled) {
-        this.continuousFocusEnabled = continuousFocusEnabled;
-
-        if (continuousFocusEnabled) {
-            focusMode = FocusMode.CONTINUOUS;
-        } else if (autoFocusEnabled) {
-            focusMode = FocusMode.AUTO;
-        } else {
-            focusMode = null;
-        }
-    }
-
-    /**
-     * Default to FocusMode.AUTO.
-     *
-     * @return value of selected focus mode
-     */
-    public FocusMode getFocusMode() {
-        return focusMode;
-    }
-
-    public void setFocusMode(FocusMode focusMode) {
-        this.focusMode = focusMode;
-    }
-
-    /**
-     * Default to false.
-     *
-     * @return true if the torch is automatically controlled based on ambient light.
-     */
-    public boolean isAutoTorchEnabled() {
-        return autoTorchEnabled;
-    }
-
-    public void setAutoTorchEnabled(boolean autoTorchEnabled) {
-        this.autoTorchEnabled = autoTorchEnabled;
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraSurface.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraSurface.java
deleted file mode 100644
index af3c851d..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraSurface.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.graphics.SurfaceTexture;
-import android.hardware.Camera;
-import android.os.Build;
-import android.view.SurfaceHolder;
-
-import java.io.IOException;
-
-/**
- * A surface on which a camera preview is displayed.
- *
- * This wraps either a SurfaceHolder or a SurfaceTexture.
- */
-public class CameraSurface {
-    private SurfaceHolder surfaceHolder;
-    private SurfaceTexture surfaceTexture;
-
-    public CameraSurface(SurfaceHolder surfaceHolder) {
-        if(surfaceHolder == null) {
-            throw new IllegalArgumentException("surfaceHolder may not be null");
-        }
-        this.surfaceHolder = surfaceHolder;
-    }
-
-    public CameraSurface(SurfaceTexture surfaceTexture) {
-        if(surfaceTexture == null) {
-            throw new IllegalArgumentException("surfaceTexture may not be null");
-        }
-        this.surfaceTexture = surfaceTexture;
-    }
-
-    public SurfaceHolder getSurfaceHolder() {
-        return surfaceHolder;
-    }
-
-    public SurfaceTexture getSurfaceTexture() {
-        return surfaceTexture;
-    }
-
-    public void setPreview(Camera camera) throws IOException {
-        if(surfaceHolder != null) {
-            camera.setPreviewDisplay(surfaceHolder);
-        } else {
-            if(Build.VERSION.SDK_INT >= 11) {
-                camera.setPreviewTexture(surfaceTexture);
-            } else {
-                // This should not happen, but we check for it anyway.
-                throw new IllegalStateException("SurfaceTexture not supported.");
-            }
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraThread.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraThread.java
deleted file mode 100644
index 00ff18f8..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CameraThread.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.os.Handler;
-import android.os.HandlerThread;
-
-/**
- * Singleton thread that is started and stopped on demand.
- *
- * Any access to Camera / CameraManager should happen on this thread, through CameraInstance.
- */
-class CameraThread {
-    private static final String TAG = CameraThread.class.getSimpleName();
-
-    private static CameraThread instance;
-
-    public static CameraThread getInstance() {
-        if (instance == null) {
-            instance = new CameraThread();
-        }
-        return instance;
-    }
-
-    private Handler handler;
-    private HandlerThread thread;
-
-    private int openCount = 0;
-
-    private final Object LOCK = new Object();
-
-
-    private CameraThread() {
-    }
-
-    /**
-     * Call from main thread or camera thread.
-     *
-     * Enqueues a task on the camera thread.
-     *
-     * @param runnable the task to enqueue
-     */
-    protected void enqueue(Runnable runnable) {
-        synchronized (LOCK) {
-            checkRunning();
-            this.handler.post(runnable);
-        }
-    }
-
-    /**
-     * Call from main thread or camera thread.
-     *
-     * Enqueues a task on the camera thread.
-     *
-     * @param runnable the task to enqueue
-     * @param delayMillis the delay in milliseconds before executing the runnable
-     */
-    protected void enqueueDelayed(Runnable runnable, long delayMillis) {
-        synchronized (LOCK) {
-            checkRunning();
-            this.handler.postDelayed(runnable, delayMillis);
-        }
-    }
-
-    private void checkRunning() {
-        synchronized (LOCK) {
-            if (this.handler == null) {
-                if (openCount <= 0) {
-                    throw new IllegalStateException("CameraThread is not open");
-                }
-                this.thread = new HandlerThread("CameraThread");
-                this.thread.start();
-                this.handler = new Handler(thread.getLooper());
-            }
-        }
-    }
-
-    /**
-     * Call from camera thread.
-     */
-    private void quit() {
-        synchronized (LOCK) {
-            this.thread.quit();
-            this.thread = null;
-            this.handler = null;
-        }
-    }
-
-    /**
-     * Call from camera thread
-     */
-    protected void decrementInstances() {
-        synchronized (LOCK) {
-            openCount -= 1;
-            if (openCount == 0) {
-                quit();
-            }
-        }
-    }
-
-    /**
-     * Call from main thread.
-     *
-     * @param runner The {@link Runnable} to be enqueued
-     */
-    protected void incrementAndEnqueue(Runnable runner) {
-        synchronized (LOCK) {
-            openCount += 1;
-            enqueue(runner);
-        }
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CenterCropStrategy.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CenterCropStrategy.java
deleted file mode 100644
index 48884250..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/CenterCropStrategy.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.graphics.Rect;
-import android.util.Log;
-
-import com.journeyapps.barcodescanner.Size;
-
-/**
- * Scales the dimensions so that it fits entirely inside the parent.One of width or height will
- * fit exactly. Aspect ratio is preserved.
- */
-public class CenterCropStrategy extends PreviewScalingStrategy {
-    private static final String TAG = CenterCropStrategy.class.getSimpleName();
-
-
-    /**
-     * Get a score for our size.
-     *
-     * Based on heuristics for penalizing scaling and cropping.
-     *
-     * 1.0 is perfect (exact match).
-     * 0.0 means we can't use it at all.
-     *
-     * @param size the camera preview size (that can be scaled)
-     * @param desired the viewfinder size
-     * @return the score
-     */
-    @Override
-    protected float getScore(Size size, Size desired) {
-        if(size.width <= 0 || size.height <= 0) {
-            return 0f;
-        }
-        Size scaled = size.scaleCrop(desired);
-        // Scaling preserves aspect ratio
-        float scaleRatio = scaled.width * 1.0f / size.width;
-
-        // Treat downscaling as slightly better than upscaling
-        float scaleScore;
-        if(scaleRatio > 1.0f) {
-            // Upscaling
-            scaleScore = (float)Math.pow(1.0f / scaleRatio, 1.1);
-        } else {
-            // Downscaling
-            scaleScore = scaleRatio;
-        }
-
-        // Ratio of scaledDimension / dimension.
-        // Note that with scaleCrop, only one dimension is cropped.
-        float cropRatio = scaled.width * 1.0f / desired.width +
-                scaled.height * 1.0f / desired.height;
-
-        // Cropping is bad, square it
-        // 1.0 means no cropping. 50% cropping is 0.44f, 10% cropping is 0.82f
-        float cropScore = 1.0f / cropRatio / cropRatio;
-
-        return scaleScore * cropScore;
-    }
-
-    /**
-     * Scale the preview to cover the viewfinder, then center it.
-     *
-     * Aspect ratio is preserved.
-     *
-     * @param previewSize the size of the preview (camera), in current display orientation
-     * @param viewfinderSize the size of the viewfinder (display), in current display orientation
-     * @return a rect placing the preview
-     */
-    public Rect scalePreview(Size previewSize, Size viewfinderSize) {
-        // We avoid scaling if feasible.
-        Size scaledPreview = previewSize.scaleCrop(viewfinderSize);
-        Log.i(TAG, "Preview: " + previewSize + "; Scaled: " + scaledPreview + "; Want: " + viewfinderSize);
-
-        int dx = (scaledPreview.width - viewfinderSize.width) / 2;
-        int dy = (scaledPreview.height - viewfinderSize.height) / 2;
-
-        return new Rect(-dx, -dy, scaledPreview.width - dx, scaledPreview.height - dy);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/DisplayConfiguration.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/DisplayConfiguration.java
deleted file mode 100644
index db710bda..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/DisplayConfiguration.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.graphics.Rect;
-
-import com.journeyapps.barcodescanner.Size;
-
-import java.util.List;
-
-/**
- *
- */
-public class DisplayConfiguration {
-    private static final String TAG = DisplayConfiguration.class.getSimpleName();
-
-    private Size viewfinderSize;
-    private int rotation;
-    private boolean center = false;
-    private PreviewScalingStrategy previewScalingStrategy = new FitCenterStrategy();
-
-    public DisplayConfiguration(int rotation) {
-        this.rotation = rotation;
-    }
-
-    public DisplayConfiguration(int rotation, Size viewfinderSize) {
-        this.rotation = rotation;
-        this.viewfinderSize = viewfinderSize;
-    }
-
-    public int getRotation() {
-        return rotation;
-    }
-
-    public Size getViewfinderSize() {
-        return viewfinderSize;
-    }
-
-    public PreviewScalingStrategy getPreviewScalingStrategy() {
-        return previewScalingStrategy;
-    }
-
-    public void setPreviewScalingStrategy(PreviewScalingStrategy previewScalingStrategy) {
-        this.previewScalingStrategy = previewScalingStrategy;
-    }
-
-    /**
-     * @param rotate true to rotate the preview size
-     * @return desired preview size in natural camera orientation.
-     */
-    public Size getDesiredPreviewSize(boolean rotate) {
-        if (viewfinderSize == null) {
-            return null;
-        } else if (rotate) {
-            return viewfinderSize.rotate();
-        } else {
-            return viewfinderSize;
-        }
-    }
-
-    /**
-     * Choose the best preview size, based on our display size.
-     *
-     * We prefer:
-     * 1. no scaling
-     * 2. least downscaling
-     * 3. least upscaling
-     *
-     * We do not care much about aspect ratio, since we just crop away extra pixels. We only choose
-     * the size to minimize scaling.
-     *
-     * In the future we may consider choosing the biggest possible preview size, to maximize the
-     * resolution we have for decoding. We need more testing to see whether or not that is feasible.
-     *
-     * @param sizes supported preview sizes, containing at least one size. Sizes are in natural camera orientation.
-     * @param isRotated true if the camera is rotated perpendicular to the current display orientation
-     * @return the best preview size, never null
-     */
-    public Size getBestPreviewSize(List<Size> sizes, boolean isRotated) {
-        // Sample of supported preview sizes:
-        // http://www.kirill.org/ar/ar.php
-
-
-        final Size desired = getDesiredPreviewSize(isRotated);
-
-        return previewScalingStrategy.getBestPreviewSize(sizes, desired);
-    }
-
-    /**
-     * Scale the preview to cover the viewfinder, then center it.
-     *
-     * Aspect ratio is preserved.
-     *
-     * @param previewSize the size of the preview (camera), in current display orientation
-     * @return a rect placing the preview
-     */
-    public Rect scalePreview(Size previewSize) {
-        return previewScalingStrategy.scalePreview(previewSize, viewfinderSize);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/FitCenterStrategy.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/FitCenterStrategy.java
deleted file mode 100644
index 547a8d08..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/FitCenterStrategy.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.graphics.Rect;
-import android.util.Log;
-
-import com.journeyapps.barcodescanner.Size;
-
-/**
- * Scales the size so that both dimensions will be greater than or equal to the corresponding
- * dimension of the parent. One of width or height will fit exactly. Aspect ratio is preserved.
- */
-public class FitCenterStrategy extends PreviewScalingStrategy {
-    private static final String TAG = FitCenterStrategy.class.getSimpleName();
-
-
-    /**
-     * Get a score for our size.
-     *
-     * Based on heuristics for penalizing scaling and cropping.
-     *
-     * 1.0 is perfect (exact match).
-     * 0.0 means we can't use it at all.
-     *
-     * @param size the camera preview size (that can be scaled)
-     * @param desired the viewfinder size
-     * @return the score
-     */
-    @Override
-    protected float getScore(Size size, Size desired) {
-        if(size.width <= 0 || size.height <= 0) {
-            return 0f;
-        }
-        Size scaled = size.scaleFit(desired);
-        // Scaling preserves aspect ratio
-        float scaleRatio = scaled.width * 1.0f / size.width;
-
-        // Treat downscaling as slightly better than upscaling
-        float scaleScore;
-        if(scaleRatio > 1.0f) {
-            // Upscaling
-            scaleScore = (float)Math.pow(1.0f / scaleRatio, 1.1);
-        } else {
-            // Downscaling
-            scaleScore = scaleRatio;
-        }
-
-        // Ratio of scaledDimension / dimension.
-        // Note that with scaleCrop, only one dimension is cropped.
-        float cropRatio = (desired.width * 1.0f / scaled.width) *
-                (desired.height * 1.0f / scaled.height);
-
-        // Cropping is very bad, since it's used-visible for centerFit
-        // 1.0 means no cropping.
-        float cropScore = 1.0f / cropRatio / cropRatio / cropRatio;
-
-        return scaleScore * cropScore;
-    }
-
-    /**
-     * Scale the preview to cover the viewfinder, then center it.
-     *
-     * Aspect ratio is preserved.
-     *
-     * @param previewSize the size of the preview (camera), in current display orientation
-     * @param viewfinderSize the size of the viewfinder (display), in current display orientation
-     * @return a rect placing the preview
-     */
-    public Rect scalePreview(Size previewSize, Size viewfinderSize) {
-        // We avoid scaling if feasible.
-        Size scaledPreview = previewSize.scaleFit(viewfinderSize);
-        Log.i(TAG, "Preview: " + previewSize + "; Scaled: " + scaledPreview + "; Want: " + viewfinderSize);
-
-        int dx = (scaledPreview.width - viewfinderSize.width) / 2;
-        int dy = (scaledPreview.height - viewfinderSize.height) / 2;
-
-        return new Rect(-dx, -dy, scaledPreview.width - dx, scaledPreview.height - dy);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/FitXYStrategy.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/FitXYStrategy.java
deleted file mode 100644
index 3d21db0b..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/FitXYStrategy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.graphics.Rect;
-
-import com.journeyapps.barcodescanner.Size;
-
-/**
- * Scales the size so that it fits exactly. Aspect ratio is NOT preserved.
- */
-public class FitXYStrategy extends PreviewScalingStrategy {
-    private static final String TAG = FitXYStrategy.class.getSimpleName();
-
-
-    private static float absRatio(float ratio) {
-        if(ratio < 1.0f) {
-            return 1.0f / ratio;
-        } else {
-            return ratio;
-        }
-    }
-
-    /**
-     * Get a score for our size.
-     *
-     * Based on heuristics for penalizing scaling and cropping.
-     *
-     * 1.0 is perfect (exact match).
-     * 0.0 means we can't use it at all.
-     *
-     * @param size the camera preview size (that can be scaled)
-     * @param desired the viewfinder size
-     * @return the score
-     */
-    @Override
-    protected float getScore(Size size, Size desired) {
-        if(size.width <= 0 || size.height <= 0) {
-            return 0f;
-        }
-        float scaleX = absRatio(size.width * 1.0f / desired.width);
-        float scaleY = absRatio(size.height * 1.0f / desired.height);
-
-        float scaleScore = 1.0f / scaleX / scaleY;
-
-        float distortion = absRatio((1.0f * size.width / size.height) / (1.0f * desired.width / desired.height));
-
-        // Distortion is bad!
-        float distortionScore = 1.0f / distortion / distortion / distortion;
-
-        return scaleScore * distortionScore;
-    }
-
-    /**
-     * Scale the preview to match the viewfinder exactly.
-     *
-     * @param previewSize the size of the preview (camera), in current display orientation
-     * @param viewfinderSize the size of the viewfinder (display), in current display orientation
-     * @return a rect placing the preview
-     */
-    public Rect scalePreview(Size previewSize, Size viewfinderSize) {
-        return new Rect(0, 0, viewfinderSize.width, viewfinderSize.height);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/LegacyPreviewScalingStrategy.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/LegacyPreviewScalingStrategy.java
deleted file mode 100644
index fea04567..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/LegacyPreviewScalingStrategy.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.graphics.Rect;
-import android.util.Log;
-
-import com.journeyapps.barcodescanner.Size;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- *
- */
-public class LegacyPreviewScalingStrategy extends PreviewScalingStrategy {
-    private static final String TAG = LegacyPreviewScalingStrategy.class.getSimpleName();
-
-    /**
-     * Choose the best preview size, based on our display size.
-     *
-     * We prefer:
-     * 1. no scaling
-     * 2. least downscaling
-     * 3. least upscaling
-     *
-     * We do not care much about aspect ratio, since we just crop away extra pixels. We only choose
-     * the size to minimize scaling.
-     *
-     * In the future we may consider choosing the biggest possible preview size, to maximize the
-     * resolution we have for decoding. We need more testing to see whether or not that is feasible.
-     *
-     * @param sizes supported preview sizes, containing at least one size. Sizes are in natural camera orientation.
-     * @param desired The desired display size, in the same orientation
-     * @return the best preview size, never null
-     */
-    public Size getBestPreviewSize(List<Size> sizes, final Size desired) {
-        // Sample of supported preview sizes:
-        // http://www.kirill.org/ar/ar.php
-
-        if (desired == null) {
-            return sizes.get(0);
-        }
-
-        Collections.sort(sizes, new Comparator<Size>() {
-            @Override
-            public int compare(Size a, Size b) {
-                Size ascaled = scale(a, desired);
-                int aScale = ascaled.width - a.width;
-                Size bscaled = scale(b, desired);
-                int bScale = bscaled.width - b.width;
-
-                if (aScale == 0 && bScale == 0) {
-                    // Both no scaling, pick the smaller one
-                    return a.compareTo(b);
-                } else if (aScale == 0) {
-                    // No scaling for a; pick a
-                    return -1;
-                } else if (bScale == 0) {
-                    // No scaling for b; pick b
-                    return 1;
-                } else if (aScale < 0 && bScale < 0) {
-                    // Both downscaled. Pick the smaller one (less downscaling).
-                    return a.compareTo(b);
-                } else if (aScale > 0 && bScale > 0) {
-                    // Both upscaled. Pick the larger one (less upscaling).
-                    return -a.compareTo(b);
-                } else if (aScale < 0) {
-                    // a downscaled, b upscaled. Pick a.
-                    return -1;
-                } else {
-                    // a upscaled, b downscaled. Pick b.
-                    return 1;
-                }
-            }
-        });
-
-        Log.i(TAG, "Viewfinder size: " + desired);
-        Log.i(TAG, "Preview in order of preference: " + sizes);
-
-        return sizes.get(0);
-    }
-
-    /**
-     * Scale from so that to.fitsIn(size). Tries to scale by powers of two, or by 3/2. Aspect ratio
-     * is preserved.
-     *
-     * These scaling factors will theoretically result in fast scaling with minimal quality loss.
-     *
-     * TODO: confirm whether or not this is the case in practice.
-     *
-     * @param from the start size
-     * @param to   the minimum desired size
-     * @return the scaled size
-     */
-    public static Size scale(Size from, Size to) {
-        Size current = from;
-
-        if (!to.fitsIn(current)) {
-            // Scale up
-            while (true) {
-                Size scaled150 = current.scale(3, 2);
-                Size scaled200 = current.scale(2, 1);
-                if (to.fitsIn(scaled150)) {
-                    // Scale by 3/2
-                    return scaled150;
-                } else if (to.fitsIn(scaled200)) {
-                    // Scale by 2/1
-                    return scaled200;
-                } else {
-                    // Scale by 2/1 and continue
-                    current = scaled200;
-                }
-            }
-        } else {
-            // Scale down
-            while (true) {
-                Size scaled66 = current.scale(2, 3);
-                Size scaled50 = current.scale(1, 2);
-
-                if (!to.fitsIn(scaled50)) {
-                    if (to.fitsIn(scaled66)) {
-                        // Scale by 2/3
-                        return scaled66;
-                    } else {
-                        // No more downscaling
-                        return current;
-                    }
-                } else {
-                    // Scale by 1/2
-                    current = scaled50;
-                }
-            }
-        }
-    }
-
-    /**
-     * Scale the preview to cover the viewfinder, then center it.
-     *
-     * Aspect ratio is preserved.
-     *
-     * @param previewSize the size of the preview (camera), in current display orientation
-     * @param viewfinderSize the size of the viewfinder (display), in current display orientation
-     * @return a rect placing the preview
-     */
-    public Rect scalePreview(Size previewSize, Size viewfinderSize) {
-        // We avoid scaling if feasible.
-        Size scaledPreview = scale(previewSize, viewfinderSize);
-        Log.i(TAG, "Preview: " + previewSize + "; Scaled: " + scaledPreview + "; Want: " + viewfinderSize);
-
-        int dx = (scaledPreview.width - viewfinderSize.width) / 2;
-        int dy = (scaledPreview.height - viewfinderSize.height) / 2;
-
-        return new Rect(-dx, -dy, scaledPreview.width - dx, scaledPreview.height - dy);
-    }
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/PreviewCallback.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/PreviewCallback.java
deleted file mode 100644
index afdc1ecc..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/PreviewCallback.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import com.journeyapps.barcodescanner.SourceData;
-
-/**
- * Callback for camera previews.
- */
-public interface PreviewCallback {
-    void onPreview(SourceData sourceData);
-    void onPreviewError(Exception e);
-}
diff --git a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/PreviewScalingStrategy.java b/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/PreviewScalingStrategy.java
deleted file mode 100644
index 5b2d7827..00000000
--- a/qrcode/src/main/java/com/journeyapps/barcodescanner/camera/PreviewScalingStrategy.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.journeyapps.barcodescanner.camera;
-
-import android.graphics.Rect;
-import android.util.Log;
-
-import com.journeyapps.barcodescanner.Size;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- *
- */
-public abstract class PreviewScalingStrategy {
-    private static final String TAG = PreviewScalingStrategy.class.getSimpleName();
-
-    /**
-     * Choose the best preview size, based on our viewfinder size.
-     *
-     * The default implementation lets subclasses calculate a score for each size, the picks the one
-     * with the best score.
-     *
-     * The sizes list may be reordered by this call.
-     *
-     * @param sizes supported preview sizes, containing at least one size. Sizes are in natural camera orientation.
-     * @param desired The desired viewfinder size, in the same orientation
-     * @return the best preview size, never null
-     */
-    public Size getBestPreviewSize(List<Size> sizes, final Size desired) {
-        // Sample of supported preview sizes:
-        // http://www.kirill.org/ar/ar.php
-
-        List<Size> ordered = getBestPreviewOrder(sizes, desired);
-
-        Log.i(TAG, "Viewfinder size: " + desired);
-        Log.i(TAG, "Preview in order of preference: " + ordered);
-
-        return ordered.get(0);
-    }
-
-    /**
-     * Sort previews based on their suitability.
-     *
-     * In most cases, {@link #getBestPreviewSize(List, Size)} should be used instead.
-     *
-     * The sizes list may be reordered by this call.
-     *
-     * @param sizes supported preview sizes, containing at least one size. Sizes are in natural camera orientation.
-     * @param desired The desired viewfinder size, in the same orientation
-     * @return an ordered list, best preview first
-     */
-    public List<Size> getBestPreviewOrder(List<Size> sizes, final Size desired) {
-        if (desired == null) {
-            return sizes;
-        }
-
-        Collections.sort(sizes, new Comparator<Size>() {
-            @Override
-            public int compare(Size a, Size b) {
-                float aScore = getScore(a, desired);
-                float bScore = getScore(b, desired);
-                // Bigger score first
-                return Float.compare(bScore, aScore);
-            }
-        });
-
-
-        return sizes;
-    }
-
-    /**
-     * Get a score for our size.
-     *
-     * 1.0 is perfect (exact match).
-     * 0.0 means we can't use it at all.
-     *
-     * Subclasses should override this.
-     *
-     * @param size the camera preview size (that can be scaled)
-     * @param desired the viewfinder size
-     * @return the score
-     */
-    protected float getScore(Size size, Size desired) {
-        return 0.5f;
-    }
-
-    /**
-     * Scale and position the preview relative to the viewfinder.
-     *
-     * @param previewSize the size of the preview (camera), in current display orientation
-     * @param viewfinderSize the size of the viewfinder (display), in current display orientation
-     * @return a rect placing the preview, relative to the viewfinder
-     */
-    public abstract Rect scalePreview(Size previewSize, Size viewfinderSize);
-}
diff --git a/qrcode/src/main/res/layout/zxing_barcode_scanner.xml b/qrcode/src/main/res/layout/zxing_barcode_scanner.xml
deleted file mode 100644
index fda64f5e..00000000
--- a/qrcode/src/main/res/layout/zxing_barcode_scanner.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <com.journeyapps.barcodescanner.BarcodeView
-        android:id="@+id/zxing_barcode_surface"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <com.journeyapps.barcodescanner.ViewfinderView
-        android:id="@+id/zxing_viewfinder_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-    <TextView
-        android:id="@+id/zxing_status_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:background="@color/zxing_transparent"
-        android:padding="15dp"
-        android:text="@string/zxing_msg_default_status"
-        android:textColor="@color/zxing_status_text"/>
-</merge>
diff --git a/qrcode/src/main/res/layout/zxing_capture.xml b/qrcode/src/main/res/layout/zxing_capture.xml
deleted file mode 100644
index 84a435c8..00000000
--- a/qrcode/src/main/res/layout/zxing_capture.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <!--
-    This Activity is typically full-screen. Therefore we can safely use centerCrop scaling with
-    a SurfaceView, without fear of weird artifacts. -->
-    <com.journeyapps.barcodescanner.DecoratedBarcodeView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/zxing_barcode_scanner"
-        app:zxing_preview_scaling_strategy="centerCrop"
-        app:zxing_use_texture_view="false"/>
-
-</merge>
diff --git a/qrcode/src/main/res/raw/zxing_beep.ogg b/qrcode/src/main/res/raw/zxing_beep.ogg
deleted file mode 100644
index 14199476a89093b575f6ef388febe417b5cd003b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6401
zcmb7Id010N*Pk205(EqoRuRJ@5(Fd=lu+y&Srj551j3F&fGPqigt!*HtO5!mghdDx
zEUN{@B`R7mD2oe3APu0XY_eFa;)-vz@=b#6(|&(^@B7_n?%Z?F%$#%2ne&@DbGK~Y
z?gKF3>or1gvXGE8-;~dYKC*Xr0xOy=VIa<pk_P~DTM+5<DzZf~@~=xWQquBoHIsEq
zT^Ig-os?OWV+WfzZ25*5zT21MM`Tf0#9(VHD_b&|ye^bz$_i&kMG|-KA_he7*<raQ
zVf!jJF*cgzC;bGHL=PgnD96On$qxYv0HB8M+U;m>9uojO0F{mFiVoemG5_>Xa{VU4
zp-c%i(YUGiU}g)XUf!tFJ#-)P*hEUC1^`%qk`zi4Mjd~>F|V&PrRuF~)+M3Rv#hu}
z>FWz01<e{1Ja+tb{j|P<a-b}LKB6fYq!Add2I+rRq?!^|HmSCRb&pi1$L=O~5mQy{
zXQ~Ul9C4&-FS=PnHJ3rR7zkp&ydnRD{c6KUVjA8N3i-2=+ChZh0-2FgrbP0hyhXE!
z0F_woc9L-ayk1YAUe9a22dXQ*)mHXdTZkC8J~r!_zAj>4rav<@bYGl!Z=AR&ZqQFk
z_{9ZYjvM}Gk(y3KK&25i--wiNNXnnE%g3f=G-5!c#3hxc*%NlT&s=j?M(2NbplEwm
zY5l3vnT85QX%~RNE|P0>fA;kL-0cVQrFCgtbZPB>TWCA(m;oB}Wmml3V%d~nEHCx&
z9RTN)#xU+mFyF+cbg>;aB|3K{y5Hsc-sOiZ`EwHBw8M+0Ztmja&{g2@K;8C%h|;6(
z;Z5-n{TIcDkSvWCXox}icSSo<1)IEZsasGeR=Y~UNoi3N?2uXYj9A)R`nHFvQaV}L
zKqwQnW%-t^YH27bV+*O%yjY>m1dlBw-8<D$d8)UREp$^Vty!cFsFle#HS|NC&NNS@
zQzsnui|#L#Z+I90#|HM6PSv*%AeF@}Tg7kjU6dyk$`&?k<q6xUV{k;)qq3M5Tqvae
z9m#vygOl)}-meu-8a^~QZ{b7Qo#iRSq+B@`!JyWlKtJ(>N<k(04yjr{CwC*gA=Qha
zv#KUBMQS+_fHeHyqu3xro0Vx$$4gK&tFO+_HoIqfvD^B-xuj~mEwrC)zKwTMB46sK
zo7;;0B69ds73{NA*O(gqK+x(M7~rIuMMS|#B}V3LkkgUkBcmh%qM|ZI@$VBiXZ%2Q
zdEej4gV%a6m>1(&8q7@py>WrXoZ&0!p+lUJ!K9JFoNZbeQGrGOD2t{;OMnDUQaEy1
z$H`s1R8L3T;sk$1&Zc-m*Gav*Cyh5>F!ty-?|DPn@|M!4?gGQbM<cXPgCo+6@>v@y
zvW*fkqr`io9$t<LzLFGpIca46Z)K44cjQ3W7*ca5T>puj+;O{HBe#6xz<d)aavDxm
zJa0JtzmQY8BfG97yDl?(Iy2Wat0+3F^i0d?*n4MZul>jJ7jhtAU~yp>yZi$=0<xYH
z1kVL?kGG39uJ41ZL!yh;-zNY7L7viP$x>qM&9D$NY{d)<rtf;@f4amHXhFvoN>^HC
z`;WSZ?v}LYAKG!;QR(1p2|M>-&vC;$@h|W;nFp2>8etFQoN~^LhfZ?=c(`_Ir|LO%
z8%*=6JsHn<KlXd?<gvN-^yM{#n0x#meOa6NYlT$!dYo~Of9a7oonNcF1TF@9;N6T@
zR1Q=H&IrIO7}Vr3TuD>B1Qk*ZFG6Tg%VpoAPV!Rw-5Pl8ek$oCL-Lv+bbHS86;es%
zX>eP^=)v1O4MGJA;xRy_>$QWM$l1G};{DFOkF&lnG1N`u?xXI)6gzt}J^cA`eZEn_
z{S?tJ@YUAam+5UA_t2L){J~vR<S{6Y^Ja2_FUN)Nj~kv}FS-O@<DMjj2Jee|I3E=}
zn6pVL${&j2c=(Isd^mBT>MnyCO#dPmabc8y5ocRr)RRHyK8}l+8|ux83N8#C*&7u&
z?=kqE!z@aNtz%a>q1wAf)>S}7+hD7I)I+UZPu3nDo=@K{{i;5uZJ%$bh{=I^hX*90
z{P|Ik^RO^(#6R@m2V3vN&^~5VU?MZnFY4iZXy6BqH!~@?FiO%oA2*_v@o*q%EHN}x
zBH1tSL(=eI;p6~k?4!HrGBl7Q;v|iH;A}s|3H|6Y_&$kQloY{_+V(Mhq~TNN>*Ht6
z%%1s8@uu1RTg^+ZzkS@ghRYfL824oR<JJ?eCq8$cj2XT~p1sU|+<Mmh=3AS?Q2_^Q
zqlar}f4}zpTI-tGYvjkR=Lk&kATxMvhPW_&Li6y%P|}#)#=jJW4<(K4KODZlV(@a#
z*oUNhv9lXjeE-9n?rS-}ed<j3WIw$xS2(AHg8?Op4XY|8g6;)Fkf{#B@ChnpSp$X=
zTn}ng9O<eNc<brv$Zj`WO|>T7&4Q)mI90;!rjn|-MUEtkbhV%*HSL=8=qA2j%ub5|
zJUyn0tL;Rxs2$kp-Xzu~%Neje=~Fzoy1|A4>*@ML6~?bbxSj7jUrmUZ<Z+ek&6cNe
z>1O0YE=#GQ-H(yYul9|IIX|fxA*|wRZZ<m)8{){5+7aDUiE`ee@&WiQelS3xD5_}#
z6h$I+bW`1+DEk>xIKthcLzAA>1Vxb=I-n?vjsPb&iy|(|g48j@>Tc;M3YM?p=h2VD
z&ka6Ky)v*<xu!i}QTcKH2W^RR?agMka73K#hexbND!(XZ=lLnkhzI=1ff(V9x`CY@
z=O-Vry4O!>NA|SHFLi_lYC4g~mj`ynk*D;&Dklv<Q5FM_V1rb-SQpwcFa&)y2t_q?
zl*S0#x=JFpSPbYzbg%Cyis@;YFAdIvP*;Lk9=60w4#E~Eg>9N?hjyBrK_{=Em)Ksy
zW|(#IQuF8?C2TzX9xv64PCo@HHxf6WPH#$Q(CH0)2wO!7Y-4-50eY2^MTcev(6)H<
z`){4SZKEEZH-4b*B7&&gE8+A}nBvP8iyRoh5{@rZ%;7vymn24mF!JZ6eK-&f9->4E
zXZS;sh{7D?M8S1FoFnB7#6<*1I1ew!g;IAtfr!w`2rqeb?d7M|HA-D`?lM52t_M)X
z*ns6@)jQ0arC%inK)8~loI$#hBg_i9j;^GY0E7t;Koq1|d+oSG2Sk`@65E4fn&4*1
zYJe4_GU(FR|ErSjs{ijw1I+l3fzgGq+rKKTa*0Sz&uGMgTQDh)fH7+S+_?G|t4ZxN
z2E(nUa3gt|$jxWao0vj3*P5DvpkwC~JmD<xHG_}CU<}%6(WxEr0!C?23>i|UH8t81
zjpTtKC$|Q^cEoYp!5{|g0<CG8&u1JXcZS5gY$+aKHS(umcCwzY8PQ}r{g^!`=`7^K
z?AxoUBOvB1RetOc0v;=?06cE3usJ``&rUZ)>Lz1=(lW`NJhlo1urr+u#YppESJGEr
zTHaS)6_;VX$Xm(vf)JJTgFO1(#jz5nEl>Q)Bh^UcNm@xYFzGg3%vQLt^(&?J7sdFq
zUp0gNbp#xSGmwszR8?sbDH2MeS4x@H5CGUS3b({CY<Z+_U|Nnz$bKLVe3&W|g+Z~T
zjS@#^+#$9TGZaZ3JiZbsRj<~al*TO-k~1<3G=rCD$iQqCFG-y+$rw|sJOs!q;23}w
zo?PXWrhxxZAh>$<5<KlVMrOD=o6BY4#58a6a$s(0^-PAA(Yf(ahiszGXo}@ad%Pn)
z1>Zgn6kP>vxOEP%Ggdtw#g?CD$V(4waKT&(K$jd|wNG!;(Jpz{%sUEhZZLxaU<e50
zfgl{?>`dwE8+(nY8Cp9s)TB+43X5IL`Xz@%ELM8z!zLOoHcL)@5`Ho7WsxSucEM=D
zVu1p0i-pzjNi;KO*e4z=)2=LQ4Cd%_E}UH^xZ>1-aAZ``o1CS$^BWnDbCm0Avxm2!
zwqT)UU9;v~*}Cp9gi^8F1ywqI50(F^Y@5am`iT*>c?QKJmqxZ$|Mo@jO-{glwM!1=
znO$a+ycMiWlgONXTEPD2id|kbyW3giUvfPnV<;CaC5Cr8t^mr*G)G$s<^YH_2eG{i
ze6-@~a)7HM0wG%^01ZZ0AsC=u30!enBfaN}I7lKwJmV*mZC|ea4Wh+!tSFH|4Mxi^
zdCM06gr+XA59DNs*6%aIC>*O#1)7Aa>W+Fl=6-A)_eTxiyN9wi3Ql>@Xs$G`%%j=h
zY}rizS=+;j-&{NJs3-2)jZ4SNi;J&xtd4(G^6FFTtEGF%&*q9>$Sj;?m)zn`@dp|;
z$nU~#e4f9rPC29Oe5Q?{ViM?Z*V9^P{5yH%M4_K<%hqY0k8YTwBS<LFcuq9OC>=Ld
zy6bS!vB`R&>3YyWDR7cSZ>fMa_g0)h^(;Ysj>v|3<l9Ize5=g2O|6fU(PpAu!sf$E
z4KI=|D2dF!-13Oke(Ku?fJ(2xCB-vL77)#w(=GvUQJDgF+O>wrG5DgsAUD&FRU3_n
z6<}hKJ=<<!O~E5d9zYULnAzN@)@O{~Cn1%D$c$@Yb~kihQBt_43Gi56WEu55vj_ux
zLB`$asY+D>ZA5L98;{qlbxF1XK~v6XrUHhbpyD{!;jLJu#y!n#l%<Oe6f6}yofY@o
z7(D|7OBH1Gf<H8C;fPMhRH<<?*zmob`JKd$1G0)r89&|hRkl0&uYn!zWj|_gu_>R8
z0;%#T$$JzF`#6f>w2zyfr8tlKs7DAwBGVkL5gFqH_Q#O(PF&<dk1ETpmtc=W4_Bz-
z#w!qZxN^yw$zZa~6ackKuS~x*J{{74r%rc$#@w=#JI;!up)<f96kCMV3i~u)2jt)n
z5%drkLx7znDr-z5eh(3bVn6b+lr$9V5A8;lp_@@tq#P(91n?Gs>SU~IrNtch?BD?i
zvbc>QKf6Ye11?`LB6?j925Ft`h~RxV(vkm3whe@B!<5dCW~)U7@j%7~Z|;wR^@1Sl
z+|@23%+lu@@!8Sdir9{hDzoRN*{Mb}QWh7J?8G$9E;}=BXAZoao#S~$M1lYZ_80*a
z3{5`le%_E~8T0;d-L)*c_-DUO?5Y5HCVjC9TDfjpPbqvmIp_R?otlwJ)7Hbdgn-AG
z)4qF6^1bkp%_l<p6fw!FCPM}E9B0<ieOf22_g!44yW%EQ_xDeqz6%p}efP^Vty>F9
z<>~v7FF&_Fu0(r@LvAar?jAEg@6a>;;E#JM4F|=Zdw@!F-cIEZ1UfBEuCy7h8J1`u
zq6xRl2?YU5=7^EN(;Y{<4I}IXPi8H+0{k(?z=Vd(aQEQemPPo+&&`nD9XSC;313`)
zQO;Oa)+Bf@GBh1B0AW;zne@)xAqY4_xP%#8lIHGz#hkFNKhqHTLqAM)Hk*A)6WK6)
z#7;KHnUGp}bqk8A^2Y3+^v<rdPS5peW@J}Z)TjD9Zp2(o7zZ62v3o2v|443-`yHW`
zK5KiOe-Ce!ay}2UQgfQwhPPtzjcjxDb-M6F!S$~;V@+;{7~lSa>Z^zMe=^juCW8LA
z+2zTIYWPX_gh&tK)E^hYr99Ostv73M#Bt!IXyf?i3IbTG!M8VBW7P<FOV<MhDI<4h
zgBsf|!Btj%l(v&-+bi*sxj;>2$=v&8K$Er~qVPK~B-pluw&n9GL|I({%}S8Lj_Qss
z4_j7=lSG#qAclk(s%~|g8CeR|D2<mWzCc+epU0QCH2`pb%4%hR?_;&hFua~|1JO?5
za^Yzua21DlZCZWn7T;91l>KW8UMJ}8QShX018upX7WWoCnZZ?+S5zeAQ8$phEa}OU
z7zN>41}ajw@LFRnt9Y7mw_1FascFCJg3rwP`?aheMk1VmPHD>_izc9L>Z$Vu*J=Lr
z_G-_lnM3WjGKpJ*Y$L2v!k5;yv3S8=Ka$!#H$FGMzQbnpb0>?a^V{;1_%S6_HA<Fi
zZ)fkSM2}EQ!BWiU93wEf4@jV>4F4m9=mpIM=V|Q{`h}Ntyn1@k=ef|V3_1;T>kfgJ
zuSO7TucpE+MF8rN@3it@h{cA0=H%;T=qykhoyI1HVQ_N=R2tZYoP~dy+))g%P!3bM
zp=^a)!u7+v{TW|oBLTrh_HbKRbI^E4U|_T9$Il%IcY~<^S|X_}?@=@YlG@{ELR`Gp
z?w}@jR8r1jykxw-J-wRFjfv0B_r|64es&aW5JwZPo{PbyR4Uq;Dic<ED$AyfZcIBJ
zHj#b0LV46~ohm{<Krp?xk<it$XSr;pC+$(j56cp-YJvV=e&^mkpb>AJIoU3pu2-XZ
zzgQY>l@hrw9^2{}!EFvO%y#<_&MnjCTI~JOswz_;>#Vng{CVXF03sbU+u+-;2=pSh
zTh<b^pB0uy|70iqDXW4P)W|qU!m81u*Iu%4VFzBA?10Z4B{WiIw+2w(jv?YPm`d|0
zR7D_5(*y{Lry+Uz0Hxpoa!F1fT~h~8pN~Yb_0yK87Dd&kE#!Mw0<=&ZHsgL%6ZCc|
z%DZ&%c{Q4Cz422-H3C|Is9rg1R~&;^Y}b#@a(ag6_+ado5#%QYBz#7Zmz}>CFU4tj
z<w>IBSa<R`A=ayMDAUXCZ50s8;RP;0a0E3a2!DQtJgGYRWkW>yKDE?|p1MOSAm8}n
zi@NUwD7S%ZZF=7BoMHwTKT-b6_3V=dDC_!3Z>DyDL;3R5a~9{j1jbtanc90rZga6&
z<;d)nT7h78J_lCYZN}dlouf3yzH|R@eX9zQ_-=0K`G~4v<Mjut0r+KFY$A|j$Q=5{
z0|h&1lqCV^4OKJnU|~W<l0e|at^&{R_rbrmG|cxp#bAwWrIsXpC|Lz)SNGpM3Ty_V
zLPdXUe05{~-Mg~{ZS$x*Lr;qpyzsV+TdK|{6JlGHH^k`bzB~No0yiyVHD{zJe8chY
zD+wF!r(~{ad-V2&saRY<UU*t~k<pHf8Zj#0%VpVl9W)`6)#ixH_T<ftWsgQeFglRH
z7zQLTjyz2#KcHV;+W#-cn&)TQ(CKqWC;15)Hb>Htn(>I@6T1}Ez1vj`obs2sV{PvE
zvod0@x1n!sGTiAu-C5>z47|G-2;>ZncbLfn{5J_H`$;5~r_AIZmRg}t^Z=!H<P9kJ
znCi3o({%gV?^O-J0$!#1v&?~9`xQ4=p1r9U;BmXDnzfm-(xLW;IWU~4jn{9~n210S
zwmqE)X1^(-ZL2^Z)MMR`?%WO9O;Uy1uWHLuPIr+74$d>_C@RW1*8KgKy87vce*xdu
z)8}$V=hffY_=m_0%Pc`(*d*nfsI+q5{9ISPHj7$Hp(d=od8EgLsv;^rcr^X^zKP=9
z;`*S`5beano5(2XXwQw;m+R+OJ?N*77W<Lq^{p6jDuA}k?Tz;r((s`NR;`49SAzMi
Q!3(l<w0I|Y!;u01144^n5dZ)H

diff --git a/qrcode/src/main/res/values-ar/zxing_strings.xml b/qrcode/src/main/res/values-ar/zxing_strings.xml
deleted file mode 100644
index a2acd0c8..00000000
--- a/qrcode/src/main/res/values-ar/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">ماسح الرمز الشريطي</string>
-  <string name="zxing_button_ok">موافق</string>
-  <string name="zxing_msg_camera_framework_bug">عفوا، حدثت مشكلة في كاميرا جهاز Android. قد تحتاج إلى إعادة تشغيل الجهاز.</string>
-  <string name="zxing_msg_default_status">قم بوضع الرمز الشريطي داخل حدود صورة الكاميرا ليتم مسحه.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-bg/zxing_strings.xml b/qrcode/src/main/res/values-bg/zxing_strings.xml
deleted file mode 100644
index 83ce67f8..00000000
--- a/qrcode/src/main/res/values-bg/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Баркод Скенер</string>
-  <string name="zxing_button_ok">ОК</string>
-  <string name="zxing_msg_camera_framework_bug">Съжаляваме, срещнахме проблем с камерата. Може да се наложи да рестартирате устройството си.</string>
-  <string name="zxing_msg_default_status">Сложете баркода вътре в правоъгълника за да го сканирате.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-ca/zxing_strings.xml b/qrcode/src/main/res/values-ca/zxing_strings.xml
deleted file mode 100644
index 23fd687a..00000000
--- a/qrcode/src/main/res/values-ca/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">D\'acord</string>
-  <string name="zxing_msg_camera_framework_bug">S\'ha produït un problema amb la càmera de l\'Android. Potser haureu de reiniciar el dispositiu.</string>
-  <string name="zxing_msg_default_status">Poseu un codi de barres dins el rectangle per escanejar-lo.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-cs/zxing_strings.xml b/qrcode/src/main/res/values-cs/zxing_strings.xml
deleted file mode 100644
index 32fdcdd2..00000000
--- a/qrcode/src/main/res/values-cs/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Omlouváme se, zjistili jsem problém s fotoaparátem. Možná bude nutné restartovat zařízení.</string>
-  <string name="zxing_msg_default_status">Zaměřte čtvercem na čárový kód</string>
-</resources>
diff --git a/qrcode/src/main/res/values-da/zxing_strings.xml b/qrcode/src/main/res/values-da/zxing_strings.xml
deleted file mode 100644
index a600f95b..00000000
--- a/qrcode/src/main/res/values-da/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Beklager, Android-kameraet er stødt på et problem. Du skal muligvis genstarte enheden.</string>
-  <string name="zxing_msg_default_status">Placér en stregkode inden i firkanten for at aflæse den.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-de/zxing_strings.xml b/qrcode/src/main/res/values-de/zxing_strings.xml
deleted file mode 100644
index e18781f9..00000000
--- a/qrcode/src/main/res/values-de/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Mit der Android-Kamera ist leider ein Fehler aufgetreten. Es könnte sein, dass Sie das Gerät neu starten müssen.</string>
-  <string name="zxing_msg_default_status">Positionieren Sie den Barcode innerhalb des Rechteckes.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-el/zxing_strings.xml b/qrcode/src/main/res/values-el/zxing_strings.xml
deleted file mode 100644
index 67ed249a..00000000
--- a/qrcode/src/main/res/values-el/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Συγνώμη, προέκυψε ένα πρόβλημα με την κάμερα. Ίσως χρειαστεί να επανεκιννήσετε τη συσκευή.</string>
-  <string name="zxing_msg_default_status">Τοποθετήστε ένα barcode μέσα στο πλαίσιο για να το σκανάρετε.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-es/zxing_strings.xml b/qrcode/src/main/res/values-es/zxing_strings.xml
deleted file mode 100644
index 3561ab16..00000000
--- a/qrcode/src/main/res/values-es/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Lo sentimos, la cámara de Android ha encontrado un problema. Es posible que necesite reiniciar el dispositivo.</string>
-  <string name="zxing_msg_default_status">Coloque un código de barras en el interior del rectángulo del visor para escanear.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-eu/zxing_strings.xml b/qrcode/src/main/res/values-eu/zxing_strings.xml
deleted file mode 100644
index 6ab99f90..00000000
--- a/qrcode/src/main/res/values-eu/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barra-kode Eskanerra</string>
-  <string name="zxing_button_ok">Ados</string>
-  <string name="zxing_msg_camera_framework_bug">Barkatu, Android kamerak arazo bat izan du. Behar bada gailua berrabiarazi beharko duzu.</string>
-  <string name="zxing_msg_default_status">Kokatu barra-kode bat laukizuzenaren barruan eskaneatzeko.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-fi/zxing_strings.xml b/qrcode/src/main/res/values-fi/zxing_strings.xml
deleted file mode 100644
index dcafab80..00000000
--- a/qrcode/src/main/res/values-fi/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Valitettavasti Androidin kameran toimiinta häiriintyi. Joudut ehkä käynnistämään laitteen uudelleen.</string>
-  <string name="zxing_msg_default_status">Aseta viivakoodi neliön sisälle skannataksesi sen.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-fr/zxing_strings.xml b/qrcode/src/main/res/values-fr/zxing_strings.xml
deleted file mode 100644
index ff94f199..00000000
--- a/qrcode/src/main/res/values-fr/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Désolé, la caméra Android a rencontré un problème. Un redémarrage de l\'appareil est peut-être nécessaire.</string>
-  <string name="zxing_msg_default_status">Encadrez un code-barres avec le viseur pour le balayer.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-he/zxing_strings.xml b/qrcode/src/main/res/values-he/zxing_strings.xml
deleted file mode 100644
index 1736fa03..00000000
--- a/qrcode/src/main/res/values-he/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">סורק ברקודים</string>
-  <string name="zxing_button_ok">אישור</string>
-  <string name="zxing_msg_camera_framework_bug">סליחה, מצלמת האנדרואיד נתקלה בבעיה. ייתכן שיהיה עליך להפעיל מחדש את המכשיר.</string>
-  <string name="zxing_msg_default_status">הצב ברקוד בתוך המלבן כדי לסרוק אותו.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-hi/zxing_strings.xml b/qrcode/src/main/res/values-hi/zxing_strings.xml
deleted file mode 100644
index bc3640c6..00000000
--- a/qrcode/src/main/res/values-hi/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">बारकोड स्कैनर</string>
-  <string name="zxing_button_ok">ठीक है</string>
-  <string name="zxing_msg_camera_framework_bug">क्षमा करें, Android कैमरा एक समस्या का सामना करना पड़ा. आप डिवाइस को पुनरारंभ करने की आवश्यकता हो सकती है.</string>
-  <string name="zxing_msg_default_status">दृश्यदर्शी आयत के अंदर एक बारकोड प्लेस इसे स्कैन.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-hu/zxing_strings.xml b/qrcode/src/main/res/values-hu/zxing_strings.xml
deleted file mode 100644
index 1b74b042..00000000
--- a/qrcode/src/main/res/values-hu/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Android kamera hiba. Lehet, hogy újra kell indítania a készüléket.</string>
-  <string name="zxing_msg_default_status">Pozícionálja a vonalkódot a kereső téglalapba a szkenneléshez.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-id/zxing_strings.xml b/qrcode/src/main/res/values-id/zxing_strings.xml
deleted file mode 100644
index aded70c7..00000000
--- a/qrcode/src/main/res/values-id/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Maaf, kamera mengalami masalah. Anda mungkin perlu me-restart perangkat.</string>
-  <string name="zxing_msg_default_status">Letakkan barcode di dalam kotak jendela untuk memindai.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-it/zxing_strings.xml b/qrcode/src/main/res/values-it/zxing_strings.xml
deleted file mode 100644
index 3381133a..00000000
--- a/qrcode/src/main/res/values-it/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Spiacenti, la fotocamera Android ha riscontrato un problema. Potrebbe essere necessario riavviare il dispositivo.</string>
-  <string name="zxing_msg_default_status">Posiziona un codice a barre dentro il mirino rettangolare per la scansione.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-iw b/qrcode/src/main/res/values-iw
deleted file mode 100644
index 08adc17c..00000000
--- a/qrcode/src/main/res/values-iw
+++ /dev/null
@@ -1 +0,0 @@
-values-he/
\ No newline at end of file
diff --git a/qrcode/src/main/res/values-ja/zxing_strings.xml b/qrcode/src/main/res/values-ja/zxing_strings.xml
deleted file mode 100644
index 547db553..00000000
--- a/qrcode/src/main/res/values-ja/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">QRコードスキャナー</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Androidのカメラに問題が発生しました。デバイスを再起動する必要があります。</string>
-  <string name="zxing_msg_default_status">QRコードを画面の読み取り範囲内に写すとスキャンします。</string>
-</resources>
diff --git a/qrcode/src/main/res/values-ko/zxing_strings.xml b/qrcode/src/main/res/values-ko/zxing_strings.xml
deleted file mode 100644
index 4eb5777e..00000000
--- a/qrcode/src/main/res/values-ko/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">바코드 스캐너</string>
-  <string name="zxing_button_ok">확인</string>
-  <string name="zxing_msg_camera_framework_bug">죄송합니다. 기기의 카메라에 오류가 생겼습니다. 기기를 재시작 해야될 수도 있습니다.</string>
-  <string name="zxing_msg_default_status">바코드를 사각형 안에 비춰주세요.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-nl/zxing_strings.xml b/qrcode/src/main/res/values-nl/zxing_strings.xml
deleted file mode 100644
index 6fce6a01..00000000
--- a/qrcode/src/main/res/values-nl/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Sorry, er is een probleem met de Android-camera. Probeer je telefoon opnieuw op te starten.</string>
-  <string name="zxing_msg_default_status">Plaats een barcode binnen de rechthoek om deze te scannen.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-pl/zxing_strings.xml b/qrcode/src/main/res/values-pl/zxing_strings.xml
deleted file mode 100644
index a03026f6..00000000
--- a/qrcode/src/main/res/values-pl/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Przepraszamy, aparat Android napotkał problem. Może wystąpić potrzeba ponownego uruchomienia urządzenia.</string>
-  <string name="zxing_msg_default_status">Umieść kod paskowy w prostokącie wizjera aby zeskanować.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-pt/zxing_strings.xml b/qrcode/src/main/res/values-pt/zxing_strings.xml
deleted file mode 100644
index 156a97f5..00000000
--- a/qrcode/src/main/res/values-pt/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Desculpe, a câmera do Android encontrou um problema. Poderá precisar de reiniciar o dispositivo.</string>
-  <string name="zxing_msg_default_status">Alinhar código de barras com o exemplo para ser lido.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-ro/zxing_strings.xml b/qrcode/src/main/res/values-ro/zxing_strings.xml
deleted file mode 100644
index 5f12a6be..00000000
--- a/qrcode/src/main/res/values-ro/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">Acceptă</string>
-  <string name="zxing_msg_camera_framework_bug">Probleme cu camera foto. Repornește dispozitivul.</string>
-  <string name="zxing_msg_default_status">Plasează codul de bare în interiorul vizorului pentru a-l scana</string>
-</resources>
diff --git a/qrcode/src/main/res/values-ru/zxing_strings.xml b/qrcode/src/main/res/values-ru/zxing_strings.xml
deleted file mode 100644
index f2418932..00000000
--- a/qrcode/src/main/res/values-ru/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Сканер штрих-кодов</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">К сожалению, возникла ошибка камеры. Может потребоваться перезагрузить устройство.</string>
-  <string name="zxing_msg_default_status">Чтобы сканировать штрих-код, поместите его в прямоугольник видоискателя.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-sk/zxing_strings.xml b/qrcode/src/main/res/values-sk/zxing_strings.xml
deleted file mode 100644
index cecefa4f..00000000
--- a/qrcode/src/main/res/values-sk/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Ospravedlňujeme sa, fotoaparát narazil na problém. Možno bude potrebné reštartovať zariadenie.</string>
-  <string name="zxing_msg_default_status">Umiestnite čiarový kód do vnútra obdĺžnika hľadáčiku pre skenovanie</string>
-</resources>
diff --git a/qrcode/src/main/res/values-sl/zxing_strings.xml b/qrcode/src/main/res/values-sl/zxing_strings.xml
deleted file mode 100644
index 874fa78e..00000000
--- a/qrcode/src/main/res/values-sl/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">V redu</string>
-  <string name="zxing_msg_camera_framework_bug">Oprostite, Android kamera je naletela na težave. Mogoče boste morali ponovno zagnati napravo.</string>
-  <string name="zxing_msg_default_status">Za branje postavite črtno kodo znotraj iskala.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-sv/zxing_strings.xml b/qrcode/src/main/res/values-sv/zxing_strings.xml
deleted file mode 100644
index e0c920f8..00000000
--- a/qrcode/src/main/res/values-sv/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Det uppstod tyvärr ett fel med Androidkameran.</string>
-  <string name="zxing_msg_default_status">Placera steckkoden inom sökarens rektangel för att läsa den.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-th/zxing_strings.xml b/qrcode/src/main/res/values-th/zxing_strings.xml
deleted file mode 100644
index 6d0e44f7..00000000
--- a/qrcode/src/main/res/values-th/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">ตกลง</string>
-  <string name="zxing_msg_camera_framework_bug">ขออภัย พบปัญหาของกล้อง Android คุณอาจจะต้องรีสตาร์ทอุปกรณ์</string>
-  <string name="zxing_msg_default_status">วางบาร์โค้ดภายในสี่เหลี่ยมผืนผ้าที่ช่องมองภาพเพื่อสแกน</string>
-</resources>
diff --git a/qrcode/src/main/res/values-tr/zxing_strings.xml b/qrcode/src/main/res/values-tr/zxing_strings.xml
deleted file mode 100644
index 24d14a44..00000000
--- a/qrcode/src/main/res/values-tr/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barkod Tarayıcısı</string>
-  <string name="zxing_button_ok">Tamam</string>
-  <string name="zxing_msg_camera_framework_bug">Üzgünüz, Android kamera bir sorunla karşılaştı. Cihazı yeniden başlatmanız gerekebilir.</string>
-  <string name="zxing_msg_default_status">Barkodu taramak için vizördeki dikdörtgenin içerisine yerleştirin.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-uk/zxing_strings.xml b/qrcode/src/main/res/values-uk/zxing_strings.xml
deleted file mode 100644
index 2d68ab1f..00000000
--- a/qrcode/src/main/res/values-uk/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Сканер штрих-кодів</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Нажаль, виникла помилка камери. Можливо, вам знадобиться перезавантажити пристрій.</string>
-  <string name="zxing_msg_default_status">Щоб відсканувати штрих-код, помістіть його в прямокутник видошукача.</string>
-</resources>
diff --git a/qrcode/src/main/res/values-zh-rCN/zxing_strings.xml b/qrcode/src/main/res/values-zh-rCN/zxing_strings.xml
deleted file mode 100644
index 8fd5344d..00000000
--- a/qrcode/src/main/res/values-zh-rCN/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">条码扫描器</string>
-  <string name="zxing_button_ok">确定</string>
-  <string name="zxing_msg_camera_framework_bug">抱歉，Android相机出现问题。您可能需要重启设备。</string>
-  <string name="zxing_msg_default_status">请将条码置于取景框内扫描。  </string>
-</resources>
diff --git a/qrcode/src/main/res/values-zh-rHK b/qrcode/src/main/res/values-zh-rHK
deleted file mode 100644
index 79288ab9..00000000
--- a/qrcode/src/main/res/values-zh-rHK
+++ /dev/null
@@ -1 +0,0 @@
-values-zh-rTW
\ No newline at end of file
diff --git a/qrcode/src/main/res/values-zh-rTW/zxing_strings.xml b/qrcode/src/main/res/values-zh-rTW/zxing_strings.xml
deleted file mode 100644
index 4f8f35ec..00000000
--- a/qrcode/src/main/res/values-zh-rTW/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">條碼掃描器</string>
-  <string name="zxing_button_ok">確定</string>
-  <string name="zxing_msg_camera_framework_bug">很抱歉，Android 相機出現問題，您可能需要重新啟動您的裝置。</string>
-  <string name="zxing_msg_default_status">將條碼置於鏡頭範圍內以進行掃描。</string>
-</resources>
diff --git a/qrcode/src/main/res/values/strings.xml b/qrcode/src/main/res/values/strings.xml
deleted file mode 100644
index 1060dd04..00000000
--- a/qrcode/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">qrCode</string>
-</resources>
diff --git a/qrcode/src/main/res/values/zxing_attrs.xml b/qrcode/src/main/res/values/zxing_attrs.xml
deleted file mode 100644
index b5960ea7..00000000
--- a/qrcode/src/main/res/values/zxing_attrs.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-
-  <declare-styleable name="zxing_view">
-    <attr name="zxing_scanner_layout" format="reference"/>
-  </declare-styleable>
-
-  <declare-styleable name="zxing_camera_preview">
-    <attr name="zxing_framing_rect_width" format="dimension" />
-    <attr name="zxing_framing_rect_height" format="dimension" />
-    <attr name="zxing_use_texture_view" format="boolean" />
-    <attr name="zxing_preview_scaling_strategy" format="enum">
-      <enum name="centerCrop" value="1" />
-      <enum name="fitCenter" value="2" />
-      <enum name="fitXY" value="3" />
-    </attr>
-  </declare-styleable>
-
-  <declare-styleable name="zxing_finder">
-    <attr name="zxing_possible_result_points" format="color"/>
-    <attr name="zxing_result_view" format="color"/>
-    <attr name="zxing_viewfinder_laser" format="color"/>
-    <attr name="zxing_viewfinder_mask" format="color"/>
-  </declare-styleable>
-
-</resources>
diff --git a/qrcode/src/main/res/values/zxing_colors.xml b/qrcode/src/main/res/values/zxing_colors.xml
deleted file mode 100644
index 56acb910..00000000
--- a/qrcode/src/main/res/values/zxing_colors.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <color name="zxing_possible_result_points">#c0ffbd21</color> <!-- Android standard ICS color -->
-  <color name="zxing_result_view">#b0000000</color>
-  <color name="zxing_status_text">#ffffffff</color>
-  <color name="zxing_transparent">#00000000</color>
-  <color name="zxing_viewfinder_laser">#ffcc0000</color> <!-- Android standard ICS color -->
-  <color name="zxing_viewfinder_mask">#60000000</color>
-
-  <color name="zxing_custom_possible_result_points">#903A89CF</color>
-  <color name="zxing_custom_result_view">#b0000000</color>
-  <color name="zxing_custom_viewfinder_laser">#1976D2</color>
-  <color name="zxing_custom_viewfinder_mask">#60000000</color>
-</resources>
diff --git a/qrcode/src/main/res/values/zxing_ids.xml b/qrcode/src/main/res/values/zxing_ids.xml
deleted file mode 100644
index 96cc99b8..00000000
--- a/qrcode/src/main/res/values/zxing_ids.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2008 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <item type="id" name="zxing_decode"/>
-  <item type="id" name="zxing_preview_failed"/>
-  <item type="id" name="zxing_decode_failed"/>
-  <item type="id" name="zxing_decode_succeeded"/>
-  <item type="id" name="zxing_possible_result_points"/>
-  <item type="id" name="zxing_back_button"/>
-  <item type="id" name="zxing_prewiew_size_ready"/>
-  <item type="id" name="zxing_camera_error"/>
-  <item type="id" name="zxing_camera_closed"/>
-</resources>
diff --git a/qrcode/src/main/res/values/zxing_strings.xml b/qrcode/src/main/res/values/zxing_strings.xml
deleted file mode 100644
index 1f870ebd..00000000
--- a/qrcode/src/main/res/values/zxing_strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <string name="zxing_app_name">Barcode Scanner</string>
-  <string name="zxing_button_ok">OK</string>
-  <string name="zxing_msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>
-  <string name="zxing_msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
-</resources>
diff --git a/qrcode/src/main/res/values/zxing_themes.xml b/qrcode/src/main/res/values/zxing_themes.xml
deleted file mode 100644
index 6281e997..00000000
--- a/qrcode/src/main/res/values/zxing_themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="zxing_CaptureTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowFullscreen">true</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/qrcode/src/test/java/com/genonbeta/qrcode/ExampleUnitTest.java b/qrcode/src/test/java/com/genonbeta/qrcode/ExampleUnitTest.java
deleted file mode 100644
index ba299c6f..00000000
--- a/qrcode/src/test/java/com/genonbeta/qrcode/ExampleUnitTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.genonbeta.qrcode;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest
-{
-	@Test
-	public void addition_isCorrect() throws Exception
-	{
-		assertEquals(4, 2 + 2);
-	}
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 946e0563..f33a7d1c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':gdatabase', ':updatewithgithub', ':qrcode'
\ No newline at end of file
+include ':app', ':gdatabase', ':updatewithgithub'
\ No newline at end of file