first try at integrating google's barcode scanner

svn path=/; revision=499

diff --git a/Personnel/justin/lab inventory/.classpath b/Personnel/justin/lab inventory/.classpath
index a4763d1eeceda200d34208db1c129af010a168c6..7b60a9d83c23a51d17abfd05fa46c8eaa4a04b24 100644 (file)
--- a/Personnel/justin/lab inventory/.classpath
+++ b/Personnel/justin/lab inventory/.classpath
@@ -2,7 +2,9 @@
 <classpath>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="gen"/>
-       <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-       <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+       <classpathentry kind="lib" path="/home/miles/Documents/Testing/ZXing-2.2.zip"/>
        <classpathentry kind="output" path="bin/classes"/>
 </classpath>

diff --git a/Personnel/justin/lab inventory/AndroidManifest.xml b/Personnel/justin/lab inventory/AndroidManifest.xml
index ba8b6959ae178b474dbc517d2d4a15d3da890cde..133dfcb3910885126d302fe302d5e8f6043f08f1 100644 (file)
--- a/Personnel/justin/lab inventory/AndroidManifest.xml
+++ b/Personnel/justin/lab inventory/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="15" />
+        android:targetSdkVersion="18" />
 
     <application
         android:icon="@drawable/ic_launcher"

diff --git a/Personnel/justin/lab inventory/bin/AndroidManifest.xml b/Personnel/justin/lab inventory/bin/AndroidManifest.xml
index ba8b6959ae178b474dbc517d2d4a15d3da890cde..133dfcb3910885126d302fe302d5e8f6043f08f1 100644 (file)
--- a/Personnel/justin/lab inventory/bin/AndroidManifest.xml
+++ b/Personnel/justin/lab inventory/bin/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="15" />
+        android:targetSdkVersion="18" />
 
     <application
         android:icon="@drawable/ic_launcher"

diff --git a/Personnel/justin/lab inventory/bin/classes.dex b/Personnel/justin/lab inventory/bin/classes.dex
index 4ff645cc18f02f98b1af040bf26bb58bab292d7c..7121c6372eb6b3f9e2a9520edfd6630167607cba 100644 (file)
Binary files a/Personnel/justin/lab inventory/bin/classes.dex and b/Personnel/justin/lab inventory/bin/classes.dex differ

diff --git a/Personnel/justin/lab inventory/bin/dexedLibs/android-support-v4-6cd064a6e5509dc41a089b4a4355ac79.jar b/Personnel/justin/lab inventory/bin/dexedLibs/android-support-v4-6cd064a6e5509dc41a089b4a4355ac79.jar
new file mode 100644 (file)
index 0000000..4d292d2
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/dexedLibs/android-support-v4-6cd064a6e5509dc41a089b4a4355ac79.jar differ

diff --git a/Personnel/justin/lab inventory/bin/jarlist.cache b/Personnel/justin/lab inventory/bin/jarlist.cache
index 1b5ec3f9c5741ea2c49e7978c6fe7f6c7924d9ed..0565465f225d470f6791a61ca04463ad4ee2131b 100644 (file)
--- a/Personnel/justin/lab inventory/bin/jarlist.cache
+++ b/Personnel/justin/lab inventory/bin/jarlist.cache
@@ -1,3 +1,3 @@
-# cache for current jar dependecy. DO NOT EDIT.
+# cache for current jar dependency. DO NOT EDIT.
 # format is <lastModified> <length> <SHA-1> <path>
 # Encoding is UTF-8

diff --git a/Personnel/justin/lab inventory/bin/lab inventory.apk b/Personnel/justin/lab inventory/bin/lab inventory.apk
index 1684cb36490165aae0585c2f82d1dfa61960c8bd..e9b9df1249a568156034069ee9da808950b87e68 100644 (file)
Binary files a/Personnel/justin/lab inventory/bin/lab inventory.apk and b/Personnel/justin/lab inventory/bin/lab inventory.apk differ

diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/ic_action_search.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/ic_action_search.png
new file mode 100644 (file)
index 0000000..ffec9be
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/ic_action_search.png differ

diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/ic_launcher.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..498a287
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/ic_launcher.png differ

diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/ic_launcher.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..7d9eba3
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/ic_launcher.png differ

diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/ic_action_search.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/ic_action_search.png
new file mode 100644 (file)
index 0000000..ce9399c
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/ic_action_search.png differ

diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/ic_launcher.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..9eb7580
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/ic_launcher.png differ

diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/ic_action_search.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/ic_action_search.png
new file mode 100644 (file)
index 0000000..b2d7b2d
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/ic_action_search.png differ

diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/ic_launcher.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/ic_launcher.png
new file mode 100644 (file)
index 0000000..cd07610
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/ic_launcher.png differ

diff --git a/Personnel/justin/lab inventory/bin/resources.ap_ b/Personnel/justin/lab inventory/bin/resources.ap_
index 21c32bb4a62675f92a6b2768039c4db03a243066..1f3049be31ff4384243c0daa7d39f6e9c9c23bfd 100644 (file)
Binary files a/Personnel/justin/lab inventory/bin/resources.ap_ and b/Personnel/justin/lab inventory/bin/resources.ap_ differ

diff --git a/Personnel/justin/lab inventory/project.properties b/Personnel/justin/lab inventory/project.properties
index 9b84a6b4bf98e3a34bdd89c1d1f327611ce05b1b..ce39f2d0a061116c8dfd41e74b2bfd54ff4d554b 100644 (file)
--- a/Personnel/justin/lab inventory/project.properties
+++ b/Personnel/justin/lab inventory/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-18

diff --git a/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java
index 396f6b473dbf81d28a28c7525bb9c481ce472c3a..566c58ef8d76497a7a876bd9425c273bc9cec061 100644 (file)
--- a/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java
+++ b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/MainActivity.java
@@ -1,11 +1,14 @@
 package com.jaiswallab.lab.inventory;
 
-import android.os.Bundle;
 import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
 import android.view.Menu;
 import android.view.View;
 import android.widget.EditText;
 
+
+
 public class MainActivity extends Activity {
        private EditText text;
 
@@ -25,6 +28,23 @@ public class MainActivity extends Activity {
     // This method is called at click of the QR code button
     public void qrClick(View view) {
        text.setText("QR button clicked again");
+       Intent intent = new Intent("com.google.zxing.client.android.SCAN"); 
+       startActivityForResult(intent, 0);
+    }
+    
+    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        if (requestCode == 0) {
+            if (resultCode == RESULT_OK) {
+                // contents contains whatever was encoded
+                String contents = intent.getStringExtra("SCAN_RESULT");
+               text.setText(contents);
+                // Format contains the type of code i.e. UPC, EAN, QRCode etc...
+                String format = intent.getStringExtra("SCAN_RESULT_FORMAT");
+
+
+            }
+        }
+
     }
     
     // This method is called at click of the check inventory button