hopeforthebest

PlaysRUs2/.idea/deploymentTargetDropDown.xml

@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\sampp\.android\avd\Pixel_XL_API_31.avd" />
+            <value value="C:\Users\sampp\.android\avd\Pixel_2_API_31.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-06-09T08:34:14.203186200Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-06-17T15:15:32.518966900Z" />
   </component>
 </project>
\ No newline at end of file

PlaysRUs2/app/src/main/java/com/example/playsrus/antigone.java

@@ -29,8 +29,6 @@ public class antigone extends AppCompatActivity implements AdapterView.OnItemSel
         super.onCreate(savedInstanceState);
         setContentView(R.layout.antigone);
         displayorderedtickets = findViewById(R.id.orderedticketshamlet6);
-        fullName = (EditText) findViewById(R.id.fullnamehamlet6);
-
 
         Spinner hamletseatingtype = (Spinner) findViewById(R.id.hamletseatingtype6);
         hamletseatingtype.setOnItemSelectedListener(this);

PlaysRUs2/app/src/main/java/com/example/playsrus/hamlet.java

@@ -29,7 +29,6 @@ public class hamlet extends AppCompatActivity implements AdapterView.OnItemSelec
         super.onCreate(savedInstanceState);
         setContentView(R.layout.hamlet);
         displayorderedtickets = findViewById(R.id.orderedticketshamlet2);
-        fullName = (EditText) findViewById(R.id.fullnamehamlet2);
 
 
         Spinner hamletseatingtype = (Spinner) findViewById(R.id.hamletseatingtype2);

PlaysRUs2/app/src/main/java/com/example/playsrus/lights.java

