Made changes so that chat buttons also display the time of the last message

Author: amyyong11

src/main/java/screens/app_screen/AppScreen.java

@@ -3,16 +3,14 @@
 
 import entities.chat.Chat;
 import screens.chat_screen.ChatView;
-import use_cases.app_screen_use_case.AppScreenController;
-import use_cases.app_screen_use_case.AppScreenPresenter;
-import use_cases.app_screen_use_case.ChatName;
-import use_cases.app_screen_use_case.Refresh;
+import use_cases.app_screen_use_case.*;
 
 import javax.swing.*;
 import java.awt.*;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 
-public class AppScreen implements AppScreenPresenter, AppScreenController, ChatName, Refresh {
+public class AppScreen implements AppScreenPresenter, AppScreenController, ChatName, Refresh, LastUpdate {
 
     private final JFrame jFrame;
     private JScrollPane jScrollPane;
@@ -45,7 +43,7 @@ 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(true);
             newChat.chatDisplay();
 
         });
@@ -89,20 +87,9 @@ public void displayAppScreen(){
         for (int i = this.chats.size() - 1; i > -1; i--) {
 
             String chatName = getChatName(this.chats.get(i));
-            JButton b = new JButton(chatName);
-            b.setPreferredSize(new Dimension(280, 50));
-            JLabel jLabel = new JLabel("time");
-            jLabel.setAlignmentX(Component.RIGHT_ALIGNMENT);
-            jLabel.setFont(new Font(null, Font.BOLD, 11));
-            b.add(jLabel);
-
-            // defines the action of opening a chat when a chat is clicked on
-            b.addActionListener(e -> {
-
-                ChatView newChat = new ChatView(currentUsername, false, chatName);
-                newChat.chatDisplay();
-            });
-            jPanel.add(b);
+            LocalDateTime lastUpdated = getLastUpdatedTime(this.chats.get(i));
+
+            jPanel.add(ChatButton.createButton(chatName, currentUsername, lastUpdated));
         }
 
         jPanel.setAlignmentY(Component.CENTER_ALIGNMENT);
@@ -119,6 +106,16 @@ public void displayAppScreen(){
 
     }
 
+    /**
+     * Return the date and time of the last message in a chat
+     * @param chat The given chat
+     * @return date and time of last update
+     */
+    @Override
+    public LocalDateTime getLastUpdatedTime(Chat chat) {
+        return chat.getLastUpdated();
+    }
+
     /**
      Make the chat list scrollable
      @param jPanel The panel containing the chats
@@ -177,6 +174,7 @@ public void addNewChat(Chat chat){
 
     /**
      * Update the order of chats that appear on screen if there was a change to conversation history
+     * This should not be called if chatID is not an ID of an existing chat that the current user has
      * @param chatID The ID of the given chat
      */
     @Override
@@ -192,20 +190,23 @@ public void updateScreen(String chatID) {
     }
 
     /**
-     * Return true if the given chat as an update to its conversation history
+     * Return true if the given existing chat has an update to its conversation history
      * @param chatID The ID of the given chat
      * @return true/false
      */
     @Override
     public boolean hasUpdate(String chatID) {
         Chat chat = getChat(chatID);
-        return this.chats.get(this.chats.size() - 1) != chat;
+        if (!(this.chats.isEmpty())) {
+            return !(this.chats.get(this.chats.size() - 1).equals(chat));
+        }
+        return true;
     }
 
     /**
-     * Get the chat object given its chat ID
-     * @param chatID The ID of the chat
-     * @return The chat with the given ID
+     * Get the existing chat object given its chat ID
+     * @param chatID The ID of the existing chat
+     * @return The existing chat with the given ID
      */
     @Override
     public Chat getChat(String chatID) {
@@ -214,7 +215,7 @@ public Chat getChat(String chatID) {
                 return chat;
             }
         }
-        throw new RuntimeException("Current user is not part of this chat");
+        throw new RuntimeException("User does not currently have this chat");
     }
 
 }

src/main/java/use_cases/app_screen_use_case/ChatButton.java

@@ -0,0 +1,46 @@
+package use_cases.app_screen_use_case;
+
+import screens.chat_screen.ChatView;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.time.LocalDateTime;
+
+public class ChatButton {
+
+
+    /**
+     * Create and return a button for an existing chat object
+     * @param chatName The name of the chat
+     * @param currentUsername The username of the current user
+     * @param lastUpdated The time of the last update to a chat's conversation history
+     * @return The button created
+     */
+    public static JButton createButton(String chatName, String currentUsername, LocalDateTime lastUpdated){
+        JButton jButton = new JButton(chatName);
+        jButton.setPreferredSize(new Dimension(280, 50));
+
+        JLabel jLabel;
+        if (lastUpdated != null){
+            jLabel = new JLabel(String.valueOf(lastUpdated.toLocalDate()));
+        }
+        else{
+            jLabel = new JLabel();
+        }
+        jLabel.setAlignmentX(Component.RIGHT_ALIGNMENT);
+        jLabel.setFont(new Font(null, Font.BOLD, 11));
+        jButton.add(jLabel);
+
+        // defines the action of opening a chat when a chat is clicked on
+        jButton.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ChatView chatView = new ChatView(false);
+            }
+        });
+        return jButton;
+    }
+}

src/main/java/use_cases/app_screen_use_case/LastUpdate.java

@@ -0,0 +1,9 @@
+package use_cases.app_screen_use_case;
+
+import entities.chat.Chat;
+
+import java.time.LocalDateTime;
+
+public interface LastUpdate {
+    LocalDateTime getLastUpdatedTime(Chat chat);
+}