From: miles <miles@localhost>
Date: Mon, 21 Oct 2013 23:15:29 +0000 (+0000)
Subject: update user interface
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=8a48db2db198970a06ea4c9e4322f776bf03c94c;p=old-jaiswallab-svn%2F.git

update user interface
	buttons
	colors
added web posting for more information

svn path=/; revision=513
---

diff --git a/Personnel/justin/lab inventory/bin/AndroidManifest.xml b/Personnel/justin/lab inventory/bin/AndroidManifest.xml
deleted file mode 100644
index 1b5c44e..0000000
--- a/Personnel/justin/lab inventory/bin/AndroidManifest.xml	
+++ /dev/null
@@ -1,29 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jaiswallab.lab.inventory"
-    android:versionCode="1"
-    android:versionName="1.0" >
-    
-    <uses-permission android:name="android.permission.READ_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"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/title_activity_main" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-    
-</manifest>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/bin/AndroidManifest.xml.svntmp b/Personnel/justin/lab inventory/bin/AndroidManifest.xml.svntmp
deleted file mode 100644
index 133dfcb..0000000
--- a/Personnel/justin/lab inventory/bin/AndroidManifest.xml.svntmp	
+++ /dev/null
@@ -1,25 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jaiswallab.lab.inventory"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="18" />
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/title_activity_main" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/bin/classes.dex b/Personnel/justin/lab inventory/bin/classes.dex
deleted file mode 100644
index 3c12e54..0000000
Binary files a/Personnel/justin/lab inventory/bin/classes.dex and /dev/null differ
diff --git a/Personnel/justin/lab inventory/bin/jarlist.cache b/Personnel/justin/lab inventory/bin/jarlist.cache
deleted file mode 100644
index 0565465..0000000
--- a/Personnel/justin/lab inventory/bin/jarlist.cache	
+++ /dev/null
@@ -1,3 +0,0 @@
-# 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
deleted file mode 100644
index 8a2e6e8..0000000
Binary files a/Personnel/justin/lab inventory/bin/lab inventory.apk and /dev/null differ
diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/green_button.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/green_button.png
new file mode 100644
index 0000000..141c950
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/green_button.png differ
diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/grey_button.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/grey_button.png
new file mode 100644
index 0000000..e6ad9f4
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/grey_button.png 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
deleted file mode 100644
index ffec9be..0000000
Binary files a/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/ic_action_search.png and /dev/null 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
deleted file mode 100644
index 498a287..0000000
Binary files a/Personnel/justin/lab inventory/bin/res/crunch/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/green_button.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/green_button.png
new file mode 100644
index 0000000..141c950
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/green_button.png differ
diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/grey_button.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/grey_button.png
new file mode 100644
index 0000000..e6ad9f4
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/grey_button.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
deleted file mode 100644
index 7d9eba3..0000000
Binary files a/Personnel/justin/lab inventory/bin/res/crunch/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/green_button.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/green_button.png
new file mode 100644
index 0000000..141c950
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/green_button.png differ
diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/grey_button.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/grey_button.png
new file mode 100644
index 0000000..e6ad9f4
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/grey_button.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
deleted file mode 100644
index ce9399c..0000000
Binary files a/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/ic_action_search.png and /dev/null 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
deleted file mode 100644
index 9eb7580..0000000
Binary files a/Personnel/justin/lab inventory/bin/res/crunch/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/green_button.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/green_button.png
new file mode 100644
index 0000000..141c950
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/green_button.png differ
diff --git a/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/grey_button.png b/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/grey_button.png
new file mode 100644
index 0000000..e6ad9f4
Binary files /dev/null and b/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/grey_button.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
deleted file mode 100644
index b2d7b2d..0000000
Binary files a/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/ic_action_search.png and /dev/null 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
deleted file mode 100644
index cd07610..0000000
Binary files a/Personnel/justin/lab inventory/bin/res/crunch/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/Personnel/justin/lab inventory/bin/resources.ap_ b/Personnel/justin/lab inventory/bin/resources.ap_
deleted file mode 100644
index 9693860..0000000
Binary files a/Personnel/justin/lab inventory/bin/resources.ap_ and /dev/null differ
diff --git a/Personnel/justin/lab inventory/res/drawable-hdpi/green_button.png b/Personnel/justin/lab inventory/res/drawable-hdpi/green_button.png
new file mode 100644
index 0000000..9ef4369
Binary files /dev/null and b/Personnel/justin/lab inventory/res/drawable-hdpi/green_button.png differ
diff --git a/Personnel/justin/lab inventory/res/drawable-hdpi/grey_button.png b/Personnel/justin/lab inventory/res/drawable-hdpi/grey_button.png
new file mode 100644
index 0000000..f9d3a2d
Binary files /dev/null and b/Personnel/justin/lab inventory/res/drawable-hdpi/grey_button.png differ
diff --git a/Personnel/justin/lab inventory/res/drawable-hdpi/scan_button.xml b/Personnel/justin/lab inventory/res/drawable-hdpi/scan_button.xml
new file mode 100644
index 0000000..c87d864
--- /dev/null
+++ b/Personnel/justin/lab inventory/res/drawable-hdpi/scan_button.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item  android:drawable="@drawable/green_button"></item>
+</selector>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/drawable-hdpi/update_button.xml b/Personnel/justin/lab inventory/res/drawable-hdpi/update_button.xml
new file mode 100644
index 0000000..cc50636
--- /dev/null
+++ b/Personnel/justin/lab inventory/res/drawable-hdpi/update_button.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item  android:drawable="@drawable/grey_button"></item>
+</selector>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/drawable-ldpi/green_button.png b/Personnel/justin/lab inventory/res/drawable-ldpi/green_button.png
new file mode 100644
index 0000000..9ef4369
Binary files /dev/null and b/Personnel/justin/lab inventory/res/drawable-ldpi/green_button.png differ
diff --git a/Personnel/justin/lab inventory/res/drawable-ldpi/grey_button.png b/Personnel/justin/lab inventory/res/drawable-ldpi/grey_button.png
new file mode 100644
index 0000000..f9d3a2d
Binary files /dev/null and b/Personnel/justin/lab inventory/res/drawable-ldpi/grey_button.png differ
diff --git a/Personnel/justin/lab inventory/res/drawable-ldpi/scan_button.xml b/Personnel/justin/lab inventory/res/drawable-ldpi/scan_button.xml
new file mode 100644
index 0000000..c87d864
--- /dev/null
+++ b/Personnel/justin/lab inventory/res/drawable-ldpi/scan_button.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item  android:drawable="@drawable/green_button"></item>
+</selector>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/drawable-ldpi/update_button.xml b/Personnel/justin/lab inventory/res/drawable-ldpi/update_button.xml
new file mode 100644
index 0000000..cc50636
--- /dev/null
+++ b/Personnel/justin/lab inventory/res/drawable-ldpi/update_button.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item  android:drawable="@drawable/grey_button"></item>
+</selector>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/drawable-mdpi/green_button.png b/Personnel/justin/lab inventory/res/drawable-mdpi/green_button.png
new file mode 100644
index 0000000..9ef4369
Binary files /dev/null and b/Personnel/justin/lab inventory/res/drawable-mdpi/green_button.png differ
diff --git a/Personnel/justin/lab inventory/res/drawable-mdpi/grey_button.png b/Personnel/justin/lab inventory/res/drawable-mdpi/grey_button.png
new file mode 100644
index 0000000..f9d3a2d
Binary files /dev/null and b/Personnel/justin/lab inventory/res/drawable-mdpi/grey_button.png differ
diff --git a/Personnel/justin/lab inventory/res/drawable-mdpi/scan_button.xml b/Personnel/justin/lab inventory/res/drawable-mdpi/scan_button.xml
new file mode 100644
index 0000000..c87d864
--- /dev/null
+++ b/Personnel/justin/lab inventory/res/drawable-mdpi/scan_button.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item  android:drawable="@drawable/green_button"></item>
+</selector>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/drawable-mdpi/update_button.xml b/Personnel/justin/lab inventory/res/drawable-mdpi/update_button.xml
new file mode 100644
index 0000000..cc50636
--- /dev/null
+++ b/Personnel/justin/lab inventory/res/drawable-mdpi/update_button.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item  android:drawable="@drawable/grey_button"></item>
+</selector>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/drawable-xhdpi/green_button.png b/Personnel/justin/lab inventory/res/drawable-xhdpi/green_button.png
new file mode 100644
index 0000000..9ef4369
Binary files /dev/null and b/Personnel/justin/lab inventory/res/drawable-xhdpi/green_button.png differ
diff --git a/Personnel/justin/lab inventory/res/drawable-xhdpi/grey_button.png b/Personnel/justin/lab inventory/res/drawable-xhdpi/grey_button.png
new file mode 100644
index 0000000..f9d3a2d
Binary files /dev/null and b/Personnel/justin/lab inventory/res/drawable-xhdpi/grey_button.png differ
diff --git a/Personnel/justin/lab inventory/res/drawable-xhdpi/scan_button.xml b/Personnel/justin/lab inventory/res/drawable-xhdpi/scan_button.xml
new file mode 100644
index 0000000..c87d864
--- /dev/null
+++ b/Personnel/justin/lab inventory/res/drawable-xhdpi/scan_button.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item  android:drawable="@drawable/green_button"></item>
+</selector>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/drawable-xhdpi/update_button.xml b/Personnel/justin/lab inventory/res/drawable-xhdpi/update_button.xml
new file mode 100644
index 0000000..cc50636
--- /dev/null
+++ b/Personnel/justin/lab inventory/res/drawable-xhdpi/update_button.xml	
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<item  android:drawable="@drawable/grey_button"></item>
+</selector>
\ No newline at end of file
diff --git a/Personnel/justin/lab inventory/res/layout/activity_main.xml b/Personnel/justin/lab inventory/res/layout/activity_main.xml
index e21144a..a9c8ca7 100644
--- a/Personnel/justin/lab inventory/res/layout/activity_main.xml	
+++ b/Personnel/justin/lab inventory/res/layout/activity_main.xml	
@@ -1,8 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    android:background="@color/light_green"
+    android:layout_height="match_parent"
+    android:background="@color/light_blue" >
 
     <EditText
         android:id="@+id/editText2"
