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
dbcc86ea
Commit
dbcc86ea
authored
Apr 29, 2021
by
Sam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
This contains all of the application Data
parent
0b54b19d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
cafe_activity.java
...java/com/example/museumworld/cafe_shop/cafe_activity.java
+2
-2
MainActivity.java
...main/java/com/example/museumworld/login/MainActivity.java
+1
-1
No files found.
app/src/main/java/com/example/museumworld/cafe_shop/cafe_activity.java
View file @
dbcc86ea
...
...
@@ -138,7 +138,7 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList
case
R
.
id
.
next_btn
:
Intent
shop
=
new
Intent
(
this
,
shop_activity
.
class
);
//TODO PUT EXTRA
//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
));
...
...
@@ -166,7 +166,7 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList
itemNameCafe
.
add
(
cafeName
);
itemPriceCafe
.
add
(
cafePrice
);
//TODO PUT EXTRA IS FUNCTION DOES NOT WORK
}
}
if
(
itemNameCafe
.
size
()
>
0
)
{
...
...
app/src/main/java/com/example/museumworld/login/MainActivity.java
View file @
dbcc86ea
...
...
@@ -31,7 +31,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
private
String
message
;
private
String
URL
=
"https://ysjcs.net/~sam.markey/UNI/museum_php/login.php"
;
//TODO URL , EDIT TEXT GET TEXT AND PASS THEM TO LOGIN FUNC
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
...
...
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