TUSCANY-3060 - Applying SANNI Lookman patch with updates to Android Store UI

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@778916 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 99 insertions, 16 deletions

diff --git a/branches/sca-java-1.x/samples/store-android/res/drawable/addc.png b/branches/sca-java-1.x/samples/store-android/res/drawable/addc.png
new file mode 100644
index 0000000000..17259450d8
--- /dev/null
+++ b/branches/sca-java-1.x/samples/store-android/res/drawable/addc.png
diff --git a/branches/sca-java-1.x/samples/store-android/res/drawable/rems.png b/branches/sca-java-1.x/samples/store-android/res/drawable/rems.png
new file mode 100644
index 0000000000..378690fad4
--- /dev/null
+++ b/branches/sca-java-1.x/samples/store-android/res/drawable/rems.png
diff --git a/branches/sca-java-1.x/samples/store-android/res/layout/cat_row.xml b/branches/sca-java-1.x/samples/store-android/res/layout/cat_row.xml
new file mode 100644
index 0000000000..e7f71cb0b6
--- /dev/null
+++ b/branches/sca-java-1.x/samples/store-android/res/layout/cat_row.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:padding="10px"
+        android:layout_height="50px">        
+        <TextView 
+                android:id="@+id/txtItemC"
+                android:layout_width="250px"
+                android:layout_height="30px"
+                android:textSize="20px"
+                
+                />
+                
+		<ImageView android:src="@drawable/addc"
+                android:layout_width="30px"
+        		android:layout_height="30px"
+                />
+</LinearLayout>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/samples/store-android/res/layout/main.xml b/branches/sca-java-1.x/samples/store-android/res/layout/main.xml
index f7494f5a3a..7f296e9ac0 100644
--- a/branches/sca-java-1.x/samples/store-android/res/layout/main.xml
+++ b/branches/sca-java-1.x/samples/store-android/res/layout/main.xml
@@ -17,27 +17,49 @@
             android:layout_height="fill_parent">
             
             
-	            <ListView android:id="@+id/ListView01"
-	            	android:layout_width="fill_parent"
-	            	android:layout_height="wrap_content"
-	            	/>
+	         <ListView android:id="@+id/ListView01"
+	            android:layout_width="fill_parent"
+	            android:layout_height="wrap_content" />
 	           	
-	        <LinearLayout 
-	        android:id="@+id/tab02"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent">
+	         <LinearLayout 
+	            android:id="@+id/tab02"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
         
-        <ListView android:id="@+id/ListView02"
+		     	<TextView 
+                	android:id="@+id/txtThx"
+                	android:layout_width="fill_parent"
+                	android:layout_height="30px" 
+                	android:text="@string/title_thx"
+                 />
+       		  	<TextView 
+	                android:id="@+id/txtEmpty"
+                	android:layout_width="fill_parent"
+                	android:layout_height="wrap_content" 
+                 />
+       		 	<LinearLayout 
+        			android:orientation="horizontal"
+        			android:layout_width="fill_parent"
+        			android:layout_height="41px">
+			        
+        				<TextView 
+                			android:id="@+id/txtTotal"
+                			android:layout_width="200px"
+                			android:layout_height="30px" 
+                			android:text="@string/title_order"
+                 		/>
+            
+            			 <Button android:id="@+id/btnClean" 
+                			android:layout_width="100px" 
+                			android:layout_height="40px"  
+                		/>
+         		</LinearLayout>
+                
+              <ListView android:id="@+id/ListView02"
 	            	android:layout_width="fill_parent"
 	            	android:layout_height="wrap_content"
 	            	/>
-        
-            <TextView 
-                android:id="@+id/txtTotal"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent" 
-                 />
                  
                </LinearLayout>
     	</FrameLayout>
diff --git a/branches/sca-java-1.x/samples/store-android/res/layout/shop_row.xml b/branches/sca-java-1.x/samples/store-android/res/layout/shop_row.xml
new file mode 100644
index 0000000000..a2ffeea56f
--- /dev/null
+++ b/branches/sca-java-1.x/samples/store-android/res/layout/shop_row.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="50px"
+        android:padding="10px">        
+        <TextView 
+                android:id="@+id/txtItemS"
+                android:layout_width="250px"
+                android:layout_height="30px"
+                android:textSize="20px"
+                
+                />
+                
+		<ImageView android:src="@drawable/rems"
+                android:layout_width="30px"
+        		android:layout_height="30px"
+
+                />
+</LinearLayout>
\ No newline at end of file
diff --git a/branches/sca-java-1.x/samples/store-android/res/values/strings.xml b/branches/sca-java-1.x/samples/store-android/res/values/strings.xml
index 2cf7940514..33f936b510 100644
--- a/branches/sca-java-1.x/samples/store-android/res/values/strings.xml
+++ b/branches/sca-java-1.x/samples/store-android/res/values/strings.xml
@@ -3,4 +3,26 @@
     <string name="hello">Hello World, catalog</string>
     <string name="app_name">store</string>
     <string name="app_tag">Tuscany</string>
+    <string name="btn_clean">Erase cart</string>
+    <string name="btn_add_del1">Delete</string>
+    <string name="btn_add_del2">Add</string>
+    <string name="txt_empty">Nothing to display. The cart is currently empty</string>
+    <string name="tab_catalog">catalog_tab</string>
+    <string name="tab_shop">shopping_cart_tab</string>
+    <string name="title_catalog">Catalog Items</string>
+    <string name="title_shop">Shopping Cart</string>
+    <string name="get_tag">Catalog GET!!</string>
+    <string name="start_tag">Activity started</string>
+    <string name="txt_total">Total: </string>
+    <string name="add_entry_ok">Entry added: </string>
+    <string name="add_entry_ko">Unable to add entry: </string>
+    <string name="del_entry_ok">Entry removed: </string>
+    <string name="del_entry_ko">Unable to delete item: </string>
+    <string name="alert_yes">Yes</string>
+    <string name="alert_cancel">Cancel</string>
+    <string name="del_all_ok">All entries have been removed</string>
+    <string name="title_thx">Thanks for Shopping With Us!</string>
+    <string name="title_order">Your order</string>
+    <string name="howto_del">Click on an item below to remove it</string>
+    
 </resources>