Added items in the option's menu

Scan again - launches scan activity
Menu - launches category activity

ClientAlphaPrototype/gen/com/example/clientalphaprototype/R.java

@@ -9,6 +9,14 @@
 
 public final class R {
     public static final class attr {
+        /** <p>Must be an integer value, such as "<code>100</code>".
+<p>This may also be a reference to a resource (in the form
+"<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
+theme attribute (in the form
+"<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
+containing a value of this type.
+         */
+        public static final int trimLength=0x7f010000;
     }
     public static final class dimen {
         /**  Default screen margins, per the Android Design guidelines. 
@@ -28,23 +36,27 @@ public static final class drawable {
         public static final int image3=0x7f020004;
     }
     public static final class id {
-        public static final int action_settings=0x7f080010;
+        public static final int Menu=0x7f080012;
+        public static final int ScanAgain=0x7f080013;
+        public static final int action_settings=0x7f080014;
         public static final int basket_button=0x7f080001;
         public static final int basket_list=0x7f080002;
         public static final int button1=0x7f080000;
-        public static final int button_addToBasket=0x7f080007;
-        public static final int button_scan=0x7f08000d;
+        public static final int button_addToBasket=0x7f08000c;
+        public static final int button_scan=0x7f08000e;
         public static final int categories_listview=0x7f080003;
-        public static final int editText_notes=0x7f080006;
-        public static final int large_txt=0x7f08000f;
+        public static final int editText_notes=0x7f08000b;
+        public static final int expandable_scaninfo=0x7f08000f;
+        public static final int large_txt=0x7f080011;
         public static final int pager=0x7f080004;
-        public static final int price_txt=0x7f08000b;
+        public static final int price_txt=0x7f080009;
         public static final int products_gallery=0x7f080005;
-        public static final int products_imageview=0x7f080008;
-        public static final int products_listview=0x7f08000c;
-        public static final int small_txt=0x7f08000e;
+        public static final int products_imageview=0x7f080007;
+        public static final int products_listview=0x7f08000d;
+        public static final int scrollView1=0x7f080008;
+        public static final int small_txt=0x7f080010;
         public static final int textView_description=0x7f08000a;
-        public static final int textView_title=0x7f080009;
+        public static final int textView_title=0x7f080006;
     }
     public static final class layout {
         public static final int actionbar_submit_view=0x7f030000;
@@ -105,4 +117,33 @@ public static final class style {
          */
         public static final int AppTheme=0x7f060001;
     }
+    public static final class styleable {
+        /** Attributes that can be used with a ExpandableTextView.
+           <p>Includes the following attributes:</p>
+           <table>
+           <colgroup align="left" />
+           <colgroup align="left" />
+           <tr><th>Attribute</th><th>Description</th></tr>
+           <tr><td><code>{@link #ExpandableTextView_trimLength com.example.clientalphaprototype:trimLength}</code></td><td></td></tr>
+           </table>
+           @see #ExpandableTextView_trimLength
+         */
+        public static final int[] ExpandableTextView = {
+            0x7f010000
+        };
+        /**
+          <p>This symbol is the offset where the {@link com.example.clientalphaprototype.R.attr#trimLength}
+          attribute's value can be found in the {@link #ExpandableTextView} array.
+
+
+          <p>Must be an integer value, such as "<code>100</code>".
+<p>This may also be a reference to a resource (in the form
+"<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
+theme attribute (in the form
+"<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
+containing a value of this type.
+          @attr name com.example.clientalphaprototype:trimLength
+        */
+        public static final int ExpandableTextView_trimLength = 0;
+    };
 }

ClientAlphaPrototype/res/layout/activity_productdetails.xml

@@ -15,63 +15,75 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true" />
 
-    <EditText
-        android:id="@+id/editText_notes"
+    <TextView
+        android:id="@+id/textView_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/button_addToBasket"
+        android:layout_below="@+id/products_imageview"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="26dp"
-        android:ems="10"
-        android:inputType="textMultiLine"
-        android:text="Your notes here" >
+        android:text="Large Text"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <ScrollView
+        android:id="@+id/scrollView1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/price_txt" >
 
-        <requestFocus />
-    </EditText>
+        <LinearLayout
+            android:layout_width="275dp"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/textView_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="19dp"
+                android:text="Medium Text"
+                android:textSize="15sp" />
+
+            <EditText
+                android:id="@+id/editText_notes"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:ems="10"
+                android:inputType="textMultiLine"
+                android:text="your notes here"
+                android:textSize="14sp" >
+
+
+            </EditText>
+
+            <Button
+                android:id="@+id/button_addToBasket"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@+id/products_imageview"
+                android:layout_below="@+id/editText_notes"
+                android:layout_marginTop="18dp"
+                android:text="add to basket"
+                android:textSize="12sp" />
+        </LinearLayout>
+    </ScrollView>
 
     <ImageView
         android:id="@+id/products_imageview"
         android:layout_width="wrap_content"
         android:layout_height="150dp"
