[Tan Hong Liang] iP

src/main/java/Duke.java

@@ -2,79 +2,50 @@
 import java.util.ArrayList;
 
 public class Duke {
-
-    private static class Task {
-        protected String description;
-        protected   boolean isDone;
-
-        Task (String description) {
-            this.description = description;
-            this.isDone = false;
-        }
-        Task (String description, boolean isDone) {
-            this.description = description;
-            this.isDone = isDone;
-        }
-
-        public String getDescription() {
-            return this.description;
-        }
-
-        public void mark() {
-            this.isDone = true;
-        }
-
-        public void unmark() {
-            this.isDone = false;
-        }
-
-        @Override
-        public String toString() {
-            char mark;
-            if (this.isDone) {
-                mark = 'X';
-            } else {
-                mark = ' ';
-            }
-            return ("[" + mark + "] " + this.getDescription());
-        }
-    }
     private static ArrayList<Task> tasks = new ArrayList<Task>();
     private static boolean isEnd = false;
 
     private static final String UI_LINE_SPACING = "----------------------------------------\n";
 
     private static final String COMMAND_LIST = "list";
     private static final String COMMAND_BYE = "bye";
+    private static final String COMMAND_TODO = "todo";
+    private static final String COMMAND_MARK = "mark";
+    private static final String COMMAND_UNMARK = "unmark";
 
-
-    public static void main(String[] args) { //runs chatbot UI
+    public static void main(String[] args) {
         String greeting = "Hello! I'm Duke  \n" + "What can I do for you?\n";
         Scanner userInput = new Scanner(System.in);
         System.out.println(UI_LINE_SPACING + greeting + UI_LINE_SPACING);
         while (!isEnd) {
-            String command = userInput.nextLine();
-
+            String userStatement = userInput.nextLine();
+            String splitUserStatement[] = userStatement.split(" ", 2);
+            String command = splitUserStatement[0];
+            String userArgs = "";
+            if (splitUserStatement.length > 1) {
+                userArgs = splitUserStatement[1];
+            }
             switch(command) {
             case COMMAND_LIST:
-                System.out.println(UI_LINE_SPACING + list() + UI_LINE_SPACING);
+                System.out.println(chat("Here are the tasks in your list: /n" + list()));
                 break;
             case COMMAND_BYE:
-                System.out.println("Bye! Hope to see you again!");
+                System.out.println(chat("Bye! Hope to see you again!"));
                 isEnd = true;
                 break;
+            case COMMAND_TODO:
+                ToDo taskToAdd = new ToDo(command);
+                tasks.add(taskToAdd);
+                System.out.println(chat("Got it, I've added this task:\n " + taskToAdd + "\n" + outputNumOfTasks()));
+                break;
+            case COMMAND_MARK:
+                mark(Integer.parseInt(userArgs));
+                break;
+            case COMMAND_UNMARK:
+                unmark(Integer.parseInt(userArgs));
+                break;
             default:
-                if (command.contains("mark")) {
-                    int taskNum = Integer.parseInt(command.substring(command.length() - 1));
-                    if (command.contains("unmark")) {
-                        unmark(taskNum);
-                    } else {
-                        mark(taskNum);
-                    }
-                } else {
-                    tasks.add(new Task(command));
-                    System.out.println(UI_LINE_SPACING + "Added: " + command + "\n" + UI_LINE_SPACING);
-                }
+                System.out.println(chat("Not a command, just wanna chat?"));
             }
         }
     }
@@ -102,6 +73,14 @@ public static void unmark(int taskNum) {
         System.out.println(UI_LINE_SPACING + "OK, I've marked this task as not done yet:\n" + targetTask + "\n" + UI_LINE_SPACING);
     }
 
+    public static String outputNumOfTasks() {
+        return String.format("Now you have %d tasks in the list \n", tasks.size());
+    }
+
+    public static String chat(String message) {
+        return UI_LINE_SPACING + message + UI_LINE_SPACING;
+    }
+
     public static void end() {
         System.out.println(UI_LINE_SPACING + "Bye! Hope to see you again!" + UI_LINE_SPACING);
         isEnd = true;

src/main/java/Task.java

@@ -0,0 +1,36 @@
+public class Task {
+    protected String description;
+    protected   boolean isDone;
+
+    Task (String description) {
+        this.description = description;
+        this.isDone = false;
+    }
+    Task (String description, boolean isDone) {
+        this.description = description;
+        this.isDone = isDone;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public void mark() {
+        this.isDone = true;
+    }
+
+    public void unmark() {
+        this.isDone = false;
+    }
+
+    @Override
+    public String toString() {
+        char mark;
+        if (this.isDone) {
+            mark = 'X';
+        } else {
+            mark = ' ';
+        }
+        return ("[" + mark + "] " + this.getDescription());
+    }
+}

src/main/java/TaskType.java

@@ -0,0 +1,5 @@
+enum TaskType {
+    TODO,
+    DEADLINE,
+    EVENT
+}

src/main/java/ToDo.java

@@ -0,0 +1,11 @@
+public class ToDo extends Task{
+
+    public ToDo(String description) {
+        super(description);
+    }
+
+    @Override
+    public String toString() {
+        return "[T]" + super.toString();
+    }
+}