Merge branch '1.2.0'

wjc

2025-05-07 b9cc7390e8e8ce64c41c26fb369c98ce669d660c

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

@@ -21,7 +21,7 @@
        >

        <RelativeLayout
            android:layout_marginTop="@dimen/dp_20"
            android:layout_marginTop="@dimen/dp_30"
            android:layout_width="match_parent"
            android:layout_height="50dp"
            >