-        android:layout_alignRight="@+id/editText_notes"
         android:layout_below="@+id/products_gallery"
+        android:layout_centerHorizontal="true"
         android:contentDescription="d"
         android:src="@drawable/image1" />
 
-    <TextView
-        android:id="@+id/textView_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/products_imageview"
-        android:layout_centerHorizontal="true"
-        android:text="Large Text"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <TextView
-        android:id="@+id/textView_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/textView_title"
-        android:layout_below="@+id/textView_title"
-        android:layout_marginTop="32dp"
-        android:text="Medium Text"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
     <TextView
         android:id="@+id/price_txt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignRight="@+id/button_addToBasket"
+        android:layout_alignRight="@+id/textView_title"
         android:layout_below="@+id/textView_title"
         android:text="Price Here"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
-    <Button
-        android:id="@+id/button_addToBasket"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:text="Add to Basket" />
-
 </RelativeLayout>

ClientAlphaPrototype/res/layout/activity_scan.xml

@@ -12,9 +12,15 @@
         android:id="@+id/button_scan"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="160dp"
-        android:text="I am ready to order" />
+        android:layout_centerVertical="true"
+        android:text="scan" />
 
-</RelativeLayout>
+    <com.example.clientalphaprototype.adapters.ExpandableTextView
+        android:id="@+id/expandable_scaninfo"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true" />
+
+</RelativeLayout>

ClientAlphaPrototype/res/layout/basket_listview.xml

@@ -12,7 +12,7 @@
         android:ellipsize="marquee"
         android:gravity="left"
         android:singleLine="true"
-        android:textSize="12sp" />
+        android:textSize="12sp"/>
 
     <TextView
         android:id="@+id/large_txt"

ClientAlphaPrototype/res/layout/product_listview.xml

@@ -11,7 +11,7 @@
         android:layout_below="@+id/large_txt"
         android:ellipsize="marquee"
         android:singleLine="true"
-        android:textSize="12sp" />
+        android:textSize="12sp"/> 
 
     <TextView
         android:id="@+id/large_txt"

ClientAlphaPrototype/res/menu/basket.xml

@@ -1,9 +1,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+  <item android:id="@+id/Menu"
+          android:title="Menu"/>
+
+    <item android:id="@+id/ScanAgain"
+          android:title="Scan Again"/>
 
 </menu>

ClientAlphaPrototype/res/menu/categories.xml

@@ -1,9 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+    <item android:id="@+id/ScanAgain"
+          android:title="Scan Again"/>
 
 </menu>
+
+

ClientAlphaPrototype/res/menu/details.xml

@@ -1,9 +1,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+  <item android:id="@+id/Menu"
+          android:title="Menu"/>
+
+    <item android:id="@+id/ScanAgain"
+          android:title="Scan Again"/>
 
 </menu>

ClientAlphaPrototype/res/menu/main_menu.xml

@@ -1,9 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+  <item android:id="@+id/Menu"
+          android:title="Menu"/>
+
+    <item android:id="@+id/ScanAgain"
+          android:title="Scan Again"/>
 
 </menu>
+

ClientAlphaPrototype/res/menu/products.xml

@@ -1,9 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+  <item android:id="@+id/Menu"
+          android:title="Menu"/>
+
+    <item android:id="@+id/ScanAgain"
+          android:title="Scan Again"/>
 
 </menu>
+

ClientAlphaPrototype/res/values/attrs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="ExpandableTextView">
+        <attr name="trimLength" format="integer" />
+    </declare-styleable>
+
+</resources>

ClientAlphaPrototype/src/com/example/clientalphaprototype/BasketActivity.java

@@ -12,6 +12,7 @@
 import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
@@ -151,5 +152,23 @@ public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.basket, menu);
 		return true;
 	}
-
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+	    switch(item.getItemId()) {
+	    case R.id.Menu:
+	        Intent menuIntent = new Intent(this, CategoriesActivity.class);
+	        this.startActivity(menuIntent);
+	        break;
+	    case R.id.ScanAgain:
+	        Intent scanIntent = new Intent(this, ScanActivity.class);
+	        this.startActivity(scanIntent);
+	        break;
+	    default:
+	        return super.onOptionsItemSelected(item);
+	    }
+
+	    return true;
+	}
 }

ClientAlphaPrototype/src/com/example/clientalphaprototype/CategoriesActivity.java

@@ -18,6 +18,7 @@
 import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
@@ -162,7 +163,23 @@ public boolean isNetworkAvailable() {
 	public boolean onCreateOptionsMenu(Menu menu) {
 		// Inflate the menu; this adds items to the action bar if it is present.
 		getMenuInflater().inflate(R.menu.categories, menu);
+
 		return true;
 	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+
+	    switch(item.getItemId()) {
+	    case R.id.ScanAgain:
+	        Intent scanIntent = new Intent(this, ScanActivity.class);
+	        this.startActivity(scanIntent);
+	        break;
+	    default:
+	        return super.onOptionsItemSelected(item);
+	    }
+
+	    return true;
+	}
 
 }