From: miles <miles@localhost>
Date: Fri, 18 Oct 2013 18:07:04 +0000 (+0000)
Subject: working image capture
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=8e0c3a02181f08b23559f8ef9ed7fc638c526290;p=old-jaiswallab-svn%2F.git

working image capture
working server interaction, displays correct information about scanned item
items can be edited through the app interface (quantity, location can be changed)
clickable linking to the web interface for detailed information

svn path=/; revision=512
---

diff --git a/Personnel/justin/lab inventory/AndroidManifest.xml b/Personnel/justin/lab inventory/AndroidManifest.xml
index f76d817..e31fedc 100644
--- a/Personnel/justin/lab inventory/AndroidManifest.xml	
+++ b/Personnel/justin/lab inventory/AndroidManifest.xml	
@@ -9,6 +9,7 @@
     
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_CALENDAR"/>
 
     <application
diff --git a/Personnel/justin/lab inventory/bin/AndroidManifest.xml b/Personnel/justin/lab inventory/bin/AndroidManifest.xml
index f76d817..1b5c44e 100644
--- a/Personnel/justin/lab inventory/bin/AndroidManifest.xml	
+++ b/Personnel/justin/lab inventory/bin/AndroidManifest.xml	
@@ -3,13 +3,12 @@
     android:versionCode="1"
     android:versionName="1.0" >
     
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
-    
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_CALENDAR"/>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    
+	<uses-sdk android:targetSdkVersion="18" android:minSdkVersion="8"/>
+	<uses-permission android:name="android.permission.INTERNET"/>
 
     <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 3d32b17..3c12e54 100644
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/IzPack-install-4.3.5-b8c147d7e000f6b47e4b830cd2de9a3f.jar b/Personnel/justin/lab inventory/bin/dexedLibs/IzPack-install-4.3.5-b8c147d7e000f6b47e4b830cd2de9a3f.jar
new file mode 100644
index 0000000..20adba2
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/dexedLibs/IzPack-install-4.3.5-b8c147d7e000f6b47e4b830cd2de9a3f.jar differ
diff --git a/Personnel/justin/lab inventory/bin/lab inventory.apk b/Personnel/justin/lab inventory/bin/lab inventory.apk
index 4e27faf..8a2e6e8 100644
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/resources.ap_ b/Personnel/justin/lab inventory/bin/resources.ap_
index 2537228..9693860 100644
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/libs/IzPack-install-4.3.5.jar b/Personnel/justin/lab inventory/libs/IzPack-install-4.3.5.jar
new file mode 100644
index 0000000..2fcd88a
Binary files /dev/null and b/Personnel/justin/lab inventory/libs/IzPack-install-4.3.5.jar differ
diff --git a/Personnel/justin/lab inventory/res/layout/activity_main.xml b/Personnel/justin/lab inventory/res/layout/activity_main.xml
index a8c1b2d..e21144a 100644
--- a/Personnel/justin/lab inventory/res/layout/activity_main.xml	
+++ b/Personnel/justin/lab inventory/res/layout/activity_main.xml	
@@ -2,14 +2,32 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
+    android:background="@color/light_green"
+
+    <EditText
+        android:id="@+id/editText2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/editText1"
+        android:ems="10"
+        android:text="Data 2" />
+
+    <EditText
+        android:id="@+id/editText3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/editText2"
+        android:ems="10"
+        android:text="Data 3" />
 
     <Button
         android:id="@+id/button1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/button2"
-        android:layout_alignBottom="@+id/button2"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
         android:onClick="recognizeQRClick"
         android:text="@string/recognize_qr_button" />
 
@@ -18,46 +36,94 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
+        android:layout_below="@+id/button2"
         android:ems="10"
         android:text="Data 1" />
 
-    <EditText
-        android:id="@+id/editText2"
+    <Button
+        android:id="@+id/button2"
+        style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/editText1"
-        android:ems="10"
-        android:text="Data 2" />
+        android:layout_below="@+id/button1"
+        android:layout_toLeftOf="@+id/editText2"
+        android:onClick="updateInventoryItem"
+        android:text="Update Item" />
 
     <EditText
