No commit message

src/main/java/espresso/Espresso.java

@@ -1,3 +1,4 @@
+//Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
 package espresso;
 
 import espresso.task.TaskList;

src/main/java/espresso/gui/DialogBox.java

@@ -1,3 +1,4 @@
+//Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
 package espresso.gui;
 
 import javafx.geometry.Insets;
@@ -22,7 +23,8 @@ public class DialogBox extends HBox {
      * @param message The message text to be displayed.
      * @param avatar The ImageView containing the avatar to be displayed.
      */
-    private DialogBox(String message, ImageView avatar) {
+    //Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
+    private DialogBox(String message, ImageView avatar, Boolean bot) {
         this.message = new Label(message);
         this.avatar = avatar;
 
@@ -41,7 +43,11 @@ private DialogBox(String message, ImageView avatar) {
         VBox.setVgrow(messageContainer, Priority.ALWAYS);
 
         this.setAlignment(Pos.TOP_RIGHT);
-        getChildren().addAll(messageContainer, avatar);
+        if (bot) {
+            getChildren().addAll(avatar, messageContainer);
+        } else {
+            getChildren().addAll(messageContainer, avatar);
+        }
     }
 
     /**
@@ -51,15 +57,16 @@ private DialogBox(String message, ImageView avatar) {
      * @param message The message text to be displayed in the user dialog.
      * @return A DialogBox containing the user message and avatar.
      */
+    //Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
     public static DialogBox createUserDialog(String message) {
         ImageView userAvatar = new ImageView(new Image(DialogBox.class.getResourceAsStream("/images/EspressoUser.png")));
-        DialogBox userDialog = new DialogBox(message, userAvatar);
-        userDialog.setAlignment(Pos.TOP_RIGHT);  // Align user dialog to the right
-
+        DialogBox userDialog = new DialogBox(message, userAvatar, false);
         // Set margin
         HBox.setMargin(userDialog.avatar, new Insets(0, 0, 0, 3));
         HBox.setMargin(userDialog.message, new Insets(0, 3, 0, 0));
         userDialog.setMinHeight(Region.USE_PREF_SIZE);
+
+        userDialog.setAlignment(Pos.CENTER_RIGHT);  // Align user dialog to the CENTER RIGHT
         return userDialog;
     }
 
@@ -69,15 +76,17 @@ public static DialogBox createUserDialog(String message) {
      * @param message The message text to be displayed in the bot dialog.
      * @return A DialogBox containing the bot message and avatar.
      */
+    //Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
     public static DialogBox createBotDialog(String message) {
         ImageView botAvatar = new ImageView(new Image(DialogBox.class.getResourceAsStream("/images/Espresso.png")));
-        DialogBox botDialog = new DialogBox(message, botAvatar);
-        botDialog.setAlignment(Pos.TOP_LEFT);  // Align bot dialog to the left
+        DialogBox botDialog = new DialogBox(message, botAvatar, true);
 
         // Set margin
         HBox.setMargin(botDialog.avatar, new Insets(0, 0, 0, 4));
         HBox.setMargin(botDialog.message, new Insets(0, 0, 0, 4));
         botDialog.setMinHeight(Region.USE_PREF_SIZE);
+
+        botDialog.setAlignment(Pos.TOP_LEFT);  // Align bot dialog to the center left
         return botDialog;
     }
 }

src/main/java/espresso/gui/Main.java

@@ -1,4 +1,3 @@
-// USED AI generate some code and also referenced @rituliP for some code
 package espresso.gui;
 
 import javafx.application.Application;

src/main/java/espresso/gui/MainWindow.java

@@ -1,5 +1,5 @@
 package espresso.gui;
-//Reference from @RitulKumarSingh for MainWindow.fxml
+
 import espresso.command.InvalidCommandException;
 import espresso.Espresso;
 import javafx.animation.PauseTransition;
@@ -46,6 +46,7 @@ public void initialize() throws InvalidCommandException, ParseException {
             dialogBoxContainer.setPrefWidth(newVal.doubleValue());
         });
     }
+    //Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
 
     @FXML
     private void handleUserInput() throws ParseException {

src/main/java/espresso/parser/Parser.java

@@ -24,6 +24,7 @@ public class Parser {
      * @throws InvalidCommandException If the command format is invalid.
      * @throws ParseException          If there is an error in parsing task data.
      */
+    //Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
     public static String parse(String input, TaskList taskList, Ui ui) throws InvalidCommandException, ParseException {
         if (input.equals("list")) {
             return ui.printTasks(taskList);

src/main/java/espresso/storage/Storage.java

@@ -40,6 +40,7 @@ public Storage(String filePath) {
      * @throws ParseException           If the file content is in an invalid format.
      * @throws InvalidCommandException  If an invalid task type is encountered in the file.
      */
+    //Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
     public ArrayList<Task> load() throws IOException, ParseException, InvalidCommandException {
         ArrayList<Task> tasks = new ArrayList<>();
 

src/main/java/espresso/task/DeadlineTask.java

@@ -1,3 +1,4 @@
+//Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
 package espresso.task;
 
 import java.text.ParseException;

src/main/java/espresso/task/EventTask.java

@@ -1,3 +1,4 @@
+//Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission
 package espresso.task;
 
 import java.text.ParseException;

src/main/resources/view/MainWindow.fxml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Solution below inspired by https://github.com/nus-cs2103-AY2425S1/ip/pull/557 with permission -->
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ScrollPane?>