@@ -10,8 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/editText1"
-        android:ems="10"
-        android:text="Data 2" />
+        android:ems="10" />
 
     <EditText
         android:id="@+id/editText3"
@@ -19,17 +18,7 @@
         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_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:onClick="recognizeQRClick"
-        android:text="@string/recognize_qr_button" />
+        android:ems="10" />
 
     <EditText
         android:id="@+id/editText1"
@@ -37,8 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/button2"
-        android:ems="10"
-        android:text="Data 1" />
+        android:ems="10" />
 
     <Button
         android:id="@+id/button2"
@@ -48,6 +36,7 @@
         android:layout_below="@+id/button1"
         android:layout_toLeftOf="@+id/editText2"
         android:onClick="updateInventoryItem"
+        android:background="@drawable/update_button"
         android:text="Update Item" />
 
     <EditText
@@ -56,11 +45,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/editText3"
-        android:ems="10"
-        android:text="Data 4" >
-
-        <requestFocus />
-    </EditText>
+        android:ems="10" />
 
     <EditText
         android:id="@+id/editText5"
@@ -68,8 +53,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/editText4"
-        android:ems="10"
-        android:text="Data 5" />
+        android:ems="10" />
 
     <Button
         android:id="@+id/button3"
@@ -114,7 +98,7 @@
         android:layout_height="wrap_content"
         android:layout_above="@+id/editText5"
         android:layout_alignLeft="@+id/TextView04"
