some layout

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 869a3a541c6e4923f888546e0a1b58d9921c06a1..38060ddb5e4bcea16cbe3d38b560cf79beb08140 100644 (file)
--- 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 24a846156697f2b8fda3c76222b130076398dddc..d3d2fe83a581e0ac6cf19a540ffd0ba92754de40 100644 (file)
--- 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 30077733db632e9dcd3307dc435661ef777603fd..11010e3e011a83c46414af08ede95588245d83f0 100644 (file)
--- 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;