names/theme setup

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 70507a433278f512e5381b04b6c1f0ff6b256812..ee3692d339fb36b699577c411212bf96222c1451 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,13 +3,25 @@
       package="org.average.nfcauthcr"
       android:versionCode="1"
       android:versionName="1.0">
       package="org.average.nfcauthcr"
       android:versionCode="1"
       android:versionName="1.0">

-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
-        <activity android:name="NFCAuthCRConf"
+    <uses-sdk android:minSdkVersion="10"
+              android:targetSdkVersion="17" />
+
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-feature android:name="android.hardware.nfc"
+                  android:required="true" />
+
+    <application android:label="@string/app_name"
+                 android:icon="@drawable/yalekey"
+                 android:allowBackup="true"
+                 android:theme="@style/AppTheme">
+
+        <activity android:name=".NFCAuthCREnroll"

                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

+

     </application>
 </manifest>
     </application>
 </manifest>

diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644 (file)
index 96a442e..0000000
Binary files a/res/drawable-hdpi/ic_launcher.png and /dev/null differ

diff --git a/res/drawable-hdpi/yalekey.png b/res/drawable-hdpi/yalekey.png
new file mode 100644 (file)
index 0000000..6899f97
Binary files /dev/null and b/res/drawable-hdpi/yalekey.png differ

diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644 (file)
index 9923872..0000000
Binary files a/res/drawable-ldpi/ic_launcher.png and /dev/null differ

diff --git a/res/drawable-ldpi/yalekey.png b/res/drawable-ldpi/yalekey.png
new file mode 100644 (file)
index 0000000..71482e7
Binary files /dev/null and b/res/drawable-ldpi/yalekey.png differ

diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644 (file)
index 359047d..0000000
Binary files a/res/drawable-mdpi/ic_launcher.png and /dev/null differ

diff --git a/res/drawable-mdpi/yalekey.png b/res/drawable-mdpi/yalekey.png
new file mode 100644 (file)
index 0000000..a5e5b87
Binary files /dev/null and b/res/drawable-mdpi/yalekey.png differ

diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644 (file)
index 71c6d76..0000000
Binary files a/res/drawable-xhdpi/ic_launcher.png and /dev/null differ

diff --git a/res/drawable-xhdpi/yalekey.png b/res/drawable-xhdpi/yalekey.png
new file mode 100644 (file)
index 0000000..bc335ef
Binary files /dev/null and b/res/drawable-xhdpi/yalekey.png differ

diff --git a/res/layout/main.xml b/res/layout/main.xml
index cac2f702499ecef854620cf55a261fbb31c7b1a9..869a3a541c6e4923f888546e0a1b58d9921c06a1 100644 (file)
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -7,7 +7,7 @@
 <TextView
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
 <TextView
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"

-    android:text="Hello World, NFCAuthCRConf"
+    android:text="Hello World, NFCAuthCR"

     />
 </LinearLayout>
 
     />
 </LinearLayout>
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 57603e936832fd95ff423ac81b83278f5f37caaa..24a846156697f2b8fda3c76222b130076398dddc 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <?xml version="1.0" encoding="utf-8"?>
 <resources>

-    <string name="app_name">NFCAuthCRConf</string>
+    <string name="app_name">NFC Chal-Resp Auth</string>

 </resources>
 </resources>

diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644 (file)
index 0000000..d48e975
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,7 @@
+<resources>
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+    </style>
+
+    <style name="AppTheme" parent="AppBaseTheme">
+    </style>
+</resources>

diff --git a/src/org/average/nfcauthcr/NFCAuthCRConf.java b/src/org/average/nfcauthcr/NFCAuthCRConf.java
deleted file mode 100644 (file)
index e9a0aa7..0000000
--- a/src/org/average/nfcauthcr/NFCAuthCRConf.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.average.nfcauthcr;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class NFCAuthCRConf extends Activity
-{
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-    }
-}

diff --git a/src/org/average/nfcauthcr/NFCAuthCREnroll.java b/src/org/average/nfcauthcr/NFCAuthCREnroll.java
new file mode 100644 (file)
index 0000000..3007773
--- /dev/null
+++ b/src/org/average/nfcauthcr/NFCAuthCREnroll.java
@@ -0,0 +1,24 @@
+package org.average.nfcauthcr;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class NFCAuthCREnroll extends Activity
+{
+    private static final String logTag = "NFCAuthCR";
+
+    private static boolean waitingForResult = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (!waitingForResult) { finish(); }
+    }
+}