-        android:id="@+id/editText3"
+        android:id="@+id/editText4"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_below="@+id/editText2"
+        android:layout_below="@+id/editText3"
         android:ems="10"
-        android:text="Data 3" />
+        android:text="Data 4" >
+
+        <requestFocus />
+    </EditText>
 
     <EditText
-        android:id="@+id/editText4"
+        android:id="@+id/editText5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_below="@+id/editText3"
+        android:layout_below="@+id/editText4"
         android:ems="10"
-        android:text="Data 4" />
+        android:text="Data 5" />
 
     <Button
-        android:id="@+id/print"
+        android:id="@+id/button3"
+        style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/editText1"
         android:layout_alignParentRight="true"
-        android:layout_marginBottom="80dp"
-        android:onClick="printQRClick"
-        android:text="@string/print_qr_button" />
-    
+        android:layout_below="@+id/editText5"
+        android:onClick="viewMoreInformation"
+        android:text="More Information" />
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/editText1"
+        android:layout_alignLeft="@+id/button2"
+        android:text="Quantity:"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/TextView01"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/editText2"
+        android:layout_alignLeft="@+id/textView1"
+        android:text="Room:"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/TextView04"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/editText3"
+        android:layout_alignLeft="@+id/TextView01"
+        android:text="Cupboard:"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/TextView03"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/editText5"
+        android:layout_alignLeft="@+id/TextView04"
+        android:text="Shelf:"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/TextView02"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/editText5"
+        android:layout_alignLeft="@+id/TextView03"
+        android:text="Freezer:"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/values/strings.xml b/Personnel/justin/lab inventory/res/values/strings.xml
index e4d2d24..05c7aee 100644
--- a/Personnel/justin/lab inventory/res/values/strings.xml	
+++ b/Personnel/justin/lab inventory/res/values/strings.xml	
@@ -8,5 +8,6 @@
     <string name="inventory_button">Check inventory</string>
     <string name="recognize_qr_button">Recognize QR</string>
     <string name="print_qr_button">Print new QR</string>
+    <color name="light_green">#FF89EC6A</color>
     
 </resources>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/IntentIntegrator.java b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/IntentIntegrator.java
new file mode 100644
index 0000000..14b0304
--- /dev/null
+++ b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/IntentIntegrator.java	
@@ -0,0 +1,430 @@
+/*
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.jaiswallab.lab.inventory;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+/**
+ * <p>A utility class which helps ease integration with Barcode Scanner via {@link Intent}s. This is a simple
+ * way to invoke barcode scanning and receive the result, without any need to integrate, modify, or learn the
+ * project's source code.</p>
+ *
+ * <h2>Initiating a barcode scan</h2>
+ *
+ * <p>To integrate, create an instance of {@code IntentIntegrator} and call {@link #initiateScan()} and wait
+ * for the result in your app.</p>
+ *
+ * <p>It does require that the Barcode Scanner (or work-alike) application is installed. The
+ * {@link #initiateScan()} method will prompt the user to download the application, if needed.</p>
+ *
+ * <p>There are a few steps to using this integration. First, your {@link Activity} must implement
+ * the method {@link Activity#onActivityResult(int, int, Intent)} and include a line of code like this:</p>
+ *
+ * <pre>{@code
+ * public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+ *   IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+ *   if (scanResult != null) {
+ *     // handle scan result
+ *   }
+ *   // else continue with any other code you need in the method
+ *   ...
+ * }
+ * }</pre>
+ *
+ * <p>This is where you will handle a scan result.</p>
+ *
+ * <p>Second, just call this in response to a user action somewhere to begin the scan process:</p>
+ *
+ * <pre>{@code
+ * IntentIntegrator integrator = new IntentIntegrator(yourActivity);
+ * integrator.initiateScan();
+ * }</pre>
+ *
+ * <p>Note that {@link #initiateScan()} returns an {@link AlertDialog} which is non-null if the
+ * user was prompted to download the application. This lets the calling app potentially manage the dialog.
+ * In particular, ideally, the app dismisses the dialog if it's still active in its {@link Activity#onPause()}
+ * method.</p>
+ *
+ * <p>You can use {@link #setTitle(String)} to customize the title of this download prompt dialog (or, use
+ * {@link #setTitleByID(int)} to set the title by string resource ID.) Likewise, the prompt message, and
+ * yes/no button labels can be changed.</p>
+ *
+ * <p>Finally, you can use {@link #addExtra(String, Object)} to add more parameters to the Intent used
+ * to invoke the scanner. This can be used to set additional options not directly exposed by this
+ * simplified API.</p>
+ *
+ * <p>By default, this will only allow applications that are known to respond to this intent correctly
+ * do so. The apps that are allowed to response can be set with {@link #setTargetApplications(List)}.
+ * For example, set to {@link #TARGET_BARCODE_SCANNER_ONLY} to only target the Barcode Scanner app itself.</p>
+ *
+ * <h2>Sharing text via barcode</h2>
+ *
+ * <p>To share text, encoded as a QR Code on-screen, similarly, see {@link #shareText(CharSequence)}.</p>
+ *
+ * <p>Some code, particularly download integration, was contributed from the Anobiit application.</p>
+ *
+ * <h2>Enabling experimental barcode formats</h2>
+ *
+ * <p>Some formats are not enabled by default even when scanning with {@link #ALL_CODE_TYPES}, such as
+ * PDF417. Use {@link #initiateScan(java.util.Collection)} with
+ * a collection containing the names of formats to scan for explicitly, like "PDF_417", to use such
+ * formats.</p>
+ *
+ * @author Sean Owen
+ * @author Fred Lin
+ * @author Isaac Potoczny-Jones
+ * @author Brad Drehmer
+ * @author gcstang
+ */
+public class IntentIntegrator {
+
+  public static final int REQUEST_CODE = 0x0000c0de; // Only use bottom 16 bits
+  private static final String TAG = IntentIntegrator.class.getSimpleName();
+
+  public static final String DEFAULT_TITLE = "Install Barcode Scanner?";
+  public static final String DEFAULT_MESSAGE =
+      "This application requires Barcode Scanner. Would you like to install it?";
+  public static final String DEFAULT_YES = "Yes";
+  public static final String DEFAULT_NO = "No";
+
+  private static final String BS_PACKAGE = "com.google.zxing.client.android";
+  private static final String BSPLUS_PACKAGE = "com.srowen.bs.android";
+
+  // supported barcode formats
+  public static final Collection<String> PRODUCT_CODE_TYPES = list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "RSS_14");
+  public static final Collection<String> ONE_D_CODE_TYPES =
+      list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "CODE_39", "CODE_93", "CODE_128",
+           "ITF", "RSS_14", "RSS_EXPANDED");
+  public static final Collection<String> QR_CODE_TYPES = Collections.singleton("QR_CODE");
+  public static final Collection<String> DATA_MATRIX_TYPES = Collections.singleton("DATA_MATRIX");
+
+  public static final Collection<String> ALL_CODE_TYPES = null;
+ 
+  public static final List<String> TARGET_BARCODE_SCANNER_ONLY = Collections.singletonList(BS_PACKAGE);
+  public static final List<String> TARGET_ALL_KNOWN = list(
+          BSPLUS_PACKAGE,             // Barcode Scanner+
+          BSPLUS_PACKAGE + ".simple", // Barcode Scanner+ Simple
+          BS_PACKAGE                  // Barcode Scanner          
+          // What else supports this intent?
+      );
+ 
+  private final Activity activity;
+  private String title;
+  private String message;
+  private String buttonYes;
+  private String buttonNo;
+  private List<String> targetApplications;
+  private final Map<String,Object> moreExtras;
+ 
+  public IntentIntegrator(Activity activity) {
+    this.activity = activity;
+    title = DEFAULT_TITLE;
+    message = DEFAULT_MESSAGE;
+    buttonYes = DEFAULT_YES;
+    buttonNo = DEFAULT_NO;
+    targetApplications = TARGET_ALL_KNOWN;
+    moreExtras = new HashMap<String,Object>(3);
+  }
+ 
+  public String getTitle() {
+    return title;
+  }
+ 
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public void setTitleByID(int titleID) {
+    title = activity.getString(titleID);
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public void setMessageByID(int messageID) {
+    message = activity.getString(messageID);
+  }
+
+  public String getButtonYes() {
+    return buttonYes;
+  }
+
+  public void setButtonYes(String buttonYes) {
+    this.buttonYes = buttonYes;
+  }
+
+  public void setButtonYesByID(int buttonYesID) {
+    buttonYes = activity.getString(buttonYesID);
+  }
+
+  public String getButtonNo() {
+    return buttonNo;
+  }
+
+  public void setButtonNo(String buttonNo) {
+    this.buttonNo = buttonNo;
+  }
+
+  public void setButtonNoByID(int buttonNoID) {
+    buttonNo = activity.getString(buttonNoID);
+  }
+ 
+  public Collection<String> getTargetApplications() {
+    return targetApplications;
+  }
+ 
+  public final void setTargetApplications(List<String> targetApplications) {
+    if (targetApplications.isEmpty()) {
+      throw new IllegalArgumentException("No target applications");
+    }
+    this.targetApplications = targetApplications;
+  }
+ 
+  public void setSingleTargetApplication(String targetApplication) {
+    this.targetApplications = Collections.singletonList(targetApplication);
+  }
+
+  public Map<String,?> getMoreExtras() {
+    return moreExtras;
+  }
+
+  public final void addExtra(String key, Object value) {
+    moreExtras.put(key, value);
+  }
+
+  /**
+   * Initiates a scan for all known barcode types.
+   */
+  public final AlertDialog initiateScan() {
+    return initiateScan(ALL_CODE_TYPES);
+  }
+
+  /**
+   * Initiates a scan only for a certain set of barcode types, given as strings corresponding
+   * to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
+   * like {@link #PRODUCT_CODE_TYPES} for example.
+   *
+   * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+   *   if a prompt was needed, or null otherwise
+   */
+  public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats) {
+    Intent intentScan = new Intent(BS_PACKAGE + ".SCAN");
+    intentScan.addCategory(Intent.CATEGORY_DEFAULT);
+
+    // check which types of codes to scan for
+    if (desiredBarcodeFormats != null) {
+      // set the desired barcode types
+      StringBuilder joinedByComma = new StringBuilder();
+      for (String format : desiredBarcodeFormats) {
+        if (joinedByComma.length() > 0) {
+          joinedByComma.append(',');
+        }
+        joinedByComma.append(format);
+      }
+      intentScan.putExtra("SCAN_FORMATS", joinedByComma.toString());
+    }
+
+    String targetAppPackage = findTargetAppPackage(intentScan);
+    if (targetAppPackage == null) {
+      return showDownloadDialog();
+    }
+    intentScan.setPackage(targetAppPackage);
+    intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+    attachMoreExtras(intentScan);
+    startActivityForResult(intentScan, REQUEST_CODE); // this is critical to starting the camera
+    return null;
+  }
+
+  /**
+   * Start an activity. This method is defined to allow different methods of activity starting for
+   * newer versions of Android and for compatibility library.
+   *
+   * @param intent Intent to start.
+   * @param code Request code for the activity
+   * @see android.app.Activity#startActivityForResult(Intent, int)
+   * @see android.app.Fragment#startActivityForResult(Intent, int)
+   */
+  protected void startActivityForResult(Intent intent, int code) {
+    activity.startActivityForResult(intent, code);
+  }
+ 
+  private String findTargetAppPackage(Intent intent) {
+    PackageManager pm = activity.getPackageManager();
+    List<ResolveInfo> availableApps = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+    if (availableApps != null) {
+      for (String targetApp : targetApplications) {
+        if (contains(availableApps, targetApp)) {
+          return targetApp;
+        }
+      }
+    }
+    return null;
+  }
+ 
+  private static boolean contains(Iterable<ResolveInfo> availableApps, String targetApp) {
+    for (ResolveInfo availableApp : availableApps) {
+      String packageName = availableApp.activityInfo.packageName;
+      if (targetApp.equals(packageName)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private AlertDialog showDownloadDialog() {
+    AlertDialog.Builder downloadDialog = new AlertDialog.Builder(activity);
+    downloadDialog.setTitle(title);
+    downloadDialog.setMessage(message);
+    downloadDialog.setPositiveButton(buttonYes, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialogInterface, int i) {
+        String packageName = targetApplications.get(0);
+        Uri uri = Uri.parse("market://details?id=" + packageName);
+        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+        try {
+          activity.startActivity(intent);
+        } catch (ActivityNotFoundException anfe) {
+          // Hmm, market is not installed
+          Log.w(TAG, "Google Play is not installed; cannot install " + packageName);
+        }
+      }
+    });
+    downloadDialog.setNegativeButton(buttonNo, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialogInterface, int i) {}
+    });
+    return downloadDialog.show();
+  }
+
+
+  /**
+   * <p>Call this from your {@link Activity}'s
+   * {@link Activity#onActivityResult(int, int, Intent)} method.</p>
+   *
+   * @return null if the event handled here was not related to this class, or
+   *  else an {@link IntentResult} containing the result of the scan. If the user cancelled scanning,
+   *  the fields will be null.
+   */
+  public static IntentResult parseActivityResult(int requestCode, int resultCode, Intent intent) {
+    if (requestCode == REQUEST_CODE) {
+      if (resultCode == Activity.RESULT_OK) {
+        String contents = intent.getStringExtra("SCAN_RESULT");
+        String formatName = intent.getStringExtra("SCAN_RESULT_FORMAT");
+        byte[] rawBytes = intent.getByteArrayExtra("SCAN_RESULT_BYTES");
+        int intentOrientation = intent.getIntExtra("SCAN_RESULT_ORIENTATION", Integer.MIN_VALUE);
+        Integer orientation = intentOrientation == Integer.MIN_VALUE ? null : intentOrientation;
+        String errorCorrectionLevel = intent.getStringExtra("SCAN_RESULT_ERROR_CORRECTION_LEVEL");
+        return new IntentResult(contents,
+                                formatName,
+                                rawBytes,
+                                orientation,
+                                errorCorrectionLevel);
+      }
+      return new IntentResult();
+    }
+    return null;
+  }
+
+
+  /**
+   * Defaults to type "TEXT_TYPE".
+   * @see #shareText(CharSequence, CharSequence)
+   */
+  public final AlertDialog shareText(CharSequence text) {
+    return shareText(text, "TEXT_TYPE");
+  }
+
+  /**
+   * Shares the given text by encoding it as a barcode, such that another user can
+   * scan the text off the screen of the device.
+   *
+   * @param text the text string to encode as a barcode
+   * @param type type of data to encode. See {@code com.google.zxing.client.android.Contents.Type} constants.
+   * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+   *   if a prompt was needed, or null otherwise
+   */
+  public final AlertDialog shareText(CharSequence text, CharSequence type) {
+    Intent intent = new Intent();
+    intent.addCategory(Intent.CATEGORY_DEFAULT);
+    intent.setAction(BS_PACKAGE + ".ENCODE");
+    intent.putExtra("ENCODE_TYPE", type);
+    intent.putExtra("ENCODE_DATA", text);
+    String targetAppPackage = findTargetAppPackage(intent);
+    if (targetAppPackage == null) {
+      return showDownloadDialog();
+    }
+    intent.setPackage(targetAppPackage);
+    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+    attachMoreExtras(intent);
+    Log.i("debug", "Just before intent integrator launches activity.startActivity(intent)");
+    activity.startActivity(intent);
+    Log.i("debug", "Just after intent integrator launches activity.startActivity(intent)");
+    return null;
+  }
+ 
+  private static List<String> list(String... values) {
+    return Collections.unmodifiableList(Arrays.asList(values));
+  }
+
+  private void attachMoreExtras(Intent intent) {
+    for (Map.Entry<String,Object> entry : moreExtras.entrySet()) {
+      String key = entry.getKey();
+      Object value = entry.getValue();
+      // Kind of hacky
+      if (value instanceof Integer) {
+        intent.putExtra(key, (Integer) value);
+      } else if (value instanceof Long) {
+        intent.putExtra(key, (Long) value);
+      } else if (value instanceof Boolean) {
+        intent.putExtra(key, (Boolean) value);
+      } else if (value instanceof Double) {
+        intent.putExtra(key, (Double) value);
+      } else if (value instanceof Float) {
+        intent.putExtra(key, (Float) value);
+      } else if (value instanceof Bundle) {
+        intent.putExtra(key, (Bundle) value);
+      } else {
+        intent.putExtra(key, value.toString());
+      }
+    }
+  }
+
+}
+
diff --git a/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/IntentResult.java b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/IntentResult.java
new file mode 100644
index 0000000..ee6b968
--- /dev/null
+++ b/Personnel/justin/lab inventory/src/com/jaiswallab/lab/inventory/IntentResult.java	
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.jaiswallab.lab.inventory;
+
+/**
+ * <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>
+ *
+ * @author Sean Owen
+ */
+public final class IntentResult {
+
+  private final String contents;
+  private final String formatName;
+  private final byte[] rawBytes;
+  private final Integer orientation;
+  private final String errorCorrectionLevel;
+
+  IntentResult() {
+    this(null, null, null, null, null);
+  }
+
+  IntentResult(String contents,
+               String formatName,
+               byte[] rawBytes,
+               Integer orientation,
+               String errorCorrectionLevel) {
+    this.contents = contents;
+    this.formatName = formatName;
+    this.rawBytes = rawBytes;
+    this.orientation = orientation;
+    this.errorCorrectionLevel = errorCorrectionLevel;
+  }
+
+  /**
+   * @return raw content of barcode
+   */
+  public String getContents() {
+    return contents;
+  }
+
+  /**
+   * @return name of format, like "QR_CODE", "UPC_A". See {@code BarcodeFormat} for more format names.
+   */
+  public String getFormatName() {
+    return formatName;
+  }
+
+  /**
+   * @return raw bytes of the barcode content, if applicable, or null otherwise
+   */
+  public byte[] getRawBytes() {
+    return rawBytes;
+  }
+
+  /**
+   * @return rotation of the image, in degrees, which resulted in a successful scan. May be null.
+   */
+  public Integer getOrientation() {
+    return orientation;
+  }
+
+  /**
+   * @return name of the error correction level used in the barcode, if applicable
+   */
+  public String getErrorCorrectionLevel() {
+    return errorCorrectionLevel;
+  }
+ 
+  @Override
+  public String toString() {
+    StringBuilder dialogText = new StringBuilder(100);
+    dialogText.append("Format: ").append(formatName).append('\n');
+    dialogText.append("Contents: ").append(contents).append('\n');
+    int rawBytesLength = rawBytes == null ? 0 : rawBytes.length;
+    dialogText.append("Raw bytes: (").append(rawBytesLength).append(" bytes)\n");
+    dialogText.append("Orientation: ").append(orientation).append('\n');
+    dialogText.append("EC level: ").append(errorCorrectionLevel).append('\n');
+    return dialogText.toString();
+  }
+
+}
+
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 7298762..0959bb0 100644
--- 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,46 +1,101 @@
 package com.jaiswallab.lab.inventory;
 
