Updated the product's details activity

Details activity now supports multiple images in a gallery view
Qorder · Dec 5, 2013 · 1ee2305 · 1ee2305
1 parent 71ef7d0
commit 1ee2305
Show file tree

Hide file tree

Showing 29 changed files with 139 additions and 57 deletions.
diff --git a/ClientAlphaPrototype/bin/ClientAlphaPrototype.apk b/ClientAlphaPrototype/bin/ClientAlphaPrototype.apk
diff --git a/ClientAlphaPrototype/bin/classes.dex b/ClientAlphaPrototype/bin/classes.dex
diff --git a/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$drawable.class b/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$drawable.class
diff --git a/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$id.class b/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$id.class
diff --git a/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$layout.class b/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$layout.class
diff --git a/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$menu.class b/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$menu.class
diff --git a/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$string.class b/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$string.class
diff --git a/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$style.class b/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/R$style.class
diff --git a/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/ScanActivity.class b/ClientAlphaPrototype/bin/classes/com/example/clientalphaprototype/ScanActivity.class
diff --git a/...t-v4-f75407d8ef6d2db41494b2bfc8e0f797.jar → ...t-v4-88392992613c8509305a52ac0e99cc38.jar b/...t-v4-f75407d8ef6d2db41494b2bfc8e0f797.jar → ...t-v4-88392992613c8509305a52ac0e99cc38.jar
diff --git a/....2.3-2536abb9c0dec41142c5fe4aec5b49a4.jar → ....2.3-d63219809b0db56220657d9801d46c96.jar b/....2.3-2536abb9c0dec41142c5fe4aec5b49a4.jar → ....2.3-d63219809b0db56220657d9801d46c96.jar
diff --git a/....3.0-d2a6fa77ac79c2dab73f895d63212e8b.jar → ....3.0-2f7dcfb2f6654be15eb269df52490167.jar b/....3.0-d2a6fa77ac79c2dab73f895d63212e8b.jar → ....3.0-2f7dcfb2f6654be15eb269df52490167.jar
diff --git a/....2.3-e47103f57d17cd6233c76f538ac65a25.jar → ....2.3-4b94d888e77e984d254c732e9e3467ea.jar b/....2.3-e47103f57d17cd6233c76f538ac65a25.jar → ....2.3-4b94d888e77e984d254c732e9e3467ea.jar
diff --git a/....9.5-0ff4d4a24a1f5da79c4baf992bc523ea.jar → ....9.5-4902815ba706e8f5eac5ec6c68c81cc0.jar b/....9.5-0ff4d4a24a1f5da79c4baf992bc523ea.jar → ....9.5-4902815ba706e8f5eac5ec6c68c81cc0.jar
diff --git a/...zbar-60d908c87798036715d02cab8ef19431.jar → ...zbar-aad6359c03b0c6d6aacace6704fef60c.jar b/...zbar-60d908c87798036715d02cab8ef19431.jar → ...zbar-aad6359c03b0c6d6aacace6704fef60c.jar
diff --git a/...vity-4e7ab5b48af7e29b6aa94432ab87721e.jar → ...vity-3ead9030b3bb3c9f84877cae80219dec.jar b/...vity-4e7ab5b48af7e29b6aa94432ab87721e.jar → ...vity-3ead9030b3bb3c9f84877cae80219dec.jar
diff --git a/ClientAlphaPrototype/bin/jarlist.cache b/ClientAlphaPrototype/bin/jarlist.cache
diff --git a/ClientAlphaPrototype/bin/resources.ap_ b/ClientAlphaPrototype/bin/resources.ap_
diff --git a/ClientAlphaPrototype/gen/com/example/clientalphaprototype/R.java b/ClientAlphaPrototype/gen/com/example/clientalphaprototype/R.java
@@ -23,31 +23,35 @@ public static final class dimen {
     public static final class drawable {
         public static final int basket=0x7f020000;
         public static final int ic_launcher=0x7f020001;
+        public static final int image1=0x7f020002;
+        public static final int image2=0x7f020003;
+        public static final int image3=0x7f020004;
     }
     public static final class id {
-        public static final int action_settings=0x7f08000f;
+        public static final int action_settings=0x7f080010;
         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=0x7f080008;
-        public static final int button_scan=0x7f08000c;
+        public static final int button_addToBasket=0x7f080007;
+        public static final int button_scan=0x7f08000d;
         public static final int categories_listview=0x7f080003;
-        public static final int editText_notes=0x7f080009;
-        public static final int large_txt=0x7f08000e;
+        public static final int editText_notes=0x7f080006;
+        public static final int large_txt=0x7f08000f;
         public static final int pager=0x7f080004;
-        public static final int price_txt=0x7f08000a;
-        public static final int product_Img=0x7f080005;
-        public static final int products_listview=0x7f08000b;
-        public static final int small_txt=0x7f08000d;
-        public static final int textView_description=0x7f080007;
-        public static final int textView_title=0x7f080006;
+        public static final int price_txt=0x7f08000b;
+        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 textView_description=0x7f08000a;
+        public static final int textView_title=0x7f080009;
     }
     public static final class layout {
         public static final int actionbar_submit_view=0x7f030000;
         public static final int actionbar_view=0x7f030001;
         public static final int activity_basket=0x7f030002;
         public static final int activity_categories=0x7f030003;
-        public static final int activity_details=0x7f030004;
+        public static final int activity_productdetails=0x7f030004;
         public static final int activity_products=0x7f030005;
         public static final int activity_scan=0x7f030006;
         public static final int basket_listview=0x7f030007;

diff --git a/ClientAlphaPrototype/res/drawable/image1.bmp b/ClientAlphaPrototype/res/drawable/image1.bmp
diff --git a/ClientAlphaPrototype/res/drawable/image2.bmp b/ClientAlphaPrototype/res/drawable/image2.bmp
diff --git a/ClientAlphaPrototype/res/drawable/image3.bmp b/ClientAlphaPrototype/res/drawable/image3.bmp
diff --git a/...Prototype/res/layout/activity_details.xml → ...pe/res/layout/activity_productdetails.xml b/...Prototype/res/layout/activity_details.xml → ...pe/res/layout/activity_productdetails.xml
@@ -8,64 +8,70 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".DetailsActivity" >
 
-    <ImageView
-        android:id="@+id/product_Img"
+    <Gallery
+        android:id="@+id/products_gallery"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true" />
+
+    <EditText
+        android:id="@+id/editText_notes"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:src="@drawable/ic_launcher" />
+        android:layout_above="@+id/button_addToBasket"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="26dp"
+        android:ems="10"
+        android:inputType="textMultiLine"
+        android:text="Your notes here" >
+
+        <requestFocus />
+    </EditText>
+
+    <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:contentDescription="d"
+        android:src="@drawable/image1" />
 
     <TextView
         android:id="@+id/textView_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/product_Img"
-        android:layout_marginLeft="58dp"
-        android:layout_toRightOf="@+id/product_Img"
+        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/product_Img"
-        android:layout_below="@+id/product_Img"
-        android:layout_marginTop="34dp"
+        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" />
 
-    <Button
-        android:id="@+id/button_addToBasket"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignRight="@+id/textView_title"
-        android:layout_marginBottom="14dp"
-        android:text="Add to Basket" />
-
-    <EditText
-        android:id="@+id/editText_notes"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/button_addToBasket"
-        android:layout_alignLeft="@+id/textView_description"
-        android:layout_marginBottom="35dp"
-        android:ems="10"
-        android:inputType="textMultiLine"
-        android:text="Your notes here" >
-
-        <requestFocus />
-    </EditText>
-
     <TextView
         android:id="@+id/price_txt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignRight="@+id/button_addToBasket"
         android:layout_below="@+id/textView_title"
-        android:layout_toRightOf="@+id/editText_notes"
         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>
diff --git a/ClientAlphaPrototype/src/com/example/clientalphaprototype/BasketActivity.java b/ClientAlphaPrototype/src/com/example/clientalphaprototype/BasketActivity.java
@@ -22,7 +22,7 @@
 import com.example.clientalphaprototype.swipe.SwipeDismissListViewTouchListener;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
-import com.example.clientalphaprototype.customviews.BasketCustomList;
+import com.example.clientalphaprototype.adapters.BasketCustomList;
 import com.example.clientalphaprototype.model.BasketProduct;
 import com.example.clientalphaprototype.model.OrderHolder;
 

diff --git a/ClientAlphaPrototype/src/com/example/clientalphaprototype/DetailsActivity.java b/ClientAlphaPrototype/src/com/example/clientalphaprototype/DetailsActivity.java
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.example.clientalphaprototype.adapters.DetailsImageAdapter;
 import com.example.clientalphaprototype.model.BasketProduct;
 import com.example.clientalphaprototype.model.DetailedProduct;
 import com.example.clientalphaprototype.model.OrderHolder;
@@ -23,8 +24,11 @@
 import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.Gallery;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -34,12 +38,19 @@ public class DetailsActivity extends Activity {
 	OrderHolder orderHolder = new OrderHolder();
 	DetailedProduct product;
 	final String currencySign = "€";
+	ImageView currentImage;  
 	String notes;
 
+	private Integer[] imgIds = {
+               R.drawable.image1,
+               R.drawable.image2,
+               R.drawable.image3,
+       };
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_details);
+		setContentView(R.layout.activity_productdetails);
 
 		notes = null;
 		Bundle extras = getIntent().getExtras();
@@ -68,6 +79,7 @@ public void onClick(View v) {
 		});
 	}
 
