Skip to content

S
Summative_Lucy_Hemingway
Commit 20a1c387 authored by lucy.hemingway's avatar lucy.hemingway
Browse files
Options

almost finished - colours

parent 224a9007
Show whitespace changes
Inline Side-by-side
Showing with 708 additions and 221 deletions
app/src/main/AndroidManifest.xml
View file @ 20a1c387
......@@ -9,7 +9,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.APPPPPpp">
<activity android:name=".Payment"></activity>
<activity android:name=".Receipt"></activity>
<activity android:name=".Payment" />
<activity android:name=".FullPurchase" />
<activity android:name=".SouvenirShop" />
<activity android:name=".cafe" />
......
app/src/main/java/com/example/appppppp/Booking.java
View file @ 20a1c387
......@@ -70,6 +70,8 @@ public class Booking extends AppCompatActivity {
Date = (TextView) findViewById(R.id.selectdate);
String dateshown = Date.toString();
Date.setOnClickListener(new View.OnClickListener() {
......@@ -115,9 +117,11 @@ public class Booking extends AppCompatActivity {
public void onClick(View v) {
int choosen = radiogroup.getCheckedRadioButtonId();
if(choosen == -1){
//prevent going to next page if button isn't pressed
//should stop if date isn't selected but this does not function
if(choosen == -1 || selecteddate == "Click Here"){
//none selected, tell user to select
Toast.makeText(getApplicationContext(),"Please select a time above.", Toast.LENGTH_LONG).show();
Toast.makeText(getApplicationContext(),"Please select a time/date above.", Toast.LENGTH_LONG).show();
}else {
findRadioButton(choosen);
Intent cafe = new Intent (getApplicationContext(), cafe.class);
......@@ -156,6 +160,11 @@ public class Booking extends AppCompatActivity {
}
}
//back to log in
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),LogIn.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/FullPurchase.java
View file @ 20a1c387
......@@ -55,9 +55,22 @@ public class FullPurchase extends AppCompatActivity {
public void onClick(View v) {
Intent intent = new Intent (getApplicationContext(), Payment.class);
intent.putExtra("fullprice",fullprice);
intent.putExtra("totalsouvenir",totalofsouvenir);
intent.putExtra("totalcafe",totalofcafe);
intent.putExtra("selectedMuseum",museumname);
intent.putExtra("price",priceofticket);
intent.putExtra("time",time);
intent.putExtra("date",date);
startActivity(intent);
}
});
}
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),SouvenirShop.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/LogIn.java
View file @ 20a1c387
......@@ -50,4 +50,9 @@ public class LogIn extends AppCompatActivity {
}
});
}
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),MainMenu.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/MuseumList.java
View file @ 20a1c387
......@@ -4,7 +4,9 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Toast;
import java.util.ArrayList;
......@@ -45,4 +47,10 @@ public class MuseumList extends AppCompatActivity {
adapterObj = new adapter(this, dataList);
recyclerObj.setAdapter(adapterObj);
}
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),fulldetails.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/Payment.java
View file @ 20a1c387
......@@ -4,10 +4,17 @@ import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
public class Payment extends AppCompatActivity {
TextView pricetopay;
TextView pricetopay, input;
Button makepayment;
public static int price,totalcafe,totalsouvenir;
public static String selectedMuseum,time,selecteddate;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -15,10 +22,86 @@ public class Payment extends AppCompatActivity {
setContentView(R.layout.activity_payment);
Intent intent = getIntent();
totalsouvenir = intent.getIntExtra("totalsouvenir",0);
totalcafe = intent.getIntExtra("totalcafe",0);
selectedMuseum = intent.getStringExtra("selectedMuseum");
time = intent.getStringExtra("time");
selecteddate = intent.getStringExtra("date");
Integer price = intent.getIntExtra("fullprice",0);
price = intent.getIntExtra("fullprice",0);
pricetopay = findViewById(R.id.fullpriceview);
pricetopay.setText("Total Price = £" + String.valueOf(price));
makepayment = findViewById(R.id.makepayment);
makepayment.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v) {
input = findViewById(R.id.enteramount);
String inputfound = input.getText().toString();
int val = Integer.parseInt(inputfound);
checkamount(val);
Intent receipt = new Intent (getApplicationContext(), Receipt.class);
receipt.putExtra("pricepaid",val);
receipt.putExtra("fullprice",price);
receipt.putExtra("totalsouvenir",totalsouvenir);
receipt.putExtra("totalcafe",totalcafe);
receipt.putExtra("selectedMuseum",selectedMuseum);
receipt.putExtra("price",price);
receipt.putExtra("time",time);
receipt.putExtra("date",selecteddate);
}
});
}
public void checkamount(Integer value){
Integer change = 0;
if (value == price){
Toast.makeText(getApplicationContext(),"You have successfully paid the correct amount",Toast.LENGTH_SHORT).show();
Intent receipt = new Intent (getApplicationContext(), Receipt.class);
receipt.putExtra("pricepaid",value);
receipt.putExtra("fullprice",price);
receipt.putExtra("totalsouvenir",totalsouvenir);
receipt.putExtra("totalcafe",totalcafe);
receipt.putExtra("selectedMuseum",selectedMuseum);
receipt.putExtra("price",price);
receipt.putExtra("time",time);
receipt.putExtra("date",selecteddate);
startActivity(receipt);
}
else if(value > price){
change = value - price;
Toast.makeText(getApplicationContext(),"Thankyou for the purchase",Toast.LENGTH_SHORT).show();
Intent receipt = new Intent (getApplicationContext(), Receipt.class);
receipt.putExtra("pricepaid",value);
receipt.putExtra("fullprice",price);
receipt.putExtra("totalsouvenir",totalsouvenir);
receipt.putExtra("totalcafe",totalcafe);
receipt.putExtra("selectedMuseum",selectedMuseum);
receipt.putExtra("price",price);
receipt.putExtra("time",time);
receipt.putExtra("date",selecteddate);
startActivity(receipt);
}else{
Toast.makeText(getApplicationContext(),"You have underpaid, please retry payment",Toast.LENGTH_SHORT).show();
}
}
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),fulldetails.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/Receipt.java 0 → 100644
View file @ 20a1c387
package com.example.appppppp;
import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
import java.util.Random;
public class Receipt extends AppCompatActivity {
public static int price,totalcafe,totalsouvenir, value, priceofticket;
public static String selectedMuseum,time,selecteddate;
TextView totalprices;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_receipt);
Intent intent = getIntent();
totalsouvenir = intent.getIntExtra("totalsouvenir",0);
totalcafe = intent.getIntExtra("totalcafe",0);
selectedMuseum = intent.getStringExtra("selectedMuseum");
time = intent.getStringExtra("time");
selecteddate = intent.getStringExtra("date");
value = intent.getIntExtra("pricepaid",0);
priceofticket = intent.getIntExtra("price",0);
price = intent.getIntExtra("fullprice",0);
int change = value - price;
String bookingid = randombookingnumber();
totalprices = findViewById(R.id.completereceipt);
totalprices.setText("\nMuseum: " + selectedMuseum + "\n\n" + "Date of Visit: " + selecteddate + "\n\n" + "Time Slot: " + time + "\n\n" + "Ticket Price: £" + priceofticket + "\n\n" + "Cafe Total Costs: £" + totalcafe + "\n\n" + "Souvenir Store Total Costs: £" +
totalsouvenir + "\n\n\n" + "Full Price Due: £" + price + "\n\n" + "Price Paid: £" + value + "\n\n" + "Change Due: £" + change + "\n\n\n" + "Your Booking Code (PLEASE RETAIN): " + bookingid);
}
public static String randombookingnumber(){
Random nmbr = new Random();
int booking = nmbr.nextInt(999999);
return String.format("%06d", booking);
}
public void logout(View view){
Intent intent = new Intent (this, MainMenu.class);
startActivity(intent);
}
public void tomuseums(View view){
Intent intent = new Intent (this, MuseumList.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/Registration.java
View file @ 20a1c387
......@@ -66,4 +66,9 @@ public class Registration extends AppCompatActivity {
});
}
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),MainMenu.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/SouvenirShop.java
View file @ 20a1c387
......@@ -34,8 +34,8 @@ public class SouvenirShop extends AppCompatActivity {
time = intent.getStringExtra("time");
selecteddate = intent.getStringExtra("date");
showtotal = findViewById(R.id.cafe);
showtotal.setText(String.valueOf(selecteddate));
// showtotal = findViewById(R.id.cafe);
//showtotal.setText(String.valueOf(selecteddate));
museumshow = findViewById(R.id.museumshow2);
museumshow.setText(String.valueOf(selectedMuseum));
......@@ -132,4 +132,9 @@ public class SouvenirShop extends AppCompatActivity {
}
});
}
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),cafe.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/cafe.java
View file @ 20a1c387
......@@ -133,14 +133,21 @@ public class cafe extends AppCompatActivity implements AdapterView.OnItemSelecte
}
//leave both empty, no actions needed
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
String text = parent.getItemAtPosition(position).toString();
Toast.makeText(parent.getContext(),text,Toast.LENGTH_SHORT).show();
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
//back
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),Booking.class);
startActivity(intent);
}
}
\ No newline at end of file
app/src/main/java/com/example/appppppp/fulldetails.java
View file @ 20a1c387
......@@ -174,6 +174,10 @@ public class fulldetails extends AppCompatActivity {
startActivity(book);
}
public void backone(View view){
Intent intent = new Intent (getApplicationContext(),MuseumList.class);
startActivity(intent);
}
}
......
app/src/main/res/layout/activity_booking.xml
View file @ 20a1c387
......@@ -9,7 +9,7 @@
<TextView
android:id="@+id/Museumname"
android:layout_width="316dp"
android:layout_width="342dp"
android:layout_height="58dp"
android:editable="false"
android:text="Museum"
......@@ -17,10 +17,10 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.568"
app:layout_constraintHorizontal_bias="0.782"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.053" />
app:layout_constraintVertical_bias="0.093" />
<TextView
android:id="@+id/selectdate"
......@@ -28,13 +28,15 @@
android:layout_height="68dp"
android:editable="false"
android:text="Click Here"
android:textSize="24sp"
android:textColor="#E48B84"
android:textSize="20sp"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.341"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/Museumname"
app:layout_constraintVertical_bias="0.21" />
app:layout_constraintVertical_bias="0.223" />
<TextView
android:id="@+id/pricehere"
......@@ -56,12 +58,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Book Time and Date"
app:backgroundTint="#E48B84"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.842"
app:layout_constraintHorizontal_bias="0.787"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/times"
app:layout_constraintVertical_bias="0.657" />
app:layout_constraintVertical_bias="0.743" />
<TextView
android:id="@+id/times"
......@@ -76,7 +79,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/selectdate"
app:layout_constraintVertical_bias="0.009" />
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/textView5"
......@@ -91,34 +94,36 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.301"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/pricehere" />
app:layout_constraintTop_toBottomOf="@+id/pricehere"
app:layout_constraintVertical_bias="0.0" />
<RadioGroup
android:id="@+id/allbuttons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="20dp"
app:layout_constraintBottom_toTopOf="@+id/booknow"
android:layout_marginTop="32dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.163"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/times"
app:layout_constraintVertical_bias="1.0">
app:layout_constraintVertical_bias="0.019">
<RadioButton
android:id="@+id/button1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="9-11am" />
android:text="9-11am"
app:buttonTint="#E48B84" />
<RadioButton
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="11-1pm" />
android:text="11-1pm"
app:buttonTint="#E48B84" />
<RadioButton
......@@ -126,14 +131,30 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1-3pm" />
android:text="1-3pm"
app:buttonTint="#E48B84" />
<RadioButton
android:id="@+id/button4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="3-5pm" />
android:text="3-5pm"
app:buttonTint="#E48B84" />
</RadioGroup>
<Button
android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="11dp"
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_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_cafe.xml
View file @ 20a1c387
......@@ -4,19 +4,21 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#CAD0ED"
tools:context=".cafe">
<Spinner
android:id="@+id/spinner2"
android:layout_width="122dp"
android:layout_height="40dp"
android:layout_marginBottom="480dp"
android:layout_marginEnd="60dp"
android:layout_marginRight="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.764"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spinner1"
app:layout_constraintVertical_bias="1.0" />
app:layout_constraintHorizontal_bias="0.966"
app:layout_constraintStart_toEndOf="@+id/textView3"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.386" />
<Spinner
android:id="@+id/spinner3"
......@@ -24,11 +26,12 @@
android:layout_height="40dp"
android:layout_marginEnd="64dp"
android:layout_marginRight="64dp"
android:layout_marginBottom="416dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.96"
app:layout_constraintStart_toEndOf="@+id/textView4" />
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textView4"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.46" />
<Spinner
android:id="@+id/spinner4"
......@@ -36,75 +39,73 @@
android:layout_height="40dp"
android:layout_marginEnd="64dp"
android:layout_marginRight="64dp"
android:layout_marginBottom="360dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.948"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/spinner3"
app:layout_constraintVertical_bias="0.937" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.544" />
<Spinner
android:id="@+id/spinner5"
android:layout_width="122dp"
android:layout_height="40dp"
android:layout_marginTop="17dp"
android:layout_marginEnd="64dp"
android:layout_marginRight="64dp"
android:layout_marginBottom="304dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.95"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/spinner4" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.628" />
<Spinner
android:id="@+id/spinner6"
android:layout_width="122dp"
android:layout_height="40dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="64dp"
android:layout_marginRight="64dp"
android:layout_marginBottom="252dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.95"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/spinner5" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.707" />
<Spinner
android:id="@+id/spinner7"
android:layout_width="122dp"
android:layout_height="40dp"
android:layout_marginTop="19dp"
android:layout_marginEnd="64dp"
android:layout_marginRight="64dp"
android:layout_marginBottom="192dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.95"
app:layout_constraintStart_toEndOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/spinner6" />
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textView14"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.784" />
<TextView
android:id="@+id/museumshow"
android:layout_width="180dp"
android:layout_height="28dp"
android:layout_width="168dp"
android:layout_height="45dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="TextView"
android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/textView8"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.09"
app:layout_constraintHorizontal_bias="0.923"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.571" />
app:layout_constraintVertical_bias="0.4" />
<TextView
android:id="@+id/textView8"
android:layout_width="179dp"
android:layout_height="42dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Cafe Shop"
android:textColor="#000000"
android:textSize="22sp"
......@@ -113,35 +114,37 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.081" />
app:layout_constraintVertical_bias="0.149" />
<TextView
android:id="@+id/textView9"
android:layout_width="367dp"
android:layout_height="23dp"
android:layout_width="342dp"
android:layout_height="38dp"
android:layout_marginTop="12dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Please select any items you wish to purchase on your trip:"
android:textColor="#000000"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.363"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView8"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.209" />
<TextView
android:id="@+id/textView13"
android:layout_width="44dp"
android:layout_height="19dp"
android:layout_marginTop="27dp"
android:layout_marginBottom="552dp"
android:editable="false"
android:text="Tea"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.286"
app:layout_constraintHorizontal_bias="0.277"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView9" />
app:layout_constraintTop_toBottomOf="@+id/textView9"
app:layout_constraintVertical_bias="0.0" />
<Spinner
android:id="@+id/spinner1"
......@@ -152,12 +155,12 @@
android:layout_marginTop="18dp"
android:layout_marginEnd="64dp"
android:layout_marginRight="64dp"
android:layout_marginBottom="540dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.571"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/textView13"
app:layout_constraintTop_toBottomOf="@+id/textView9" />
app:layout_constraintTop_toBottomOf="@+id/textView9"
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/textView3"
......@@ -166,63 +169,63 @@
android:editable="false"
android:text="Water"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/spinner2"
app:layout_constraintHorizontal_bias="0.572"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.272"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView13"
app:layout_constraintVertical_bias="0.08" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.391" />
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="33dp"
android:layout_marginBottom="44dp"
android:editable="false"
android:text="Coffee"
app:layout_constraintBottom_toTopOf="@+id/textView6"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.284"
app:layout_constraintHorizontal_bias="0.276"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.462" />
<TextView
android:id="@+id/textView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="96dp"
android:editable="false"
android:text="Flatbread"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.298"
app:layout_constraintHorizontal_bias="0.289"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView3" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.542" />
<TextView
android:id="@+id/textView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:editable="false"
android:text="Sandwich"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.3"
app:layout_constraintHorizontal_bias="0.291"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.622" />
<TextView
android:id="@+id/textView12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:editable="false"
android:text="Sweet Roll"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.307"
app:layout_constraintHorizontal_bias="0.295"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7"
app:layout_constraintVertical_bias="0.048" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.699" />
<TextView
android:id="@+id/textView14"
......@@ -232,20 +235,40 @@
android:text="Salad"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.287"
app:layout_constraintHorizontal_bias="0.271"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView12"
app:layout_constraintVertical_bias="0.141" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.778" />
<Button
android:id="@+id/submitbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="62dp"
android:fontFamily="serif-monospace"
android:text="Purchase"
android:textColor="#000000"
app:backgroundTint="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.458"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/spinner7"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.875" />
<Button
android:id="@+id/button7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="80dp"
android:fontFamily="serif-monospace"
android:onClick="backone"
android:text="Back"
android:textColor="#000000"
app:backgroundTint="#FFFFFF"
app:layout_constraintBottom_toTopOf="@+id/textView9"
app:layout_constraintEnd_toStartOf="@+id/museumshow"
app:layout_constraintHorizontal_bias="0.188"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.941" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_full_purchase.xml
View file @ 20a1c387
......@@ -16,10 +16,10 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.318"
app:layout_constraintHorizontal_bias="0.437"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.05" />
app:layout_constraintVertical_bias="0.104" />
<TextView
android:id="@+id/receipt"
......@@ -31,10 +31,10 @@
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintHorizontal_bias="0.493"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.267" />
app:layout_constraintVertical_bias="0.343" />
<Button
android:id="@+id/next"
......@@ -50,4 +50,18 @@
app:layout_constraintTop_toBottomOf="@+id/receipt"
app:layout_constraintVertical_bias="0.133" />
<Button
android:id="@+id/button9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:onClick="backone"
android:text="back"
app:layout_constraintBottom_toTopOf="@+id/textView24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.084"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.941" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_fulldetails.xml
View file @ 20a1c387
......@@ -8,42 +8,46 @@
<TextView
android:id="@+id/check"
android:layout_width="325dp"
android:layout_height="36dp"
android:layout_width="346dp"
android:layout_height="66dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="TextView"
android:textColor="#000000"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.511"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.021" />
app:layout_constraintVertical_bias="0.099" />
<EditText
android:id="@+id/thetext"
android:layout_width="322dp"
android:layout_height="294dp"
android:layout_width="333dp"
android:layout_height="310dp"
android:editable="false"
android:ems="10"
android:fontFamily="serif-monospace"
android:gravity="start|top"
android:inputType="textMultiLine"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.494"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/check"
app:layout_constraintVertical_bias="0.573" />
app:layout_constraintVertical_bias="0.591" />
<ImageView
android:id="@+id/theimage"
android:layout_width="283dp"
android:layout_height="194dp"
android:layout_width="245dp"
android:layout_height="125dp"
android:layout_marginTop="4dp"
app:layout_constraintBottom_toTopOf="@+id/thetext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/check"
app:layout_constraintVertical_bias="1.0"
app:layout_constraintVertical_bias="0.0"
tools:srcCompat="@tools:sample/avatars" />
<Button
......@@ -53,38 +57,59 @@
android:layout_marginTop="49dp"
android:onClick="bookthis"
android:text="Book Now"
app:backgroundTint="#D3B8D8"
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/thetext"
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/priceview"
android:layout_width="52dp"
android:layout_height="0dp"
android:layout_marginTop="11dp"
android:layout_width="63dp"
android:layout_height="22dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="19dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="price"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/book"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.323"
app:layout_constraintHorizontal_bias="0.42"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/thetext"
app:layout_constraintVertical_bias="1.0" />
app:layout_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/textView2"
android:layout_width="55dp"
android:layout_height="19dp"
android:layout_width="91dp"
android:layout_height="20dp"
android:layout_marginTop="13dp"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="Price: £"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/priceview"
app:layout_constraintHorizontal_bias="0.82"
app:layout_constraintHorizontal_bias="0.902"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/thetext"
app:layout_constraintVertical_bias="0.0" />
<Button
android:id="@+id/button10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:onClick="backone"
android:text="Back"
app:backgroundTint="#D3B8D8"
app:layout_constraintBottom_toTopOf="@+id/check"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.05"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.761" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_log_in.xml
View file @ 20a1c387
......@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#FBF7D4"
tools:context=".LogIn">
<EditText
......@@ -11,8 +12,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:fontFamily="serif-monospace"
android:hint="Password"
android:inputType="numberPassword"
android:textColor="#000000"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
......@@ -22,24 +25,46 @@
<Button
android:id="@+id/loginlog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="79dp"
android:layout_width="142dp"
android:layout_height="38dp"
android:layout_marginTop="39dp"
android:layout_marginBottom="336dp"
android:fontFamily="serif-monospace"
android:text="Log In"
android:textColor="#000000"
app:backgroundTint="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.46"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/passwordlog" />
<Button
android:id="@+id/bCK3"
android:layout_width="99dp"
android:layout_height="44dp"
android:background="#FFFFFF"
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.498"
app:layout_constraintHorizontal_bias="0.105"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/passwordlog"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.049" />
<EditText
android:id="@+id/emaillog"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:fontFamily="serif-monospace"
android:hint="Email"
android:inputType="textPersonName"
android:textColor="#000000"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
......
app/src/main/res/layout/activity_main_menu.xml
View file @ 20a1c387
......@@ -11,8 +11,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="75dp"
android:fontFamily="serif-monospace"
android:onClick="toRegister"
android:text="Register"
android:textColor="#605F5F"
app:backgroundTint="#95D7F4"
app:layout_constraintBottom_toTopOf="@+id/button3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -21,26 +24,29 @@
<ImageView
android:id="@+id/imageView"
android:layout_width="129dp"
android:layout_height="144dp"
android:layout_width="197dp"
android:layout_height="152dp"
android:layout_marginTop="64dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@android:mipmap/sym_def_app_icon" />
app:srcCompat="@drawable/national" />
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:editable="false"
android:fontFamily="serif-monospace"
android:text="VisitMuseum"
android:textSize="24sp"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView"
app:layout_constraintVertical_bias="0.243" />
app:layout_constraintVertical_bias="0.086" />
<Button
android:id="@+id/button2"
......@@ -48,8 +54,11 @@
android:layout_height="47dp"
android:layout_marginTop="40dp"
android:layout_marginBottom="28dp"
android:fontFamily="serif-monospace"
android:onClick="toLogIn"
android:text="Log In Here"
android:textColor="#605F5F"
app:backgroundTint="#95D7F4"
app:layout_constraintBottom_toTopOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -57,10 +66,14 @@
<Button
android:id="@+id/button3"
android:layout_width="37dp"
android:layout_height="41dp"
android:layout_width="43dp"
android:layout_height="55dp"
android:fontFamily="serif-monospace"
android:onClick="toHelp"
android:text="?"
android:textColor="#605F5F"
android:textSize="18sp"
app:backgroundTint="#95D7F4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
app/src/main/res/layout/activity_museum_list.xml
View file @ 20a1c387
......@@ -8,10 +8,24 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerID"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout_editor_absoluteX="263dp"
tools:layout_editor_absoluteY="336dp" />
android:layout_width="412dp"
android:layout_height="662dp"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="69dp" />
<Button
android:id="@+id/button11"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:onClick="backone"
android:text="back"
app:layout_constraintBottom_toTopOf="@+id/recyclerID"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.05"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_payment.xml
View file @ 20a1c387
......@@ -17,10 +17,10 @@
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.534"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.204" />
app:layout_constraintVertical_bias="0.275" />
<TextView
android:id="@+id/textView27"
......@@ -33,10 +33,10 @@
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/fullpriceview"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.629"
app:layout_constraintHorizontal_bias="0.691"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.552" />
app:layout_constraintVertical_bias="0.75" />
<TextView
android:id="@+id/textView28"
......@@ -50,25 +50,47 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.167"
app:layout_constraintHorizontal_bias="0.159"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fullpriceview"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintVertical_bias="0.047" />
<TextView
<Button
android:id="@+id/makepayment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="324dp"
android:text="Pay"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.826"
app:layout_constraintStart_toStartOf="parent" />
<EditText
android:id="@+id/enteramount"
android:layout_width="109dp"
android:layout_height="24dp"
android:layout_marginStart="27dp"
android:layout_marginLeft="27dp"
android:layout_marginTop="68dp"
android:text="TextView"
android:textSize="18sp"
android:layout_width="132dp"
android:layout_height="40dp"
android:layout_marginTop="60dp"
android:ems="10"
android:inputType="number"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@+id/textView28"
app:layout_constraintHorizontal_bias="0.86"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fullpriceview"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintVertical_bias="0.048" />
<Button
android:id="@+id/button12"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="backone"
android:text="back"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.088"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.046" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_receipt.xml 0 → 100644
View file @ 20a1c387
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Receipt">
<TextView
android:id="@+id/completereceipt"
android:layout_width="357dp"
android:layout_height="534dp"
android:text="TextView"
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" />
<TextView
android:id="@+id/textView26"
android:layout_width="159dp"
android:layout_height="43dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="Receipt"
android:textColor="#FF77BFC8"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/completereceipt"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.611"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
<Button
android:id="@+id/button5"
android:layout_width="167dp"
android:layout_height="43dp"
android:layout_marginBottom="52dp"
android:onClick="logout"
android:text="Log Out"
app:backgroundTint="#77BFC8"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.127"
app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/button6"
android:layout_width="166dp"
android:layout_height="47dp"
android:layout_marginStart="3dp"
android:layout_marginLeft="3dp"
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:onClick="tomuseums"
android:text="Return to Museum Menu"
android:textSize="12sp"
app:backgroundTint="#FF77BFC8"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.541"
app:layout_constraintStart_toEndOf="@+id/button5"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.923" />
<TextView
android:id="@+id/textView29"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="13dp"
android:text="Thankyou for purchasing your ticket with VisitMuseum"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/completereceipt"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView26"
app:layout_constraintVertical_bias="0.0" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_registration.xml
View file @ 20a1c387
......@@ -6,11 +6,30 @@
android:layout_height="match_parent"
tools:context=".Registration">
<Button
android:id="@+id/button13"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="serif-monospace"
android:onClick="backone"
android:text="back"
android:textColor="#605F5F"
app:backgroundTint="#C0E8C1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.088"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.046" />
<Button
android:id="@+id/register"
android:layout_width="129dp"
android:layout_height="48dp"
android:fontFamily="serif-monospace"
android:text="Register"
android:textColor="#605F5F"
app:backgroundTint="#C0E8C1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -22,8 +41,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:fontFamily="serif-monospace"
android:hint="Email"
android:inputType="textPersonName"
android:textColor="#605F5F"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
......@@ -36,8 +57,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:fontFamily="serif-monospace"
android:hint="Re-enter Password"
android:inputType="numberPassword"
android:textColor="#605F5F"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
......@@ -51,8 +74,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:ems="10"
android:fontFamily="serif-monospace"
android:hint="Password"
android:inputType="numberPassword"
android:textColor="#605F5F"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
......
app/src/main/res/layout/activity_souvenir_shop.xml
View file @ 20a1c387
......@@ -15,10 +15,10 @@
android:text="Please select any items you wish to purchase on your trip:"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.636"
app:layout_constraintHorizontal_bias="0.522"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/museumshow2"
app:layout_constraintVertical_bias="0.1" />
app:layout_constraintVertical_bias="0.121" />
<TextView
android:id="@+id/textView23"
......@@ -31,14 +31,15 @@
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.482"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.095" />
app:layout_constraintVertical_bias="0.156" />
<TextView
android:id="@+id/museumshow2"
android:layout_width="207dp"
android:layout_height="48dp"
android:layout_width="140dp"
android:layout_height="78dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="17dp"
android:editable="false"
......@@ -46,10 +47,10 @@
android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/textView23"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.079"
app:layout_constraintHorizontal_bias="0.921"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintVertical_bias="0.692" />
<Spinner
android:id="@+id/spinner8"
......@@ -57,10 +58,10 @@
android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.877"
app:layout_constraintHorizontal_bias="0.785"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.216" />
app:layout_constraintVertical_bias="0.304" />
<Spinner
android:id="@+id/spinner9"
......@@ -68,10 +69,10 @@
android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.877"
app:layout_constraintHorizontal_bias="0.785"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.277" />
app:layout_constraintVertical_bias="0.362" />
<Spinner
android:id="@+id/spinner10"
......@@ -79,10 +80,10 @@
android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.877"
app:layout_constraintHorizontal_bias="0.785"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.335" />
app:layout_constraintVertical_bias="0.427" />
<Spinner
android:id="@+id/spinner11"
......@@ -90,10 +91,10 @@
android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.877"
app:layout_constraintHorizontal_bias="0.785"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.388" />
app:layout_constraintVertical_bias="0.49" />
<Spinner
android:id="@+id/spinner12"
......@@ -101,10 +102,10 @@
android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.877"
app:layout_constraintHorizontal_bias="0.785"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.442" />
app:layout_constraintVertical_bias="0.551" />
<Spinner
android:id="@+id/spinner13"
......@@ -112,10 +113,10 @@
android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.877"
app:layout_constraintHorizontal_bias="0.785"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.499" />
app:layout_constraintVertical_bias="0.613" />
<Spinner
android:id="@+id/spinner14"
......@@ -123,40 +124,37 @@
android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.877"
app:layout_constraintHorizontal_bias="0.785"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.558" />
app:layout_constraintVertical_bias="0.678" />
<TextView
android:id="@+id/textView15"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="156dp"
android:clickable="false"
android:editable="false"
android:text="Shirt"
app:layout_constraintBottom_toTopOf="@+id/textView16"
app:layout_constraintEnd_toStartOf="@+id/spinner8"
app:layout_constraintHorizontal_bias="0.156"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.212"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.076" />
app:layout_constraintVertical_bias="0.301" />
<TextView
android:id="@+id/textView16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="152dp"
android:layout_marginRight="152dp"
android:editable="false"
android:text="Hat"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/spinner9"
app:layout_constraintHorizontal_bias="0.402"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.208"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.282" />
app:layout_constraintVertical_bias="0.367" />
<TextView
android:id="@+id/textView17"
......@@ -165,11 +163,11 @@
android:editable="false"
android:text="Snow Globe"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/spinner10"
app:layout_constraintHorizontal_bias="0.193"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.241"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView16"
app:layout_constraintVertical_bias="0.044" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.431" />
<TextView
android:id="@+id/textView18"
......@@ -178,27 +176,25 @@
android:editable="false"
android:text="Key Chain"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/spinner11"
app:layout_constraintHorizontal_bias="0.181"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.232"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView17"
app:layout_constraintVertical_bias="0.042" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.495" />
<TextView
android:id="@+id/textView19"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="137dp"
android:layout_marginRight="137dp"
android:editable="false"
android:text="Bottle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/spinner12"
app:layout_constraintHorizontal_bias="0.402"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.216"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView18"
app:layout_constraintVertical_bias="0.007" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.545" />
<TextView
android:id="@+id/textView20"
......@@ -208,11 +204,11 @@
android:editable="false"
android:text="Mug"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/spinner13"
app:layout_constraintHorizontal_bias="0.155"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.211"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView19"
app:layout_constraintVertical_bias="0.002" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.605" />
<TextView
android:id="@+id/textView21"
......@@ -222,11 +218,11 @@
android:editable="false"
android:text="Coaster"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/spinner14"
app:layout_constraintHorizontal_bias="0.17"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.223"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView20"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.67" />
<Button
android:id="@+id/purchase"
......@@ -236,20 +232,23 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView21" />
app:layout_constraintTop_toBottomOf="@+id/textView21"
app:layout_constraintVertical_bias="0.589" />
<TextView
android:id="@+id/cafe"
<Button
android:id="@+id/button14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginBottom="67dp"
android:editable="false"
android:text="TextView"
android:layout_marginStart="28dp"
android:layout_marginLeft="28dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="129dp"
android:layout_marginRight="129dp"
android:layout_marginBottom="102dp"
android:onClick="backone"
android:text="back"
app:layout_constraintBottom_toTopOf="@+id/textView22"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.926"
app:layout_constraintEnd_toStartOf="@+id/museumshow2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/row_museum.xml
View file @ 20a1c387
......@@ -5,36 +5,51 @@
android:layout_marginHorizontal="5dp"
android:layout_marginTop="5dp"
android:orientation="vertical">
<TextView
android:id="@+id/MuseumText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_alignWithParentIfMissing="true"
android:gravity="center_vertical"
android:text="Line1"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:textSize="18sp" />
android:background="#F6B7A3"
android:fontFamily="serif-monospace"
android:gravity="center_vertical"
android:text="Line1"
android:textColor="#000000"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/description1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="description" />
android:background="#F6B7A3"
android:fontFamily="serif-monospace"
android:text="description"
android:textSize="16sp" />
<TextView
android:id="@+id/price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Price (£):" />
android:background="#F6B7A3"
android:fontFamily="serif-monospace"
android:text="Price (£):"
android:textSize="16sp" />
<TextView
android:id="@+id/PriceText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="description of each museum" />
android:background="#F6B7A3"
android:fontFamily="serif-monospace"
android:text="description of each museum"
android:textSize="16sp"
android:textStyle="italic" />
<View
android:layout_width="match_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