Commit 4f5f7a62 authored by Sam's avatar Sam

2.0 push of World Museums

parent dbcc86ea
...@@ -138,11 +138,10 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList ...@@ -138,11 +138,10 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList
case R.id.next_btn: case R.id.next_btn:
Intent shop = new Intent(this, shop_activity.class); Intent shop = new Intent(this, shop_activity.class);
shop.putExtra("topURL", topImgURL);
//if the itemData array is not null add the cafe items to the shop activity which will be passed down to the checkout and receipt //if the itemData array is not null add the cafe items to the shop activity which will be passed down to the checkout and receipt
if (getItemData() != null) { if (getItemData() != null) {
shop.putExtra("cafeItems", getItemData().get(0)); shop.putExtra("cafeItems", getItemData().get(0));
shop.putExtra("topURL", topImgURL);
shop.putExtra("cafeQuantity", getItemData().get(1)); shop.putExtra("cafeQuantity", getItemData().get(1));
shop.putExtra("cafePrice", getItemData().get(2)); shop.putExtra("cafePrice", getItemData().get(2));
} }
......
...@@ -58,6 +58,7 @@ public class shop_activity extends AppCompatActivity implements View.OnClickList ...@@ -58,6 +58,7 @@ public class shop_activity extends AppCompatActivity implements View.OnClickList
MuseumDetails md = new MuseumDetails(); MuseumDetails md = new MuseumDetails();
top_img = findViewById(R.id.top_img); top_img = findViewById(R.id.top_img);
topImgURL= getIntent().getStringExtra("topURL"); topImgURL= getIntent().getStringExtra("topURL");
Log.d("topImgURLShop", topImgURL);
md.setImagesByURL(getApplicationContext(), top_img, getIntent().getStringExtra("topURL")); md.setImagesByURL(getApplicationContext(), top_img, getIntent().getStringExtra("topURL"));
next_btn = findViewById(R.id.next_btn); next_btn = findViewById(R.id.next_btn);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment