Improved UIs and added demo to readme

Author: parmism

README.md

@@ -35,6 +35,16 @@ Each of us have created one or more PRs and most of these have been merged into
 ![img_6.png](img_6.png)
 
 
+### App Screen UI
+- By Amy
+- The App Screen UI is the screen that acts as a proxy between the user's login screen and their individual chats
+- Upon logging in, a user will will be rendered with a view of app screen
+- App Screen provides an ordered list of a user's chats, allowing the user to open an individual chat by clicking the chat button
+- ChatView(the window referenced above) will open, displaying the chats's GUI
+- Apart from that, app screen also provides buttons that allow a user to create new chats
+
+
+
 ## Template Readme
 This is a template repository for CSC 207 projects. 
 This repository contains starter code for a gradle project.

src/main/java/data_access/UserDatabase.java

@@ -1,17 +1,19 @@
 package data_access;
 
+import entities.chat.Chat;
 import interface_adapters.User_search_IA.IRetrieveList;
 import interface_adapters.user_registration_interface_adapters.UserExists;
 import entities.user_entities.User;
 import interface_adapters.profile_modification_IA.UserModificationGateway;
 import use_cases.user_registration_use_cases.UserCreator;
 import entities.user_entities.UserFactory;
+import interface_adapters.Chat.UserChatGateway;
 import interface_adapters.User_search_IA.UserRetriever;
 
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
-public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList, UserModificationGateway {
+public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList, UserModificationGateway, UserChatGateway {
     File accounts;
     List<User> accountList;
     public UserDatabase(){
@@ -125,6 +127,16 @@ public void modifyUser(String oldUsername, User modified){
         }
     }
 
+    @Override
+    public ArrayList<Chat> getUserChats(String username) {
+        for (User user: accountList){
+            if (getUser(username).equals(user)){
+                return user.getUserChats();
+            }
+        }
+        throw new RuntimeException("Invalid username");
+    }
+
     // Below two methods are used by conversation history-related interactors
     // (Commented as objects are not found)
 //    /**

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

@@ -48,7 +48,7 @@ public void setRecipientUsername(String recipientUsername) {
     public String getSendertUsername(){
         return this.senderUsername;
     }
-    public String setSendertUsername(String recipientUsername){
+    public void setSendertUsername(String recipientUsername){
         this.recipientUsername = recipientUsername;
     }
 

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

@@ -1,8 +1,11 @@
 package entities.user_entities;
+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);
+        return new BasicUser(Username, Password, Email, new ArrayList<>());
     }
 }

src/main/java/interface_adapters/Chat/UserChatGateway.java

@@ -1,8 +1,10 @@
 package interface_adapters.Chat;
 
+import entities.chat.Chat;
+
 import java.util.ArrayList;
 
 public interface UserChatGateway {
 
-    // ArrayList<Chat> getUserChats(String username);
+    ArrayList<Chat> getUserChats(String username);
 }

src/main/java/interface_adapters/User_search_IA/IRetrieveList.java

@@ -1,7 +1,5 @@
 package interface_adapters.User_search_IA;
 
-import entities.user_entities.User;
-
 import entities.user_entities.User;
 import java.util.List;
 

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/interface_adapters/app_screen_interface_adapters/UserAppScreenGateway.java

@@ -1,10 +1,7 @@
 package interface_adapters.app_screen_interface_adapters;
 
-import java.util.ArrayList;
-
-import entities.chat.Chat;
-import interface_adapters.*;
 import data_access.UserDatabase;
+import entities.chat.Chat;
 import interface_adapters.login_interface_adapters.Login;
 
 import java.util.ArrayList;
@@ -13,7 +10,6 @@ public class UserAppScreenGateway implements Login {
 
     private final UserDatabase userDatabase;
     private final String username;
-    private ArrayList<Chat> userChats;
 
     /**
      * Create gateway between user and appscreen
@@ -27,9 +23,9 @@ public UserAppScreenGateway(String username){
     /**
      * Log the user into the system
      */
-    public void login(){;
-        this.userChats = this.userDatabase.getUserChats(this.username);
-        AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, this.userChats);
+    public void login(){
+        ArrayList<Chat> userChats = this.userDatabase.getUserChats(this.username);
+        AppScreenLoader appScreenLoader = new AppScreenLoader(this.username, userChats);
     }
 
 }

src/main/java/interface_adapters/user_registration_interface_adapters/UserExists.java

@@ -1,5 +1,5 @@
-package interface_adapters.user_registration_interface_adapters;
 
+package interface_adapters.user_registration_interface_adapters;
 public interface UserExists {
     boolean UserExists(String username, String email);
     boolean UserExists(String username);

src/main/java/interface_adapters/user_registration_interface_adapters/UserRegistrationController.java

@@ -1,6 +1,9 @@
 package interface_adapters.user_registration_interface_adapters;
 
+import interface_adapters.User_search_IA.UserRetriever;
+import screens.login_screen.UserLoginUI;
 import use_cases.user_registration_use_cases.verificationMethodFactory;
+import use_cases.user_registration_use_cases.UserCreator;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -89,14 +92,14 @@ public static void accountExistsMessage(){
         accountExistsFrame.setVisible(true);
     }
 
-    public static void verificationSuccessMessage(){
+    public static void verificationSuccessMessage(String message){
         JFrame verificationSuccessFrame = new JFrame();
         verificationSuccessFrame.setSize(400, 100);
         verificationSuccessFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
         JPanel verificationSuccessPanel = new JPanel();
         verificationSuccessPanel.setLayout(null);
         verificationSuccessFrame.add(verificationSuccessPanel);
-        JLabel errorMessage = new JLabel("Could not verify please try again");
+        JLabel errorMessage = new JLabel(message);
         errorMessage.setBounds(10,20, 350, 20);
         verificationSuccessPanel.add(errorMessage);
         verificationSuccessFrame.setVisible(true);
@@ -107,9 +110,11 @@ public void actionPerformed(ActionEvent e) {
         int verCode = Integer.parseInt(verificationCodeText.getText());
         if(verCode == this.code){
             database.createUser(this.username, this.password, this.email, "Basic");
-            System.out.println("Verification successful");
+            verificationSuccessMessage("Verification successful");
+            UserLoginUI loginUI = new UserLoginUI((UserRetriever) database);
+            loginUI.getLoginCredentials();
         }else{
-            verificationSuccessMessage();
+            verificationSuccessMessage("Could not verify please try again");
         }
     }
 }