+	@SuppressWarnings("deprecation")
 	void initializeView() {
 		EditText mEdit = (EditText) findViewById(R.id.editText_notes);
 
@@ -86,8 +98,18 @@ void initializeView() {
 		// TODO: review
 		description.setText(product.getAttributes().get(0));
 
+		Gallery gallery = (Gallery) findViewById(R.id.products_gallery);
+        gallery.setSpacing(1);
+        gallery.setAdapter(new DetailsImageAdapter(this));
+        currentImage=(ImageView)findViewById(R.id.products_imageview);
+        gallery.setOnItemClickListener(new OnItemClickListener() {
+            public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+                currentImage.setImageResource(imgIds[position]);
+            }
+         });
+
 		// TODO: review
-		ImageView img = (ImageView) findViewById(R.id.product_Img);
+		//ImageView img = (ImageView) findViewById(R.id.product_Img);
 		// img.setImageResource("uri");
 
 	}
@@ -164,7 +186,8 @@ void parseJson(String url) {
 
 	void createMockProduct() {
 		List<String> attributes = new ArrayList<String>();
-		attributes.add("Some attribute");
+		attributes.add("Some attribute...");
+
 		product = new DetailedProduct(1, "Product", BigDecimal.valueOf(1.99),
 				"your notes here", attributes,"example uri");
 	}
@@ -177,3 +200,4 @@ public boolean onCreateOptionsMenu(Menu menu) {
 	}
 
 }
