Fix QR Scanner activity

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
-        versionName "0.0.1-beta"
+        versionName "0.0.2-beta"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/com/adityapk/zcash/zqwandroid/QrReaderActivity.kt

@@ -72,9 +72,12 @@ class QrReaderActivity : AppCompatActivity() {
                         cameraSource.start(cameraView.holder)
 
                         val w = cameraView.width
+                        val h = cameraView.height
                         val scale = cameraSource.previewSize.width.toDouble() / cameraSource.previewSize.height.toDouble()
 
-                        cameraView.layout(0, 0, w, (w.toDouble() / scale).toInt())
+                        val scaleWidth = (h.toDouble() / scale).toInt()
+
+                        cameraView.layout((w - scaleWidth)/2, 0, scaleWidth , h)
                         println("Preview size: ${cameraSource.previewSize}")
                     }
                 } catch (ie: IOException) {

app/src/main/res/layout/activity_qr_reader.xml

@@ -11,10 +11,16 @@
 
     <SurfaceView
             android:layout_width="0dp"
-            android:layout_height="400dp"
+            android:layout_height="0dp"
             android:id="@+id/camera_view"
             app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/>
+    <ImageView
+            android:src="#ee000000"
+            android:layout_width="0dp"
+            android:layout_height="200dp" android:id="@+id/imageView4"
+            app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
     <TextView
             android:text="Go to Apps -> Connect mobile app on your desktop and scan the QR Code to connect"
             android:layout_width="0dp"
@@ -22,31 +28,26 @@
             android:id="@+id/txtQrCodeHelp"
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="8dp" android:textAlignment="center" android:layout_marginTop="8dp"
-            app:layout_constraintTop_toBottomOf="@+id/camera_view"/>
+            android:layout_marginEnd="8dp" android:textAlignment="center"
+            android:layout_marginBottom="16dp" app:layout_constraintBottom_toTopOf="@+id/btnQrCodeCancel"
+            android:textColor="@android:color/white"/>
     <Button
             android:text="Cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/btnQrCodeCancel" android:layout_marginTop="16dp"
-            app:layout_constraintTop_toBottomOf="@+id/txtQrCodeHelp" app:layout_constraintStart_toStartOf="parent"
+            android:id="@+id/btnQrCodeCancel"
+            app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginEnd="8dp" android:background="@color/colorPrimary"
-            android:textColor="@android:color/white"/>
-    <ImageView
-            android:src="@android:drawable/ic_menu_camera"
-            android:layout_width="349dp"
-            android:layout_height="306dp"
-            android:id="@+id/imageView4"
-            app:layout_constraintTop_toTopOf="@+id/camera_view"
-            app:layout_constraintBottom_toBottomOf="@+id/camera_view" app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="8dp" app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="8dp"/>
+            android:textColor="@android:color/white" android:layout_marginBottom="16dp"
+            app:layout_constraintBottom_toTopOf="@+id/lblErrorMsg"/>
     <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:id="@+id/lblErrorMsg" android:layout_marginTop="8dp"
-            app:layout_constraintTop_toBottomOf="@+id/btnQrCodeCancel" app:layout_constraintStart_toStartOf="parent"
+            android:id="@+id/lblErrorMsg"
+            app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="8dp" android:textAlignment="center" android:textColor="@color/colorAccent"/>
+            android:layout_marginEnd="8dp" android:textAlignment="center" android:textColor="@color/colorPrimary"
+            android:layout_marginBottom="32dp"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 </android.support.constraint.ConstraintLayout>