trying to implement the timer, also abstracted a bunch of arraylists

Author: anthony-chen-ca

.idea/misc.xml

@@ -4,7 +4,7 @@
 import create_flashcard_use_case.fcCScreens.FcCResponsePresenter;
 import create_flashcard_use_case.fcCScreens.FcCScreen;
 import data_access.*;
-import view.Screen;
+import frameworks_and_drivers.Screen;
 
 import javax.swing.*;
 import java.io.IOException;

src/main/java/create_flashcard_use_case/FcCMain.java

@@ -3,7 +3,7 @@
 import data_access.*;
 import delete_flashcard_use_case.FcRScreens.FcRController;
 import delete_flashcard_use_case.FcRScreens.FcRResponsePresenter;
-import view.Screen;
+import frameworks_and_drivers.Screen;
 
 import javax.swing.*;
 import java.io.IOException;

src/main/java/delete_flashcard_use_case/FcRMain.java

@@ -5,7 +5,7 @@
 import edit_flashcard_set_use_case.screens.FCSetEditorScreen;
 import data_access.DBGateway;
 import data_access.entity_request_models.FlashcardSetDsRequestModel;
-import view.Screen;
+import frameworks_and_drivers.Screen;
 
 public class FCSetEditorMain extends Screen {
     /**

src/main/java/edit_flashcard_set_use_case/FCSetEditorMain.java

@@ -5,7 +5,7 @@
 import edit_flashcard_use_case.screens.FlashcardEditorScreen;
 import data_access.*;
 import data_access.entity_request_models.FlashcardDsRequestModel;
-import view.Screen;
+import frameworks_and_drivers.Screen;
 
 public class FlashcardEditorMain extends Screen {
     /**

src/main/java/edit_flashcard_use_case/FlashcardEditorMain.java

@@ -3,7 +3,7 @@
 import data_access.*;
 import data_access.entity_request_models.FlashcardDsRequestModel;
 import data_access.entity_request_models.FlashcardSetDsRequestModel;
-import view.Screen;
+import frameworks_and_drivers.Screen;
 
 import javax.swing.*;
 import java.io.IOException;

src/main/java/editor_main_page/EditorMainPage.java

@@ -37,7 +37,7 @@ public Quiz(QuizSettings quizSettings, List<Flashcard> flashcards) {
     public void generateQuestions() {
         int numQuestions = this.quizSettings.getNumQuestions();
 
-        ArrayList<String> types = new ArrayList<String>();
+        List<String> types = new ArrayList<>();
         if (this.quizSettings.isTrueFalseOn()) {
             types.add("TF");
         }
@@ -73,24 +73,16 @@ public void evaluate() {
     }
 
     /** GETTERS AND SETTERS **/
-    public ArrayList<String> getUserAnswers() {
-        ArrayList<String> userAnswers = new ArrayList<>();
-        for (QuizQuestion q : this.quizQuestions) {
-            userAnswers.add(q.getUserAnswer());
-        }
-        return userAnswers;
-    }
-
-    public void setUserAnswers(ArrayList<String> userAnswers) {
+    public void setUserAnswers(List<String> userAnswers) {
         for (int i = 0; i < userAnswers.size(); i++) {
             QuizQuestion q = this.quizQuestions.get(i);
             String a = userAnswers.get(i);
             q.setUserAnswer(a);
         }
     }
 
-    public ArrayList<String> getActualAnswers() {
-        ArrayList<String> actualAnswers = new ArrayList<>();
+    public List<String> getActualAnswers() {
+        List<String> actualAnswers = new ArrayList<>();
         for (QuizQuestion q : this.quizQuestions) {
             actualAnswers.add(q.getActualAnswer());
         }

src/main/java/entities/Quiz.java

@@ -1,4 +1,4 @@
-package view;
+package frameworks_and_drivers;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;

src/main/java/view/Screen.java renamed to src/main/java/frameworks_and_drivers/Screen.java

@@ -3,7 +3,7 @@
 import main_page.HomePage;
 import login_and_signup_use_case.UserLoginResponseModel;
 import data_access.*;
-import view.Screen;
+import frameworks_and_drivers.Screen;
 
 import javax.swing.*;
 import java.awt.*;

src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/LoginScreen.java

@@ -3,7 +3,6 @@
 import main_page.HomePage;
 import login_and_signup_use_case.*;
 import data_access.*;
-import view.Screen;
 
 import javax.swing.*;
 import java.awt.*;