> bigboi V (The Final Frontier)

app/src/main/java/com/example/summative_chris_crook/BookingDetails.java

@@ -58,7 +58,7 @@ public class BookingDetails extends AppCompatActivity {
         String title;
 
         for (int i = 0; i < temploadarray.length; i++){
-            Toast.makeText(getApplicationContext(), temploadarray [i] , Toast.LENGTH_LONG).show();
+            //Toast.makeText(getApplicationContext(), temploadarray [i] , Toast.LENGTH_LONG).show();
         }
 
 

app/src/main/java/com/example/summative_chris_crook/MainShopPage.java

@@ -38,23 +38,23 @@ public class MainShopPage extends AppCompatActivity {
         String [] temploadarray = temp.split("&");
 
         if (temploadarray [4].equals("ENG")){
-            Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
+            //Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
             ((Button)findViewById(R.id.button26)).setText("Back");
         }
         else if (temploadarray [4].equals("FRA")){
-            Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
+            //Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
             ((Button)findViewById(R.id.button26)).setText("de retour");
         }
         else if (temploadarray [4].equals("ESP")){
-            Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
+            //Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
             ((Button)findViewById(R.id.button26)).setText("espalda");
         }
         else if (temploadarray [4].equals("DEU")){
-            Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
+            //Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
             ((Button)findViewById(R.id.button26)).setText("rückseite");
         }
         else{
-            Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
+            //Toast.makeText(getApplicationContext(), temploadarray [4], Toast.LENGTH_LONG).show();
             ((Button)findViewById(R.id.button26)).setText("Back (something broke)");
         }
     }

app/src/main/java/com/example/summative_chris_crook/ShopDetails.java

@@ -56,7 +56,7 @@ public class ShopDetails extends AppCompatActivity {
         String title;
 
         for (int i = 0; i < temploadarray.length; i++){
-            Toast.makeText(getApplicationContext(), temploadarray [i] , Toast.LENGTH_LONG).show();
+            //Toast.makeText(getApplicationContext(), temploadarray [i] , Toast.LENGTH_LONG).show();
         }
 
 

app/src/main/java/com/example/summative_chris_crook/UserMenu.java

@@ -124,7 +124,7 @@ public class UserMenu extends AppCompatActivity {
     }
 
     public void SelfServiceMode (View view){
-        Intent intent = new Intent(this,MainShopPage.class);
+        Intent intent = new Intent(this,CheckoutScreen.class);
         startActivity(intent);
     }
 }
\ No newline at end of file

app/src/main/res/layout/activity_admin_menu.xml

@@ -55,7 +55,7 @@
         <Button
             android:id="@+id/button22"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
             android:text="Delete Account" />
 
         <TextView

app/src/main/res/layout/activity_main_shop_page.xml

@@ -386,7 +386,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:onClick="tobooking"
-                android:text="Shop" />
+                android:text="Booking" />
         </LinearLayout>
 
     </LinearLayout>

app/src/main/res/layout/activity_settings.xml

@@ -43,14 +43,14 @@
         <Button
             android:id="@+id/button29"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
             android:onClick="WhatWasItAgain"
             android:text="Button" />
 
         <Button
             android:id="@+id/button30"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
             android:text="Button" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/activity_user_menu.xml

@@ -55,7 +55,7 @@
         <Button
             android:id="@+id/button21"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0px"
             android:text="Delete account" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file