-        android:text="Shelf:"
+        android:text="Freezer:"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <TextView
@@ -123,7 +107,19 @@
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/editText5"
         android:layout_alignLeft="@+id/TextView03"
-        android:text="Freezer:"
+        android:text="Shelf:"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/green_button"
+        android:onClick="recognizeQRClick"
+        android:text="@string/recognize_qr_button" />
+
 </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 05c7aee..58e05b7 100644
--- a/Personnel/justin/lab inventory/res/values/strings.xml	
+++ b/Personnel/justin/lab inventory/res/values/strings.xml	
@@ -6,8 +6,9 @@
     <string name="title_activity_main">Lab Inventory</string>
     <string name="qr_button">Start QR code scanner</string>
     <string name="inventory_button">Check inventory</string>
-    <string name="recognize_qr_button">Recognize QR</string>
+    <string name="recognize_qr_button">New Scan</string>
     <string name="print_qr_button">Print new QR</string>
-    <color name="light_green">#FF89EC6A</color>
+    <color name="light_green">#9962B1D0</color>
+    <color name="light_blue">#FF4282D3</color>
     
 </resources>
\ No newline at end of file
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 0959bb0..ddd1245 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	
@@ -81,9 +81,6 @@ import android.view.View;
 import android.webkit.WebView;
 import android.widget.EditText;
 
-
-
-
 public class MainActivity extends Activity {
 
 	boolean printingNewQR = false;
@@ -123,7 +120,6 @@ public class MainActivity extends Activity {
     public void recognizeQRClick(View view) throws CloneNotSupportedException { 
     	printingNewQR = false;
     	recognizingQR = true;
-    	text1.setText("Recognize QR button clicked");
     	
     	IntentIntegrator intentIntegrator = new IntentIntegrator(this);
     	intentIntegrator.initiateScan();
@@ -147,13 +143,13 @@ public class MainActivity extends Activity {
     			params = params + "&room=" + text2.getText();
     		}
     		if((text3.getText() != null) && (!text3.getText().equals(""))) {
-    			params = params + "&shelf=" + text3.getText();
+    			params = params + "&cupboard=" + 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();
+    			params = params + "&shelf=" + text5.getText();
     		}