From 6f4673c9fbb6fad1a9c554a24166318289b8aafb Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 14 Dec 2020 21:34:28 +0100
Subject: [PATCH] Theming improvements

---
 .../res/layout/custom_barcode_scanner.xml     | 10 ++++----
 app/src/main/res/layout/scan_activity.xml     | 24 +++++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/custom_barcode_scanner.xml b/app/src/main/res/layout/custom_barcode_scanner.xml
index 9a9de3222..e96ff23c6 100644
--- a/app/src/main/res/layout/custom_barcode_scanner.xml
+++ b/app/src/main/res/layout/custom_barcode_scanner.xml
@@ -20,13 +20,11 @@
         app:zxing_viewfinder_laser="@color/zxing_custom_viewfinder_laser"
         app:zxing_viewfinder_mask="@color/zxing_custom_viewfinder_mask"/>
 
-    <TextView
-        android:id="@+id/zxing_status_view"
+    <Button
+        android:id="@+id/add_manually"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:text="@string/addManually"
         android:layout_gravity="bottom|center_horizontal"
-        android:background="@color/zxing_transparent"
-        android:text="@string/scanCardBarcode"
-        android:textColor="@color/zxing_status_text"/>
-
+        android:onClick="addManually"/>
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/scan_activity.xml b/app/src/main/res/layout/scan_activity.xml
index bdbf25e99..97b8e3d7f 100644
--- a/app/src/main/res/layout/scan_activity.xml
+++ b/app/src/main/res/layout/scan_activity.xml
@@ -7,20 +7,24 @@
     android:layout_height="match_parent"
     tools:context=".ScanActivity">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
     <com.journeyapps.barcodescanner.DecoratedBarcodeView
         android:id="@+id/zxing_barcode_scanner"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:zxing_scanner_layout="@layout/custom_barcode_scanner">
     </com.journeyapps.barcodescanner.DecoratedBarcodeView>
-
-    <Button
-        android:id="@+id/add_manually"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/addManually"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:onClick="addManually"/>
-
 </RelativeLayout>
\ No newline at end of file