Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/entities/user_entities/User.java

Author: Madhavan7

src/main/java/emoji_manager/model/EmoInfo.java

@@ -0,0 +1,23 @@
+package main.java.emoji_manager.model;
+
+/**
+ * EmoInfo
+ */
+public class EmoInfo {
+    /* Emo Info*/
+    int pos;
+    String val;
+
+    public EmoInfo(int pos, String val) {
+        this.pos = pos;
+        this.val = val;
+    }
+
+    public int getPos() {
+        return pos;
+    }
+
+    public String getVal() {
+        return val;
+    }
+}

src/main/java/emoji_manager/model/FontAndText.java

@@ -0,0 +1,77 @@
+package main.java.emoji_manager.model;
+
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+import java.awt.*;
+
+/**
+ * Font
+ */
+public class FontAndText {
+    private String msg = "", name = "Song"; //
+
+    private int size = 0; // Font
+
+    private Color color = new Color(225, 225, 225); // Font color
+
+    /**
+     * Free Construction(for newline)
+     */
+
+    public FontAndText() {
+    }
+
+    public FontAndText(String msg, String fontName, int fontSize, Color color) {
+        this.msg = msg;
+        this.name = fontName;
+        this.size = fontSize;
+        this.color = color;
+    }
+
+    /**
+     * return Attribute set
+     *
+     */
+    public SimpleAttributeSet getAttrSet() {
+        // Attribute Set
+        SimpleAttributeSet attrSet = new SimpleAttributeSet();
+        if (name != null) {
+            StyleConstants.setFontFamily(attrSet, name);
+        }
+        StyleConstants.setBold(attrSet, false);
+        StyleConstants.setItalic(attrSet, false);
+        StyleConstants.setFontSize(attrSet, size);
+        if (color != null)
+            StyleConstants.setForeground(attrSet, color);
+        return attrSet;
+    }
+
+    public String toString() {
+        //divide message to 4 parts
+        return name + "|"
+                + size + "|"
+                + color.getRed() + "-" + color.getGreen() + "-" + color.getBlue() + "|"
+                + msg;
+    }
+
+    public String getText() {
+        return msg;
+    }
+
+    public void setText(String text) {
+        this.msg = text;
+    }
+
+
+    public void setColor(Color color) {
+        this.color = color;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+}

src/main/java/emoji_manager/msg/MsgType.java

@@ -0,0 +1,5 @@
+package main.java.emoji_manager.msg;
+public final class MsgType {
+	public final static int CHAT = 0;        // Chat
+	public final static int SHAKE = 3;        // Shake
+}

src/main/java/emoji_manager/msg/Sender.java

@@ -0,0 +1,49 @@
+package main.java.emoji_manager.msg;
+
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
+
+public class Sender {
+	/* local ip */
+	public static String localIP = "127.0.0.1";
+	/* wrong message */
+	public static String err_msg = "";
+	/* default send port */
+	public static int SendPort = 5555;
+	/* default chat port */
+	public static int chatPort = 6666;
+
+	public Sender() {
+	}
+
+	/**
+	 * @param msgType    message Type
+	 * @return send success or not
+	 */
+	public static boolean sendUDPMsg(int msgType, String uname, String friendIP, int friendPort, String message) {
+		try {
+			/* From Common line get to send context, convert to string by UTF-8 */
+			byte[] msg = (msgType + "*" + uname + "*" + message).getBytes(StandardCharsets.UTF_8);
+			/* get the host internet Address */
+			InetAddress address = InetAddress.getByName(friendIP);
+
+			/* Initializes a datagram packet (packet) with data and address*/
+			DatagramPacket packet = new DatagramPacket(msg, msg.length, address,
+					friendPort);
+
+			/* Create a default socket and send packets through this socket */
+			DatagramSocket dSocket = new DatagramSocket();
+			dSocket.send(packet);
+
+			/* Close the socket after sending */
+			dSocket.close();
+		} catch (Exception e) {
+			e.printStackTrace();
+			err_msg = "System error！";
+			return false;
+		}
+		return true;
+	}
+}

src/main/java/entities/chat/GroupChat.java

@@ -1,7 +1,5 @@
 package entities.chat;
 
-import entities.message.Message;
-
 import java.util.ArrayList;
 
 public class GroupChat extends Chat {
@@ -25,7 +23,7 @@ public GroupChat(String name, String chatID, String senderUsername){
         this.name = name;
         this.chatID = chatID;
         this.senderUsername = senderUsername;
-        this.convHist = new ArrayList<Message>();
+        this.convHist = new ArrayList<>();
         this.groupMembers = new ArrayList<>();
     }
 
@@ -35,7 +33,7 @@ public GroupChat(String name, String chatID, String senderUsername){
      * @return groupMembers
      */
     public ArrayList<String> getGroupMembers(){
-        return new ArrayList<String>(this.groupMembers);
+        return new ArrayList<>(this.groupMembers);
     }
 
     /**

src/main/java/entities/chat/PrivateChat.java

@@ -1,7 +1,5 @@
 package entities.chat;
 
-import entities.message.Message;
-
 import java.util.ArrayList;
 
 public class PrivateChat extends Chat {
@@ -29,7 +27,7 @@ public PrivateChat(String name, String chatID, String recipientUsername ){
         this.name = name;
         this.chatID = chatID;
         this.recipientUsername = recipientUsername;
-        this.convHist = new ArrayList<Message>();
+        this.convHist = new ArrayList<>();
 
     }
 

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

@@ -3,15 +3,15 @@
 import data_access.UserDatabase;
 import entities.chat.Chat;
 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.app_screen_interface_adapters.UserAppScreenGateway;
-import use_cases.user_login_use_cases.Loginable;
+import interface_adapters.appscreen.UserAppScreenGateway;
 
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 
-public abstract class User implements Serializable, Changeable, Loginable, UserAuthenticationI {
+public abstract class User implements Serializable, Changeable, Login, UserAuthenticationI {
     protected String username;
     protected String password;
     protected String email;
@@ -56,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/interface_adapters/User_search_IA/IRetrieveList.java

@@ -1,8 +1,9 @@
 package interface_adapters.User_search_IA;
-
 import entities.user_entities.User;
 import java.util.List;
-
+/**
+ * allows for the User Database (whatever type it may be) to present all its users in a list format.
+ */
 public interface IRetrieveList {
     List<User> getList();
 }

src/main/java/interface_adapters/User_search_IA/UserPresenter.java

@@ -1,6 +1,8 @@
 package interface_adapters.User_search_IA;
 
-// UI implements this interface to invert the dependency of UI on the inner layers
+/**
+ * Implemented interface to invert the dependency of UI on the inner layers
+ */
 public interface UserPresenter {
     String showProfile(String username);
 }

src/main/java/interface_adapters/User_search_IA/UserPresenterClass.java

@@ -0,0 +1,25 @@
+package interface_adapters.User_search_IA;
+import data_access.UserDatabase;
+import entities.user_entities.User;
+import use_cases.user_profile_display_use_case.UserReader;
+
+/**
+ * User_search_IA.UserPresenter makes us implement showProfile to invert the dependency
+ */
+public class UserPresenterClass implements UserPresenter{
+    @Override
+    public String showProfile(String username) {
+        //    setting up access to the database of users:
+        UserDatabase db = new UserDatabase();
+        if (db.UserExists(username)){
+            User user = db.getUser(username);
+            UserReader reader = new UserReader();
+            String[] features = reader.ProfileReader(user);
+            String email = features[1];
+            return("<html>Username: " + username + "<br>Email: " + email + "</html>");
+        }
+        else{
+            return("User with given username does not exist.");
+        }
+    }
+}