Level-10

Created a new GUI for Duke.
Some minor bug fixes.

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'java'
     id 'application'
     id 'com.github.johnrengelman.shadow' version '5.1.0'
+    id 'org.openjfx.javafxplugin' version '0.0.13'
 }
 
 repositories {
@@ -11,6 +12,21 @@ repositories {
 dependencies {
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
+
+    String javaFxVersion = '11'
+
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
 }
 
 test {
@@ -39,3 +55,8 @@ shadowJar {
 run{
     standardInput = System.in
 }
+
+javafx {
+    version = "19"
+    modules = [ 'javafx.controls' , 'javafx.fxml']
+}

data/duke.txt

@@ -5,3 +5,4 @@ todo,false,te
 todo,false,abcde
 deadline,false,aoawjdwaodj,2018-12-02T18:00
 event,false,oiajwodjoiawjdoajawoidjaowd,2018-12-02T18:00,2018-12-02T19:00
+todo,false,amdmdmadmad1

src/main/java/Duke.java

@@ -1,42 +1,19 @@
-import duke.*;
-import duke.command.Command;
+import duke.Storage;
+import duke.gui.Ui;
+import duke.TaskList;
+import duke.Parser;
+import duke.gui.Start;
 
-import java.io.*;
+import javafx.application.Application;
 
-public class Duke {
+public class Duke{
     private Ui ui;
     private Storage storage;
     private TaskList tasks;
     private Parser parser;
 
-    public Duke(String filepath) {
-        ui = new Ui();
-        storage = new Storage(filepath);
-        parser = new Parser();
-        try {
-            tasks = new TaskList(storage.load());
-        }catch (IOException e) {
-            ui.showLoadingError();
-            tasks = new TaskList();
-        }
-    }
-    public void run() {
-        boolean isExit = false;
-        while (!isExit) {
-            try {
-                String fullCommand = ui.readCommand();
-                Command c = parser.parse(fullCommand,ui);
-                c.execute(tasks,ui,storage);
-                isExit = c.isExit();
-            } catch (IOException | NullPointerException e) {
-
-            }
-        }
-    }
     public static void main(String[] args){
-        new Duke("data/duke.txt").run();
+        Application.launch(Start.class);
     }
 
-    //Error Checking Methods
-
 }

src/main/java/duke/Parser.java

@@ -1,6 +1,7 @@
 package duke;
 
 import duke.command.*;
+import duke.gui.Ui;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -131,8 +132,8 @@ public String getToDo() {
         String[] arr = fullCommand.split(" ", 2);
         try {
             return arr[1];
-        } catch(ArrayIndexOutOfBoundsException e) {
-            ui.customMessage("☹ OOPS!!! The description of a todo cannot be empty.");
+        } catch(ArrayIndexOutOfBoundsException e)  {
+
         }
         return null;
     }

src/main/java/duke/Storage.java

@@ -1,9 +1,10 @@
 package duke;
 
-import duke.Deadline;
-import duke.Event;
-
-import java.io.*;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.BufferedReader;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 

src/main/java/duke/command/AddCommand.java

@@ -2,7 +2,7 @@
 
 import duke.Storage;
 import duke.TaskList;
-import duke.Ui;
+import duke.gui.Ui;
 import duke.Task;
 
 /**
@@ -23,12 +23,13 @@ public AddCommand(Task t) {
      * Adds ToDo,Deadline or Event tasks to the tasklist and storage.
      */
     @Override
-    public void execute(TaskList tasks, Ui ui, Storage storage) {
+    public String execute(TaskList tasks, Ui ui, Storage storage) {
         tasks.add(this.task);
-        ui.customMessage("Added : " + task.getValue());
-        ui.showNumberOfListings(tasks.size());
         storage.write(this.task);
+        String message = "Added : " + task.getValue() + "\n"
+                + ui.showNumberOfListings(tasks.size());
 
+        return message;
     }
 }
 

src/main/java/duke/command/Command.java

@@ -2,15 +2,15 @@
 
 import duke.Storage;
 import duke.TaskList;
-import duke.Ui;
+import duke.gui.Ui;
 
 
 /**
  * Abstract class
  */
 public abstract class Command {
 
-    public abstract void execute(TaskList tasks, Ui ui, Storage storage);
+    public abstract String execute(TaskList tasks, Ui ui, Storage storage);
 
     public boolean isExit() {
         return false;

src/main/java/duke/command/CommandNotFound.java

@@ -2,7 +2,7 @@
 
 import duke.Storage;
 import duke.TaskList;
-import duke.Ui;
+import duke.gui.Ui;
 
 /**
  * CommandNotFound - when user enters a Command and Duke
@@ -21,7 +21,7 @@ public CommandNotFound() {
      * Display the UI
      */
     @Override
-    public void execute(TaskList tasks, Ui ui, Storage storage) {
-        ui.showCommandNotFound();
+    public String execute(TaskList tasks, Ui ui, Storage storage) {
+        return ui.showCommandNotFound();
     }
 }

src/main/java/duke/command/DeleteCommand.java

@@ -2,7 +2,7 @@
 
 import duke.Storage;
 import duke.TaskList;
-import duke.Ui;
+import duke.gui.Ui;
 
 /**
  * DeleteCommand - If user enters the delete command.
@@ -19,10 +19,13 @@ public DeleteCommand(int index) {
      *  Deletes the given task.
      */
     @Override
-    public void execute(TaskList tasks, Ui ui, Storage storage) {
-        ui.customMessage("Noted. I've removed this task: \n");
-        ui.customMessage(tasks.get(index));
+    public String execute(TaskList tasks, Ui ui, Storage storage) {
+
+        String message = "Noted. I've removed this task: \n" +
+                tasks.get(index) + "\n" +
+                ui.showNumberOfListings(tasks.size() - 1);
+
         tasks.remove(index);
-        ui.showNumberOfListings(tasks.size());
+        return message;
     }
 }

src/main/java/duke/command/ExitCommand.java

@@ -2,7 +2,7 @@
 
 import duke.Storage;
 import duke.TaskList;
-import duke.Ui;
+import duke.gui.Ui;
 
 /**
  * ExitCommand - User enters the bye command.
@@ -27,8 +27,8 @@ public boolean isExit() {
      * Print the exit message
      */
     @Override
-    public void execute(TaskList tasks, Ui ui, Storage storage) {
-        ui.byeMessage();
+    public String execute(TaskList tasks, Ui ui, Storage storage) {
+        return ui.byeMessage();
     }
 
 }

src/main/java/duke/command/FindCommand.java

@@ -2,13 +2,11 @@
 
 import duke.Storage;
 import duke.TaskList;
-import duke.Ui;
+import duke.gui.Ui;
 import duke.Task;
 
 import java.util.stream.Collectors;
 import java.util.List;
-import java.util.ArrayList;
-
 
 
 /**
@@ -26,11 +24,11 @@ public FindCommand(String value) {
      * Finds given value in all the tasks in the TaskList
      */
     @Override
-    public void execute(TaskList tasks, Ui ui, Storage storage) {
+    public String execute(TaskList tasks, Ui ui, Storage storage) {
         List<Task> matches = tasks.stream()
                 .filter(it -> it.getValue().contains( this.value ))
                 .collect(Collectors.toList());
 
-        ui.printList(matches);
+        return ui.printList(matches);
     }
 }

src/main/java/duke/command/ListCommand.java

@@ -2,7 +2,7 @@
 
 import duke.Storage;
 import duke.TaskList;
-import duke.Ui;
+import duke.gui.Ui;
 
 /**
  * ListCommand - User enters the list command
@@ -20,7 +20,7 @@ public ListCommand() {
      * Prints out all the tasks.
      */
     @Override
-    public void execute(TaskList tasks, Ui ui, Storage storage) {
-        ui.printList(tasks.getList());
+    public String execute(TaskList tasks, Ui ui, Storage storage) {
+        return ui.printList(tasks.getList());
     }
 }

src/main/java/duke/command/MarkCommand.java

@@ -2,7 +2,7 @@
 
 import duke.Storage;
 import duke.TaskList;
-import duke.Ui;
+import duke.gui.Ui;
 
 /**
  * Mark Command - User enters the mark command
@@ -24,8 +24,8 @@ public MarkCommand(int index) {
      * Mark the given task in the list and storage
      */
     @Override
-    public void execute(TaskList tasks, Ui ui, Storage storage) {
+    public String execute(TaskList tasks, Ui ui, Storage storage) {
         tasks.mark(index);
-        ui.showMarkSucess(tasks.get(index));
+        return ui.showMarkSucess(tasks.get(index));
     }
 }