From 1e67fdf065a7970f476484ddc6075f9cdb5e2ea9 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Mon, 11 Feb 2019 18:53:18 -0600
Subject: [PATCH] Improve the camera preview in SendTransactionFragment, so
 that both the preview and the scan zone are squared.

---
 .../fragments/SendTransactionFragment.kt      |  2 +
 .../res/drawable/camera_view_background.xml   |  6 ++-
 .../res/layout/fragment_send_transaction.xml  | 52 ++++++++++---------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
index 0bcc144..5680722 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
@@ -351,6 +351,8 @@ class SendTransactionFragment : ConnectedFragment(), ZXingScannerView.ResultHand
         cameraPreview.setMaskColor(R.color.colorAccent)
         cameraPreview.setResultHandler(this)
         cameraPreview.startCamera()
+
+        cameraPreview.scrollY = holderCamera.width / 6
     }
 
     private fun stopCameraPreview() {
diff --git a/app/src/main/res/drawable/camera_view_background.xml b/app/src/main/res/drawable/camera_view_background.xml
index 3557241..a738e4f 100644
--- a/app/src/main/res/drawable/camera_view_background.xml
+++ b/app/src/main/res/drawable/camera_view_background.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    <corners android:radius="10dp" />
-    <solid android:color="#111" />
+    <corners android:radius="8dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#888"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_send_transaction.xml b/app/src/main/res/layout/fragment_send_transaction.xml
index 8c128e6..141c97c 100644
--- a/app/src/main/res/layout/fragment_send_transaction.xml
+++ b/app/src/main/res/layout/fragment_send_transaction.xml
@@ -136,18 +136,32 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilMemo" />
 
-        <View
-            android:id="@+id/viewCamera"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/spacing_same_topic"
-            android:layout_marginStart="@dimen/activity_horizontal_margin"
-            android:background="@drawable/camera_view_background"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toBottomOf="@+id/tvScan"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/cameraVerticalGuideline"/>
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/holderCamera"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="@dimen/spacing_same_topic"
+                android:layout_marginStart="@dimen/activity_horizontal_margin"
+                android:background="@drawable/camera_view_background"
+                app:layout_constraintDimensionRatio="1:1"
+                app:layout_constraintTop_toBottomOf="@+id/tvScan"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/cameraVerticalGuideline">
+
+            <me.dm7.barcodescanner.zxing.ZXingScannerView
+                    android:id="@+id/cameraPreview"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:squaredFinder="true"
+                    app:borderColor="@color/colorSend"
+                    app:layout_constraintDimensionRatio="h,3:4"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fabOpenCamera"
@@ -161,16 +175,6 @@
             app:layout_constraintStart_toEndOf="@id/cameraVerticalGuideline"
             app:layout_constraintTop_toBottomOf="@+id/tvScan"/>
 
-        <me.dm7.barcodescanner.zxing.ZXingScannerView
-            android:id="@+id/cameraPreview"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintDimensionRatio="w,3:4"
-            app:layout_constraintTop_toTopOf="@+id/viewCamera"
-            app:layout_constraintBottom_toBottomOf="@id/viewCamera"
-            app:layout_constraintStart_toStartOf="@id/viewCamera"
-            app:layout_constraintEnd_toEndOf="@id/viewCamera" />
-
         <View
             android:id="@+id/vSend"
             android:layout_width="120dp"
@@ -178,8 +182,8 @@
             android:layout_marginEnd="0dp"
             android:background="@drawable/send_fab_background_disabled"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/viewCamera"
-            app:layout_constraintBottom_toBottomOf="@id/viewCamera"/>
+            app:layout_constraintTop_toTopOf="@id/holderCamera"
+            app:layout_constraintBottom_toBottomOf="@id/holderCamera"/>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fabSendTransaction"