Merge pull request nus-cs2113-AY2324S1#34 from wendelinwemhoener/unify-flashcard-and-calendar-mode

Unify calendar and flashcard mode

Author: wendelinwemhoener

README.md

@@ -62,3 +62,4 @@ Steps for publishing documentation to the public:
 1. Scroll down to the `GitHub Pages` section.
 1. Set the `source` as `master branch /docs folder`.
 1. Optionally, use the `choose a theme` button to choose a theme for your documentation.
+

data/flashcard.txt

@@ -6,3 +6,4 @@ hello | bye | - | - | -
 hello | bye | - | - | -
 end program | hello | - | - | -
 hello | world | - | - | -
+dfdf | aaa | - | - | -

src/main/java/seedu/duke/Duke.java

@@ -1,11 +1,9 @@
-//@@author wendelinwemhoener & kherlenbayasgalan
+//@@author wendelinwemhoener
 
 package seedu.duke;
 
-import seedu.duke.flashcard.Flashcard;
-import seedu.duke.flashcard.FlashcardComponent;
 import seedu.duke.calendar.CalendarManager;
-import seedu.duke.calendar.Event;
+import seedu.duke.flashcard.FlashcardComponent;
 
 import java.util.ArrayList;
 import java.util.Scanner;
@@ -17,71 +15,25 @@ public static void main(String[] args) {
         new Duke().run();
     }
 
-    private void runCalendar() {
-        System.out.println("Enter your command: ");
-
-        CalendarManager manager = new CalendarManager(new ArrayList<Event>());
-
-        Scanner scanner = new Scanner(System.in);
-        String input;
-        boolean isDone = false;
-
-        while (!isDone) {
-            input = scanner.nextLine();
-
-            if (input.equals("end program")) {
-                System.out.println("Bye bye");
-                break;
-            } else if (input.equals("flashcard")) {
-                System.out.println("    Switched to flashcard functions");
-                runFlashcard();
-            } else if (manager.validCommand(input)) {
-                manager.startCalendar(input);
-            } else {
-                System.out.println("Invalid command! Enter a valid command.");
-            }
-        }
-    }
-
-    private void runFlashcard() {
-        FlashcardComponent fc = new FlashcardComponent(new ArrayList<Flashcard>());
+    private void run() {
+        FlashcardComponent fc = new FlashcardComponent();
+        CalendarManager cm = new CalendarManager(new ArrayList<>());
 
         Scanner scanner = new Scanner(System.in);
         String input;
         boolean shouldTerminate = false;
 
-        System.out.print("Enter your command: ");
         while (!shouldTerminate) {
             input = scanner.nextLine();
 
-            if (input.equals("end program")) {
-                System.out.println("Bye bye");
-                break;
-            } else if (input.equals("calendar")) {
-                System.out.println("    Switched to calendar functions");
-                runCalendar();
-            } else if (fc.isResponsible(input)) {
+            if (fc.isResponsible(input)) {
                 fc.processInput(input);
+            } else if (cm.isResponsible(input)) {
+                cm.processInput(input);
             } else {
-                System.out.println("    Invalid command! Sorry; please try again.");
+                System.out.println("    Invalid command! Please try again.");
             }
         }
-    }
 
-    private void run() {
-        String flashcardOrCalendar;
-        Scanner scanner = new Scanner(System.in);
-
-        System.out.println("Do you choose flashcard or calendar? ");
-        flashcardOrCalendar = scanner.nextLine();
-
-        if (flashcardOrCalendar.equals("flashcard")) {
-            runFlashcard();
-        } else if (flashcardOrCalendar.equals("calendar")) {
-            runCalendar();
-        } else {
-            System.out.println("Invalid command! Sorry; please try again.");
-            run();
-        }
     }
-}
+}

src/main/java/seedu/duke/calendar/CalendarManager.java

@@ -30,6 +30,14 @@ public boolean validCommand(String input) {
         return !(command instanceof UnknownCommand);
     }
 
+    public boolean isResponsible(String input) {
+        return validCommand(input);
+    }
+
+    public void processInput(String input) {
+        startCalendar(input);
+    }
+
     public void startCalendar(String input) {
         EventCommand command = calendarCommandParser.parseInput(input);
         assert !(command instanceof seedu.duke.calendar.command.UnknownCommand) :

src/main/java/seedu/duke/flashcard/FlashcardComponent.java

@@ -16,11 +16,10 @@ public class FlashcardComponent {
     private FlashcardStorage storage;
 
 
-    public FlashcardComponent(ArrayList<Flashcard> flashcards) {
+    public FlashcardComponent() {
         parser = new FlashcardCommandParser();
 
         //@@author junhyeong0411
-
         FlashcardDirectory flashcarddirectory = new FlashcardDirectory();
         flashcarddirectory.listFlashcardFiles();
 
@@ -29,7 +28,7 @@ public FlashcardComponent(ArrayList<Flashcard> flashcards) {
             flashcardList = storage.loadFlashcards();
         } catch (FileNotFoundException e){
             System.out.println("Making New file");
-            flashcardList = new FlashcardList(flashcards);
+            flashcardList = new FlashcardList(new ArrayList<>());
         }
 
         //@@author wendelinwemhoener