@@ -16,8 +16,8 @@ public class lights extends AppCompatActivity {
         setContentView(R.layout.lights);
 
         //This sets the buttons and ensures they open certain screens when clicked
-        Button undo = (Button) findViewById(R.id.undo5);
-        Button wheelchair = (Button) findViewById(R.id.undo6);
+        Button undo = (Button) findViewById(R.id.undo6);
+        Button wheelchair = (Button) findViewById(R.id.undo5);
         Button view = (Button) findViewById(R.id.filteredview3);
         Button midsummer = (Button) findViewById(R.id.midsummerfilter3);
         Button hamlet = (Button) findViewById(R.id.hamletfilter3);

PlaysRUs2/app/src/main/java/com/example/playsrus/midsummer.java

@@ -29,7 +29,6 @@ public class midsummer extends AppCompatActivity implements AdapterView.OnItemSe
         super.onCreate(savedInstanceState);
         setContentView(R.layout.midsummer);
         displayorderedtickets = findViewById(R.id.orderedticketshamlet4);
-        fullName = (EditText) findViewById(R.id.fullnamehamlet4);
 
 
         Spinner hamletseatingtype = (Spinner) findViewById(R.id.hamletseatingtype4);

PlaysRUs2/app/src/main/java/com/example/playsrus/oedipus.java

@@ -29,7 +29,6 @@ public class oedipus extends AppCompatActivity implements AdapterView.OnItemSele
         super.onCreate(savedInstanceState);
         setContentView(R.layout.oedipus);
         displayorderedtickets = findViewById(R.id.orderedticketshamlet3);
-        fullName = (EditText) findViewById(R.id.fullnamehamlet3);
         //This sets the spinner
         Spinner hamletseatingtype = (Spinner) findViewById(R.id.hamletseatingtype3);
         hamletseatingtype.setOnItemSelectedListener(this);

PlaysRUs2/app/src/main/java/com/example/playsrus/seating.java

@@ -30,7 +30,6 @@ public class seating extends AppCompatActivity implements AdapterView.OnItemSele
         super.onCreate(savedInstanceState);
         setContentView(R.layout.seating);
         displayorderedtickets = findViewById(R.id.orderedticketshamlet);
-        fullName = (EditText) findViewById(R.id.fullnamehamlet);
         displayplayname = findViewById(R.id.displayplayname);
 //This sets the spinner
         Spinner seatingtype = (Spinner) findViewById(R.id.hamletseatingtype);
@@ -47,35 +46,39 @@ public class seating extends AppCompatActivity implements AdapterView.OnItemSele
         TextView displaytickets = findViewById(R.id.hamlettickets);
         String playnameforthis = "The Merchant of Venice";
         int ticketsthere = database.gettickets(playnameforthis);
+        String getseating = seatingtype.getSelectedItem().toString();
+        String getname = fullName.getText().toString();
         displaytickets.setText(String.valueOf(ticketsthere));
 //This ensures that the number of ordered tickets is acceptable
         confirm.setOnClickListener(v -> {
-            TextView displayorderedtickets = findViewById(R.id.orderedticketshamlet);
-            int orderedtickets = Integer.parseInt(displayorderedtickets.getText().toString());
-
-            if (orderedtickets > 0) {
-
-                if (orderedtickets <= ticketsthere) {
-                    int currentickets = ticketsthere - orderedtickets;
-                    displaytickets.setText(String.valueOf(ticketsthere));
-                    boolean bookedupdate = database.ticketsupdate(playnameforthis, currentickets);
-                    if (bookedupdate) {
-                        Boolean input = database.bookinginput(playnameforthis, orderedtickets);
-                        if (input == true) {
-                        Intent screenchange = new Intent(seating.this, booked.class);
-                        startActivity(screenchange);
-                    }
-                    }else {
-                        Toast.makeText(seating.this, "Please try again.", Toast.LENGTH_SHORT).show();
-                    }
-
-                } else {
-                    Toast.makeText(seating.this, "Please order less tickets.", Toast.LENGTH_SHORT).show();
-                }
+                        TextView displayorderedtickets = findViewById(R.id.orderedticketshamlet);
+                        int orderedtickets = Integer.parseInt(displayorderedtickets.getText().toString());
+
+                        if (orderedtickets > 0) {
+
+                            if (orderedtickets <= ticketsthere) {
+                                int currentickets = ticketsthere - orderedtickets;
+                                displaytickets.setText(String.valueOf(ticketsthere));
+                                boolean bookedupdate = database.ticketsupdate(playnameforthis, currentickets);
+                                if (bookedupdate) {
+                                    Boolean input = database.bookinginput(playnameforthis, orderedtickets);
+                                    if (input == true) {
+                                        Intent screenchange = new Intent(seating.this, booked.class);
+                                        startActivity(screenchange);
+                                    }
+                                } else {
+                                    Toast.makeText(seating.this, "Please try again.", Toast.LENGTH_SHORT).show();
+                                }
+
+                            } else {
+                                Toast.makeText(seating.this, "Please order less tickets.", Toast.LENGTH_SHORT).show();
+                            }
+
+                        } else {
+                            Toast.makeText(seating.this, "Please order some tickets.", Toast.LENGTH_SHORT).show();
+                        }
+
 
-            }else {
-                Toast.makeText(seating.this, "Please order some tickets.", Toast.LENGTH_SHORT).show();
-            }
         });
         seatingback.setOnClickListener(new View.OnClickListener() {
             @Override

PlaysRUs2/app/src/main/java/com/example/playsrus/tempest.java

@@ -29,7 +29,6 @@ public class tempest extends AppCompatActivity implements AdapterView.OnItemSele
         super.onCreate(savedInstanceState);
         setContentView(R.layout.tempest);
         displayorderedtickets = findViewById(R.id.orderedticketshamlet5);
-        fullName = (EditText) findViewById(R.id.fullnamehamlet5);
 
 
         Spinner hamletseatingtype = (Spinner) findViewById(R.id.hamletseatingtype5);

PlaysRUs2/app/src/main/res/layout/activity_main.xml

@@ -121,26 +121,26 @@
 
     <Button
         android:id="@+id/filtered"
-        android:layout_width="237dp"
-        android:layout_height="74dp"
+        android:layout_width="207dp"
+        android:layout_height="90dp"
         android:text="View Performances With Wheelchair Access"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.908"
+        app:layout_constraintHorizontal_bias="0.911"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.791" />
+        app:layout_constraintVertical_bias="0.765" />
 
     <Button
         android:id="@+id/filtered2"
-        android:layout_width="237dp"
-        android:layout_height="74dp"
+        android:layout_width="200dp"
+        android:layout_height="95dp"
         android:text="View Performances With Flashing Lights"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.908"
+        app:layout_constraintHorizontal_bias="0.881"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.939" />
+        app:layout_constraintVertical_bias="0.949" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

PlaysRUs2/app/src/main/res/layout/antigone.xml

@@ -65,22 +65,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.616" />
 
-    <TextView
-        android:id="@+id/textView40"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Full name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.124"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.752"
-        tools:text="Fullname" />
-
     <TextView
         android:id="@+id/textView41"
         android:layout_width="wrap_content"
@@ -120,20 +104,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.909" />
 
-    <EditText
-        android:id="@+id/fullnamehamlet6"
-        android:layout_width="261dp"
-        android:layout_height="55dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:text="Input fullname"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.9"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.766" />
-
     <Spinner
         android:id="@+id/hamletseatingtype6"
         android:layout_width="361dp"

PlaysRUs2/app/src/main/res/layout/filteredwheelchair.xml

@@ -89,33 +89,33 @@
         android:text="View Bookings"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.014"
+        app:layout_constraintHorizontal_bias="0.059"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.83" />
 
     <Button
         android:id="@+id/undo"
-        android:layout_width="237dp"
-        android:layout_height="74dp"
+        android:layout_width="162dp"
+        android:layout_height="68dp"
         android:text="View All"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.908"
+        app:layout_constraintHorizontal_bias="0.855"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.773" />
+        app:layout_constraintVertical_bias="0.761" />
 
     <Button
         android:id="@+id/undo2"
-        android:layout_width="237dp"
-        android:layout_height="74dp"
+        android:layout_width="200dp"
+        android:layout_height="79dp"
         android:text="View Performances with Flashing Lights"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.908"
+        app:layout_constraintHorizontal_bias="0.927"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.922" />
+        app:layout_constraintVertical_bias="0.928" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

PlaysRUs2/app/src/main/res/layout/hamlet.xml

@@ -65,22 +65,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.616" />
 
-    <TextView
-        android:id="@+id/textView19"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Full name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.124"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.752"
-        tools:text="Fullname" />
-
     <TextView
         android:id="@+id/textView20"
         android:layout_width="wrap_content"
@@ -120,20 +104,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.909" />
 
-    <EditText
-        android:id="@+id/fullnamehamlet2"
-        android:layout_width="261dp"
-        android:layout_height="55dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:text="Input fullname"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.9"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.766" />
-
     <Spinner
         android:id="@+id/hamletseatingtype2"
         android:layout_width="361dp"

PlaysRUs2/app/src/main/res/layout/lights.xml

@@ -73,25 +73,25 @@
 
     <Button
         android:id="@+id/undo5"
-        android:layout_width="237dp"
-        android:layout_height="74dp"
-        android:text="View All"
+        android:layout_width="205dp"
+        android:layout_height="87dp"
+        android:text="View  Performances With Wheelchair Access"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.908"
+        app:layout_constraintHorizontal_bias="0.849"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.773" />
+        app:layout_constraintVertical_bias="0.756" />
 
     <Button
         android:id="@+id/undo6"
-        android:layout_width="237dp"
-        android:layout_height="74dp"
-        android:text="View Performances with Flashing Lights"
+        android:layout_width="177dp"
+        android:layout_height="52dp"
+        android:text="View All"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.908"
+        app:layout_constraintHorizontal_bias="0.835"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.922" />
+        app:layout_constraintVertical_bias="0.9" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

PlaysRUs2/app/src/main/res/layout/midsummer.xml

@@ -65,22 +65,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.616" />
 
-    <TextView
-        android:id="@+id/textView31"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Full name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.124"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.752"
-        tools:text="Fullname" />
-
     <TextView
         android:id="@+id/textView32"
         android:layout_width="wrap_content"
@@ -120,20 +104,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.909" />
 
-    <EditText
-        android:id="@+id/fullnamehamlet4"
-        android:layout_width="261dp"
-        android:layout_height="55dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:text="Input fullname"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.9"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.766" />
-
     <Spinner
         android:id="@+id/hamletseatingtype4"
         android:layout_width="361dp"

PlaysRUs2/app/src/main/res/layout/oedipus.xml

@@ -65,22 +65,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.616" />
 
-    <TextView
-        android:id="@+id/textView27"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Full name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.124"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.752"
-        tools:text="Fullname" />
-
     <TextView
         android:id="@+id/textView28"
         android:layout_width="wrap_content"
@@ -120,20 +104,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.909" />
 
-    <EditText
-        android:id="@+id/fullnamehamlet3"
-        android:layout_width="261dp"
-        android:layout_height="55dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:text="Input fullname"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.9"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.766" />
-
     <Spinner
         android:id="@+id/hamletseatingtype3"
         android:layout_width="361dp"

PlaysRUs2/app/src/main/res/layout/seating.xml

@@ -65,22 +65,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.616" />
 
-    <TextView
-        android:id="@+id/textView18"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Full name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.124"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.752"
-        tools:text="Fullname" />
-
     <TextView
         android:id="@+id/textView22"
         android:layout_width="wrap_content"
@@ -120,20 +104,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.909" />
 
-    <EditText
-        android:id="@+id/fullnamehamlet"
-        android:layout_width="261dp"
-        android:layout_height="55dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:text="Input fullname"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.9"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.766" />
-
     <Spinner
         android:id="@+id/hamletseatingtype"
         android:layout_width="361dp"

PlaysRUs2/app/src/main/res/layout/tempest.xml

@@ -65,22 +65,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.616" />
 
-    <TextView
-        android:id="@+id/textView36"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="Full name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.124"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.752"
-        tools:text="Fullname" />
-
     <TextView
         android:id="@+id/textView37"
         android:layout_width="wrap_content"
@@ -120,20 +104,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.909" />
 
-    <EditText
-        android:id="@+id/fullnamehamlet5"
-        android:layout_width="261dp"
-        android:layout_height="55dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:text="Input fullname"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.9"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.766" />
-
     <Spinner
         android:id="@+id/hamletseatingtype5"
         android:layout_width="361dp"