Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
Summative_Sam_Markey
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sam.markey
Summative_Sam_Markey
Commits
4f5f7a62
Commit
4f5f7a62
authored
Apr 29, 2021
by
Sam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2.0 push of World Museums
parent
dbcc86ea
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
cafe_activity.java
...java/com/example/museumworld/cafe_shop/cafe_activity.java
+1
-2
shop_activity.java
...java/com/example/museumworld/cafe_shop/shop_activity.java
+1
-0
No files found.
app/src/main/java/com/example/museumworld/cafe_shop/cafe_activity.java
View file @
4f5f7a62
...
...
@@ -138,11 +138,10 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList
case
R
.
id
.
next_btn
:
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
(
getItemData
()
!=
null
)
{
shop
.
putExtra
(
"cafeItems"
,
getItemData
().
get
(
0
));
shop
.
putExtra
(
"topURL"
,
topImgURL
);
shop
.
putExtra
(
"cafeQuantity"
,
getItemData
().
get
(
1
));
shop
.
putExtra
(
"cafePrice"
,
getItemData
().
get
(
2
));
}
...
...
app/src/main/java/com/example/museumworld/cafe_shop/shop_activity.java
View file @
4f5f7a62
...
...
@@ -58,6 +58,7 @@ public class shop_activity extends AppCompatActivity implements View.OnClickList
MuseumDetails
md
=
new
MuseumDetails
();
top_img
=
findViewById
(
R
.
id
.
top_img
);
topImgURL
=
getIntent
().
getStringExtra
(
"topURL"
);
Log
.
d
(
"topImgURLShop"
,
topImgURL
);
md
.
setImagesByURL
(
getApplicationContext
(),
top_img
,
getIntent
().
getStringExtra
(
"topURL"
));
next_btn
=
findViewById
(
R
.
id
.
next_btn
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment