semi-working list item background. Need more work...

Signed-off-by: Bjørn Mork <bjorn@mork.no>

7 files changed, 46 insertions, 43 deletions

diff --git a/Defogger/Makefile b/Defogger/Makefile
index 37070fc..05fefc8 100644
--- a/Defogger/Makefile
+++ b/Defogger/Makefile
@@ -15,8 +15,7 @@ JAVAVER ?= 8
 ANDROID_HOME ?= /usr/lib/android-sdk
 SDKCLASSPATH ?= $(ANDROID_HOME)/platforms/android-$(APIVER)/android.jar
 
-RESOURCES=layout/activity_main.xml layout/activity_scanner.xml layout/activity_ipcam.xml layout/item_scan.xml layout/item_net.xml values/strings.xml
-RES=$(addprefix res/,$(RESOURCES))
+RES=$(wildcard res/layout/*.xml) $(wildcard res/values/*.xml) $(wildcard res/drawable/*.xml) $(wildcard res/color/*.xml)
 
 ## Temp disabled while we have some non-building classess....
 #CLASSES=obj/no/mork/android/defogger/R.class $(patsubst src/%.java,obj/%.class,$(wildcard src/no/mork/android/defogger/util/*.java) $(wildcard src/no/mork/android/defogger/*.java))
diff --git a/Defogger/res/layout/activity_main.xml b/Defogger/res/layout/activity_main.xml
index 0df524f..45df544 100644
--- a/Defogger/res/layout/activity_main.xml
+++ b/Defogger/res/layout/activity_main.xml
@@ -10,7 +10,6 @@
        android:layout_centerHorizontal="true"
        android:layout_centerVertical="true"
        android:text="@string/hello_msg" />
-
    <Button
        android:id="@+id/start_scan"
        android:layout_width="match_parent"
diff --git a/Defogger/res/layout/activity_scanner.xml b/Defogger/res/layout/activity_scanner.xml
index 9bab165..c1edca6 100644
--- a/Defogger/res/layout/activity_scanner.xml
+++ b/Defogger/res/layout/activity_scanner.xml
@@ -2,17 +2,29 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent" >
 
-   <EditText
+  <Button
+      android:id="@+id/connect"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:onClick="doConnect"
+      android:text="@string/connect"/>
+  <TextView
+      android:id="@+id/pincode_label"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/pincode"
+      android:layout_below="@id/connect" />
+  <EditText
       android:id="@+id/pincode"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:inputType="numberPassword" />
-
-   <ListView
+      android:inputType="numberPassword"
+      android:layout_below="@id/pincode_label" />
+  <ListView
       android:id="@+id/scanlist_view"
       android:scrollbars="vertical"
       android:layout_width="match_parent"
       android:layout_height="fill_parent"
-      android:layout_below="@+id/pincode" />
-
- </RelativeLayout>
+      android:choiceMode="singleChoice"
+      android:layout_below="@id/pincode" />
+</RelativeLayout>
diff --git a/Defogger/res/layout/item_scan.xml b/Defogger/res/layout/item_scan.xml
index 3167c3a..02e0135 100644
--- a/Defogger/res/layout/item_scan.xml
+++ b/Defogger/res/layout/item_scan.xml
@@ -8,6 +8,7 @@
         android:id="@+id/scanitem"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" 
+        android:layout_gravity="center"
+	android:background="@color/list_view_selector"
         android:textSize="20sp" />
 </LinearLayout>
diff --git a/Defogger/res/values/strings.xml b/Defogger/res/values/strings.xml
index 27ee25e..0bcc7f2 100644
--- a/Defogger/res/values/strings.xml
+++ b/Defogger/res/values/strings.xml
@@ -1,14 +1,18 @@
 <resources>
   <string name="app_name">Defogger</string>
   <string name="hello_msg">Welcome a Beautiful Blue Sky for the modern IP Camera</string>
-  <string name="menu_settings">Settings</string>
-  <string name="title_activity_main">MainActivity</string>
 
   <!-- Main -->
-
   <string name="start_scan">Run Bluetooth Scan</string>
   <string name="read_qrcode">Read QR Code</string>
   <string name="wificonfig">Network configuration</string>
+  <string name="qrscan_msg">Scan D-Link Camera QR Code Card</string>
+
+  <!-- Scanner -->
+  <string name="connect">Connect to Camera</string>
+  <string name="pincode">Enter pincode:</string>
+  
+  <!-- IpCam -->
   <string name="sysinfo">System information</string>
   <string name="setup">Configure network</string>
   <string name="telnetd">Enable telnet (volatile)</string>
@@ -17,21 +21,4 @@
   <string name="unsignedfw">Enable unsigned firmware (permanent)</string>
   <string name="command">Run command</string>
 
-  <string name="qrtitle">Read D-Link Camera QR Code</string>
-
-  
-  <!-- Scanner -->
-
-  <string name="bluetooth_client">Bluetooth Client</string>
-  <string name="scanning">Scanning</string>
-  <string name="start">Start</string>
-  <string name="stop">Stop</string>
-  <string name="ble_servers">BLE Servers</string>
-  <string name="connect">Connect</string>
-  <string name="disconnect">Disonnect</string>
-  <string name="messages">Messages</string>
-  <string name="send">Send</string>
-  <string name="request_timestamp">Request Timestamp</string>
-  
- 
 </resources>
diff --git a/Defogger/src/no/mork/android/defogger/MainActivity.java b/Defogger/src/no/mork/android/defogger/MainActivity.java
index a95e741..a2fb9a3 100644
--- a/Defogger/src/no/mork/android/defogger/MainActivity.java
+++ b/Defogger/src/no/mork/android/defogger/MainActivity.java
@@ -132,8 +132,9 @@ public class MainActivity extends Activity {
 
     public void startQRReaderActivity(View view) {
 	IntentIntegrator integrator = new IntentIntegrator(this);
-	integrator.setTitleByID(R.string.qrtitle);
 	integrator.addExtra(Intents.Scan.SAVE_HISTORY, false); // prevent scan result from showing up in input history...
+	integrator.addExtra(Intents.Scan.RESULT_DISPLAY_DURATION_MS, 0L); // no need to linger after a successful scan...
+	integrator.addExtra(Intents.Scan.PROMPT_MESSAGE, getResources().getString(R.string.qrscan_msg));
 	integrator.initiateScan(IntentIntegrator.QR_CODE_TYPES);
     }
 
@@ -152,15 +153,9 @@ public class MainActivity extends Activity {
 	    return;
 	}
 
-	StringBuilder mac = new StringBuilder(data[3]);
-	mac.insert(10, ':');
-	mac.insert(8, ':');
-	mac.insert(6, ':');
-	mac.insert(4, ':');
-	mac.insert(2, ':');
-
-	if (!bluetoothAdapter.checkBluetoothAddress(mac.toString())) {
-	    Log.d(msg, "Got invalid MAC address from QR scan:" + mac.toString());
+	String mac = data[3].replaceAll("([A-F0-9]{2})", "$1:").substring(0, 17);
+	if (!bluetoothAdapter.checkBluetoothAddress(mac)) {
+	    Log.d(msg, "Got invalid MAC address from QR scan:" + mac);
 	    return;
 	}
 	device = bluetoothAdapter.getRemoteDevice(mac.toString());
diff --git a/Defogger/src/no/mork/android/defogger/ScannerActivity.java b/Defogger/src/no/mork/android/defogger/ScannerActivity.java
index 310e8dd..1347320 100644
--- a/Defogger/src/no/mork/android/defogger/ScannerActivity.java
+++ b/Defogger/src/no/mork/android/defogger/ScannerActivity.java
@@ -39,6 +39,8 @@ public class ScannerActivity extends Activity implements Runnable {
     private ScanCallback leScanCallback;
     private ScanAdapter scanlistAdapter;
 
+    private BluetoothDevice device;
+
     private class BtleScanCallback extends ScanCallback {
 	@Override
 	public void onScanResult(int callbackType, ScanResult result) {
@@ -88,7 +90,7 @@ public class ScannerActivity extends Activity implements Runnable {
 		    @Override
 		    public void onClick(View v) {
 			Log.d(msg, "ScanListAdapter: onClick() will return " + ret.getName());
-			ctx.returnScanResult(ret);
+			ctx.setSelection(ret);
 		    }
 		});
 
@@ -119,6 +121,14 @@ public class ScannerActivity extends Activity implements Runnable {
 	stopScan();
     }
 
+    public void doConnect(View view) {
+	returnScanResult();
+    }
+
+    public void setSelection(BluetoothDevice device) {
+	this.device = device;
+    }
+
     private void addScanResult(ScanResult result) {
 	BluetoothDevice device = result.getDevice();
 
@@ -130,7 +140,7 @@ public class ScannerActivity extends Activity implements Runnable {
 	scanlistAdapter.add(device);
     }
     
-    public void returnScanResult(BluetoothDevice device) {
+    public void returnScanResult() {
 	Log.d(msg, "returnScanResult()");
 	stopScan();