Implemented settings object and cleaned up ChatWindow
Improvements: * Settings were implemented * Light theme support was implemented * The readability of ChatWindow got improved
This commit is contained in:
delvh
@ -1,6 +1,5 @@
|
||||
package envoy.client.ui;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.ComponentOrientation;
|
||||
import java.awt.Font;
|
||||
import java.awt.GridBagConstraints;
|
||||
@ -29,6 +28,7 @@ import envoy.client.Chat;
|
||||
import envoy.client.Client;
|
||||
import envoy.client.Config;
|
||||
import envoy.client.LocalDB;
|
||||
import envoy.client.Settings;
|
||||
import envoy.schema.Message;
|
||||
import envoy.schema.Sync;
|
||||
import envoy.schema.User;
|
||||
@ -47,19 +47,30 @@ public class ChatWindow extends JFrame {
|
||||
|
||||
private static final long serialVersionUID = 6865098428255463649L;
|
||||
|
||||
private JPanel contentPane = new JPanel();
|
||||
// user specific objects
|
||||
private Client client;
|
||||
private LocalDB localDB;
|
||||
private Settings settings;
|
||||
// used colors in Envoy
|
||||
private UIColors uiColors = UIColors.getInstance(true);
|
||||
// GUI components
|
||||
private JPanel contentPane = new JPanel();
|
||||
private JTextArea messageEnterTextArea = new JTextArea();
|
||||
private JList<User> userList = new JList<>();
|
||||
private Chat currentChat;
|
||||
private JList<Message> messageList = new JList<>();
|
||||
private JScrollPane scrollPane = new JScrollPane();
|
||||
private JTextPane textPane = new JTextPane();
|
||||
// private JCheckBox jCbChangeMode;
|
||||
private JButton postButton = new JButton();
|
||||
private JButton settingsButton = new JButton();
|
||||
|
||||
private Client client;
|
||||
private LocalDB localDB;
|
||||
private static int space = 4;
|
||||
|
||||
private JList<User> userList = new JList<>();
|
||||
private Chat currentChat;
|
||||
|
||||
private JTextArea messageEnterTextArea;
|
||||
|
||||
public ChatWindow(Client client, LocalDB localDB) {
|
||||
public ChatWindow(Client client, LocalDB localDB, Settings setting) {
|
||||
this.client = client;
|
||||
this.localDB = localDB;
|
||||
this.settings = setting;
|
||||
|
||||
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
setBounds(100, 100, 600, 800);
|
||||
@ -73,9 +84,7 @@ public class ChatWindow extends JFrame {
|
||||
public void windowClosing(WindowEvent e) { localDB.saveToLocalDB(); }
|
||||
});
|
||||
|
||||
contentPane.setBackground(new Color(0, 0, 0));
|
||||
contentPane.setForeground(Color.white);
|
||||
contentPane.setBorder(new EmptyBorder(0, 5, 0, 0));
|
||||
contentPane.setBorder(new EmptyBorder(space, space, space, space));
|
||||
setContentPane(contentPane);
|
||||
GridBagLayout gbl_contentPane = new GridBagLayout();
|
||||
gbl_contentPane.columnWidths = new int[] { 1, 1, 1 };
|
||||
@ -84,25 +93,16 @@ public class ChatWindow extends JFrame {
|
||||
gbl_contentPane.rowWeights = new double[] { 0.05, 1.0, 0.07 };
|
||||
contentPane.setLayout(gbl_contentPane);
|
||||
|
||||
JList<Message> messageList = new JList<>();
|
||||
messageList.setCellRenderer(new MessageListRenderer());
|
||||
|
||||
messageList.setFocusTraversalKeysEnabled(false);
|
||||
messageList.setSelectionForeground(new Color(255, 255, 255));
|
||||
messageList.setSelectionBackground(new Color(102, 0, 153));
|
||||
messageList.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
|
||||
messageList.setForeground(new Color(255, 255, 255));
|
||||
messageList.setBackground(new Color(51, 51, 51));
|
||||
|
||||
DefaultListModel<Message> messageListModel = new DefaultListModel<>();
|
||||
messageList.setModel(messageListModel);
|
||||
messageList.setFont(new Font("Arial", Font.PLAIN, 17));
|
||||
messageList.setFixedCellHeight(60);
|
||||
messageList.setBorder(new EmptyBorder(5, 5, 5, 5));
|
||||
messageList.setBorder(new EmptyBorder(space, space, space, space));
|
||||
|
||||
JScrollPane scrollPane = new JScrollPane();
|
||||
scrollPane.setForeground(new Color(0, 0, 0));
|
||||
scrollPane.setBackground(new Color(51, 51, 51));
|
||||
scrollPane.setViewportView(messageList);
|
||||
scrollPane.setBorder(null);
|
||||
|
||||
@ -112,18 +112,17 @@ public class ChatWindow extends JFrame {
|
||||
gbc_scrollPane.gridx = 1;
|
||||
gbc_scrollPane.gridy = 1;
|
||||
|
||||
gbc_scrollPane.insets = new Insets(0, 10, 10, 10);
|
||||
gbc_scrollPane.insets = new Insets(space, space, space, space);
|
||||
|
||||
contentPane.add(scrollPane, gbc_scrollPane);
|
||||
|
||||
// Message enter field
|
||||
messageEnterTextArea = new JTextArea();
|
||||
messageEnterTextArea.addKeyListener(new KeyAdapter() {
|
||||
|
||||
@Override
|
||||
public void keyReleased(KeyEvent e) {
|
||||
|
||||
if (e.getKeyCode() == KeyEvent.VK_ENTER && ((SettingsScreen.enterToSend && e.getModifiersEx() == 0)
|
||||
if (e.getKeyCode() == KeyEvent.VK_ENTER && ((settings.isEnterToSend() && e.getModifiersEx() == 0)
|
||||
|| (e.getModifiersEx() == KeyEvent.CTRL_DOWN_MASK))) {
|
||||
|
||||
postMessage(messageList);
|
||||
@ -133,44 +132,34 @@ public class ChatWindow extends JFrame {
|
||||
});
|
||||
// Checks for changed Message
|
||||
messageEnterTextArea.setWrapStyleWord(true);
|
||||
messageEnterTextArea.setCaretColor(new Color(255, 255, 255));
|
||||
messageEnterTextArea.setForeground(new Color(255, 255, 255));
|
||||
messageEnterTextArea.setBackground(new Color(51, 51, 51));
|
||||
messageEnterTextArea.setLineWrap(true);
|
||||
messageEnterTextArea.setBorder(null);
|
||||
messageEnterTextArea.setFont(new Font("Arial", Font.PLAIN, 17));
|
||||
messageEnterTextArea.setBorder(new EmptyBorder(5, 5, 5, 5));
|
||||
messageEnterTextArea.setBorder(new EmptyBorder(space, space, space, space));
|
||||
|
||||
GridBagConstraints gbc_messageEnterTextfield = new GridBagConstraints();
|
||||
gbc_messageEnterTextfield.fill = GridBagConstraints.BOTH;
|
||||
gbc_messageEnterTextfield.gridx = 1;
|
||||
gbc_messageEnterTextfield.gridy = 2;
|
||||
|
||||
gbc_messageEnterTextfield.insets = new Insets(10, 10, 10, 10);
|
||||
gbc_messageEnterTextfield.insets = new Insets(space, space, space, space);
|
||||
|
||||
contentPane.add(messageEnterTextArea, gbc_messageEnterTextfield);
|
||||
|
||||
// Post Button
|
||||
JButton postButton = new JButton("Post");
|
||||
postButton.setForeground(new Color(255, 255, 255));
|
||||
postButton.setBackground(new Color(102, 51, 153));
|
||||
postButton.setBorderPainted(false);
|
||||
|
||||
GridBagConstraints gbc_moveSelectionPostButton = new GridBagConstraints();
|
||||
|
||||
gbc_moveSelectionPostButton.fill = GridBagConstraints.BOTH;
|
||||
gbc_moveSelectionPostButton.gridx = 2;
|
||||
gbc_moveSelectionPostButton.gridy = 2;
|
||||
|
||||
gbc_moveSelectionPostButton.insets = new Insets(10, 10, 10, 10);
|
||||
gbc_moveSelectionPostButton.insets = new Insets(space, space, space, space);
|
||||
|
||||
postButton.addActionListener((evt) -> { postMessage(messageList); });
|
||||
contentPane.add(postButton, gbc_moveSelectionPostButton);
|
||||
|
||||
// Settings Button
|
||||
JButton settingsButton = new JButton("Settings");
|
||||
settingsButton.setForeground(new Color(255, 255, 255));
|
||||
settingsButton.setBackground(new Color(102, 51, 153));
|
||||
settingsButton.setBorderPainted(false);
|
||||
|
||||
GridBagConstraints gbc_moveSelectionSettingsButton = new GridBagConstraints();
|
||||
@ -179,13 +168,12 @@ public class ChatWindow extends JFrame {
|
||||
gbc_moveSelectionSettingsButton.gridx = 2;
|
||||
gbc_moveSelectionSettingsButton.gridy = 0;
|
||||
|
||||
gbc_moveSelectionSettingsButton.insets = new Insets(10, 10, 10, 10);
|
||||
gbc_moveSelectionSettingsButton.insets = new Insets(space, space, space, space);
|
||||
|
||||
settingsButton.addActionListener((evt) -> {
|
||||
try {
|
||||
SettingsScreen.open(localDB.getUser().getName());
|
||||
} catch (Exception e) {
|
||||
SettingsScreen.open();
|
||||
} catch (Exception e) {
|
||||
System.err.println("An error occured while opening the settings screen: " + e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
@ -193,10 +181,6 @@ public class ChatWindow extends JFrame {
|
||||
contentPane.add(settingsButton, gbc_moveSelectionSettingsButton);
|
||||
|
||||
// Partner name display
|
||||
JTextPane textPane = new JTextPane();
|
||||
textPane.setBackground(new Color(0, 0, 0));
|
||||
textPane.setForeground(new Color(255, 255, 255));
|
||||
|
||||
textPane.setFont(new Font("Arial", Font.PLAIN, 20));
|
||||
|
||||
GridBagConstraints gbc_partnerName = new GridBagConstraints();
|
||||
@ -204,7 +188,7 @@ public class ChatWindow extends JFrame {
|
||||
gbc_partnerName.gridx = 1;
|
||||
gbc_partnerName.gridy = 0;
|
||||
|
||||
gbc_partnerName.insets = new Insets(0, 10, 0, 10);
|
||||
gbc_partnerName.insets = new Insets(space, space, space, space);
|
||||
contentPane.add(textPane, gbc_partnerName);
|
||||
|
||||
userList.setCellRenderer(new UserListRenderer());
|
||||
@ -234,20 +218,18 @@ public class ChatWindow extends JFrame {
|
||||
}
|
||||
});
|
||||
|
||||
userList.setSelectionForeground(new Color(255, 255, 255));
|
||||
userList.setSelectionBackground(new Color(102, 0, 153));
|
||||
userList.setForeground(new Color(255, 255, 255));
|
||||
userList.setBackground(new Color(51, 51, 51));
|
||||
userList.setFont(new Font("Arial", Font.PLAIN, 17));
|
||||
userList.setBorder(new EmptyBorder(5, 5, 5, 5));
|
||||
userList.setBorder(new EmptyBorder(space, space, space, space));
|
||||
|
||||
GridBagConstraints gbc_userList = new GridBagConstraints();
|
||||
gbc_userList.fill = GridBagConstraints.VERTICAL;
|
||||
gbc_userList.gridx = 0;
|
||||
gbc_userList.gridy = 1;
|
||||
gbc_userList.anchor = GridBagConstraints.PAGE_START;
|
||||
gbc_userList.insets = new Insets(0, 0, 10, 0);
|
||||
gbc_userList.insets = new Insets(space, space, space, space);
|
||||
|
||||
changeChatWindowColors();
|
||||
|
||||
contentPane.add(userList, gbc_userList);
|
||||
contentPane.revalidate();
|
||||
|
||||
@ -257,6 +239,46 @@ public class ChatWindow extends JFrame {
|
||||
contentPane.revalidate();
|
||||
}
|
||||
|
||||
/**
|
||||
* Used to immediately reload the ChatWindow when settings were changed.
|
||||
*
|
||||
* @since Envoy v0.1-alpha
|
||||
*/
|
||||
public void changeChatWindowColors() {
|
||||
uiColors.setDisplayMode(settings.isDarkMode());
|
||||
|
||||
// contentPane
|
||||
contentPane.setBackground(uiColors.getBackgroundColor());
|
||||
contentPane.setForeground(uiColors.getTextColor());
|
||||
// messageList
|
||||
messageList.setSelectionForeground(uiColors.getTextColor());
|
||||
messageList.setSelectionBackground(uiColors.getSpecialUseColor());
|
||||
messageList.setForeground(uiColors.getTextColor());
|
||||
messageList.setBackground(uiColors.getUserInteractionColor());
|
||||
// scrollPane
|
||||
scrollPane.setForeground(uiColors.getBackgroundColor());
|
||||
scrollPane.setBackground(uiColors.getUserInteractionColor());
|
||||
// messageEnterTextArea
|
||||
messageEnterTextArea.setCaretColor(uiColors.getTextColor());
|
||||
messageEnterTextArea.setForeground(uiColors.getTextColor());
|
||||
messageEnterTextArea.setBackground(uiColors.getUserInteractionColor());
|
||||
// postButton
|
||||
postButton.setForeground(uiColors.getTextColor());
|
||||
postButton.setBackground(uiColors.getSpecialUseColor());
|
||||
// settingsButton
|
||||
settingsButton.setForeground(uiColors.getTextColor());
|
||||
settingsButton.setBackground(uiColors.getSpecialUseColor());
|
||||
// textPane
|
||||
textPane.setBackground(uiColors.getBackgroundColor());
|
||||
textPane.setForeground(uiColors.getTextColor());
|
||||
// userList
|
||||
userList.setSelectionForeground(uiColors.getTextColor());
|
||||
userList.setSelectionBackground(uiColors.getSpecialUseColor());
|
||||
userList.setForeground(uiColors.getTextColor());
|
||||
userList.setBackground(uiColors.getUserInteractionColor());
|
||||
|
||||
}
|
||||
|
||||
private void postMessage(JList<Message> messageList) {
|
||||
if (!client.hasRecipient()) {
|
||||
JOptionPane.showMessageDialog(this,
|
||||
@ -268,7 +290,7 @@ public class ChatWindow extends JFrame {
|
||||
if (!messageEnterTextArea.getText().isEmpty()) try {
|
||||
|
||||
// Create and send message object
|
||||
final Message message = localDB.createMessage(messageEnterTextArea.getText(), currentChat.getRecipient());
|
||||
final Message message = localDB.createMessage(messageEnterTextArea.getText(), currentChat.getRecipient().getID());
|
||||
localDB.addWaitingMessageToLocalDB(message, currentChat);
|
||||
messageList.setModel(currentChat.getModel());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user