Fixed some import statements, and resolved conflicts, and made minor changes

Author: Madhavan7

src/main/java/entities/user_entities/BasicUser.java

@@ -1,7 +1,7 @@
 package entities.user_entities;
 
 import java.util.ArrayList;
-import entities.chat;
+import entities.chat.Chat;
 
 public class BasicUser extends User{
     public BasicUser(String Username, String Password, String Email, ArrayList<Chat> userChats){

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

@@ -1,9 +1,9 @@
 package entities.user_entities;
 
+import entities.chat.Chat;
 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 entities.chat;
 
 import java.io.Serializable;
 import java.util.ArrayList;

src/main/java/entities/user_entities/UserFactory.java

@@ -1,12 +1,11 @@
 package entities.user_entities;
-
-import entities.chat;
+import entities.chat.Chat;
 
 import java.util.ArrayList;
 
 public class UserFactory {
     //Following the factory design pattern, just in case in the future we decide to add various different types of Users
     public static User BirthUser(String Username, String Password, String Email, String type){
-        return new BasicUser(Username, Password, Email, new ArrayList<Chat>());
+        return new BasicUser(Username, Password, Email, new ArrayList<>());
     }
 }

src/main/java/interface_adapters/app_screen_interface_adapters/AppScreenLoader.java

@@ -1,7 +1,7 @@
 package interface_adapters.app_screen_interface_adapters;
 
+import entities.chat.Chat;
 import use_cases.app_screen_use_case.AppScreenPresenter;
-import entities.*;
 import screens.app_screen.AppScreen;
 
 import java.util.ArrayList;

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

@@ -1,6 +1,8 @@
 package screens.app_screen;
 
 
+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;

src/main/java/screens/chat_screen/ChatView.java

@@ -24,8 +24,7 @@
  */
 
 
-
-class ChatView extends JFrame implements  ActionListener{
+public class ChatView extends JFrame implements  ActionListener{
     //use two Interactors .
     private ChatInteractor chatInteractor;
     private CheckUsername_Interactor checkusername_interactor;

src/main/java/use_cases/app_screen_use_case/AppScreenController.java

@@ -1,6 +1,5 @@
 package use_cases.app_screen_use_case;
-
-import entities.*;
+import entities.chat.Chat;
 
 public interface AppScreenController{
     Chat getChat(String chatID);

src/main/java/use_cases/app_screen_use_case/ChatName.java

@@ -1,6 +1,7 @@
 package use_cases.app_screen_use_case;
 
-import entities.*;
+
+import entities.chat.Chat;
 
 public interface ChatName {
     String getChatName(Chat chat);