Made some changes to adhere to clean architecture and changed some import statements

Author: amyyong11

src/main/java/entities/user_entities/User.java

@@ -2,10 +2,10 @@
 
 import data_access.UserDatabase;
 import entities.chat.Chat;
-import interface_adapters.appscreen.UserAppScreenGateway;
 import interface_adapters.profile_modification_IA.UserAuthenticationI;
 import interface_adapters.login_interface_adapters.Login;
 import use_cases.user_attribute_modification_use_case.Changeable;
+import interface_adapters.appscreen.UserAppScreenGateway;
 
 import java.io.File;
 import java.io.Serializable;
@@ -41,16 +41,12 @@ public ArrayList<Chat> getUserChats(){
     @Override
 //    from Changeable
     public void changeFeature(String feature, String newFeature){
-        switch (feature) {
-            case "Username":
-                this.username = newFeature;
-                break;
-            case "Password":
-                this.password = newFeature;
-                break;
-            case "Email":
-                this.email = newFeature;
-                break;
+        if (feature == "Username"){
+            this.username = newFeature;
+        } else if (feature == "Password"){
+            this.password = newFeature;
+        } else if (feature == "Email"){
+            this.email = newFeature;
         }
     }
 
@@ -60,7 +56,7 @@ public Boolean PasswordMatch(String attempt){
     }
 
     public void login(){
-        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername(), new UserDatabase(new File("user_accounts")));
+        UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername());
         appScreenGateway.login();
     }
 

src/main/java/screens/appscreen/AppScreen.java

@@ -6,10 +6,8 @@
 import interface_adapters.appscreen.AppScreenController;
 import interface_adapters.appscreen.AppScreenPresenter;
 import interface_adapters.appscreen.Refresh;
-import screens.Profile_screen.UserSearchUI;
 import screens.chat_screen.ChatController;
 import screens.chat_screen.ChatView;
-import screens.profile_update_screen.UserModificationUI;
 import use_cases.appscreen.*;
 import use_cases.chat_initiation_use_case.ChatInputBoundry;
 import use_cases.chat_initiation_use_case.ChatInteractor;
@@ -29,8 +27,8 @@ public class AppScreen implements AppScreenPresenter {
 
     /**
      Create an AppScreen object
-     @param chats This is a list o     most recent chats at the end of the list)
-     f chats given by the user (the list will always come as sorted with the
+     @param chats This is a list of chats given by the user (the list will always come as sorted with the
+     most recent chats at the end of the list)
      */
     public AppScreen(String currentUsername, ArrayList<Chat> chats) {
         this.currentUsername = currentUsername;
@@ -50,24 +48,6 @@ public AppScreen(String currentUsername, ArrayList<Chat> chats) {
         addPrivateChat.setPreferredSize(new Dimension(40, 30));
         addGroupChat.setPreferredSize(new Dimension(40, 30));
 
-        // menu panel containing the buttons for searching for users or accessing profile settings
-        JPanel menuPanel = new JPanel();
-        menuPanel.setLayout(new GridLayout(1,2));
-
-        JButton searchUsers = new JButton("Search Users");
-        JButton profileSettings = new JButton("Profile Settings");
-
-        searchUsers.setPreferredSize(new Dimension(40, 30));
-        profileSettings.setPreferredSize(new Dimension(30, 30));
-
-
-        // adding the action listeners for the Search Users button
-        searchUsers.addActionListener(e -> new UserSearchUI());
-
-        // adding the action listeners for the Profile Settings button
-        profileSettings.addActionListener(e -> new UserModificationUI());
-
-
         // adding the action listeners for the +private-chat and +group-chat buttons
         addPrivateChat.addActionListener(e -> {
             PrivateChatfactory privateChatfactory = new CommonPrivatechat();
@@ -85,10 +65,7 @@ public AppScreen(String currentUsername, ArrayList<Chat> chats) {
 
         topPanel.add(addPrivateChat);
         topPanel.add(addGroupChat);
-        menuPanel.add(searchUsers);
-        menuPanel.add(profileSettings);
         jFrame.add(topPanel, BorderLayout.NORTH);
-        jFrame.add(menuPanel, BorderLayout.SOUTH);
 
         this.chats = chats;
         openScreen();

src/main/java/use_cases/chat_initiation_use_case/ChatInteractor.java

@@ -3,6 +3,7 @@
 
 import entities.chat.PrivateChat;
 import entities.chat.PrivateChatfactory;
+import use_cases.appscreen.AppScreenStatus;
 
 import java.util.UUID;