Change layout of the main screen

The button has been replaced by a label.

diff --git a/QRScanner/mobile/src/main/res/layout-land/activity_main.xml b/QRScanner/mobile/src/main/res/layout-land/activity_main.xml
index 930b3061bd79440a42e1f256c640ca71cede2c65..0a102cfcfd9a7a6e75346760f431a4c83788829a 100644 (file)
--- a/QRScanner/mobile/src/main/res/layout-land/activity_main.xml
+++ b/QRScanner/mobile/src/main/res/layout-land/activity_main.xml
@@ -13,21 +13,21 @@
         android:layout_height="wrap_content"
         android:id="@+id/imageView"
         android:src="@drawable/skoda_logo"
+        android:onClick="findComponent"
+        android:layout_below="@+id/textView9"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
-        android:layout_toLeftOf="@+id/button"
-        android:onClick="findComponent"
-        android:layout_toStartOf="@+id/button"/>
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"/>
 
-    <Button
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/butStartScanning"
-        android:id="@+id/button"
-        android:onClick="findComponent"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/touch_to_start_scan"
+        android:id="@+id/textView9"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"/>
+
 </RelativeLayout>

diff --git a/QRScanner/mobile/src/main/res/layout/activity_main.xml b/QRScanner/mobile/src/main/res/layout/activity_main.xml
index 27c684f171abf443b606a15bba485e504bc7ac0d..77c1d7bb78be41b868823233d189caa717181ac3 100644 (file)
--- a/QRScanner/mobile/src/main/res/layout/activity_main.xml
+++ b/QRScanner/mobile/src/main/res/layout/activity_main.xml
@@ -8,26 +8,27 @@
                 android:paddingBottom="@dimen/activity_vertical_margin"
                 tools:context=".MainActivity">
 
-    <ImageView
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/imageView"
-        android:src="@drawable/skoda_logo"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/touch_to_start_scan"
+        android:id="@+id/textView8"
         android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:onClick="findComponent"
-        android:layout_above="@+id/button"
-        android:contentDescription="@string/skoda_logo_content_desc"/>
+        android:layout_centerHorizontal="true"/>
 
-    <Button
+    <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/butStartScanning"
-        android:id="@+id/button"
+        android:id="@+id/imageView"
+        android:src="@drawable/skoda_logo"
         android:onClick="findComponent"
+        android:contentDescription="@string/skoda_logo_content_desc"
+        android:layout_below="@+id/textView8"
         android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"/>
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"/>
+
 </RelativeLayout>

diff --git a/QRScanner/mobile/src/main/res/values/strings.xml b/QRScanner/mobile/src/main/res/values/strings.xml
index 7a8d7db0ec6eb44317a095f06c2703c06cf9d3d4..7b1ed42ca3716efe06f6e96bc554b3f0f2b9e982 100644 (file)
--- a/QRScanner/mobile/src/main/res/values/strings.xml
+++ b/QRScanner/mobile/src/main/res/values/strings.xml
@@ -68,6 +68,7 @@
     <string name="loading_page">Loading...</string>
     <string name="preview_content_desc">Component preview image</string>
     <string name="skoda_logo_content_desc">Skoda auto logo</string>
+    <string name="touch_to_start_scan">Touch the screen to scan the code.</string>
 
 
 </resources>