+import java.io.BufferedReader;
+
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Calendar;
+import java.util.Scanner;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EncodingUtils;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
 
 import com.google.zxing.*;
-import com.google.zxing.integration.android.*;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.google.zxing.qrcode.encoder.ByteMatrix;
 import com.google.zxing.qrcode.encoder.Encoder;
 
 import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.content.IntentSender.SendIntentException;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.AssetManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.content.res.Resources.Theme;
+import android.database.DatabaseErrorHandler;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.media.MediaScannerConnection;
 import android.media.MediaScannerConnection.MediaScannerConnectionClient;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
 import android.provider.MediaStore;
 import android.util.Log;
+import android.view.Display;
 import android.view.Menu;
 import android.view.View;
+import android.webkit.WebView;
 import android.widget.EditText;
 
 
 
 
-
 public class MainActivity extends Activity {
 
 	boolean printingNewQR = false;
 	boolean recognizingQR = false;
+	private String contents = "";
+	private boolean scanSuccess;
+	private String code = "";
 	private EditText text1;
 	private EditText text2;
 	private EditText text3;
 	private EditText text4;
+	private EditText text5;
 	
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -50,6 +105,12 @@ public class MainActivity extends Activity {
         text2 = (EditText) findViewById(R.id.editText2);
         text3 = (EditText) findViewById(R.id.editText3);
         text4 = (EditText) findViewById(R.id.editText4);
+        text5 = (EditText) findViewById(R.id.editText5);
+        
+        if(contents != "") {
+        	text1.setText(contents);
+        }
+        
     }
 
     @Override
@@ -59,114 +120,71 @@ public class MainActivity extends Activity {
     }
     
     // This method is called at click of the QR code button
-    public void recognizeQRClick(View view) { 
+    public void recognizeQRClick(View view) throws CloneNotSupportedException { 
     	printingNewQR = false;
     	recognizingQR = true;
     	text1.setText("Recognize QR button clicked");
     	
     	IntentIntegrator intentIntegrator = new IntentIntegrator(this);
     	intentIntegrator.initiateScan();
-    	return;
     }
     
-    // This method is called at click of the scan new QR button
-    public void printQRClick(View view) throws Exception {
-    	printingNewQR = true;
-    	recognizingQR = false;
-    	addNewQR();
+    public void viewMoreInformation(View view) throws CloneNotSupportedException {
+    	if(scanSuccess) {
+		 	String postData = "code=" + code;
+		 	Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://jaiswallab.cgrb.oregonstate.edu/inventory/search_results.php?" + postData));
+		 	startActivity(browserIntent);
+		 }
+    }
+    
+    public void updateInventoryItem(View view) {
+    	if(scanSuccess) {
+    		String params = "";
+    		if((text1.getText() != null) && (!text1.getText().equals(""))) {
+    			params = params + "&quantity=" + text1.getText();
+    		}
+    		if((text2.getText() != null) && (!text2.getText().equals(""))) {
+    			params = params + "&room=" + text2.getText();
+    		}
+    		if((text3.getText() != null) && (!text3.getText().equals(""))) {
+    			params = params + "&shelf=" + text3.getText();
+    		}
+    		if((text4.getText() != null) && (!text4.getText().equals(""))) {
+    			params = params + "&freezer=" + text4.getText();
+    		}
+    		if((text5.getText() != null) && (!text5.getText().equals(""))) {
+    			params = params + "&cupboard=" + text5.getText();
+    		}
+    		
+    		
+    		String url = "http://jaiswallab.cgrb.oregonstate.edu/inventory/edit_item.php?code=" + code + params;
+			new HttpGetTask().execute(url);
+    	}
     }
     
+    @Override
     public void onActivityResult (int requestCode, int resultCode, Intent intent) {
     	switch (requestCode) {
-    	case IntentIntegrator.REQUEST_CODE: 
-        	IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+    	case IntentIntegrator.REQUEST_CODE:
+    		IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
         	if (scanResult != null) {
         		String contents = scanResult.getContents();
-	    		if(printingNewQR) {
-	    			return;
-	    		} else if(recognizingQR){
-	    			displayQRInfo(contents);
+	    		if(recognizingQR){
+		    		scanSuccess = false;
+		    		recognizingQR = false;
+		    		code=contents;
+		    		displayQRInfo(contents);
 	    		}
-	    		text1.setText(contents);
     		}
     		break;
     	}
-
-    	
-    	
-    	/*
-*/    	
 	}
     
     
-    
-    //this will use the information passed to it to create a new ID in the database
-    //it will also use any input from a variety of text edits in order to populate the database entry
-    //can we store pictures in the database if desired?
-    public void addNewQR() throws Exception {
-
-    	int rand1 = (int) (100*Math.random());
-    	int rand2 = (int) (100*Math.random());
-    	int rand3 = (int) (100*Math.random());
-    	int rand4 = (int) (100*Math.random());
-    	String barcode_content = text1.getText().toString() + Integer.toString(rand1) 
-    						   + text2.getText().toString() + Integer.toString(rand2)
-    						   + text3.getText().toString() + Integer.toString(rand3)
-    						   + text4.getText().toString() + Integer.toString(rand4);
-    	text1.setText(barcode_content);
-
-    	
-    	try {
-    	    // generate a 150x150 QR code
-    	    byte[][] barcode_matrix = Encoder.encode(barcode_content, ErrorCorrectionLevel.L).getMatrix().getArray();
-//    	    Bitmap barcode_bitmap = BitmapFactory.decodeByteArray(barcode_matrix, 0, barcode_matrix.length);
-
-            int height = 100;
-            int width = 100;
-            QRCodeWriter writer = new QRCodeWriter();
-
-            Bitmap barcode_bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-
-			for (int y = 0; y < barcode_matrix.length; ++y) // TODO possibly reverse x&y mapping here?
-			{
-				for (int x = 0; x < barcode_matrix[y].length; ++x) {
-					if (barcode_matrix[y][x] == -1) {
-						barcode_bitmap.setPixel(x, y, Color.WHITE);
-					} else {
-						barcode_bitmap.setPixel(x, y, Color.BLACK);
-					}
-				}
-			}
-
-            //imageView.SetImageBitmap(img); 
-
-    	    if(barcode_bitmap != null) text3.setText("BARCODE EXISTS");
-    	    else text3.setText("barcode null :(");
-    	    
-        	String filepath = savePhoto(barcode_bitmap);
-
-
-    	    
-    	    Uri barcodeUri = Uri.parse(filepath);
-    	    
-        	Intent printIntent = new Intent(this, PrintDialogActivity.class);
-        	printIntent.setDataAndType(barcodeUri, "image/bmp"); //TODO make sure image/bmp is correct.0
-        	printIntent.putExtra("title", "NEW QR");
-        	startActivity(printIntent);
-    	  
-    	} catch (WriterException e) { //eek }
-
-    	}	
-    	return;
-    	
-    }
-    
-    
     //this will use the information passed to it to reference an existing ID in the database
     //it will display the database information in a useful format
     public void displayQRInfo(String id) {
-        setContentView(R.layout.activity_main);
-    	text1.setText(id);
+        httpGet(id);
     	return;
     }
     
@@ -210,5 +228,65 @@ public class MainActivity extends Activity {
 	public String fromInt(int val) {
 		return String.valueOf(val);
 	}
+	
+	private void httpGet(String code) {
+		//http post
+		String url = null;
+		url = "http://jaiswallab.cgrb.oregonstate.edu/inventory/lab_inventory.php?code=" + code;
+		new HttpGetTask().execute(url);
+
+		
+	}
+	
+	
+	private class HttpGetTask extends AsyncTask<String, Integer, String> {
+		String result = "Failed: Invalid QR Code";
+	    
+	     protected String doInBackground(String... urls) {
+	 		String url = urls[0];
+			BufferedReader inStream = null;
+			try {
+				HttpClient httpClient = new DefaultHttpClient();
+				HttpGet httpRequest = new HttpGet(url);
+				HttpResponse response = httpClient.execute(httpRequest);
+				inStream = new BufferedReader(
+					new InputStreamReader(
+						response.getEntity().getContent()));
+
+				StringBuffer buffer = new StringBuffer("");
+				String line = "";
+				String NL = System.getProperty("line.separator");
+				while ((line = inStream.readLine()) != null) {
+					buffer.append(line + NL);
+				}
+				inStream.close();
+
+				result = buffer.toString();			
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			} finally {
+				if (inStream != null) {
+					try {
+						inStream.close();
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+			return result;
+	     }
+
+	     protected void onPostExecute(String result) {
+	    	 	scanSuccess = true;
+	    	 	String[] scanResults = result.split(",");
+	    	 	text1.setText(scanResults[0]);
+	    	 	text2.setText(scanResults[1]);
+	    	 	text3.setText(scanResults[2]);
+	    	 	text4.setText(scanResults[3]);
+	    	 	text5.setText(scanResults[4]);
+	     }
+	}
+	
+}
 
-}
\ No newline at end of file