Skip to content
Snippets Groups Projects
Unverified Commit 073989d3 authored by Kolya Opahle's avatar Kolya Opahle Committed by GitHub
Browse files

Improved UI on the QR Code scan screen (#272)

parent d3bd245a
No related branches found
No related tags found
No related merge requests found
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp"
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
<group
android:pivotX="20"
android:pivotY="20"
android:scaleX="2"
android:scaleY="2">
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M14.2843,13l-1.2843,1.2843l5.7157,5.7157l-5.7157,5.7157l1.2843,1.2843l5.7157,-5.7157l5.7157,5.7157l1.2843,-1.2843l-5.7157,-5.7157l5.7157,-5.7157l-1.2843,-1.2843l-5.7157,5.7157z"
android:strokeWidth="1"
android:strokeColor="#00FFFFFF" />
</group>
</vector>
......@@ -21,8 +21,8 @@
<com.journeyapps.barcodescanner.ViewfinderView
android:id="@+id/submission_qr_code_scan_viewfinder_view"
android:layout_width="@dimen/submission_scan_qr_code_viewfinder_size"
android:layout_height="@dimen/submission_scan_qr_code_viewfinder_size"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -34,19 +34,18 @@
style="@style/registrationQRCodeScanBody"
android:layout_width="@dimen/submission_scan_qr_code_viewfinder_size"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:layout_marginTop="@dimen/submission_scan_qr_code_viewfinder_center_offset"
android:text="@string/submission_qr_code_scan_body"
app:layout_constraintEnd_toEndOf="@+id/submission_qr_code_scan_preview"
app:layout_constraintStart_toStartOf="@+id/submission_qr_code_scan_preview"
app:layout_constraintTop_toBottomOf="@+id/submission_qr_code_scan_viewfinder_view" />
app:layout_constraintTop_toBottomOf="@+id/submission_qr_code_scan_guideline_center" />
<include
android:id="@+id/submission_qr_code_scan_close"
layout="@layout/include_button_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_close}"
app:icon="@{@drawable/ic_submission_qr_code_scan_close}"
app:layout_constraintBottom_toTopOf="@+id/submission_qr_code_scan_guideline_top"
app:layout_constraintEnd_toStartOf="@+id/guideline_start"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
......@@ -54,10 +53,10 @@
<ToggleButton
android:id="@+id/submission_qr_code_scan_torch"
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_width="@dimen/icon_size_button"
android:layout_height="@dimen/icon_size_button"
android:background="@drawable/ic_registration_qr_code_scan_torch_toggle"
android:backgroundTint="@color/colorTextPrimary3"
android:backgroundTint="@color/colorTextPrimary1"
android:textOff=""
android:textOn=""
app:layout_constraintBottom_toTopOf="@+id/submission_qr_code_scan_guideline_top"
......@@ -72,6 +71,13 @@
android:orientation="horizontal"
app:layout_constraintGuide_begin="@dimen/spacing_normal" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/submission_qr_code_scan_guideline_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
......
......@@ -86,4 +86,5 @@
<!-- Submission QR Code Scan -->
<dimen name="submission_scan_qr_code_viewfinder_size">240dp</dimen>
<dimen name="submission_scan_qr_code_viewfinder_center_offset">120dp</dimen>
</resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment