Made changes to acessing userdatabase and also calling chatview

Author: amyyong11

src/main/java/app_screen/AppScreen.java

@@ -44,14 +44,15 @@ public AppScreen(String currentUsername, ArrayList<Chat> chats) {
 
         // adding the action listeners for the +private-chat and +group-chat buttons
         addPrivateChat.addActionListener(e -> {
-            ChatView newChat = new ChatView(currentUsername, true);
+            ChatView newChat = new ChatView(currentUsername, true, "");
             newChat.chatDisplay();
 
         });
-        addGroupChat.addActionListener(e -> {
-            ChatView newChat = new ChatView(currentUsername, true);
-            newChat.chatDisplay();
-        });
+        //TODO: add groupchat action
+//        addGroupChat.addActionListener(e -> {
+//            ChatView newChat = new ChatView(currentUsername, true);
+//            newChat.chatDisplay();
+//        });
 
 
         topPanel.add(addPrivateChat);
@@ -97,7 +98,7 @@ public void displayAppScreen(){
             // defines the action of opening a chat when a chat is clicked on
             b.addActionListener(e -> {
 
-                ChatView newChat = new ChatView(currentUsername, false);
+                ChatView newChat = new ChatView(currentUsername, false, chatName);
                 newChat.chatDisplay();
             });
             jPanel.add(b);

src/main/java/app_screen_interface_adapters/UserAppScreenGateway.java

@@ -2,38 +2,29 @@
 
 import Interface_adapters.Login;
 import entities.User;
-import data_access.UserDataBase;
-
-
-import java.io.File;
+import data_access.UserDatabase;
 import java.util.ArrayList;
 
 public class UserAppScreenGateway implements Login {
 
     private final UserDatabase userDatabase;
-    private final File userAccounts;
-    private String username;
+    private final String username;
     private ArrayList<Chat> userChats;
 
     /**
      * Create gateway between user and appscreen
      */
     public UserAppScreenGateway(String username){
         this.username = username;
-
-        // should be given the path of the file
-        this.userAccounts = new File("\data_access\UserAccounts.csv");
-
-        this.userDatabase = new UserDatabase(userAccounts);
+        this.userDatabase = new UserDatabase();
         login();
     }
 
-
     /**
      * Log the user into the system
      */
     public void login(){;
-        this.userChats = userDatabase.getUserChats(this.username);
+        this.userChats = this.userDatabase.getUserChats(this.username);
         AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, this.userChats);
     }