diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..3e24858
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 03dae39..4b1b450 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,8 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/ConfirmationActivity.java b/app/src/main/java/com/bscpe3g/sugboeats/ConfirmationActivity.java
index 0bfc83f..2789213 100644
--- a/app/src/main/java/com/bscpe3g/sugboeats/ConfirmationActivity.java
+++ b/app/src/main/java/com/bscpe3g/sugboeats/ConfirmationActivity.java
@@ -2,7 +2,9 @@
import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
import android.view.ViewGroup;
+import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
@@ -93,5 +95,22 @@ protected void onCreate(Bundle savedInstanceState) {
backIntent.putExtra("restaurant", restaurant);
startActivity(backIntent);
});
+ Button makeReservationButton = findViewById(R.id.button_make_reservation2);
+ makeReservationButton.setOnClickListener(v -> {
+ Intent successfulBookingIntent = new Intent(ConfirmationActivity.this, SuccessfulBookingActivity.class);
+ successfulBookingIntent.putExtra("firstName", firstName);
+ successfulBookingIntent.putExtra("lastName", lastName);
+ successfulBookingIntent.putExtra("phoneNumber", phoneNumber);
+ successfulBookingIntent.putExtra("emailAddress", emailAddress);
+ successfulBookingIntent.putExtra("customerAddress", customerAddress);
+ successfulBookingIntent.putExtra("reservationDate", reservationDate);
+ successfulBookingIntent.putExtra("reservationTime", reservationTime);
+ successfulBookingIntent.putExtra("settingType", settingType);
+ successfulBookingIntent.putExtra("numberOfGuests", numberOfGuests);
+ successfulBookingIntent.putExtra("specialRequests", specialRequests);
+ successfulBookingIntent.putExtra("restaurant", restaurant);
+ startActivity(successfulBookingIntent);
+ });
}
}
+
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/HomeScreenActivity.java b/app/src/main/java/com/bscpe3g/sugboeats/HomeScreenActivity.java
new file mode 100644
index 0000000..a695a19
--- /dev/null
+++ b/app/src/main/java/com/bscpe3g/sugboeats/HomeScreenActivity.java
@@ -0,0 +1,99 @@
+package com.bscpe3g.sugboeats;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageButton;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class HomeScreenActivity extends AppCompatActivity {
+ private ImageButton homescreenSale1;
+ private ImageButton homescreenSale2;
+ private ImageButton resto1;
+ private ImageButton resto2;
+ private ImageButton resto3;
+ private ImageButton resto4;
+ private ImageButton resto5;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_home_screen);
+
+ // Find views by their ID
+ homescreenSale1 = findViewById(R.id.homescreen_sale1);
+ homescreenSale2 = findViewById(R.id.homescreen_sale2);
+ resto1 = findViewById(R.id.resto1);
+ resto2 = findViewById(R.id.resto2);
+ resto3 = findViewById(R.id.resto3);
+ resto4 = findViewById(R.id.resto4);
+ resto5 = findViewById(R.id.resto5);
+
+ // Set a click listener on the search button
+
+ homescreenSale1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Create an Intent to start the SecondActivity
+ Intent intent = new Intent(HomeScreenActivity.this, Resto4Activity.class);
+ startActivity(intent);
+ }
+ });
+
+ // Set a click listener on homescreen_sale2 ImageButton to start a new activity
+ homescreenSale2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Create an Intent to start the ThirdActivity (for example)
+ Intent intent = new Intent(HomeScreenActivity.this, Resto5Activity.class);
+ startActivity(intent);
+ }
+ });
+
+ resto1.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Navigate to the desired activity, e.g., Resto1Activity
+ Intent intent = new Intent(HomeScreenActivity.this, Resto1Activity.class);
+ startActivity(intent);
+ }
+ });
+
+ resto2.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Navigate to the desired activity, e.g., Resto2Activity
+ Intent intent = new Intent(HomeScreenActivity.this, Resto2Activity.class);
+ startActivity(intent);
+ }
+ });
+
+ resto3.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Navigate to the desired activity, e.g., Resto2Activity
+ Intent intent = new Intent(HomeScreenActivity.this, Resto3Activity.class);
+ startActivity(intent);
+ }
+ });
+
+ resto4.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Navigate to the desired activity, e.g., Resto2Activity
+ Intent intent = new Intent(HomeScreenActivity.this, Resto4Activity.class);
+ startActivity(intent);
+ }
+ });
+
+ resto5.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Navigate to the desired activity, e.g., Resto2Activity
+ Intent intent = new Intent(HomeScreenActivity.this, Resto5Activity.class);
+ startActivity(intent);
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/Resto1Activity.java b/app/src/main/java/com/bscpe3g/sugboeats/Resto1Activity.java
index 6011a14..fe2ae43 100644
--- a/app/src/main/java/com/bscpe3g/sugboeats/Resto1Activity.java
+++ b/app/src/main/java/com/bscpe3g/sugboeats/Resto1Activity.java
@@ -4,6 +4,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.widget.Button;
+import android.widget.ImageView;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
@@ -17,6 +18,7 @@
public class Resto1Activity extends AppCompatActivity {
private Button makeReservationButton;
+ private ImageView backButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -56,5 +58,11 @@ protected void onCreate(Bundle savedInstanceState) {
intent.putExtra("restaurant", restaurant);
startActivity(intent);
});
+
+ ImageView backButton = findViewById(R.id.back_button_resto1); // Ensure correct ID
+ backButton.setOnClickListener(v -> {
+ Intent intent = new Intent(Resto1Activity.this, HomeScreenActivity.class);
+ startActivity(intent); // Added to start the HomeScreenActivity
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/Resto2Activity.java b/app/src/main/java/com/bscpe3g/sugboeats/Resto2Activity.java
index f81edaf..31d8c67 100644
--- a/app/src/main/java/com/bscpe3g/sugboeats/Resto2Activity.java
+++ b/app/src/main/java/com/bscpe3g/sugboeats/Resto2Activity.java
@@ -4,6 +4,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.widget.Button;
+import android.widget.ImageView;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
@@ -18,6 +19,7 @@
public class Resto2Activity extends AppCompatActivity {
private Button makeReservationButton;
+ private ImageView backButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -58,5 +60,11 @@ protected void onCreate(Bundle savedInstanceState) {
intent.putExtra("restaurant", restaurant);
startActivity(intent);
});
+
+ ImageView backButton = findViewById(R.id.back_button_resto2); // Ensure correct ID
+ backButton.setOnClickListener(v -> {
+ Intent intent = new Intent(Resto2Activity.this, HomeScreenActivity.class);
+ startActivity(intent); // Added to start the HomeScreenActivity
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/Resto3Activity.java b/app/src/main/java/com/bscpe3g/sugboeats/Resto3Activity.java
index 84cf146..afabb17 100644
--- a/app/src/main/java/com/bscpe3g/sugboeats/Resto3Activity.java
+++ b/app/src/main/java/com/bscpe3g/sugboeats/Resto3Activity.java
@@ -4,6 +4,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.widget.Button;
+import android.widget.ImageView;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
@@ -18,6 +19,7 @@
public class Resto3Activity extends AppCompatActivity {
private Button makeReservationButton;
+ private ImageView backButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -57,5 +59,11 @@ protected void onCreate(Bundle savedInstanceState) {
intent.putExtra("restaurant", restaurant);
startActivity(intent);
});
+
+ ImageView backButton = findViewById(R.id.back_button_resto3); // Ensure correct ID
+ backButton.setOnClickListener(v -> {
+ Intent intent = new Intent(Resto3Activity.this, HomeScreenActivity.class);
+ startActivity(intent); // Added to start the HomeScreenActivity
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/Resto4Activity.java b/app/src/main/java/com/bscpe3g/sugboeats/Resto4Activity.java
index f290822..f716ffa 100644
--- a/app/src/main/java/com/bscpe3g/sugboeats/Resto4Activity.java
+++ b/app/src/main/java/com/bscpe3g/sugboeats/Resto4Activity.java
@@ -4,6 +4,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.widget.Button;
+import android.widget.ImageView;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
@@ -17,6 +18,7 @@
public class Resto4Activity extends AppCompatActivity {
private Button makeReservationButton;
+ private ImageView backButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -57,5 +59,11 @@ protected void onCreate(Bundle savedInstanceState) {
intent.putExtra("restaurant", restaurant);
startActivity(intent);
});
+
+ ImageView backButton = findViewById(R.id.back_button_resto4); // Ensure correct ID
+ backButton.setOnClickListener(v -> {
+ Intent intent = new Intent(Resto4Activity.this, HomeScreenActivity.class);
+ startActivity(intent); // Added to start the HomeScreenActivity
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/Resto5Activity.java b/app/src/main/java/com/bscpe3g/sugboeats/Resto5Activity.java
index 7f521fb..bb183c9 100644
--- a/app/src/main/java/com/bscpe3g/sugboeats/Resto5Activity.java
+++ b/app/src/main/java/com/bscpe3g/sugboeats/Resto5Activity.java
@@ -4,6 +4,7 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.widget.Button;
+import android.widget.ImageView;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
@@ -18,6 +19,7 @@
public class Resto5Activity extends AppCompatActivity {
private Button makeReservationButton;
+ private ImageView backButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -57,5 +59,11 @@ protected void onCreate(Bundle savedInstanceState) {
intent.putExtra("restaurant", restaurant);
startActivity(intent);
});
+
+ ImageView backButton = findViewById(R.id.back_button_resto5); // Ensure correct ID
+ backButton.setOnClickListener(v -> {
+ Intent intent = new Intent(Resto5Activity.this, HomeScreenActivity.class);
+ startActivity(intent); // Added to start the HomeScreenActivity
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/SplashActivity.java b/app/src/main/java/com/bscpe3g/sugboeats/SplashActivity.java
index d904ece..6a7940c 100644
--- a/app/src/main/java/com/bscpe3g/sugboeats/SplashActivity.java
+++ b/app/src/main/java/com/bscpe3g/sugboeats/SplashActivity.java
@@ -17,7 +17,7 @@ protected void onCreate(Bundle savedInstanceState) {
EdgeToEdge.enable(this);
setContentView(R.layout.activity_splash);
new Handler(Looper.getMainLooper()).postDelayed(() -> {
- Intent mainIntent = new Intent(SplashActivity.this, Resto5Activity.class); // Replace HomeActivity with your actual main activity
+ Intent mainIntent = new Intent(SplashActivity.this, HomeScreenActivity.class); // Replace HomeActivity with your actual main activity
startActivity(mainIntent);
finish();
}, SPLASH_DISPLAY_LENGTH);
diff --git a/app/src/main/java/com/bscpe3g/sugboeats/SuccessfulBookingActivity.java b/app/src/main/java/com/bscpe3g/sugboeats/SuccessfulBookingActivity.java
new file mode 100644
index 0000000..f7c9f6b
--- /dev/null
+++ b/app/src/main/java/com/bscpe3g/sugboeats/SuccessfulBookingActivity.java
@@ -0,0 +1,30 @@
+package com.bscpe3g.sugboeats;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class SuccessfulBookingActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_successful_booking);
+
+ Button homeBtn = findViewById(R.id.return_home_button);
+
+ // Set a click listener on the return button
+ homeBtn.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Navigate to another activity (e.g., go to ReturnActivity)
+ Intent intent = new Intent(SuccessfulBookingActivity.this, HomeScreenActivity.class);
+ startActivity(intent);
+ }
+ });
+ }
+}
diff --git a/app/src/main/res/drawable/call.png b/app/src/main/res/drawable/call.png
new file mode 100644
index 0000000..61ffffd
Binary files /dev/null and b/app/src/main/res/drawable/call.png differ
diff --git a/app/src/main/res/drawable/email.png b/app/src/main/res/drawable/email.png
new file mode 100644
index 0000000..ee1f4c3
Binary files /dev/null and b/app/src/main/res/drawable/email.png differ
diff --git a/app/src/main/res/drawable/homescreenresto1.png b/app/src/main/res/drawable/homescreenresto1.png
new file mode 100644
index 0000000..7bb0114
Binary files /dev/null and b/app/src/main/res/drawable/homescreenresto1.png differ
diff --git a/app/src/main/res/drawable/homescreenresto2.png b/app/src/main/res/drawable/homescreenresto2.png
new file mode 100644
index 0000000..ad6bee2
Binary files /dev/null and b/app/src/main/res/drawable/homescreenresto2.png differ
diff --git a/app/src/main/res/drawable/homescreenresto3.png b/app/src/main/res/drawable/homescreenresto3.png
new file mode 100644
index 0000000..3fe7448
Binary files /dev/null and b/app/src/main/res/drawable/homescreenresto3.png differ
diff --git a/app/src/main/res/drawable/logo_transparent.png b/app/src/main/res/drawable/logo_transparent.png
new file mode 100644
index 0000000..8924e69
Binary files /dev/null and b/app/src/main/res/drawable/logo_transparent.png differ
diff --git a/app/src/main/res/drawable/promo_one.png b/app/src/main/res/drawable/promo_one.png
new file mode 100644
index 0000000..f2c2d6b
Binary files /dev/null and b/app/src/main/res/drawable/promo_one.png differ
diff --git a/app/src/main/res/drawable/promo_two.png b/app/src/main/res/drawable/promo_two.png
new file mode 100644
index 0000000..1090c72
Binary files /dev/null and b/app/src/main/res/drawable/promo_two.png differ
diff --git a/app/src/main/res/drawable/round_resto4.png b/app/src/main/res/drawable/round_resto4.png
new file mode 100644
index 0000000..10f23c8
Binary files /dev/null and b/app/src/main/res/drawable/round_resto4.png differ
diff --git a/app/src/main/res/drawable/rounded_corners.xml b/app/src/main/res/drawable/rounded_corners.xml
new file mode 100644
index 0000000..58b9ab4
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_corners.xml
@@ -0,0 +1,9 @@
+
+ -
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_resto1.png b/app/src/main/res/drawable/rounded_resto1.png
new file mode 100644
index 0000000..3f6770d
Binary files /dev/null and b/app/src/main/res/drawable/rounded_resto1.png differ
diff --git a/app/src/main/res/drawable/rounded_resto2.png b/app/src/main/res/drawable/rounded_resto2.png
new file mode 100644
index 0000000..1afba35
Binary files /dev/null and b/app/src/main/res/drawable/rounded_resto2.png differ
diff --git a/app/src/main/res/drawable/rounded_resto3.png b/app/src/main/res/drawable/rounded_resto3.png
new file mode 100644
index 0000000..1680b58
Binary files /dev/null and b/app/src/main/res/drawable/rounded_resto3.png differ
diff --git a/app/src/main/res/drawable/rounded_resto5.png b/app/src/main/res/drawable/rounded_resto5.png
new file mode 100644
index 0000000..23ecbdc
Binary files /dev/null and b/app/src/main/res/drawable/rounded_resto5.png differ
diff --git a/app/src/main/res/drawable/success_booking.png b/app/src/main/res/drawable/success_booking.png
new file mode 100644
index 0000000..f390e7a
Binary files /dev/null and b/app/src/main/res/drawable/success_booking.png differ
diff --git a/app/src/main/res/layout/activity_confirmation.xml b/app/src/main/res/layout/activity_confirmation.xml
index 496bcb4..4ca1ccb 100644
--- a/app/src/main/res/layout/activity_confirmation.xml
+++ b/app/src/main/res/layout/activity_confirmation.xml
@@ -100,7 +100,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/requests_confirm"
- app:layout_constraintVertical_bias="0.18" />
+ app:layout_constraintVertical_bias="0.18"
+ tools:ignore="HardcodedText" />
+ app:layout_constraintTop_toBottomOf="@+id/textView12"
+ tools:ignore="HardcodedText" />
+ app:layout_constraintTop_toBottomOf="@+id/textView9"
+ tools:ignore="HardcodedText" />
+ app:layout_constraintTop_toBottomOf="@+id/textView8"
+ tools:ignore="HardcodedText" />
+ app:layout_constraintTop_toBottomOf="@+id/textView6"
+ tools:ignore="HardcodedText" />
@@ -216,6 +222,7 @@
android:layout_marginTop="4dp"
android:text="restaurant_location"
android:textSize="16dp"
+ android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/reservation_date_contact" />
diff --git a/app/src/main/res/layout/activity_home_screen.xml b/app/src/main/res/layout/activity_home_screen.xml
new file mode 100644
index 0000000..931cc53
--- /dev/null
+++ b/app/src/main/res/layout/activity_home_screen.xml
@@ -0,0 +1,338 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_resto1.xml b/app/src/main/res/layout/activity_resto1.xml
index 3f4ca6a..d00f95e 100644
--- a/app/src/main/res/layout/activity_resto1.xml
+++ b/app/src/main/res/layout/activity_resto1.xml
@@ -134,7 +134,7 @@
app:layout_constraintVertical_bias="0.468" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72b06ac..b10730c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,6 +31,9 @@
Mactan Newtown, Lapu-lapu City
1:00 pm - 10:00 pm
Chef\'s Tasty serves a delightful array of Filipino favorite foods, offering authentic flavors and heartwarming dishes that bring the taste of home to every meal."
+ Table Reservation Booked Successfully!
+ Kindly present a valid ID to the front desk staff upon your arrival at the restaurant on your reserved date and time.
+ TODO
- Indoor
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3373764..95db8be 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
[versions]
-agp = "8.4.1"
+agp = "8.3.0"
junit = "4.13.2"
junitVersion = "1.1.5"
espressoCore = "3.5.1"