From 847655eccb41324cda406e21e692124666607a27 Mon Sep 17 00:00:00 2001
From: Michal Horn <hornmich@fel.cvut.cz>
Date: Tue, 17 Feb 2015 10:41:36 +0100
Subject: [PATCH] Implement and include the main activity layout

---
 .../cvut/fel/dce/qrscanner/MainActivity.java  | 47 ++++---------------
 .../src/main/res/layout/activity_main.xml     | 20 +++++---
 .../glass/src/main/res/values/strings.xml     |  1 +
 3 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/QRScanner/glass/src/main/java/cz/cvut/fel/dce/qrscanner/MainActivity.java b/QRScanner/glass/src/main/java/cz/cvut/fel/dce/qrscanner/MainActivity.java
index 6b981e3..b90a17b 100644
--- a/QRScanner/glass/src/main/java/cz/cvut/fel/dce/qrscanner/MainActivity.java
+++ b/QRScanner/glass/src/main/java/cz/cvut/fel/dce/qrscanner/MainActivity.java
@@ -46,42 +46,8 @@ public class MainActivity extends Activity {
 	@Override
 	protected void onCreate(Bundle bundle) {
 		super.onCreate(bundle);
+		setContentView(R.layout.activity_main);
 
-		mView = buildView();
-
-		mCardScroller = new CardScrollView(this);
-		mCardScroller.setAdapter(new CardScrollAdapter() {
-			@Override
-			public int getCount() {
-				return 1;
-			}
-
-			@Override
-			public Object getItem(int position) {
-				return mView;
-			}
-
-			@Override
-			public View getView(int position, View convertView, ViewGroup parent) {
-				return mView;
-			}
-
-			@Override
-			public int getPosition(Object item) {
-				if (mView.equals(item)) {
-					return 0;
-				}
-				return AdapterView.INVALID_POSITION;
-			}
-		});
-		// Handle the TAP event.
-		mCardScroller.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				startScan();
-			}
-		});
-		setContentView(mCardScroller);
 	}
 
 	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
@@ -100,15 +66,22 @@ public class MainActivity extends Activity {
 	@Override
 	protected void onResume() {
 		super.onResume();
-		mCardScroller.activate();
 	}
 
 	@Override
 	protected void onPause() {
-		mCardScroller.deactivate();
 		super.onPause();
 	}
 
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		if (keyCode == KeyEvent.KEYCODE_DPAD_CENTER) {
+			startScan();
+			return true;
+		}
+		return super.onKeyDown(keyCode, event);
+	}
+
 	private void startScan() {
 		IntentIntegrator integrator = new IntentIntegrator(this);
 		integrator.initiateScan();
diff --git a/QRScanner/glass/src/main/res/layout/activity_main.xml b/QRScanner/glass/src/main/res/layout/activity_main.xml
index c505b1c..0822edb 100644
--- a/QRScanner/glass/src/main/res/layout/activity_main.xml
+++ b/QRScanner/glass/src/main/res/layout/activity_main.xml
@@ -9,12 +9,20 @@
         android:layout_height="wrap_content"
         android:id="@+id/imageView"
         android:src="@drawable/skoda_logo"
-        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:scaleType="centerInside"
+        android:layout_below="@+id/textView8"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentStart="true"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:text="@string/tap_to_start_scan"
+        android:id="@+id/textView8"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"/>
 
 </RelativeLayout>
diff --git a/QRScanner/glass/src/main/res/values/strings.xml b/QRScanner/glass/src/main/res/values/strings.xml
index af3c239..2d98db1 100644
--- a/QRScanner/glass/src/main/res/values/strings.xml
+++ b/QRScanner/glass/src/main/res/values/strings.xml
@@ -36,4 +36,5 @@ limitations under the License.
     <string name="page_state_scrolling">scrolling</string>
     <string name="loading_page">Loading...</string>
     <string name="zoom_label">Zoom:</string>
+    <string name="tap_to_start_scan">Tap to start scanning</string>
 </resources>
-- 
2.39.2