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
ce161a7c
Commit
ce161a7c
authored
May 05, 2021
by
Sam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
bd57ab3d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
cafe_activity.java
...java/com/example/museumworld/cafe_shop/cafe_activity.java
+3
-2
shop_activity.java
...java/com/example/museumworld/cafe_shop/shop_activity.java
+1
-1
No files found.
app/src/main/java/com/example/museumworld/cafe_shop/cafe_activity.java
View file @
ce161a7c
...
@@ -94,7 +94,7 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList
...
@@ -94,7 +94,7 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList
if
(
buttonChecker
&&
!
quant_CounterString
.
equals
(
"99"
))
{
if
(
buttonChecker
&&
!
quant_CounterString
.
equals
(
"99"
))
{
quantityCounter
++;
quantityCounter
++;
}
else
if
(!
buttonChecker
&&
!
quant_CounterString
.
equals
(
"0"
)
&&
!
quant_CounterString
.
equals
(
""
))
{
}
else
if
(!
buttonChecker
&&
!
quant_CounterString
.
equals
(
"0"
)
&&
!
quant_CounterString
.
equals
(
""
)
)
{
quantityCounter
--;
quantityCounter
--;
}
else
{
}
else
{
...
@@ -180,7 +180,8 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList
...
@@ -180,7 +180,8 @@ public class cafe_activity extends AppCompatActivity implements View.OnClickList
String
cafePrice
=
cafeItemList
.
get
(
i
).
getPrice
();
String
cafePrice
=
cafeItemList
.
get
(
i
).
getPrice
();
if
(!
cafeQuantity
.
equals
(
"0"
)
&&
!
cafeQuantity
.
equals
(
""
))
{
if
(!
cafeQuantity
.
equals
(
"0"
)
&&
!
cafeQuantity
.
equals
(
""
)
&&
!
cafeQuantity
.
equals
(
"00"
))
{
Log
.
d
(
"cafeQuantity"
,
"The q is: "
+
cafeQuantity
);
Log
.
d
(
"cafeQuantity"
,
"The q is: "
+
cafeQuantity
);
itemQuantityCafe
.
add
(
cafeQuantity
);
itemQuantityCafe
.
add
(
cafeQuantity
);
itemNameCafe
.
add
(
cafeName
);
itemNameCafe
.
add
(
cafeName
);
...
...
app/src/main/java/com/example/museumworld/cafe_shop/shop_activity.java
View file @
ce161a7c
...
@@ -182,7 +182,7 @@ public class shop_activity extends AppCompatActivity implements View.OnClickList
...
@@ -182,7 +182,7 @@ public class shop_activity extends AppCompatActivity implements View.OnClickList
String
shopQuantity
=
shopItemList
.
get
(
i
).
getQuantity
();
String
shopQuantity
=
shopItemList
.
get
(
i
).
getQuantity
();
String
shopItem
=
shopItemList
.
get
(
i
).
getItem
();
String
shopItem
=
shopItemList
.
get
(
i
).
getItem
();
String
shopPriceName
=
shopItemList
.
get
(
i
).
getPrice
();
String
shopPriceName
=
shopItemList
.
get
(
i
).
getPrice
();
if
(!
shopQuantity
.
equals
(
"0"
)
&&
!
shopQuantity
.
equals
(
""
))
{
if
(!
shopQuantity
.
equals
(
"0"
)
&&
!
shopQuantity
.
equals
(
""
)
&&
!
shopQuantity
.
equals
(
"00"
)
)
{
itemQuantityShop
.
add
(
shopQuantity
);
itemQuantityShop
.
add
(
shopQuantity
);
itemNameShop
.
add
(
shopItem
);
itemNameShop
.
add
(
shopItem
);
itemPriceShop
.
add
(
shopPriceName
);
itemPriceShop
.
add
(
shopPriceName
);
...
...
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