mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-20 04:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Theming improvements

Browse Source
This commit is contained in:
Sylvia van Os
2020-12-14 21:34:28 +01:00
parent bb99321209
commit 6f4673c9fb
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/res/layout/custom_barcode_scanner.xml
View File

@@ -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>

24
app/src/main/res/layout/scan_activity.xml
View File

@@ -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>