Merge remote-tracking branch 'origin/main'

Author: Bin.W

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

@@ -3,11 +3,11 @@
 import entities.chat.Chat;
 import entities.chat.CommonPrivatechat;
 import entities.chat.PrivateChatfactory;
-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;
@@ -48,15 +48,35 @@ 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();
-            ChatInputBoundry inputBoundry = new ChatInteractor(privateChatfactory);
-            ChatController controller = new ChatController(inputBoundry, currentUsername);
+            ChatInputBoundry inputBoundary = new ChatInteractor(privateChatfactory);
+            ChatController controller = new ChatController(inputBoundary, currentUsername);
             new ChatView(controller, true);
 
         });
-        //TODO: add groupchat action
+        //TODO: add group chat action
 //        addGroupChat.addActionListener(e -> {
 //            ChatView newChat = new ChatView(currentUsername, true);
 //            newChat.chatDisplay();
@@ -65,7 +85,10 @@ 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();