A-BetterGui 🔥

Author: Yihe-Harry

src/main/java/Main.java

@@ -1,7 +1,5 @@
 import duke.Duke;
-
 import javafx.application.Application;
-
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
@@ -19,15 +17,15 @@ public class Main extends Application {
     @Override
     public void start(Stage stage) {
         mainWindow.initialize();
-        Scene scene = new Scene(mainWindow.mainLayout);
+        Scene scene = new Scene(mainWindow.getMainLayout());
         stage.setScene(scene);
         stage.show();
 
         stage.setTitle("Duke");
         stage.setResizable(true);
         stage.setMinHeight(600.0);
         stage.setMinWidth(400.0);
-        stage.getIcons().add(mainWindow.dukeImage);
+        stage.getIcons().add(mainWindow.getDukeImage());
 
         mainWindow.setDuke(duke);
         mainWindow.initializeComponentProperties();

src/main/java/MainWindow.java

@@ -27,12 +27,34 @@ public class MainWindow extends AnchorPane {
     @FXML
     private Button sendButton;
     @FXML
-    public AnchorPane mainLayout;
+    private AnchorPane mainLayout;
 
     private Duke duke;
 
-    public Image userImage = new Image(this.getClass().getResourceAsStream("/images/morty.png"));
-    public Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/rick.png"));
+    private Image userImage = new Image(this.getClass().getResourceAsStream("/images/morty.png"));
+    private Image dukeImage = new Image(this.getClass().getResourceAsStream("/images/rick.png"));
+
+    /**
+     * return duke image
+     */
+    public Image getDukeImage() {
+        return dukeImage;
+    }
+
+    /**
+     * return user image
+     */
+    public Image getUserImage() {
+        return userImage;
+    }
+
+    /**?
+     * getter for main layout
+     * @return mainLayout
+     */
+    public AnchorPane getMainLayout() {
+        return mainLayout;
+    }
 
     /**
      * Initialize the scroll panel layout
@@ -101,6 +123,7 @@ public void initializeEventListeners() {
 
     /**
      * Set Duke
+     * @param d duke to be set
      */
     public void setDuke(Duke d) {
         duke = d;
@@ -154,6 +177,7 @@ private void handleUserInput() {
 
     /**
      * print welcome message as first message when open
+     * @param duke duke that handle the main logic
      */
     public void printWelcomeMessage(Duke duke) {
         String welcomeMessage = duke.greeting();

src/main/java/duke/Duke.java

@@ -1,6 +1,6 @@
 package duke;
 import duke.exception.DukeException;
-import duke.fileSaver.FileSaver;
+import duke.filesaver.FileSaver;
 import duke.task.TaskList;
 import duke.ui.Ui;
 

src/main/java/duke/fileSaver/FileSaver.java

@@ -1,4 +1,4 @@
-package duke.fileSaver;
+package duke.filesaver;
 
 import java.io.File;
 import java.io.FileNotFoundException;

src/main/java/duke/task/TaskList.java

@@ -1,16 +1,15 @@
 package duke.task;
 
-import duke.exception.DukeException;
-import duke.ui.Ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import java.text.ParseException; //to handle date and time
+//to handle date and time
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+import duke.exception.DukeException;
+import duke.ui.Ui;
 
 /**
  * This TaskList class handles the logic of adding and deleting tasks of Duke
@@ -32,13 +31,6 @@ public int getSize() {
         return task.size();
     }
 
-    /**
-     * add task to the list
-     */
-    public void add(Task t) {
-        task.add(t);
-    }
-
     /**
      * get the number i task
      */
@@ -65,6 +57,13 @@ public boolean isDateFormat(String date, String pattern) {
         return true;
     }
 
+    /**
+     * add task to the list
+     */
+    public void add(Task t) {
+        task.add(t);
+    }
+
     /**
      * parser for add tasks
      */
@@ -83,7 +82,10 @@ public String add(String[] userInput, Ui ui) throws DukeException {
                 throw new DukeException("Missing component: due date");
             }
             String time = deadlineArr[1];
-            if (isDateFormat(time, "yyyy-mm-dd") || isDateFormat(time, "yyyy-m-dd") || isDateFormat(time, "yyyy-mm-d") || isDateFormat(time, "yyyy-m-d")) {
+            if (isDateFormat(time, "yyyy-mm-dd")
+                    || isDateFormat(time, "yyyy-m-dd")
+                    || isDateFormat(time, "yyyy-mm-d")
+                    || isDateFormat(time, "yyyy-m-d")) {
                 LocalDate date = LocalDate.parse(time);
                 time = date.format(DateTimeFormatter.ofPattern("MMM dd yyyy"));
             }
@@ -93,7 +95,7 @@ public String add(String[] userInput, Ui ui) throws DukeException {
             break;
 
         case "event":
-            String eventArr[] = userInput[1].split(" /at ", 2);
+            String[] eventArr = userInput[1].split(" /at ", 2);
             if (eventArr.length != 2) {
                 throw new DukeException("Missing component: event date and time");
             }

src/main/java/duke/ui/Ui.java

@@ -5,7 +5,7 @@
 
 import duke.command.Command;
 import duke.exception.DukeException;
-import duke.fileSaver.FileSaver;
+import duke.filesaver.FileSaver;
 import duke.task.Task;
 import duke.task.TaskList;
 
@@ -20,7 +20,7 @@ public class Ui {
             + "|  |  |  |  |  |  |  | / /  _  \\\n"
             + "|  |_|   |  |_|  |   <    ___/\n"
             + "|____/ \\__,__|_|\\_\\_____|\n";
-    public static String line = "____________________________\n";
+    private static String line = "____________________________\n";
     //public static String indentation = "    ";
 
     public final Scanner sc;
@@ -65,8 +65,8 @@ public String bye() {
      */
     public String reportTask(Task t, TaskList task) {
         int count = task.getSize();
-        String output = "Got it, I've added this task to the list:\n" +
-                t.toString()
+        String output = "Got it, I've added this task to the list:\n"
+                + t.toString()
                 + "\n"
                 + "You now have "
                 + count
@@ -119,7 +119,7 @@ public String getResponse(String userInput, TaskList task, FileSaver fs) {
             switch (command) {
             case DEADLINE:
             case TODO:
-            case EVENT    :
+            case EVENT:
                 response = task.add(input, this);
                 break;
             case DELETE:
@@ -134,10 +134,10 @@ public String getResponse(String userInput, TaskList task, FileSaver fs) {
             case FIND:
                 response = reportFindedTask(task.findTask(input[1]));
                 break;
-//          case BYE:
-//              bye();
-//              run = false;
-//              break;
+            //case BYE:
+            //bye();
+            //run = false;
+            //break;
             default:
                 throw new DukeException("Sorry, I dont understand that");
             }

src/test/java/duke/ui/UiTest.java

@@ -6,24 +6,25 @@
 
 public class UiTest {
     Ui ui = new Ui();
+    String line = "____________________________\n";
     @Test
     public void dummyTest(){
         assertEquals(2, 2);
     }
     @Test
     public void testingPrintingMessage() {
-        assertEquals(ui.printMessage("a"), ui.line + "a\n" + ui.line);
+        assertEquals(ui.printMessage("a"), line + "a\n" + line);
     }
 
     @Test
     public void testingGreetingMessage() {
-        String actual = ui.line + "Hello! I'm Duke. What I can do for you?\n" + ui.line;
+        String actual = line + "Hello! I'm Duke. What I can do for you?\n" + line;
         assertEquals(ui.greetingMessage(), actual);
     }
 
     @Test
     public void testingBye() {
-        String actual = ui.line + "Bye. Hope to see you again soon!\n" + ui.line;
+        String actual = line + "Bye. Hope to see you again soon!\n" + line;
         assertEquals(ui.bye(), actual);
     }
 }