From: Eugene Crosser <crosser@average.org>
Date: Wed, 1 May 2013 15:23:52 +0000 (+0400)
Subject: some layout
X-Git-Url: http://www.average.org/gitweb/?p=YkNeoCR.git;a=commitdiff_plain;h=6bf38fe9ae1dbd8c07a147f29ff7451220f34391

some layout
---

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 869a3a5..38060dd 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,13 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    tools:context=".NFCAuthCREnroll"
     >
-<TextView
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:text="Hello World, NFCAuthCR"
+    <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+    >
+        <RadioButton android:id="@+id/slot_1"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="@string/slot_1"
+                     android:onClick="onSlotSelectionClicked"
+        />
+        <RadioButton android:id="@+id/slot_2"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:text="@string/slot_2"
+                     android:onClick="onSlotSelectionClicked"
+        />
+    </RadioGroup>
+    <Button
+        android:id="@+id/enroll"
+        android:text="@string/enroll"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="140dp"
+        android:onClick="onEnrollClicked"
     />
-</LinearLayout>
+</RelativeLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 24a8461..d3d2fe8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">NFC Chal-Resp Auth</string>
+    <string name="app_name">NFC Auth</string>
+    <string name="enroll">Enroll</string>
+    <string name="select_slot">Select Slot</string>
+    <string name="slot_1">Slot 1</string>
+    <string name="slot_2">Slot 2</string>
 </resources>
diff --git a/src/org/average/nfcauthcr/NFCAuthCREnroll.java b/src/org/average/nfcauthcr/NFCAuthCREnroll.java
index 3007773..11010e3 100644
--- a/src/org/average/nfcauthcr/NFCAuthCREnroll.java
+++ b/src/org/average/nfcauthcr/NFCAuthCREnroll.java
@@ -5,7 +5,7 @@ import android.os.Bundle;
 
 public class NFCAuthCREnroll extends Activity
 {
-    private static final String logTag = "NFCAuthCR";
+    private static final String TAG = getClass().getName();
 
     private static boolean waitingForResult = false;