Fixed a bug in quantity feature

ginettev · Aug 3, 2012 · ea264b3 · ea264b3
1 parent f859d96
commit ea264b3
Show file tree

Hide file tree

Showing 29 changed files with 9 additions and 5 deletions.
diff --git a/out/production/HP/HP.apk.res b/out/production/HP/HP.apk.res
diff --git a/out/production/HP/HP.apk.unaligned b/out/production/HP/HP.apk.unaligned
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_arrow_down.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_arrow_down.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_arrow_up.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_arrow_up.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_bottom_frame.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_bottom_frame.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_disambig_bottom_bg.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_disambig_bottom_bg.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_disambig_checkbox_off.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_disambig_checkbox_off.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_disambig_checkbox_on.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_disambig_checkbox_on.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_disambig_divider.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_disambig_divider.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_drop_shadow.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_drop_shadow.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_frame_divider_med.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_frame_divider_med.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_photo_frame.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_photo_frame.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_background.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_background.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_btn_normal.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_btn_normal.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_btn_on.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_btn_on.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_btn_pressed.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_btn_pressed.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_btn_selected.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_btn_selected.9.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_grip_left.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_grip_left.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_grip_right.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_grip_right.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_presence_active.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_presence_active.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_presence_away.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_presence_away.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_presence_busy.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_presence_busy.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_presence_inactive.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_slider_presence_inactive.png
diff --git a/out/res-cache/HP/drawable-hdpi-finger/quickaction_top_frame.9.png b/out/res-cache/HP/drawable-hdpi-finger/quickaction_top_frame.9.png
diff --git a/out/res-cache/HP/drawable-hdpi/quickaction.9.png b/out/res-cache/HP/drawable-hdpi/quickaction.9.png
diff --git a/out/res-cache/HP/drawable-mdpi/ic_menu_goto.png b/out/res-cache/HP/drawable-mdpi/ic_menu_goto.png
diff --git a/res/layout/update_quantity.xml b/res/layout/update_quantity.xml
@@ -62,8 +62,7 @@
                         android:layout_width="60px"
                         android:layout_height="wrap_content"
                         android:ems="10"
-                        android:inputType="number"
-                        android:text="1" >
+                        android:inputType="number">
                     </EditText>
 
                     <ImageButton

diff --git a/src/com/thoughtworks/hp/activities/AddProductActivity.java b/src/com/thoughtworks/hp/activities/AddProductActivity.java
@@ -103,10 +103,12 @@ private void initToBuyListView() {
         toBuyProductListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
-                Product product = toBuyProductList.get(position);
+                Product product= (Product) adapterView.getItemAtPosition(position);
+                int quantity =  shoppingListProductTable.findQuantityOnProductAndShoppingList(shoppingListId, product.getId());
                 Intent intent = new Intent(AddProductActivity.this, AddQuantityActivity.class);
                 intent.putExtra("product_id", product.getId());
                 intent.putExtra("Shopping_list_id", shoppingListId);
+                intent.putExtra("quantity",quantity);
                 startActivityForResult(intent, 1);
             }
         });
@@ -128,7 +130,7 @@ private void initAutoSuggestListView() {
         autoSuggestListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
-                Product product = autoSuggestedProductList.get(position);
+                Product product = (Product) adapterView.getItemAtPosition(position);
                 addAndPersistProductInShoppingList(product);
                 Intent intent = new Intent(AddProductActivity.this, AddQuantityActivity.class);
                 intent.putExtra("product_id", product.getId());

diff --git a/src/com/thoughtworks/hp/activities/AddQuantityActivity.java b/src/com/thoughtworks/hp/activities/AddQuantityActivity.java
@@ -16,6 +16,7 @@ public class AddQuantityActivity extends CustomWindow {
 
 	EditText editText;
 	private long productId;
+    private int quantity;
 	@SuppressWarnings("unused")
 	private long shoppingListId;
 	private ShoppingListProductTable shoppingListProductTable;
@@ -29,6 +30,9 @@ public void onCreate(Bundle bundle) {
 		shoppingListProductTable = new ShoppingListProductTable();
 		productId = getIntent().getLongExtra("product_id", 1L);
 		shoppingListId = getIntent().getLongExtra("Shopping_list_id", 0L);
+        quantity = getIntent().getIntExtra("quantity",1);
+        editText = (EditText) findViewById(R.id.quantity_value);
+        editText.setText(String.valueOf(quantity));
 		boolean availableStatus = ProductAvailabilityService.isProductAvailable(productId);
 		TextView textToChange = (TextView) findViewById(R.id.availabilityText);
 		if (!availableStatus) {
@@ -43,7 +47,6 @@ public void onCreate(Bundle bundle) {
 	}
 
 	private int getValue() {
-		editText = (EditText) findViewById(R.id.quantity_value);
 		int quantity = Integer.parseInt(editText.getText().toString());
 		if (quantity < 0)
 			quantity = 0;