Skip to content

S
Summative_Lucy_Hemingway
Commit 598e08d4 authored by lucy.hemingway's avatar lucy.hemingway
Browse files
Options

finished

parent 20a1c387
Show whitespace changes
Inline Side-by-side
Showing with 137 additions and 44 deletions
app/src/main/java/com/example/appppppp/SouvenirShop.java
View file @ 598e08d4
......@@ -19,7 +19,7 @@ public class SouvenirShop extends AppCompatActivity {
public static Integer totalcafe;
Button purchase;
TextView showtotal,museumshow;
TextView museumshow;
@Override
protected void onCreate(Bundle savedInstanceState) {
......
app/src/main/res/layout/activity_booking.xml
View file @ 598e08d4
......@@ -12,6 +12,7 @@
android:layout_width="342dp"
android:layout_height="58dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Museum"
android:textSize="18sp"
android:textStyle="bold"
......@@ -27,6 +28,7 @@
android:layout_width="253dp"
android:layout_height="68dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Click Here"
android:textColor="#E48B84"
android:textSize="20sp"
......@@ -42,21 +44,23 @@
android:id="@+id/pricehere"
android:layout_width="209dp"
android:layout_height="29dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="78dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="price : £"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/selectdate"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.267"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/Museumname" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.888" />
<Button
android:id="@+id/booknow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:text="Book Time and Date"
app:backgroundTint="#E48B84"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -68,15 +72,17 @@
<TextView
android:id="@+id/times"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="329dp"
android:layout_height="47dp"
android:layout_marginTop="16dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Select a Time for Your Visit:"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.292"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/selectdate"
app:layout_constraintVertical_bias="0.0" />
......@@ -87,6 +93,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Select a Date to Visit:"
android:textSize="24sp"
android:textStyle="bold"
......@@ -114,6 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:text="9-11am"
app:buttonTint="#E48B84" />
......@@ -122,6 +130,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:text="11-1pm"
app:buttonTint="#E48B84" />
......@@ -131,6 +140,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:text="1-3pm"
app:buttonTint="#E48B84" />
......@@ -139,6 +149,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:text="3-5pm"
app:buttonTint="#E48B84" />
</RadioGroup>
......@@ -148,13 +159,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="11dp"
android:fontFamily="serif-monospace"
android:onClick="backone"
android:text="Back"
app:backgroundTint="#E48B84"
app:layout_constraintBottom_toTopOf="@+id/Museumname"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.128"
app:layout_constraintHorizontal_bias="0.049"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.666" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_cafe.xml
View file @ 598e08d4
......@@ -93,6 +93,7 @@
android:fontFamily="serif-monospace"
android:text="TextView"
android:textSize="18sp"
android:textStyle="italic"
app:layout_constraintBottom_toTopOf="@+id/textView8"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.923"
......@@ -138,6 +139,7 @@
android:layout_height="19dp"
android:layout_marginTop="27dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Tea"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -167,6 +169,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Water"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -180,6 +183,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Coffee"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -193,6 +197,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Flatbread"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -206,6 +211,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Sandwich"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -219,6 +225,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Sweet Roll"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -232,6 +239,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Salad"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/layout/activity_full_purchase.xml
View file @ 598e08d4
......@@ -11,23 +11,27 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Your Full Purchase:"
android:textColor="#000000"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.437"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.104" />
app:layout_constraintVertical_bias="0.103" />
<TextView
android:id="@+id/receipt"
android:layout_width="334dp"
android:layout_height="364dp"
android:background="#647583"
android:clickable="false"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="TextView"
android:textColor="#FFFFFF"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -42,7 +46,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="44dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Continue To Payment"
app:backgroundTint="#647583"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
......@@ -55,8 +61,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:fontFamily="serif-monospace"
android:onClick="backone"
android:text="back"
app:backgroundTint="#647583"
app:layout_constraintBottom_toTopOf="@+id/textView24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.084"
......
app/src/main/res/layout/activity_help_page.xml
View file @ 598e08d4
......@@ -8,10 +8,12 @@
<TextView
android:id="@+id/textView10"
android:layout_width="319dp"
android:layout_height="366dp"
android:layout_width="346dp"
android:layout_height="390dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Welcome to MuseumApp, a friendly and efficient service to help you book your upcoming museum trips. With the current situation of Covid-19, the team of MuseumApp have created an easy and safe application to aid future trips. Simply Log In or Register an account on the menu page to begin selecting and booking your museum trips. You must have a valid email address to create an account. "
android:textColor="#4E6768"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -23,8 +25,10 @@
android:id="@+id/button8"
android:layout_width="111dp"
android:layout_height="41dp"
android:fontFamily="serif-monospace"
android:onClick="toMenu"
android:text="Back"
app:backgroundTint="#4E6768"
app:layout_constraintBottom_toTopOf="@+id/textView11"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.053"
......@@ -33,16 +37,19 @@
<TextView
android:id="@+id/textView11"
android:layout_width="262dp"
android:layout_height="37dp"
android:layout_width="350dp"
android:layout_height="55dp"
android:editable="false"
android:text=" Help and Guidance"
android:fontFamily="serif-monospace"
android:text="Help and Guidance"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="#4E6768"
android:textSize="24sp"
android:textStyle="bold|italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintHorizontal_bias="0.54"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.148" />
app:layout_constraintVertical_bias="0.167" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_payment.xml
View file @ 598e08d4
......@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#D8AEAE"
tools:context=".Payment">
<TextView
......@@ -12,8 +13,10 @@
android:layout_height="37dp"
android:clickable="false"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="price"
android:textSize="18sp"
android:textColor="#000000"
android:textSize="20sp"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -28,8 +31,10 @@
android:layout_height="31dp"
android:clickable="false"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Payment"
android:textSize="22sp"
android:textColor="#000000"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/fullpriceview"
app:layout_constraintEnd_toEndOf="parent"
......@@ -40,31 +45,38 @@
<TextView
android:id="@+id/textView28"
android:layout_width="179dp"
android:layout_height="25dp"
android:layout_width="185dp"
android:layout_height="48dp"
android:layout_marginTop="67dp"
android:clickable="false"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Enter Amount to Pay:"
android:textSize="18sp"
android:textColor="#000000"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.159"
app:layout_constraintHorizontal_bias="0.181"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fullpriceview"
app:layout_constraintVertical_bias="0.047" />
app:layout_constraintVertical_bias="0.01" />
<Button
android:id="@+id/makepayment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="324dp"
android:layout_marginTop="12dp"
android:fontFamily="serif-monospace"
android:text="Pay"
android:textColor="#000000"
app:backgroundTint="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.826"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintHorizontal_bias="0.56"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.588" />
<EditText
android:id="@+id/enteramount"
......@@ -72,20 +84,24 @@
android:layout_height="40dp"
android:layout_marginTop="60dp"
android:ems="10"
android:fontFamily="serif-monospace"
android:inputType="number"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.86"
app:layout_constraintHorizontal_bias="0.863"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fullpriceview"
app:layout_constraintVertical_bias="0.048" />
app:layout_constraintVertical_bias="0.066" />
<Button
android:id="@+id/button12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:onClick="backone"
android:text="back"
android:textColor="#000000"
app:backgroundTint="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.088"
......
app/src/main/res/layout/activity_receipt.xml
View file @ 598e08d4
......@@ -11,37 +11,41 @@
android:id="@+id/completereceipt"
android:layout_width="357dp"
android:layout_height="534dp"
android:background="#DAF1F4"
android:fontFamily="serif-monospace"
android:text="TextView"
android:textColor="#000000"
android:textSize="18sp"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.497" />
app:layout_constraintVertical_bias="0.527" />
<TextView
android:id="@+id/textView26"
android:layout_width="159dp"
android:layout_height="43dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:fontFamily="serif-monospace"
android:text="Receipt"
android:textColor="#FF77BFC8"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/completereceipt"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.611"
app:layout_constraintHorizontal_bias="0.535"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintVertical_bias="0.01" />
<Button
android:id="@+id/button5"
android:layout_width="167dp"
android:layout_height="43dp"
android:layout_marginBottom="52dp"
android:fontFamily="serif-monospace"
android:onClick="logout"
android:text="Log Out"
app:backgroundTint="#77BFC8"
......@@ -58,6 +62,7 @@
android:layout_marginLeft="3dp"
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:fontFamily="serif-monospace"
android:onClick="tomuseums"
android:text="Return to Museum Menu"
android:textSize="12sp"
......@@ -71,15 +76,16 @@
<TextView
android:id="@+id/textView29"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:layout_width="373dp"
android:layout_height="31dp"
android:fontFamily="serif-monospace"
android:text="Thankyou for purchasing your ticket with VisitMuseum"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/completereceipt"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.71"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView26"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.057" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_souvenir_shop.xml
View file @ 598e08d4
......@@ -8,11 +8,15 @@
<TextView
android:id="@+id/textView22"
android:layout_width="367dp"
android:layout_height="23dp"
android:layout_width="365dp"
android:layout_height="41dp"
android:clickable="false"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Please select any items you wish to purchase on your trip:"
android:textColor="#000000"
android:textSize="16sp"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.522"
......@@ -25,8 +29,9 @@
android:layout_width="179dp"
android:layout_height="42dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Souvenir Shop"
android:textColor="#000000"
android:textColor="#D1D1B4"
android:textSize="22sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -43,8 +48,10 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="17dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="TextView"
android:textSize="18sp"
android:textStyle="italic"
app:layout_constraintBottom_toTopOf="@+id/textView23"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.921"
......@@ -135,7 +142,10 @@
android:layout_height="wrap_content"
android:clickable="false"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Shirt"
android:textColor="#000000"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.212"
......@@ -148,7 +158,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Hat"
android:textColor="#000000"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.208"
......@@ -161,7 +174,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Snow Globe"
android:textColor="#000000"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.241"
......@@ -174,7 +190,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Key Chain"
android:textColor="#000000"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.232"
......@@ -188,7 +207,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Bottle"
android:textColor="#000000"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.216"
......@@ -202,7 +224,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Mug"
android:textColor="#000000"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.211"
......@@ -216,7 +241,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Coaster"
android:textColor="#000000"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.223"
......@@ -228,12 +256,16 @@
android:id="@+id/purchase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:text="Purchase"
android:textColor="#000000"
app:backgroundTint="#D1D1B4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView21"
app:layout_constraintVertical_bias="0.589" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.79" />
<Button
android:id="@+id/button14"
......@@ -245,8 +277,11 @@
android:layout_marginEnd="129dp"
android:layout_marginRight="129dp"
android:layout_marginBottom="102dp"
android:fontFamily="serif-monospace"
android:onClick="backone"
android:text="back"
android:textColor="#000000"
app:backgroundTint="#D1D1B4"
app:layout_constraintBottom_toTopOf="@+id/textView22"
app:layout_constraintEnd_toStartOf="@+id/museumshow2"
app:layout_constraintStart_toStartOf="parent"
......
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