+
diff --git a/ClientAlphaPrototype/src/com/example/clientalphaprototype/ProductsActivity.java b/ClientAlphaPrototype/src/com/example/clientalphaprototype/ProductsActivity.java
@@ -9,7 +9,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.example.clientalphaprototype.customviews.*;
+import com.example.clientalphaprototype.adapters.*;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 

diff --git a/...ototype/customviews/BasketCustomList.java → ...aprototype/adapters/BasketCustomList.java b/...ototype/customviews/BasketCustomList.java → ...aprototype/adapters/BasketCustomList.java
@@ -1,4 +1,4 @@
-package com.example.clientalphaprototype.customviews;
+package com.example.clientalphaprototype.adapters;
 
 import java.util.List;
 

diff --git a/ClientAlphaPrototype/src/com/example/clientalphaprototype/adapters/DetailsImageAdapter.java b/ClientAlphaPrototype/src/com/example/clientalphaprototype/adapters/DetailsImageAdapter.java
@@ -0,0 +1,51 @@
+package com.example.clientalphaprototype.adapters;
+
+import com.example.clientalphaprototype.R;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Gallery;
+import android.widget.ImageView;
+
+@SuppressWarnings("deprecation")
+public class DetailsImageAdapter extends BaseAdapter 
+{
+    private Context mContext;
+
+    private Integer[] mImageIds = {
+            R.drawable.image1,
+            R.drawable.image2,
+            R.drawable.image3,
+    };
+
+    public DetailsImageAdapter(Context context) 
+    {
+        mContext = context;
+    }
+
+    public int getCount() {
+        return mImageIds.length;
+    }
+
+    public Object getItem(int position) {
+        return position;
+    }
+
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+	public View getView(int index, View view, ViewGroup viewGroup) 
+    {
+        ImageView i = new ImageView(mContext);
+
+        i.setImageResource(mImageIds[index]);
+        i.setLayoutParams(new Gallery.LayoutParams(100, 100));
+        i.setScaleType(ImageView.ScaleType.FIT_XY);
+
+        return i;
+    }
+}
diff --git a/...totype/customviews/ProductCustomList.java → ...prototype/adapters/ProductCustomList.java b/...totype/customviews/ProductCustomList.java → ...prototype/adapters/ProductCustomList.java
@@ -1,4 +1,4 @@
-package com.example.clientalphaprototype.customviews;
+package com.example.clientalphaprototype.adapters;
 
 import java.util.List;