From c6d074b84a74b48e44851bdce05f7a696b057361 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Thu, 26 Mar 2020 20:23:25 +0100
Subject: [PATCH 01/60] Prepare JavaFX integration

* Added JavaFX and FXML dependencies to pom.xml and module-info.java
* Added Startup Application
* Added ChatScene with ChatSceneController
---
 pom.xml                                       | 10 ++++++
 src/main/java/envoy/client/ui/ChatScene.fxml  | 27 +++++++++++++++
 .../envoy/client/ui/ChatSceneController.java  | 30 ++++++++++++++++
 src/main/java/envoy/client/ui/Startup.java    | 34 +++++++++++++++++++
 src/main/java/module-info.java                |  4 +++
 5 files changed, 105 insertions(+)
 create mode 100644 src/main/java/envoy/client/ui/ChatScene.fxml
 create mode 100644 src/main/java/envoy/client/ui/ChatSceneController.java
 create mode 100644 src/main/java/envoy/client/ui/Startup.java

diff --git a/pom.xml b/pom.xml
index 572b5ed..d036d0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,6 +30,16 @@
 			<artifactId>envoy-common</artifactId>
 			<version>develop-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+			<version>11.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-fxml</artifactId>
+			<version>11.0.2</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/envoy/client/ui/ChatScene.fxml b/src/main/java/envoy/client/ui/ChatScene.fxml
new file mode 100644
index 0000000..f98aab5
--- /dev/null
+++ b/src/main/java/envoy/client/ui/ChatScene.fxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<GridPane id="recipientLabel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ChatSceneController">
+	<columnConstraints>
+		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+	</columnConstraints>
+	<rowConstraints>
+		<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+		<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+		<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+	</rowConstraints>
+	<children>
+		<ListView id="userList" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="2" />
+		<Label text="Label" />
+		<Button id="settingsButton" mnemonicParsing="false" text="Settings" GridPane.columnIndex="1" />
+		<ListView id="messageList" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+		<Button id="postButton" mnemonicParsing="false" text="Post" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+	</children>
+</GridPane>
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
new file mode 100644
index 0000000..95cc8d5
--- /dev/null
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -0,0 +1,30 @@
+package envoy.client.ui;
+
+import java.util.logging.Logger;
+
+import envoy.util.EnvoyLog;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>ChatSceneController.java</strong><br>
+ * Created: <strong>26.03.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public class ChatSceneController {
+
+	private static final Logger logger = EnvoyLog.getLogger(ChatSceneController.class);
+
+	@FXML
+	public void postButtonClicked(ActionEvent e) {
+		logger.info("Post Button clicked.");
+	}
+
+	@FXML
+	public void settingsButtonClicked(ActionEvent e) {
+		logger.info("Settings Button clicked.");
+	}
+}
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
new file mode 100644
index 0000000..9179078
--- /dev/null
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -0,0 +1,34 @@
+package envoy.client.ui;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.GridPane;
+import javafx.stage.Stage;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>Startup.java</strong><br>
+ * Created: <strong>26.03.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public final class Startup extends Application {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void start(Stage primaryStage) throws Exception {
+		var	loader		= new FXMLLoader(getClass().getResource("ChatScene.fxml"));
+		var	anchorPane	= loader.<GridPane>load();
+		
+		var chatScene = new Scene(anchorPane);
+		primaryStage.setTitle("Envoy");
+		primaryStage.setScene(chatScene);
+		primaryStage.show();
+	}
+
+	public static void main(String[] args) { launch(args); }
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index d5c969a..fc96e79 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -14,4 +14,8 @@ module envoy {
 	requires transitive java.logging;
 	requires transitive java.naming;
 	requires transitive java.prefs;
+	requires javafx.controls;
+	requires javafx.fxml;
+
+	opens envoy.client.ui to javafx.graphics, javafx.fxml;
 }

From 6e0b95384bdd845afefe2f1040f4458e91d1b621 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Thu, 26 Mar 2020 21:01:42 +0100
Subject: [PATCH 02/60] Set Envoy logo as stage icon

---
 src/main/java/envoy/client/ui/Startup.java          |   2 ++
 src/main/resources/{ => icons}/envoy_logo.png       | Bin
 src/main/resources/{ => icons}/envoy_logo_alpha.png | Bin
 3 files changed, 2 insertions(+)
 rename src/main/resources/{ => icons}/envoy_logo.png (100%)
 rename src/main/resources/{ => icons}/envoy_logo_alpha.png (100%)

diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 9179078..68ecc96 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -3,6 +3,7 @@ package envoy.client.ui;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 
@@ -26,6 +27,7 @@ public final class Startup extends Application {
 		
 		var chatScene = new Scene(anchorPane);
 		primaryStage.setTitle("Envoy");
+		primaryStage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
 		primaryStage.setScene(chatScene);
 		primaryStage.show();
 	}
diff --git a/src/main/resources/envoy_logo.png b/src/main/resources/icons/envoy_logo.png
similarity index 100%
rename from src/main/resources/envoy_logo.png
rename to src/main/resources/icons/envoy_logo.png
diff --git a/src/main/resources/envoy_logo_alpha.png b/src/main/resources/icons/envoy_logo_alpha.png
similarity index 100%
rename from src/main/resources/envoy_logo_alpha.png
rename to src/main/resources/icons/envoy_logo_alpha.png

From 0403729a6325b6d30485f2eeaad7a1c1e734e3ad Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 27 Mar 2020 21:14:49 +0100
Subject: [PATCH 03/60] Started moving Startup contents into the new Startup
 class

---
 src/main/java/envoy/client/Startup.java       | 110 +-------------
 src/main/java/envoy/client/ui/ChatScene.fxml  |   6 +-
 .../envoy/client/ui/ChatSceneController.java  |   2 +-
 src/main/java/envoy/client/ui/Startup.java    | 140 +++++++++++++++++-
 4 files changed, 140 insertions(+), 118 deletions(-)

diff --git a/src/main/java/envoy/client/Startup.java b/src/main/java/envoy/client/Startup.java
index 3e9180c..50ae4af 100644
--- a/src/main/java/envoy/client/Startup.java
+++ b/src/main/java/envoy/client/Startup.java
@@ -1,26 +1,14 @@
 package envoy.client;
 
 import java.awt.EventQueue;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Properties;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
 
-import envoy.client.data.*;
-import envoy.client.net.Client;
-import envoy.client.net.WriteProxy;
+import envoy.client.data.Settings;
 import envoy.client.ui.StatusTrayIcon;
 import envoy.client.ui.container.ChatWindow;
-import envoy.client.ui.container.LoginDialog;
 import envoy.data.Config;
-import envoy.data.Message;
-import envoy.data.User.UserStatus;
 import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 
@@ -38,10 +26,9 @@ import envoy.util.EnvoyLog;
  */
 public class Startup {
 
-	private static ChatWindow chatWindow;
-
 	private static final Logger logger = EnvoyLog.getLogger(Startup.class);
 
+	// TODO: Update Javadoc
 	/**
 	 * Loads the application by first loading the configuration, then acquiring a
 	 * user name and connecting to the server. If the server cannot be reached,
@@ -54,86 +41,6 @@ public class Startup {
 	 * @since Envoy Client v0.1-alpha
 	 */
 	public static void main(String[] args) {
-		ClientConfig config = ClientConfig.getInstance();
-		SwingUtilities.invokeLater(() -> chatWindow = new ChatWindow());
-
-		try {
-			// Load the configuration from client.properties first
-			Properties properties = new Properties();
-			properties.load(Startup.class.getClassLoader().getResourceAsStream("client.properties"));
-			config.load(properties);
-
-			// Override configuration values with command line arguments
-			if (args.length > 0) config.load(args);
-
-			// Check if all mandatory configuration values have been initialized
-			if (!config.isInitialized()) throw new EnvoyException("Configuration is not fully initialized");
-		} catch (Exception e) {
-			JOptionPane.showMessageDialog(null, "Error loading configuration values:\n" + e, "Configuration error", JOptionPane.ERROR_MESSAGE);
-			e.printStackTrace();
-			System.exit(1);
-		}
-
-		// Setup logger for the envoy package
-		EnvoyLog.initialize(config);
-		EnvoyLog.attach("envoy");
-		EnvoyLog.setFileLevelBarrier(config.getFileLevelBarrier());
-		EnvoyLog.setConsoleLevelBarrier(config.getConsoleLevelBarrier());
-
-		// Initialize the local database
-		LocalDB localDB;
-		if (config.isIgnoreLocalDB()) {
-			localDB = new TransientLocalDB();
-			JOptionPane.showMessageDialog(null,
-					"Ignoring local database.\nMessages will not be saved!",
-					"Local database warning",
-					JOptionPane.WARNING_MESSAGE);
-		} else try {
-			localDB = new PersistentLocalDB(new File(config.getHomeDirectory(), config.getLocalDB().getPath()));
-		} catch (IOException e3) {
-			logger.log(Level.SEVERE, "Could not initialize local database", e3);
-			JOptionPane.showMessageDialog(null, "Could not initialize local database!\n" + e3, "Local database error", JOptionPane.ERROR_MESSAGE);
-			System.exit(1);
-			return;
-		}
-
-		// Initialize client and unread message cache
-		Client			client	= new Client();
-		Cache<Message>	cache	= new Cache<>();
-
-		// Try to connect to the server
-		new LoginDialog(client, localDB, cache);
-		SwingUtilities.invokeLater(() -> chatWindow.setVisible(true));
-
-		// Set client user in local database
-		localDB.setUser(client.getSender());
-
-		// Initialize chats in local database
-		try {
-			localDB.initializeUserStorage();
-			localDB.loadUserData();
-		} catch (FileNotFoundException e) {
-			// The local database file has not yet been created, probably first login
-		} catch (Exception e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					"Error while loading local database: " + e + "\nChats will not be stored locally.",
-					"Local DB error",
-					JOptionPane.WARNING_MESSAGE);
-		}
-
-		// Initialize write proxy
-		final WriteProxy writeProxy = client.createWriteProxy(localDB);
-
-		if (client.isOnline()) {
-
-			// Save all users to the local database and flush cache
-			localDB.setUsers(client.getUsers());
-			writeProxy.flushCache();
-		} else
-			// Set all contacts to offline mode
-			localDB.getUsers().values().stream().filter(u -> u != localDB.getUser()).forEach(u -> u.setStatus(UserStatus.OFFLINE));
-
 		// Display ChatWindow and StatusTrayIcon
 		EventQueue.invokeLater(() -> {
 			try {
@@ -160,18 +67,5 @@ public class Startup {
 			}
 		});
 
-		// Save Settings and PersistentLocalDB on shutdown
-		Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-			try {
-				logger.info("Closing connection...");
-				client.close();
-
-				logger.info("Saving local database and settings...");
-				localDB.save();
-				Settings.getInstance().save();
-			} catch (Exception e) {
-				logger.log(Level.SEVERE, "Unable to save local files", e);
-			}
-		}));
 	}
 }
diff --git a/src/main/java/envoy/client/ui/ChatScene.fxml b/src/main/java/envoy/client/ui/ChatScene.fxml
index f98aab5..bbf5504 100644
--- a/src/main/java/envoy/client/ui/ChatScene.fxml
+++ b/src/main/java/envoy/client/ui/ChatScene.fxml
@@ -3,6 +3,7 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
@@ -18,10 +19,11 @@
 		<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
 	</rowConstraints>
 	<children>
-		<ListView id="userList" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="2" />
+		<ListView id="userList" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="1" />
 		<Label text="Label" />
 		<Button id="settingsButton" mnemonicParsing="false" text="Settings" GridPane.columnIndex="1" />
-		<ListView id="messageList" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+		<ListView id="messageList" prefHeight="257.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
 		<Button id="postButton" mnemonicParsing="false" text="Post" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+      <TextArea prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2" />
 	</children>
 </GridPane>
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 95cc8d5..08a044f 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -14,7 +14,7 @@ import javafx.fxml.FXML;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public class ChatSceneController {
+public final class ChatSceneController {
 
 	private static final Logger logger = EnvoyLog.getLogger(ChatSceneController.class);
 
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 68ecc96..8677ed9 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -1,5 +1,22 @@
 package envoy.client.ui;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.swing.JOptionPane;
+
+import envoy.client.data.*;
+import envoy.client.net.Client;
+import envoy.client.net.WriteProxy;
+import envoy.client.ui.container.LoginDialog;
+import envoy.data.Message;
+import envoy.data.User.UserStatus;
+import envoy.exception.EnvoyException;
+import envoy.util.EnvoyLog;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -17,19 +34,128 @@ import javafx.stage.Stage;
  */
 public final class Startup extends Application {
 
+	private LocalDB		localDB;
+	private Client		client;
+	private WriteProxy	writeProxy;
+
+	private static final ClientConfig	config	= ClientConfig.getInstance();
+	private static final Logger			logger	= EnvoyLog.getLogger(Startup.class);
+
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void start(Stage primaryStage) throws Exception {
+	public void init() throws Exception {
+		try {
+			// Load the configuration from client.properties first
+			Properties properties = new Properties();
+			properties.load(Startup.class.getClassLoader().getResourceAsStream("client.properties"));
+			config.load(properties);
+
+			// Override configuration values with command line arguments
+			String[] args = (String[]) getParameters().getRaw().toArray();
+			if (args.length > 0) config.load(args);
+
+			// Check if all mandatory configuration values have been initialized
+			if (!config.isInitialized()) throw new EnvoyException("Configuration is not fully initialized");
+		} catch (Exception e) {
+			JOptionPane.showMessageDialog(null, "Error loading configuration values:\n" + e, "Configuration error", JOptionPane.ERROR_MESSAGE);
+			e.printStackTrace();
+			System.exit(1);
+		}
+
+		// Setup logger for the envoy package
+		EnvoyLog.initialize(config);
+		EnvoyLog.attach("envoy");
+		EnvoyLog.setFileLevelBarrier(config.getFileLevelBarrier());
+		EnvoyLog.setConsoleLevelBarrier(config.getConsoleLevelBarrier());
+
+		// Initialize the local database
+		if (config.isIgnoreLocalDB()) {
+			localDB = new TransientLocalDB();
+			JOptionPane.showMessageDialog(null,
+					"Ignoring local database.\nMessages will not be saved!",
+					"Local database warning",
+					JOptionPane.WARNING_MESSAGE);
+		} else try {
+			localDB = new PersistentLocalDB(new File(config.getHomeDirectory(), config.getLocalDB().getPath()));
+		} catch (IOException e3) {
+			logger.log(Level.SEVERE, "Could not initialize local database", e3);
+			JOptionPane.showMessageDialog(null, "Could not initialize local database!\n" + e3, "Local database error", JOptionPane.ERROR_MESSAGE);
+			System.exit(1);
+			return;
+		}
+
+		// Initialize client and unread message cache
+		Client			client	= new Client();
+		Cache<Message>	cache	= new Cache<>();
+
+		// Try to connect to the server
+		new LoginDialog(client, localDB, cache);
+
+		// Set client user in local database
+		localDB.setUser(client.getSender());
+
+		// Initialize chats in local database
+		try {
+			localDB.initializeUserStorage();
+			localDB.loadUserData();
+		} catch (FileNotFoundException e) {
+			// The local database file has not yet been created, probably first login
+		} catch (Exception e) {
+			e.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					"Error while loading local database: " + e + "\nChats will not be stored locally.",
+					"Local DB error",
+					JOptionPane.WARNING_MESSAGE);
+		}
+
+		// Initialize write proxy
+		writeProxy = client.createWriteProxy(localDB);
+
+		if (client.isOnline()) {
+
+			// Save all users to the local database and flush cache
+			localDB.setUsers(client.getUsers());
+			writeProxy.flushCache();
+		} else
+			// Set all contacts to offline mode
+			localDB.getUsers().values().stream().filter(u -> u != localDB.getUser()).forEach(u -> u.setStatus(UserStatus.OFFLINE));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void start(Stage stage) throws Exception {
+
+		// Prepare stage and load ChatScene
 		var	loader		= new FXMLLoader(getClass().getResource("ChatScene.fxml"));
 		var	anchorPane	= loader.<GridPane>load();
-		
-		var chatScene = new Scene(anchorPane);
-		primaryStage.setTitle("Envoy");
-		primaryStage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
-		primaryStage.setScene(chatScene);
-		primaryStage.show();
+		var	chatScene	= new Scene(anchorPane);
+		stage.setTitle("Envoy");
+		stage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
+		stage.setScene(chatScene);
+		stage.show();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void stop() throws Exception {
+		try {
+
+			// Save Settings and PersistentLocalDB on shutdown
+			logger.info("Closing connection...");
+			client.close();
+
+			logger.info("Saving local database and settings...");
+			localDB.save();
+			Settings.getInstance().save();
+		} catch (Exception e) {
+			logger.log(Level.SEVERE, "Unable to save local files", e);
+		}
 	}
 
 	public static void main(String[] args) { launch(args); }

From a68a01b4553f2d56b8c59e671f5d1e47ef2d8e54 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 28 Mar 2020 10:39:15 +0100
Subject: [PATCH 04/60] Added custom list cells for the user and message list
 views

---
 src/main/java/envoy/client/Startup.java       |  53 +++---
 src/main/java/envoy/client/ui/ChatScene.fxml  |  37 ++--
 .../envoy/client/ui/ChatSceneController.java  |  13 ++
 .../java/envoy/client/ui/MessageListCell.java |  26 +++
 src/main/java/envoy/client/ui/Startup.java    | 169 +++++++++---------
 .../java/envoy/client/ui/UserListCell.java    |  26 +++
 6 files changed, 199 insertions(+), 125 deletions(-)
 create mode 100644 src/main/java/envoy/client/ui/MessageListCell.java
 create mode 100644 src/main/java/envoy/client/ui/UserListCell.java

diff --git a/src/main/java/envoy/client/Startup.java b/src/main/java/envoy/client/Startup.java
index 50ae4af..0633834 100644
--- a/src/main/java/envoy/client/Startup.java
+++ b/src/main/java/envoy/client/Startup.java
@@ -1,15 +1,9 @@
 package envoy.client;
 
-import java.awt.EventQueue;
 import java.util.logging.Logger;
 
-import javax.swing.JFrame;
-
-import envoy.client.data.Settings;
-import envoy.client.ui.StatusTrayIcon;
 import envoy.client.ui.container.ChatWindow;
 import envoy.data.Config;
-import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 
 /**
@@ -42,30 +36,29 @@ public class Startup {
 	 */
 	public static void main(String[] args) {
 		// Display ChatWindow and StatusTrayIcon
-		EventQueue.invokeLater(() -> {
-			try {
-				chatWindow.initContent(client, localDB, writeProxy);
-
-				// Relay unread messages from cache
-				if (cache != null && client.isOnline()) cache.relay();
-
-				try {
-					new StatusTrayIcon(chatWindow).show();
-
-					// If the tray icon is supported and corresponding settings is set, hide the
-					// chat window on close
-					Settings.getInstance()
-						.getItems()
-						.get("onCloseMode")
-						.setChangeHandler((onCloseMode) -> chatWindow
-							.setDefaultCloseOperation((Boolean) onCloseMode ? JFrame.HIDE_ON_CLOSE : JFrame.EXIT_ON_CLOSE));
-				} catch (EnvoyException e) {
-					logger.warning("The StatusTrayIcon is not supported on this platform!");
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		});
+		// EventQueue.invokeLater(() -> {
+		// try {
+		// chatWindow.initContent(client, localDB, writeProxy);
+		//
+		//
+		// try {
+		// new StatusTrayIcon(chatWindow).show();
+		//
+		// // If the tray icon is supported and corresponding settings is set, hide the
+		// // chat window on close
+		// Settings.getInstance()
+		// .getItems()
+		// .get("onCloseMode")
+		// .setChangeHandler((onCloseMode) -> chatWindow
+		// .setDefaultCloseOperation((Boolean) onCloseMode ? JFrame.HIDE_ON_CLOSE :
+		// JFrame.EXIT_ON_CLOSE));
+		// } catch (EnvoyException e) {
+		// logger.warning("The StatusTrayIcon is not supported on this platform!");
+		// }
+		// } catch (Exception e) {
+		// e.printStackTrace();
+		// }
+		// });
 
 	}
 }
diff --git a/src/main/java/envoy/client/ui/ChatScene.fxml b/src/main/java/envoy/client/ui/ChatScene.fxml
index bbf5504..cc8b797 100644
--- a/src/main/java/envoy/client/ui/ChatScene.fxml
+++ b/src/main/java/envoy/client/ui/ChatScene.fxml
@@ -8,22 +8,37 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane id="recipientLabel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ChatSceneController">
+<GridPane id="recipientLabel" maxHeight="-Infinity"
+	maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
+	prefHeight="400.0" prefWidth="600.0"
+	xmlns="http://javafx.com/javafx/11.0.1"
+	xmlns:fx="http://javafx.com/fxml/1"
+	fx:controller="envoy.client.ui.ChatSceneController">
 	<columnConstraints>
-		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+			prefWidth="100.0" />
+		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
+			prefWidth="100.0" />
 	</columnConstraints>
 	<rowConstraints>
-		<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-		<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-		<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+		<RowConstraints minHeight="10.0" prefHeight="30.0"
+			vgrow="SOMETIMES" />
+		<RowConstraints minHeight="10.0" prefHeight="30.0"
+			vgrow="SOMETIMES" />
+		<RowConstraints minHeight="10.0" prefHeight="30.0"
+			vgrow="SOMETIMES" />
 	</rowConstraints>
 	<children>
-		<ListView id="userList" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="1" />
+		<ListView fx:id="userList" prefHeight="211.0" prefWidth="300.0"
+			GridPane.rowIndex="1" />
 		<Label text="Label" />
-		<Button id="settingsButton" mnemonicParsing="false" text="Settings" GridPane.columnIndex="1" />
-		<ListView id="messageList" prefHeight="257.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-		<Button id="postButton" mnemonicParsing="false" text="Post" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-      <TextArea prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2" />
+		<Button id="settingsButton" mnemonicParsing="false"
+			text="Settings" GridPane.columnIndex="1" />
+		<ListView fx:id="messageList" prefHeight="257.0"
+			prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+		<Button id="postButton" mnemonicParsing="false" text="Post"
+			GridPane.columnIndex="1" GridPane.rowIndex="2" />
+		<TextArea prefHeight="200.0" prefWidth="200.0"
+			GridPane.rowIndex="2" />
 	</children>
 </GridPane>
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 08a044f..d809d60 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -5,6 +5,7 @@ import java.util.logging.Logger;
 import envoy.util.EnvoyLog;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.control.ListView;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -16,8 +17,20 @@ import javafx.fxml.FXML;
  */
 public final class ChatSceneController {
 
+	@FXML
+	private ListView messageList;
+
+	@FXML
+	private ListView userList;
+
 	private static final Logger logger = EnvoyLog.getLogger(ChatSceneController.class);
 
+	@FXML
+	public void initialize() {
+		messageList.setCellFactory(listView -> new MessageListCell());
+		userList.setCellFactory(listView -> new UserListCell());
+	}
+
 	@FXML
 	public void postButtonClicked(ActionEvent e) {
 		logger.info("Post Button clicked.");
diff --git a/src/main/java/envoy/client/ui/MessageListCell.java b/src/main/java/envoy/client/ui/MessageListCell.java
new file mode 100644
index 0000000..86d37e2
--- /dev/null
+++ b/src/main/java/envoy/client/ui/MessageListCell.java
@@ -0,0 +1,26 @@
+package envoy.client.ui;
+
+import envoy.data.Message;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
+
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>MessageListCell.java</strong><br>
+ * Created: <strong>28.03.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public class MessageListCell extends ListCell<Message> {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void updateItem(Message message, boolean empty) {
+		super.updateItem(message, empty);
+		if (!empty && message != null) { setGraphic(new Label(message.getText())); }
+	}
+}
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 8677ed9..2f2bbd7 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -1,21 +1,12 @@
 package envoy.client.ui;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.swing.JOptionPane;
-
 import envoy.client.data.*;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
-import envoy.client.ui.container.LoginDialog;
 import envoy.data.Message;
-import envoy.data.User.UserStatus;
-import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -37,6 +28,7 @@ public final class Startup extends Application {
 	private LocalDB		localDB;
 	private Client		client;
 	private WriteProxy	writeProxy;
+	private Cache<Message>	cache;
 
 	private static final ClientConfig	config	= ClientConfig.getInstance();
 	private static final Logger			logger	= EnvoyLog.getLogger(Startup.class);
@@ -46,81 +38,87 @@ public final class Startup extends Application {
 	 */
 	@Override
 	public void init() throws Exception {
-		try {
-			// Load the configuration from client.properties first
-			Properties properties = new Properties();
-			properties.load(Startup.class.getClassLoader().getResourceAsStream("client.properties"));
-			config.load(properties);
-
-			// Override configuration values with command line arguments
-			String[] args = (String[]) getParameters().getRaw().toArray();
-			if (args.length > 0) config.load(args);
-
-			// Check if all mandatory configuration values have been initialized
-			if (!config.isInitialized()) throw new EnvoyException("Configuration is not fully initialized");
-		} catch (Exception e) {
-			JOptionPane.showMessageDialog(null, "Error loading configuration values:\n" + e, "Configuration error", JOptionPane.ERROR_MESSAGE);
-			e.printStackTrace();
-			System.exit(1);
-		}
-
-		// Setup logger for the envoy package
-		EnvoyLog.initialize(config);
-		EnvoyLog.attach("envoy");
-		EnvoyLog.setFileLevelBarrier(config.getFileLevelBarrier());
-		EnvoyLog.setConsoleLevelBarrier(config.getConsoleLevelBarrier());
-
-		// Initialize the local database
-		if (config.isIgnoreLocalDB()) {
-			localDB = new TransientLocalDB();
-			JOptionPane.showMessageDialog(null,
-					"Ignoring local database.\nMessages will not be saved!",
-					"Local database warning",
-					JOptionPane.WARNING_MESSAGE);
-		} else try {
-			localDB = new PersistentLocalDB(new File(config.getHomeDirectory(), config.getLocalDB().getPath()));
-		} catch (IOException e3) {
-			logger.log(Level.SEVERE, "Could not initialize local database", e3);
-			JOptionPane.showMessageDialog(null, "Could not initialize local database!\n" + e3, "Local database error", JOptionPane.ERROR_MESSAGE);
-			System.exit(1);
-			return;
-		}
-
-		// Initialize client and unread message cache
-		Client			client	= new Client();
-		Cache<Message>	cache	= new Cache<>();
-
-		// Try to connect to the server
-		new LoginDialog(client, localDB, cache);
-
-		// Set client user in local database
-		localDB.setUser(client.getSender());
-
-		// Initialize chats in local database
-		try {
-			localDB.initializeUserStorage();
-			localDB.loadUserData();
-		} catch (FileNotFoundException e) {
-			// The local database file has not yet been created, probably first login
-		} catch (Exception e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					"Error while loading local database: " + e + "\nChats will not be stored locally.",
-					"Local DB error",
-					JOptionPane.WARNING_MESSAGE);
-		}
-
-		// Initialize write proxy
-		writeProxy = client.createWriteProxy(localDB);
-
-		if (client.isOnline()) {
-
-			// Save all users to the local database and flush cache
-			localDB.setUsers(client.getUsers());
-			writeProxy.flushCache();
-		} else
-			// Set all contacts to offline mode
-			localDB.getUsers().values().stream().filter(u -> u != localDB.getUser()).forEach(u -> u.setStatus(UserStatus.OFFLINE));
+		// try {
+		// // Load the configuration from client.properties first
+		// Properties properties = new Properties();
+		// properties.load(Startup.class.getClassLoader().getResourceAsStream("client.properties"));
+		// config.load(properties);
+		//
+		// // Override configuration values with command line arguments
+		// String[] args = getParameters().getRaw().toArray(new String[0]);
+		// if (args.length > 0) config.load(args);
+		//
+		// // Check if all mandatory configuration values have been initialized
+		// if (!config.isInitialized()) throw new EnvoyException("Configuration is not
+		// fully initialized");
+		// } catch (Exception e) {
+		// JOptionPane.showMessageDialog(null, "Error loading configuration values:\n" +
+		// e, "Configuration error", JOptionPane.ERROR_MESSAGE);
+		// e.printStackTrace();
+		// System.exit(1);
+		// }
+		//
+		// // Setup logger for the envoy package
+		// EnvoyLog.initialize(config);
+		// EnvoyLog.attach("envoy");
+		// EnvoyLog.setFileLevelBarrier(config.getFileLevelBarrier());
+		// EnvoyLog.setConsoleLevelBarrier(config.getConsoleLevelBarrier());
+		//
+		// // Initialize the local database
+		// if (config.isIgnoreLocalDB()) {
+		// localDB = new TransientLocalDB();
+		// JOptionPane.showMessageDialog(null,
+		// "Ignoring local database.\nMessages will not be saved!",
+		// "Local database warning",
+		// JOptionPane.WARNING_MESSAGE);
+		// } else try {
+		// localDB = new PersistentLocalDB(new File(config.getHomeDirectory(),
+		// config.getLocalDB().getPath()));
+		// } catch (IOException e3) {
+		// logger.log(Level.SEVERE, "Could not initialize local database", e3);
+		// JOptionPane.showMessageDialog(null, "Could not initialize local database!\n"
+		// + e3, "Local database error", JOptionPane.ERROR_MESSAGE);
+		// System.exit(1);
+		// return;
+		// }
+		//
+		// // Initialize client and unread message cache
+		// client = new Client();
+		// cache = new Cache<>();
+		//
+		// // Try to connect to the server
+		// new LoginDialog(client, localDB, cache);
+		//
+		// // Set client user in local database
+		// localDB.setUser(client.getSender());
+		//
+		// // Initialize chats in local database
+		// try {
+		// localDB.initializeUserStorage();
+		// localDB.loadUserData();
+		// } catch (FileNotFoundException e) {
+		// // The local database file has not yet been created, probably first login
+		// } catch (Exception e) {
+		// e.printStackTrace();
+		// JOptionPane.showMessageDialog(null,
+		// "Error while loading local database: " + e + "\nChats will not be stored
+		// locally.",
+		// "Local DB error",
+		// JOptionPane.WARNING_MESSAGE);
+		// }
+		//
+		// // Initialize write proxy
+		// writeProxy = client.createWriteProxy(localDB);
+		//
+		// if (client.isOnline()) {
+		//
+		// // Save all users to the local database and flush cache
+		// localDB.setUsers(client.getUsers());
+		// writeProxy.flushCache();
+		// } else
+		// // Set all contacts to offline mode
+		// localDB.getUsers().values().stream().filter(u -> u !=
+		// localDB.getUser()).forEach(u -> u.setStatus(UserStatus.OFFLINE));
 	}
 
 	/**
@@ -137,6 +135,9 @@ public final class Startup extends Application {
 		stage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
 		stage.setScene(chatScene);
 		stage.show();
+
+		// Relay unread messages from cache
+		if (cache != null && client.isOnline()) cache.relay();
 	}
 
 	/**
diff --git a/src/main/java/envoy/client/ui/UserListCell.java b/src/main/java/envoy/client/ui/UserListCell.java
new file mode 100644
index 0000000..fa35ce9
--- /dev/null
+++ b/src/main/java/envoy/client/ui/UserListCell.java
@@ -0,0 +1,26 @@
+package envoy.client.ui;
+
+import envoy.data.User;
+import javafx.scene.control.ListCell;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>UserListCell.java</strong><br>
+ * Created: <strong>28.03.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public class UserListCell extends ListCell<User> {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected void updateItem(User user, boolean empty) {
+		super.updateItem(user, empty);
+		if (!empty && user != null) {
+
+		}
+	}
+}

From bd0da338a7430e992a05e8af15c4bdd616ffb979 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 28 Mar 2020 15:32:24 +0100
Subject: [PATCH 05/60] Added user and message loading and message posting

---
 src/main/java/envoy/client/data/Chat.java     |  29 ++-
 src/main/java/envoy/client/data/LocalDB.java  |   2 +-
 src/main/java/envoy/client/ui/ChatScene.fxml  |  22 ++-
 .../envoy/client/ui/ChatSceneController.java  | 126 ++++++++++++-
 .../java/envoy/client/ui/MessageListCell.java |   3 +-
 src/main/java/envoy/client/ui/Startup.java    | 173 +++++++++---------
 .../java/envoy/client/ui/UserListCell.java    |   6 +-
 .../envoy/client/ui/container/ChatWindow.java |  30 +--
 8 files changed, 252 insertions(+), 139 deletions(-)

diff --git a/src/main/java/envoy/client/data/Chat.java b/src/main/java/envoy/client/data/Chat.java
index 162b256..6f0715c 100644
--- a/src/main/java/envoy/client/data/Chat.java
+++ b/src/main/java/envoy/client/data/Chat.java
@@ -2,9 +2,10 @@ package envoy.client.data;
 
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 import envoy.client.net.WriteProxy;
-import envoy.client.ui.list.Model;
 import envoy.data.Message;
 import envoy.data.Message.MessageStatus;
 import envoy.data.User;
@@ -23,12 +24,12 @@ import envoy.event.MessageStatusChangeEvent;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-alpha
  */
-public class Chat implements Serializable {
+public final class Chat implements Serializable {
 
-	private static final long serialVersionUID = 0L;
+	private final User			recipient;
+	private final List<Message>	messages	= new ArrayList<>();
 
-	private final User				recipient;
-	private final Model<Message>	model	= new Model<>();
+	private static final long serialVersionUID = 1L;
 
 	/**
 	 * Provides the list of messages that the recipient receives.<br>
@@ -39,14 +40,6 @@ public class Chat implements Serializable {
 	 */
 	public Chat(User recipient) { this.recipient = recipient; }
 
-	/**
-	 * Appends a message to the bottom of this chat
-	 *
-	 * @param message the message to append
-	 * @since Envoy Client v0.1-alpha
-	 */
-	public void appendMessage(Message message) { model.add(message); }
-
 	/**
 	 * Sets the status of all chat messages received from the recipient to
 	 * {@code READ} starting from the bottom and stopping once a read message is
@@ -59,8 +52,8 @@ public class Chat implements Serializable {
 	 * @since Envoy Client v0.3-alpha
 	 */
 	public void read(WriteProxy writeProxy) throws IOException {
-		for (int i = model.size() - 1; i >= 0; --i) {
-			final Message m = model.get(i);
+		for (int i = messages.size() - 1; i >= 0; --i) {
+			final Message m = messages.get(i);
 			if (m.getSenderID() == recipient.getID()) if (m.getStatus() == MessageStatus.READ) break;
 			else {
 				m.setStatus(MessageStatus.READ);
@@ -74,13 +67,13 @@ public class Chat implements Serializable {
 	 *         the status {@code READ}
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public boolean isUnread() { return !model.isEmpty() && model.get(model.size() - 1).getStatus() != MessageStatus.READ; }
+	public boolean isUnread() { return !messages.isEmpty() && messages.get(messages.size() - 1).getStatus() != MessageStatus.READ; }
 
 	/**
 	 * @return all messages in the current chat
-	 * @since Envoy Client v0.1-alpha
+	 * @since Envoy Client v0.1-beta
 	 */
-	public Model<Message> getModel() { return model; }
+	public List<Message> getMessages() { return messages; }
 
 	/**
 	 * @return the recipient of a message
diff --git a/src/main/java/envoy/client/data/LocalDB.java b/src/main/java/envoy/client/data/LocalDB.java
index 0980289..1e36307 100644
--- a/src/main/java/envoy/client/data/LocalDB.java
+++ b/src/main/java/envoy/client/data/LocalDB.java
@@ -154,7 +154,7 @@ public abstract class LocalDB {
 	 */
 	public Message getMessage(long id) {
 		for (Chat c : chats)
-			for (Message m : c.getModel())
+			for (Message m : c.getMessages())
 				if (m.getID() == id) return m;
 		return null;
 	}
diff --git a/src/main/java/envoy/client/ui/ChatScene.fxml b/src/main/java/envoy/client/ui/ChatScene.fxml
index cc8b797..43af60d 100644
--- a/src/main/java/envoy/client/ui/ChatScene.fxml
+++ b/src/main/java/envoy/client/ui/ChatScene.fxml
@@ -29,16 +29,20 @@
 			vgrow="SOMETIMES" />
 	</rowConstraints>
 	<children>
-		<ListView fx:id="userList" prefHeight="211.0" prefWidth="300.0"
-			GridPane.rowIndex="1" />
-		<Label text="Label" />
-		<Button id="settingsButton" mnemonicParsing="false"
-			text="Settings" GridPane.columnIndex="1" />
+		<ListView fx:id="userList" prefHeight="211.0"
+			prefWidth="300.0" GridPane.rowIndex="1"
+			onMouseClicked="#userListClicked" />
+		<Label text="Select a contact to chat with" fx:id="contactLabel" />
+		<Button fx:id="settingsButton" mnemonicParsing="false"
+			text="Settings" GridPane.columnIndex="1"
+			onAction="#settingsButtonClicked" />
 		<ListView fx:id="messageList" prefHeight="257.0"
 			prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-		<Button id="postButton" mnemonicParsing="false" text="Post"
-			GridPane.columnIndex="1" GridPane.rowIndex="2" />
-		<TextArea prefHeight="200.0" prefWidth="200.0"
-			GridPane.rowIndex="2" />
+		<Button fx:id="postButton" mnemonicParsing="false" text="Post"
+			GridPane.columnIndex="1" GridPane.rowIndex="2"
+			onAction="#postButtonClicked" disable="true" />
+		<TextArea fx:id="messageTextArea" prefHeight="200.0"
+			prefWidth="200.0" GridPane.rowIndex="2"
+			onKeyReleased="#messageTextUpdated" />
 	</children>
 </GridPane>
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index d809d60..cff16bf 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -1,11 +1,22 @@
 package envoy.client.ui;
 
+import java.io.IOException;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import envoy.client.data.Chat;
+import envoy.client.data.LocalDB;
+import envoy.client.net.Client;
+import envoy.client.net.WriteProxy;
+import envoy.data.Message;
+import envoy.data.MessageBuilder;
+import envoy.data.User;
 import envoy.util.EnvoyLog;
-import javafx.event.ActionEvent;
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.scene.control.ListView;
+import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -18,26 +29,121 @@ import javafx.scene.control.ListView;
 public final class ChatSceneController {
 
 	@FXML
-	private ListView messageList;
+	private Label contactLabel;
 
 	@FXML
-	private ListView userList;
+	private ListView<Message> messageList;
+
+	@FXML
+	private ListView<User> userList;
+
+	@FXML
+	private Button postButton;
+
+	@FXML
+	private Button settingsButton;
+
+	@FXML
+	private TextArea messageTextArea;
+
+	private LocalDB		localDB;
+	private Client		client;
+	private WriteProxy	writeProxy;
+
+	private Chat currentChat;
 
 	private static final Logger logger = EnvoyLog.getLogger(ChatSceneController.class);
 
 	@FXML
-	public void initialize() {
+	private void initialize() {
 		messageList.setCellFactory(listView -> new MessageListCell());
 		userList.setCellFactory(listView -> new UserListCell());
 	}
 
-	@FXML
-	public void postButtonClicked(ActionEvent e) {
-		logger.info("Post Button clicked.");
+	void initializeData(LocalDB localDB, Client client, WriteProxy writeProxy) {
+		this.localDB	= localDB;
+		this.client		= client;
+		this.writeProxy	= writeProxy;
+
+		// TODO: handle offline mode
+		userList.getItems().addAll(client.getContacts().getContacts());
+		// userList.getItems().addAll(localDB.getChats().stream().map(Chat::getRecipient).collect(Collectors.toList()));
 	}
 
 	@FXML
-	public void settingsButtonClicked(ActionEvent e) {
-		logger.info("Settings Button clicked.");
+	private void userListClicked() {
+		final User user = userList.getSelectionModel().getSelectedItem();
+		if (user != null && (currentChat == null || user != currentChat.getRecipient())) {
+			contactLabel.setText(user.getName());
+
+			// Swap observable list
+			if (currentChat != null) {
+				currentChat.getMessages().clear();
+				currentChat.getMessages().addAll(messageList.getItems());
+			}
+
+			// LEON: JFC <===> JAVA FRIED CHICKEN <=/=> Java Foundation Classes
+
+			// Load the chat or create a new one and add it to the LocalDB
+			currentChat = localDB.getChats()
+				.stream()
+				.filter(c -> c.getRecipient() == user)
+				.findAny()
+				.orElseGet(() -> { var chat = new Chat(user); localDB.getChats().add(chat); return chat; });
+			messageList.setItems(FXCollections.observableArrayList(currentChat.getMessages()));
+		}
+	}
+
+	@FXML
+	private void postButtonClicked() { postMessage(); }
+
+	@FXML
+	private void settingsButtonClicked() { logger.info("Settings Button clicked."); }
+
+	@FXML
+	private void messageTextUpdated(KeyEvent e) {
+		if (e.getCode() == KeyCode.ENTER) postMessage();
+		else postButton.setDisable(messageTextArea.getText().isBlank());
+	}
+
+	/**
+	 * Sends a new message to the server based on the text entered in the
+	 * messageTextArea.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
+	private void postMessage() {
+
+		// Create and send message
+		sendMessage(new MessageBuilder(localDB.getUser().getID(), currentChat.getRecipient().getID(), localDB.getIDGenerator())
+			.setText(messageTextArea.getText().strip())
+			.build());
+
+		// Clear text field and disable post button
+		messageTextArea.setText("");
+		postButton.setDisable(true);
+	}
+
+	/**
+	 * Sends a message to the server.
+	 *
+	 * @param message the message to send
+	 * @since Envoy Client v0.1-beta
+	 */
+	private void sendMessage(Message message) {
+		try {
+
+			// Send message
+			writeProxy.writeMessage(message);
+
+			// Add message to LocalDB and update UI
+			messageList.getItems().add(message);
+
+			// Request a new ID generator if all IDs were used
+			if (!localDB.getIDGenerator().hasNext()) client.requestIdGenerator();
+
+		} catch (IOException e) {
+			logger.log(Level.SEVERE, "Error sending message", e);
+		}
 	}
 }
diff --git a/src/main/java/envoy/client/ui/MessageListCell.java b/src/main/java/envoy/client/ui/MessageListCell.java
index 86d37e2..21c216d 100644
--- a/src/main/java/envoy/client/ui/MessageListCell.java
+++ b/src/main/java/envoy/client/ui/MessageListCell.java
@@ -21,6 +21,7 @@ public class MessageListCell extends ListCell<Message> {
 	@Override
 	protected void updateItem(Message message, boolean empty) {
 		super.updateItem(message, empty);
-		if (!empty && message != null) { setGraphic(new Label(message.getText())); }
+		if (!empty && message != null) setGraphic(new Label(message.getText()));
+		else setGraphic(null);
 	}
 }
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 2f2bbd7..c392281 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -1,12 +1,21 @@
 package envoy.client.ui;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javax.swing.JOptionPane;
+
 import envoy.client.data.*;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
+import envoy.client.ui.container.LoginDialog;
 import envoy.data.Message;
+import envoy.data.User.UserStatus;
+import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -25,9 +34,9 @@ import javafx.stage.Stage;
  */
 public final class Startup extends Application {
 
-	private LocalDB		localDB;
-	private Client		client;
-	private WriteProxy	writeProxy;
+	private LocalDB			localDB;
+	private Client			client;
+	private WriteProxy		writeProxy;
 	private Cache<Message>	cache;
 
 	private static final ClientConfig	config	= ClientConfig.getInstance();
@@ -38,87 +47,81 @@ public final class Startup extends Application {
 	 */
 	@Override
 	public void init() throws Exception {
-		// try {
-		// // Load the configuration from client.properties first
-		// Properties properties = new Properties();
-		// properties.load(Startup.class.getClassLoader().getResourceAsStream("client.properties"));
-		// config.load(properties);
-		//
-		// // Override configuration values with command line arguments
-		// String[] args = getParameters().getRaw().toArray(new String[0]);
-		// if (args.length > 0) config.load(args);
-		//
-		// // Check if all mandatory configuration values have been initialized
-		// if (!config.isInitialized()) throw new EnvoyException("Configuration is not
-		// fully initialized");
-		// } catch (Exception e) {
-		// JOptionPane.showMessageDialog(null, "Error loading configuration values:\n" +
-		// e, "Configuration error", JOptionPane.ERROR_MESSAGE);
-		// e.printStackTrace();
-		// System.exit(1);
-		// }
-		//
-		// // Setup logger for the envoy package
-		// EnvoyLog.initialize(config);
-		// EnvoyLog.attach("envoy");
-		// EnvoyLog.setFileLevelBarrier(config.getFileLevelBarrier());
-		// EnvoyLog.setConsoleLevelBarrier(config.getConsoleLevelBarrier());
-		//
-		// // Initialize the local database
-		// if (config.isIgnoreLocalDB()) {
-		// localDB = new TransientLocalDB();
-		// JOptionPane.showMessageDialog(null,
-		// "Ignoring local database.\nMessages will not be saved!",
-		// "Local database warning",
-		// JOptionPane.WARNING_MESSAGE);
-		// } else try {
-		// localDB = new PersistentLocalDB(new File(config.getHomeDirectory(),
-		// config.getLocalDB().getPath()));
-		// } catch (IOException e3) {
-		// logger.log(Level.SEVERE, "Could not initialize local database", e3);
-		// JOptionPane.showMessageDialog(null, "Could not initialize local database!\n"
-		// + e3, "Local database error", JOptionPane.ERROR_MESSAGE);
-		// System.exit(1);
-		// return;
-		// }
-		//
-		// // Initialize client and unread message cache
-		// client = new Client();
-		// cache = new Cache<>();
-		//
-		// // Try to connect to the server
-		// new LoginDialog(client, localDB, cache);
-		//
-		// // Set client user in local database
-		// localDB.setUser(client.getSender());
-		//
-		// // Initialize chats in local database
-		// try {
-		// localDB.initializeUserStorage();
-		// localDB.loadUserData();
-		// } catch (FileNotFoundException e) {
-		// // The local database file has not yet been created, probably first login
-		// } catch (Exception e) {
-		// e.printStackTrace();
-		// JOptionPane.showMessageDialog(null,
-		// "Error while loading local database: " + e + "\nChats will not be stored
-		// locally.",
-		// "Local DB error",
-		// JOptionPane.WARNING_MESSAGE);
-		// }
-		//
-		// // Initialize write proxy
-		// writeProxy = client.createWriteProxy(localDB);
-		//
-		// if (client.isOnline()) {
-		//
-		// // Save all users to the local database and flush cache
-		// localDB.setUsers(client.getUsers());
-		// writeProxy.flushCache();
-		// } else
-		// // Set all contacts to offline mode
-		// localDB.getUsers().values().stream().filter(u -> u !=
-		// localDB.getUser()).forEach(u -> u.setStatus(UserStatus.OFFLINE));
+		try {
+			// Load the configuration from client.properties first
+			Properties properties = new Properties();
+			properties.load(Startup.class.getClassLoader().getResourceAsStream("client.properties"));
+			config.load(properties);
+
+			// Override configuration values with command line arguments
+			String[] args = getParameters().getRaw().toArray(new String[0]);
+			if (args.length > 0) config.load(args);
+
+			// Check if all mandatory configuration values have been initialized
+			if (!config.isInitialized()) throw new EnvoyException("Configuration is not fully initialized");
+		} catch (Exception e) {
+			JOptionPane.showMessageDialog(null, "Error loading configuration values:\n" + e, "Configuration error", JOptionPane.ERROR_MESSAGE);
+			e.printStackTrace();
+			System.exit(1);
+		}
+
+		// Setup logger for the envoy package
+		EnvoyLog.initialize(config);
+		EnvoyLog.attach("envoy");
+		EnvoyLog.setFileLevelBarrier(config.getFileLevelBarrier());
+		EnvoyLog.setConsoleLevelBarrier(config.getConsoleLevelBarrier());
+
+		// Initialize the local database
+		if (config.isIgnoreLocalDB()) {
+			localDB = new TransientLocalDB();
+			JOptionPane.showMessageDialog(null,
+					"Ignoring local database.\nMessages will not be saved!",
+					"Local database warning",
+					JOptionPane.WARNING_MESSAGE);
+		} else try {
+			localDB = new PersistentLocalDB(new File(config.getHomeDirectory(), config.getLocalDB().getPath()));
+		} catch (IOException e3) {
+			logger.log(Level.SEVERE, "Could not initialize local database", e3);
+			JOptionPane.showMessageDialog(null, "Could not initialize local database!\n" + e3, "Local database error", JOptionPane.ERROR_MESSAGE);
+			System.exit(1);
+			return;
+		}
+
+		// Initialize client and unread message cache
+		client	= new Client();
+		cache	= new Cache<>();
+
+		// Try to connect to the server
+		new LoginDialog(client, localDB, cache);
+
+		// Set client user in local database
+		localDB.setUser(client.getSender());
+
+		// Initialize chats in local database
+		try {
+			localDB.initializeUserStorage();
+			localDB.loadUserData();
+		} catch (FileNotFoundException e) {
+			// The local database file has not yet been created, probably first login
+		} catch (Exception e) {
+			e.printStackTrace();
+			JOptionPane.showMessageDialog(null,
+					"Error while loading local database: " + e + "\nChats will not be stored locally.",
+					"Local DB error",
+					JOptionPane.WARNING_MESSAGE);
+		}
+
+		// Initialize write proxy
+		writeProxy = client.createWriteProxy(localDB);
+
+		if (client.isOnline()) {
+
+			// Save all users to the local database and flush cache
+			localDB.setUsers(client.getUsers());
+			writeProxy.flushCache();
+		} else
+			// Set all contacts to offline mode
+			localDB.getUsers().values().stream().filter(u -> u != localDB.getUser()).forEach(u -> u.setStatus(UserStatus.OFFLINE));
 	}
 
 	/**
@@ -134,6 +137,8 @@ public final class Startup extends Application {
 		stage.setTitle("Envoy");
 		stage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
 		stage.setScene(chatScene);
+
+		loader.<ChatSceneController>getController().initializeData(localDB, client, writeProxy);
 		stage.show();
 
 		// Relay unread messages from cache
diff --git a/src/main/java/envoy/client/ui/UserListCell.java b/src/main/java/envoy/client/ui/UserListCell.java
index fa35ce9..f62f98a 100644
--- a/src/main/java/envoy/client/ui/UserListCell.java
+++ b/src/main/java/envoy/client/ui/UserListCell.java
@@ -1,7 +1,9 @@
 package envoy.client.ui;
 
 import envoy.data.User;
+import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
+import javafx.scene.layout.VBox;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -20,7 +22,9 @@ public class UserListCell extends ListCell<User> {
 	protected void updateItem(User user, boolean empty) {
 		super.updateItem(user, empty);
 		if (!empty && user != null) {
-
+			final Label	name	= new Label(user.getName());
+			final Label	status	= new Label(user.getStatus().toString());
+			setGraphic(new VBox(name, status));
 		}
 	}
 }
diff --git a/src/main/java/envoy/client/ui/container/ChatWindow.java b/src/main/java/envoy/client/ui/container/ChatWindow.java
index e3dfd47..eb92fc4 100644
--- a/src/main/java/envoy/client/ui/container/ChatWindow.java
+++ b/src/main/java/envoy/client/ui/container/ChatWindow.java
@@ -259,7 +259,7 @@ public class ChatWindow extends JFrame {
 					textPane.setText(currentChat.getRecipient().getName());
 
 					// Update model and scroll down
-					messageList.setModel(currentChat.getModel());
+					// messageList.setModel(currentChat.getModel());
 					scrollPane.setChatOpened(true);
 
 					messageList.synchronizeModel();
@@ -413,7 +413,7 @@ public class ChatWindow extends JFrame {
 		EventBus.getInstance().register(MessageCreationEvent.class, evt -> {
 			Message	message	= evt.get();
 			Chat	chat	= localDB.getChats().stream().filter(c -> c.getRecipient().getID() == message.getSenderID()).findFirst().get();
-			chat.appendMessage(message);
+			// chat.appendMessage(message);
 
 			// Read message and update UI if in current chat
 			if (chat == currentChat) readCurrentChat();
@@ -428,18 +428,18 @@ public class ChatWindow extends JFrame {
 			final MessageStatus	status	= evt.get();
 
 			for (Chat c : localDB.getChats())
-				for (Message m : c.getModel())
-					if (m.getID() == id) {
-
-						// Update message status
-						m.setStatus(status);
-
-						// Update model and scroll down if current chat
-						if (c == currentChat) {
-							messageList.setModel(currentChat.getModel());
-							scrollPane.setChatOpened(true);
-						} else messageList.synchronizeModel();
-					}
+				// for (Message m : c.getModel())
+				// if (m.getID() == id) {
+				//
+				// // Update message status
+				// m.setStatus(status);
+				//
+				// // Update model and scroll down if current chat
+				// if (c == currentChat) {
+				// messageList.setModel(currentChat.getModel());
+				// scrollPane.setChatOpened(true);
+				// } else messageList.synchronizeModel();
+				// }
 
 			revalidate();
 			repaint();
@@ -584,7 +584,7 @@ public class ChatWindow extends JFrame {
 			writeProxy.writeMessage(message);
 
 			// Add message to PersistentLocalDB and update UI
-			currentChat.appendMessage(message);
+			// currentChat.appendMessage(message);
 
 			// Update UI
 			revalidate();

From 67433275bde96649b67710b90d2ef1ccc4b57529 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sun, 29 Mar 2020 09:16:29 +0200
Subject: [PATCH 06/60] Fixed chat loading from LocalDB into messagList

---
 src/main/java/envoy/client/data/Chat.java              |  3 +++
 src/main/java/envoy/client/ui/ChatSceneController.java | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/envoy/client/data/Chat.java b/src/main/java/envoy/client/data/Chat.java
index 6f0715c..839daa7 100644
--- a/src/main/java/envoy/client/data/Chat.java
+++ b/src/main/java/envoy/client/data/Chat.java
@@ -40,6 +40,9 @@ public final class Chat implements Serializable {
 	 */
 	public Chat(User recipient) { this.recipient = recipient; }
 
+	@Override
+	public String toString() { return String.format("Chat[recipient=%s,messages=%d]", recipient, messages.size()); }
+
 	/**
 	 * Sets the status of all chat messages received from the recipient to
 	 * {@code READ} starting from the bottom and stopping once a read message is
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index cff16bf..588f407 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -73,7 +73,7 @@ public final class ChatSceneController {
 	@FXML
 	private void userListClicked() {
 		final User user = userList.getSelectionModel().getSelectedItem();
-		if (user != null && (currentChat == null || user != currentChat.getRecipient())) {
+		if (user != null && (currentChat == null || user.getID() != currentChat.getRecipient().getID())) {
 			contactLabel.setText(user.getName());
 
 			// Swap observable list
@@ -87,7 +87,8 @@ public final class ChatSceneController {
 			// Load the chat or create a new one and add it to the LocalDB
 			currentChat = localDB.getChats()
 				.stream()
-				.filter(c -> c.getRecipient() == user)
+				.filter(c -> c.getRecipient().getID() == user
+					.getID())
 				.findAny()
 				.orElseGet(() -> { var chat = new Chat(user); localDB.getChats().add(chat); return chat; });
 			messageList.setItems(FXCollections.observableArrayList(currentChat.getMessages()));
@@ -125,7 +126,8 @@ public final class ChatSceneController {
 	}
 
 	/**
-	 * Sends a message to the server.
+	 * Sends a message to the server and appends it to the current chat. If all
+	 * message IDs have been used, a new ID generator is requested.
 	 *
 	 * @param message the message to send
 	 * @since Envoy Client v0.1-beta
@@ -140,7 +142,7 @@ public final class ChatSceneController {
 			messageList.getItems().add(message);
 
 			// Request a new ID generator if all IDs were used
-			if (!localDB.getIDGenerator().hasNext()) client.requestIdGenerator();
+			if (!localDB.getIDGenerator().hasNext() && client.isOnline()) client.requestIdGenerator();
 
 		} catch (IOException e) {
 			logger.log(Level.SEVERE, "Error sending message", e);

From a29608c627b79c660ad75fa6495b2ed39c021c01 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sun, 29 Mar 2020 22:15:05 +0200
Subject: [PATCH 07/60] Copied event listeners from ChatWindow to
 ChatSceneController

---
 src/main/java/envoy/client/data/LocalDB.java  |  5 +--
 .../envoy/client/ui/ChatSceneController.java  | 34 +++++++++++++++++--
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/main/java/envoy/client/data/LocalDB.java b/src/main/java/envoy/client/data/LocalDB.java
index 1e36307..7de7383 100644
--- a/src/main/java/envoy/client/data/LocalDB.java
+++ b/src/main/java/envoy/client/data/LocalDB.java
@@ -153,9 +153,6 @@ public abstract class LocalDB {
 	 * @since Envoy Client v0.1-beta
 	 */
 	public Message getMessage(long id) {
-		for (Chat c : chats)
-			for (Message m : c.getMessages())
-				if (m.getID() == id) return m;
-		return null;
+		return chats.stream().map(Chat::getMessages).flatMap(List::stream).filter(m -> m.getID() == id).findAny().orElse(null);
 	}
 }
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 588f407..805f9f7 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -6,11 +6,15 @@ import java.util.logging.Logger;
 
 import envoy.client.data.Chat;
 import envoy.client.data.LocalDB;
+import envoy.client.event.MessageCreationEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
 import envoy.data.Message;
 import envoy.data.MessageBuilder;
 import envoy.data.User;
+import envoy.event.EventBus;
+import envoy.event.MessageStatusChangeEvent;
+import envoy.event.UserStatusChangeEvent;
 import envoy.util.EnvoyLog;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
@@ -52,12 +56,37 @@ public final class ChatSceneController {
 
 	private Chat currentChat;
 
-	private static final Logger logger = EnvoyLog.getLogger(ChatSceneController.class);
+	private static final EventBus	eventBus	= EventBus.getInstance();
+	private static final Logger		logger		= EnvoyLog.getLogger(ChatSceneController.class);
 
 	@FXML
 	private void initialize() {
+
+		// Initialize message and user rendering
 		messageList.setCellFactory(listView -> new MessageListCell());
 		userList.setCellFactory(listView -> new UserListCell());
+
+		// Listen to received messages
+		eventBus.register(MessageCreationEvent.class, e -> {
+			final var	message	= e.get();
+			final var	chat	= localDB.getChats().stream().filter(c -> c.getRecipient().getID() == message.getSenderID()).findAny().get();
+			chat.getMessages().add(message);
+
+			// Update UI if in current chat
+			if (chat == currentChat) messageList.getItems().add(message);
+		});
+
+		// Listen to message status changes
+		eventBus.register(MessageStatusChangeEvent.class, e -> {
+			final var message = localDB.getMessage(e.getID());
+			message.setStatus(e.get());
+
+			// Update UI if in current chat
+			if (currentChat != null && message.getSenderID() == currentChat.getRecipient().getID()) messageList.refresh();
+		});
+
+		// Listen to user status changes
+		eventBus.register(UserStatusChangeEvent.class, e -> userList.refresh());
 	}
 
 	void initializeData(LocalDB localDB, Client client, WriteProxy writeProxy) {
@@ -87,8 +116,7 @@ public final class ChatSceneController {
 			// Load the chat or create a new one and add it to the LocalDB
 			currentChat = localDB.getChats()
 				.stream()
-				.filter(c -> c.getRecipient().getID() == user
-					.getID())
+				.filter(c -> c.getRecipient().getID() == user.getID())
 				.findAny()
 				.orElseGet(() -> { var chat = new Chat(user); localDB.getChats().add(chat); return chat; });
 			messageList.setItems(FXCollections.observableArrayList(currentChat.getMessages()));

From b5fd690f430142f59aab38c1138f4427ce3bc818 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Mon, 30 Mar 2020 21:27:07 +0200
Subject: [PATCH 08/60] Wrapping data into ObservableList instances instead of
 copying it

---
 .../java/envoy/client/ui/ChatSceneController.java     | 11 +++--------
 src/main/java/module-info.java                        |  1 +
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 805f9f7..1b68322 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -95,7 +95,7 @@ public final class ChatSceneController {
 		this.writeProxy	= writeProxy;
 
 		// TODO: handle offline mode
-		userList.getItems().addAll(client.getContacts().getContacts());
+		userList.setItems(FXCollections.observableList(client.getContacts().getContacts()));
 		// userList.getItems().addAll(localDB.getChats().stream().map(Chat::getRecipient).collect(Collectors.toList()));
 	}
 
@@ -105,12 +105,6 @@ public final class ChatSceneController {
 		if (user != null && (currentChat == null || user.getID() != currentChat.getRecipient().getID())) {
 			contactLabel.setText(user.getName());
 
-			// Swap observable list
-			if (currentChat != null) {
-				currentChat.getMessages().clear();
-				currentChat.getMessages().addAll(messageList.getItems());
-			}
-
 			// LEON: JFC <===> JAVA FRIED CHICKEN <=/=> Java Foundation Classes
 
 			// Load the chat or create a new one and add it to the LocalDB
@@ -119,7 +113,8 @@ public final class ChatSceneController {
 				.filter(c -> c.getRecipient().getID() == user.getID())
 				.findAny()
 				.orElseGet(() -> { var chat = new Chat(user); localDB.getChats().add(chat); return chat; });
-			messageList.setItems(FXCollections.observableArrayList(currentChat.getMessages()));
+
+			messageList.setItems(FXCollections.observableList(currentChat.getMessages()));
 		}
 	}
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index fc96e79..2de5fa8 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -16,6 +16,7 @@ module envoy {
 	requires transitive java.prefs;
 	requires javafx.controls;
 	requires javafx.fxml;
+	requires javafx.base;
 
 	opens envoy.client.ui to javafx.graphics, javafx.fxml;
 }

From c12eac1cbccc778d987b83a361a8ad1089338e46 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Tue, 31 Mar 2020 21:54:56 +0200
Subject: [PATCH 09/60] Removed most Swing components

---
 src/main/java/envoy/client/Startup.java       |  64 --
 .../envoy/client/ui/container/ChatWindow.java | 687 ------------------
 .../ui/container/ContactsChooserDialog.java   | 145 ----
 .../client/ui/container/ContextMenu.java      | 255 -------
 .../envoy/client/ui/list/ComponentList.java   | 261 -------
 src/main/java/envoy/client/ui/list/Model.java | 120 ---
 .../java/envoy/client/ui/list/Renderer.java   |  31 -
 .../client/ui/list/SelectionHandler.java      |  28 -
 .../envoy/client/ui/list/package-info.java    |  10 -
 .../ContactSearchComponent.java               |  73 --
 .../ui/list_component/MessageComponent.java   | 127 ----
 .../ui/list_component/UserComponent.java      |  69 --
 .../ui/list_component/package-info.java       |  14 -
 .../client/ui/renderer/UserListRenderer.java  |  65 --
 .../client/ui/renderer/package-info.java      |  14 -
 15 files changed, 1963 deletions(-)
 delete mode 100644 src/main/java/envoy/client/Startup.java
 delete mode 100644 src/main/java/envoy/client/ui/container/ChatWindow.java
 delete mode 100755 src/main/java/envoy/client/ui/container/ContactsChooserDialog.java
 delete mode 100755 src/main/java/envoy/client/ui/container/ContextMenu.java
 delete mode 100644 src/main/java/envoy/client/ui/list/ComponentList.java
 delete mode 100644 src/main/java/envoy/client/ui/list/Model.java
 delete mode 100644 src/main/java/envoy/client/ui/list/Renderer.java
 delete mode 100644 src/main/java/envoy/client/ui/list/SelectionHandler.java
 delete mode 100644 src/main/java/envoy/client/ui/list/package-info.java
 delete mode 100644 src/main/java/envoy/client/ui/list_component/ContactSearchComponent.java
 delete mode 100644 src/main/java/envoy/client/ui/list_component/MessageComponent.java
 delete mode 100644 src/main/java/envoy/client/ui/list_component/UserComponent.java
 delete mode 100644 src/main/java/envoy/client/ui/list_component/package-info.java
 delete mode 100644 src/main/java/envoy/client/ui/renderer/UserListRenderer.java
 delete mode 100644 src/main/java/envoy/client/ui/renderer/package-info.java

diff --git a/src/main/java/envoy/client/Startup.java b/src/main/java/envoy/client/Startup.java
deleted file mode 100644
index 0633834..0000000
--- a/src/main/java/envoy/client/Startup.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package envoy.client;
-
-import java.util.logging.Logger;
-
-import envoy.client.ui.container.ChatWindow;
-import envoy.data.Config;
-import envoy.util.EnvoyLog;
-
-/**
- * Starts the Envoy client and prompts the user to enter their name.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>Startup.java</strong><br>
- * Created: <strong>12 Oct 2019</strong><br>
- *
- * @author Leon Hofmeister
- * @author Maximilian K&auml;fer
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.1-alpha
- */
-public class Startup {
-
-	private static final Logger logger = EnvoyLog.getLogger(Startup.class);
-
-	// TODO: Update Javadoc
-	/**
-	 * Loads the application by first loading the configuration, then acquiring a
-	 * user name and connecting to the server. If the server cannot be reached,
-	 * offline mode is entered if possible. After that, a {@link ChatWindow}
-	 * instance is initialized and then displayed to the user. Upon application
-	 * exit, settings and the local database are saved.
-	 *
-	 * @param args the command line arguments may contain configuration parameters
-	 *             and are parsed by the {@link Config} class
-	 * @since Envoy Client v0.1-alpha
-	 */
-	public static void main(String[] args) {
-		// Display ChatWindow and StatusTrayIcon
-		// EventQueue.invokeLater(() -> {
-		// try {
-		// chatWindow.initContent(client, localDB, writeProxy);
-		//
-		//
-		// try {
-		// new StatusTrayIcon(chatWindow).show();
-		//
-		// // If the tray icon is supported and corresponding settings is set, hide the
-		// // chat window on close
-		// Settings.getInstance()
-		// .getItems()
-		// .get("onCloseMode")
-		// .setChangeHandler((onCloseMode) -> chatWindow
-		// .setDefaultCloseOperation((Boolean) onCloseMode ? JFrame.HIDE_ON_CLOSE :
-		// JFrame.EXIT_ON_CLOSE));
-		// } catch (EnvoyException e) {
-		// logger.warning("The StatusTrayIcon is not supported on this platform!");
-		// }
-		// } catch (Exception e) {
-		// e.printStackTrace();
-		// }
-		// });
-
-	}
-}
diff --git a/src/main/java/envoy/client/ui/container/ChatWindow.java b/src/main/java/envoy/client/ui/container/ChatWindow.java
deleted file mode 100644
index eb92fc4..0000000
--- a/src/main/java/envoy/client/ui/container/ChatWindow.java
+++ /dev/null
@@ -1,687 +0,0 @@
-package envoy.client.ui.container;
-
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-import java.awt.event.*;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import envoy.client.data.Chat;
-import envoy.client.data.LocalDB;
-import envoy.client.data.Settings;
-import envoy.client.event.MessageCreationEvent;
-import envoy.client.event.ThemeChangeEvent;
-import envoy.client.net.Client;
-import envoy.client.net.WriteProxy;
-import envoy.client.ui.Theme;
-import envoy.client.ui.list.ComponentList;
-import envoy.client.ui.list.ComponentList.SelectionMode;
-import envoy.client.ui.list.Model;
-import envoy.client.ui.list_component.ContactSearchComponent;
-import envoy.client.ui.list_component.MessageComponent;
-import envoy.client.ui.primary.PrimaryButton;
-import envoy.client.ui.primary.PrimaryScrollPane;
-import envoy.client.ui.primary.PrimaryTextArea;
-import envoy.client.ui.renderer.UserListRenderer;
-import envoy.client.ui.settings.SettingsScreen;
-import envoy.data.Message;
-import envoy.data.Message.MessageStatus;
-import envoy.data.MessageBuilder;
-import envoy.data.User;
-import envoy.event.*;
-import envoy.util.EnvoyLog;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>ChatWindow.java</strong><br>
- * Created: <strong>28 Sep 2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @author Leon Hofmeister
- * @since Envoy Client v0.1-alpha
- */
-public class ChatWindow extends JFrame {
-
-	/**
-	 * This integer defines the maximum amount of chars allowed per message.
-	 *
-	 * @since Envoy 0.1-beta
-	 */
-	public static final int MAX_MESSAGE_LENGTH = 200;
-
-	// User specific objects
-	private Client		client;
-	private WriteProxy	writeProxy;
-	private LocalDB		localDB;
-	private Chat		currentChat;
-
-	// GUI components
-	private JPanel					contentPane				= new JPanel();
-	private PrimaryTextArea			messageEnterTextArea	= new PrimaryTextArea(space);
-	private JList<User>				userList				= new JList<>();
-	private DefaultListModel<User>	userListModel			= new DefaultListModel<>();
-	private ComponentList<Message>	messageList				= new ComponentList<>();
-	private PrimaryScrollPane		scrollPane				= new PrimaryScrollPane();
-	private JTextPane				textPane				= new JTextPane();
-	private PrimaryButton			postButton				= new PrimaryButton("Post");
-	private PrimaryButton			settingsButton			= new PrimaryButton("Settings");
-	private JPopupMenu				contextMenu;
-
-	// Contacts Header
-	private JPanel			contactsHeader	= new JPanel();
-	private JTextPane		contactsDisplay	= new JTextPane();
-	private PrimaryButton	addContact		= new PrimaryButton("+");
-
-	// Search Contacts
-	private final JPanel				searchPane					= new JPanel();
-	private final PrimaryButton			cancelButton				= new PrimaryButton("x");
-	private final PrimaryTextArea		searchField					= new PrimaryTextArea(space);
-	private final PrimaryScrollPane		scrollForPossibleContacts	= new PrimaryScrollPane();
-	private final Model<User>			contactsModel				= new Model<>();
-	private final ComponentList<User>	contactList					= new ComponentList<User>().setRenderer(ContactSearchComponent::new);
-
-	private static final Logger logger = EnvoyLog.getLogger(ChatWindow.class);
-
-	// GUI component spacing
-	private final static int	space	= 4;
-	private static final Insets	insets	= new Insets(space, space, space, space);
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * Initializes a {@link JFrame} with UI elements used to send and read messages
-	 * to different users.
-	 *
-	 * @since Envoy Client v0.1-alpha
-	 */
-	public ChatWindow() {
-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		setBounds(100, 100, 600, 800);
-		setMinimumSize(new Dimension(400, 300));
-		setTitle("Envoy");
-		setLocationRelativeTo(null);
-		setIconImage(Toolkit.getDefaultToolkit().createImage(getClass().getClassLoader().getResource("envoy_logo.png")));
-
-		contentPane.setBorder(new EmptyBorder(space, space, space, space));
-		setContentPane(contentPane);
-		GridBagLayout gbl_contentPane = new GridBagLayout();
-		gbl_contentPane.columnWidths	= new int[] { 1, 1, 1 };
-		gbl_contentPane.rowHeights		= new int[] { 1, 1, 1, 1 };
-		gbl_contentPane.columnWeights	= new double[] { 0.03, 1.0, 0.1 };
-		gbl_contentPane.rowWeights		= new double[] { 0.03, 0.001, 1.0, 0.001 };
-		contentPane.setLayout(gbl_contentPane);
-
-		messageList.setBorder(new EmptyBorder(space, space, space, space));
-		messageList.setSelectionMode(SelectionMode.SINGLE);
-		messageList.setSelectionHandler((message, comp, isSelected) -> {
-			final var theme = Settings.getInstance().getCurrentTheme();
-			comp.setBackground(isSelected ? theme.getSelectionColor() : theme.getCellColor());
-
-			// ContextMenu
-			Map<String, ActionListener> commands = Map.of("forward selected message", evt -> {
-				final Message	selectedMessage	= messageList.getSingleSelectedElement();
-				List<User>		chosenContacts	= ContactsChooserDialog
-					.showForwardingDialog("Forward selected message to", null, selectedMessage, localDB.getUsers().values());
-				if (chosenContacts != null && chosenContacts.size() > 0) forwardMessage(selectedMessage, chosenContacts.toArray(new User[0]));
-			}, "copy", evt -> {
-				// TODO should be enhanced to allow also copying of message attachments,
-				// especially pictures
-				StringSelection copy = new StringSelection(messageList.getSingleSelectedElement().getText());
-				Toolkit.getDefaultToolkit().getSystemClipboard().setContents(copy, copy);
-				// TODO insert implementation to edit and delete messages
-			}, "delete", evt -> {}, "edit", evt -> {}, "quote", evt -> {});
-
-			if (isSelected) {
-				contextMenu = new ContextMenu(null, comp, commands, null, null).build();
-				contextMenu.show(comp, 0, 0);
-			}
-		});
-
-		scrollPane.setViewportView(messageList);
-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.addComponentListener(new ComponentAdapter() {
-
-			// Update list elements when scroll pane (and thus list) is resized
-			@Override
-			public void componentResized(ComponentEvent e) {
-				messageList.setMaximumSize(new Dimension(scrollPane.getWidth(), Integer.MAX_VALUE));
-				messageList.synchronizeModel();
-			}
-		});
-
-		GridBagConstraints gbc_scrollPane = new GridBagConstraints();
-		gbc_scrollPane.fill			= GridBagConstraints.BOTH;
-		gbc_scrollPane.gridwidth	= 2;
-		gbc_scrollPane.gridheight	= 2;
-		gbc_scrollPane.gridx		= 1;
-		gbc_scrollPane.gridy		= 1;
-
-		gbc_scrollPane.insets = insets;
-
-		drawChatBox(gbc_scrollPane);
-
-		// MessageEnterTextArea
-		messageEnterTextArea.addInputMethodListener(new InputMethodListener() {
-
-			@Override
-			public void inputMethodTextChanged(InputMethodEvent event) {
-				checkMessageTextLength();
-				checkPostButton(messageEnterTextArea.getText());
-			}
-
-			@Override
-			public void caretPositionChanged(InputMethodEvent event) {}
-		});
-
-		messageEnterTextArea.addKeyListener(new KeyAdapter() {
-
-			@Override
-			public void keyReleased(KeyEvent e) {
-				if (e.getKeyCode() == KeyEvent.VK_ENTER
-						&& (Settings.getInstance().isEnterToSend() && e.getModifiersEx() == 0 || e.getModifiersEx() == KeyEvent.CTRL_DOWN_MASK)
-						&& postButton.isEnabled())
-					postMessage();
-				// Checking if text is too long
-				checkMessageTextLength();
-				checkPostButton(messageEnterTextArea.getText());
-			}
-		});
-
-		GridBagConstraints gbc_messageEnterTextArea = new GridBagConstraints();
-		gbc_messageEnterTextArea.fill	= GridBagConstraints.BOTH;
-		gbc_messageEnterTextArea.gridx	= 1;
-		gbc_messageEnterTextArea.gridy	= 3;
-		gbc_messageEnterTextArea.insets	= insets;
-		contentPane.add(messageEnterTextArea, gbc_messageEnterTextArea);
-
-		// Post Button
-		GridBagConstraints gbc_postButton = new GridBagConstraints();
-		gbc_postButton.fill		= GridBagConstraints.BOTH;
-		gbc_postButton.gridx	= 2;
-		gbc_postButton.gridy	= 3;
-		gbc_postButton.insets	= insets;
-		postButton.addActionListener((evt) -> { postMessage(); });
-		postButton.setEnabled(false);
-		contentPane.add(postButton, gbc_postButton);
-
-		// Settings Button
-		GridBagConstraints gbc_moveSelectionSettingsButton = new GridBagConstraints();
-
-		gbc_moveSelectionSettingsButton.fill	= GridBagConstraints.BOTH;
-		gbc_moveSelectionSettingsButton.gridx	= 2;
-		gbc_moveSelectionSettingsButton.gridy	= 0;
-
-		gbc_moveSelectionSettingsButton.insets = insets;
-
-		settingsButton.addActionListener(evt -> new SettingsScreen().setVisible(true));
-		contentPane.add(settingsButton, gbc_moveSelectionSettingsButton);
-
-		// Partner name display
-		textPane.setFont(new Font("Arial", Font.PLAIN, 20));
-		textPane.setEditable(false);
-
-		GridBagConstraints gbc_partnerName = new GridBagConstraints();
-		gbc_partnerName.fill	= GridBagConstraints.HORIZONTAL;
-		gbc_partnerName.gridx	= 1;
-		gbc_partnerName.gridy	= 0;
-
-		gbc_partnerName.insets = insets;
-		contentPane.add(textPane, gbc_partnerName);
-
-		userList.setCellRenderer(new UserListRenderer());
-		userList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		userList.addListSelectionListener((listSelectionEvent) -> {
-			if (client != null && localDB != null && !listSelectionEvent.getValueIsAdjusting()) {
-				final JList<User>	selectedUserList	= (JList<User>) listSelectionEvent.getSource();
-				final User			user				= selectedUserList.getSelectedValue();
-
-				for (int i = 0; i < contentPane.getComponents().length; i++)
-					if (contentPane.getComponent(i).equals(searchPane)) drawChatBox(gbc_scrollPane);
-				if (user != null) {
-					// Select current chat
-					currentChat = localDB.getChats().stream().filter(chat -> chat.getRecipient().getID() == user.getID()).findFirst().get();
-
-					// Read current chat
-					readCurrentChat();
-
-					// Set chat title
-					textPane.setText(currentChat.getRecipient().getName());
-
-					// Update model and scroll down
-					// messageList.setModel(currentChat.getModel());
-					scrollPane.setChatOpened(true);
-
-					messageList.synchronizeModel();
-					revalidate();
-					repaint();
-				}
-			}
-		});
-
-		userList.setFont(new Font("Arial", Font.PLAIN, 17));
-		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		= 2;
-		gbc_userList.gridheight	= 2;
-		gbc_userList.anchor		= GridBagConstraints.PAGE_START;
-		gbc_userList.insets		= insets;
-
-		contentPane.add(userList, gbc_userList);
-		contentPane.revalidate();
-
-		// Contacts Search
-		GridBagConstraints gbc_searchPane = new GridBagConstraints();
-		gbc_searchPane.fill			= GridBagConstraints.BOTH;
-		gbc_searchPane.gridwidth	= 2;
-		gbc_searchPane.gridheight	= 2;
-		gbc_searchPane.gridx		= 1;
-		gbc_searchPane.gridy		= 1;
-
-		gbc_searchPane.insets = insets;
-
-		GridBagLayout gbl_contactsSearch = new GridBagLayout();
-		gbl_contactsSearch.columnWidths		= new int[] { 1, 1 };
-		gbl_contactsSearch.rowHeights		= new int[] { 1, 1 };
-		gbl_contactsSearch.columnWeights	= new double[] { 1, 0.1 };
-		gbl_contactsSearch.rowWeights		= new double[] { 0.001, 1 };
-		searchPane.setLayout(gbl_contactsSearch);
-
-		GridBagConstraints gbc_searchField = new GridBagConstraints();
-		gbc_searchField.fill	= GridBagConstraints.BOTH;
-		gbc_searchField.gridx	= 0;
-		gbc_searchField.gridy	= 0;
-		gbc_searchField.insets	= new Insets(7, 4, 4, 4);
-
-		searchPane.add(searchField, gbc_searchField);
-
-		// Sends event to server, if input has changed
-		searchField.getDocument().addDocumentListener(new DocumentListener() {
-
-			@Override
-			public void removeUpdate(DocumentEvent evt) {
-				if (client.isOnline()) if (searchField.getText().isEmpty()) {
-					contactsModel.clear();
-					revalidate();
-					repaint();
-				} else try {
-					client.sendEvent(new ContactSearchRequest(searchField.getText()));
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-
-			@Override
-			public void insertUpdate(DocumentEvent evt) {
-				if (client.isOnline()) try {
-					client.sendEvent(new ContactSearchRequest(searchField.getText()));
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-
-			@Override
-			public void changedUpdate(DocumentEvent evt) {}
-		});
-
-		GridBagConstraints gbc_cancelButton = new GridBagConstraints();
-		gbc_cancelButton.fill	= GridBagConstraints.BOTH;
-		gbc_cancelButton.gridx	= 1;
-		gbc_cancelButton.gridy	= 0;
-		gbc_cancelButton.insets	= new Insets(7, 4, 4, 4);
-
-		cancelButton.addActionListener((evt) -> { drawChatBox(gbc_scrollPane); });
-
-		searchPane.add(cancelButton, gbc_cancelButton);
-
-		contactList.setModel(contactsModel);
-		scrollForPossibleContacts.setBorder(new EmptyBorder(space, space, space, space));
-		scrollForPossibleContacts.setViewportView(contactList);
-
-		GridBagConstraints gbc_possibleContacts = new GridBagConstraints();
-		gbc_possibleContacts.fill		= GridBagConstraints.BOTH;
-		gbc_possibleContacts.gridwidth	= 2;
-		gbc_possibleContacts.gridx		= 0;
-		gbc_possibleContacts.gridy		= 1;
-
-		gbc_possibleContacts.insets = insets;
-
-		searchPane.add(scrollForPossibleContacts, gbc_possibleContacts);
-
-		// Contacts Header
-		GridBagConstraints gbc_contactsHeader = new GridBagConstraints();
-		gbc_contactsHeader.fill		= GridBagConstraints.BOTH;
-		gbc_contactsHeader.gridx	= 0;
-		gbc_contactsHeader.gridy	= 1;
-		gbc_contactsHeader.insets	= insets;
-
-		GridBagLayout gbl_contactHeader = new GridBagLayout();
-		gbl_contactHeader.columnWidths	= new int[] { 1, 1 };
-		gbl_contactHeader.rowHeights	= new int[] { 1 };
-		gbl_contactHeader.columnWeights	= new double[] { 1, 1 };
-		gbl_contactHeader.rowWeights	= new double[] { 1 };
-		contactsHeader.setLayout(gbl_contactHeader);
-
-		contactsDisplay.setEditable(false);
-		contactsDisplay.setFont(new Font("Arial", Font.PLAIN, 12));
-		contactsDisplay.setText("Contacts");
-
-		GridBagConstraints gbc_contactsDisplay = new GridBagConstraints();
-		gbc_contactsDisplay.fill	= GridBagConstraints.BOTH;
-		gbc_contactsDisplay.gridx	= 0;
-		gbc_contactsDisplay.gridy	= 0;
-
-		contactsHeader.add(contactsDisplay, gbc_contactsDisplay);
-
-		addContact.setFont(new Font("Arial", Font.PLAIN, 15));
-
-		GridBagConstraints gbc_addContact = new GridBagConstraints();
-		gbc_addContact.fill		= GridBagConstraints.BOTH;
-		gbc_addContact.gridx	= 1;
-		gbc_addContact.gridy	= 0;
-		gbc_addContact.insets	= insets;
-
-		addContact.addActionListener(evt -> drawContactSearch(gbc_searchPane));
-
-		contactsHeader.add(addContact, gbc_addContact);
-
-		applyTheme(Settings.getInstance().getCurrentTheme());
-
-		contentPane.add(contactsHeader, gbc_contactsHeader);
-		contentPane.revalidate();
-
-		// Listen to theme changes
-		EventBus.getInstance().register(ThemeChangeEvent.class, evt -> applyTheme(evt.get()));
-
-		// Listen to user status changes
-		EventBus.getInstance().register(UserStatusChangeEvent.class, evt -> { userList.revalidate(); userList.repaint(); });
-
-		// Listen to received messages
-		EventBus.getInstance().register(MessageCreationEvent.class, evt -> {
-			Message	message	= evt.get();
-			Chat	chat	= localDB.getChats().stream().filter(c -> c.getRecipient().getID() == message.getSenderID()).findFirst().get();
-			// chat.appendMessage(message);
-
-			// Read message and update UI if in current chat
-			if (chat == currentChat) readCurrentChat();
-
-			revalidate();
-			repaint();
-		});
-
-		// Listen to message status changes
-		EventBus.getInstance().register(MessageStatusChangeEvent.class, evt -> {
-			final long			id		= evt.getID();
-			final MessageStatus	status	= evt.get();
-
-			for (Chat c : localDB.getChats())
-				// for (Message m : c.getModel())
-				// if (m.getID() == id) {
-				//
-				// // Update message status
-				// m.setStatus(status);
-				//
-				// // Update model and scroll down if current chat
-				// if (c == currentChat) {
-				// messageList.setModel(currentChat.getModel());
-				// scrollPane.setChatOpened(true);
-				// } else messageList.synchronizeModel();
-				// }
-
-			revalidate();
-			repaint();
-		});
-
-		// Listen to contact search results
-		EventBus.getInstance()
-			.register(ContactSearchResult.class,
-					evt -> {
-						contactsModel.clear();
-						final java.util.List<User> contacts = evt.get();
-						contacts.forEach(contactsModel::add);
-						revalidate();
-						repaint();
-					});
-
-		// Add new contacts to the contact list
-		EventBus.getInstance().register(ContactOperationEvent.class, evt -> {
-			User contact = evt.get();
-
-			// Clearing the search field and the searchResultList
-			searchField.setText("");
-			contactsModel.clear();
-
-			// Update LocalDB
-			userListModel.addElement(contact);
-			localDB.getUsers().put(contact.getName(), contact);
-			localDB.getChats().add(new Chat(contact));
-
-			revalidate();
-			repaint();
-		});
-
-		revalidate();
-		repaint();
-	}
-
-	/**
-	 * Used to immediately reload the {@link ChatWindow} when settings were changed.
-	 *
-	 * @param theme the theme to change colors into
-	 * @since Envoy Client v0.2-alpha
-	 */
-	private void applyTheme(Theme theme) {
-		// contentPane
-		contentPane.setBackground(theme.getBackgroundColor());
-		contentPane.setForeground(theme.getUserNameColor());
-		// messageList
-		messageList.setForeground(theme.getTextColor());
-		messageList.setBackground(theme.getCellColor());
-		messageList.synchronizeModel();
-		// scrollPane
-		scrollPane.applyTheme(theme);
-		scrollPane.autoscroll();
-		// messageEnterTextArea
-		messageEnterTextArea.setCaretColor(theme.getTypingMessageColor());
-		messageEnterTextArea.setForeground(theme.getTypingMessageColor());
-		messageEnterTextArea.setBackground(theme.getCellColor());
-		// postButton
-		postButton.setForeground(theme.getInteractableForegroundColor());
-		postButton.setBackground(theme.getInteractableBackgroundColor());
-		// settingsButton
-		settingsButton.setForeground(theme.getInteractableForegroundColor());
-		settingsButton.setBackground(theme.getInteractableBackgroundColor());
-		// textPane
-		textPane.setBackground(theme.getBackgroundColor());
-		textPane.setForeground(theme.getUserNameColor());
-		// userList
-		userList.setSelectionForeground(theme.getUserNameColor());
-		userList.setSelectionBackground(theme.getSelectionColor());
-		userList.setForeground(theme.getUserNameColor());
-		userList.setBackground(theme.getCellColor());
-		// contacts header
-		contactsHeader.setBackground(theme.getCellColor());
-		contactsDisplay.setBackground(theme.getCellColor());
-		contactsDisplay.setForeground(theme.getUserNameColor());
-		addContact.setBackground(theme.getInteractableBackgroundColor());
-		addContact.setForeground(theme.getInteractableForegroundColor());
-		// SearchPane
-		searchPane.setBackground(theme.getCellColor());
-		searchField.setBackground(theme.getBackgroundColor());
-		searchField.setForeground(theme.getUserNameColor());
-		cancelButton.setBackground(theme.getInteractableBackgroundColor());
-		cancelButton.setForeground(theme.getInteractableForegroundColor());
-		contactList.setForeground(theme.getTextColor());
-		contactList.setBackground(theme.getCellColor());
-		scrollForPossibleContacts.applyTheme(theme);
-	}
-
-	/**
-	 * Sends a new message to the server based on the text entered in the textArea.
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	private void postMessage() {
-		if (userList.isSelectionEmpty()) {
-			JOptionPane.showMessageDialog(this, "Please select a recipient!", "Cannot send message", JOptionPane.INFORMATION_MESSAGE);
-			return;
-		}
-		String text = messageEnterTextArea.getText().trim();
-		if (!text.isEmpty()) checkMessageTextLength();
-
-		// Create message
-		final Message message = new MessageBuilder(localDB.getUser().getID(), currentChat.getRecipient().getID(), localDB.getIDGenerator())
-			.setText(text)
-			.build();
-		sendMessage(message);
-		// Clear text field
-		messageEnterTextArea.setText("");
-		postButton.setEnabled(false);
-	}
-
-	/**
-	 * Forwards a message.
-	 *
-	 * @param message   the message to forward
-	 * @param recipient the new recipient of the message
-	 * @since Envoy Client v0.1-beta
-	 */
-	private void forwardMessage(Message message, User... recipients) {
-		Arrays.stream(recipients).forEach(recipient -> {
-			if (message != null && recipients != null) sendMessage(new MessageBuilder(message, recipient.getID(), localDB.getIDGenerator()).build());
-			else throw new NullPointerException("No recipient or no message selected");
-		});
-
-	}
-
-	@SuppressWarnings("unused")
-	private void forwardMessages(Collection<Message> messages, User... recipients) {
-		messages.forEach(message -> { forwardMessage(message, recipients); });
-	}
-
-	/**
-	 * Sends a {@link Message} to the server.
-	 *
-	 * @param message the message to send
-	 * @since Envoy Client v0.1-beta
-	 */
-	private void sendMessage(final Message message) {
-		try {
-			// Send message
-			writeProxy.writeMessage(message);
-
-			// Add message to PersistentLocalDB and update UI
-			// currentChat.appendMessage(message);
-
-			// Update UI
-			revalidate();
-			repaint();
-
-			// Request a new id generator if all IDs were used
-			if (!localDB.getIDGenerator().hasNext()) client.requestIdGenerator();
-
-		} catch (Exception e) {
-			JOptionPane.showMessageDialog(this, "Error sending message:\n" + e.toString(), "Message sending error", JOptionPane.ERROR_MESSAGE);
-			e.printStackTrace();
-		}
-	}
-
-	private void readCurrentChat() {
-		try {
-			currentChat.read(writeProxy);
-			if (messageList.getRenderer() != null) messageList.synchronizeModel();
-		} catch (IOException e) {
-			e.printStackTrace();
-			logger.log(Level.WARNING, "Couldn't notify server about message status change", e);
-		}
-	}
-
-	private void drawChatBox(GridBagConstraints gbc_scrollPane) {
-		contentPane.remove(searchPane);
-		contentPane.add(scrollPane, gbc_scrollPane);
-		contentPane.revalidate();
-		contentPane.repaint();
-	}
-
-	private void drawContactSearch(GridBagConstraints gbc_searchPane) {
-		currentChat = null;
-		userList.removeSelectionInterval(0, userList.getModel().getSize() - 1);
-		messageList.setModel(null);
-		textPane.setText("");
-		contentPane.remove(scrollPane);
-		contentPane.add(searchPane, gbc_searchPane);
-		contentPane.revalidate();
-		contentPane.repaint();
-	}
-
-	/**
-	 * Initializes the components responsible server communication and
-	 * persistence.<br>
-	 * <br>
-	 * This will trigger the display of the contact list.
-	 *
-	 * @param client     the client used to send and receive messages
-	 * @param localDB    the local database used to manage stored messages
-	 *                   and users
-	 * @param writeProxy the write proxy used to send messages and status change
-	 *                   events to the server or cache them inside the local
-	 *                   database
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public void initContent(Client client, LocalDB localDB, WriteProxy writeProxy) {
-		this.client		= client;
-		this.localDB	= localDB;
-		this.writeProxy	= writeProxy;
-
-		messageList.setRenderer((list, message) -> new MessageComponent(list, message, client.getSender().getID()));
-
-		// Load users and chats
-		new Thread(() -> {
-			localDB.getUsers().values().forEach(user -> {
-				userListModel.addElement(user);
-
-				// Check if user exists in local DB
-				if (localDB.getChats().stream().noneMatch(c -> c.getRecipient().getID() == user.getID())) localDB.getChats().add(new Chat(user));
-			});
-			SwingUtilities.invokeLater(() -> userList.setModel(userListModel));
-
-			revalidate();
-			repaint();
-		}).start();
-	}
-
-	/**
-	 * Checks whether the length of the text inside messageEnterTextArea >=
-	 * {@link ChatWindow#MAX_MESSAGE_LENGTH}
-	 * and splits the text into the allowed part, if that is the case.
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	private void checkMessageTextLength() {
-		String input = messageEnterTextArea.getText();
-		if (input.length() >= MAX_MESSAGE_LENGTH) {
-			messageEnterTextArea.setText(input.substring(0, MAX_MESSAGE_LENGTH - 1));
-			// TODO: current notification is like being hit with a hammer, maybe it should
-			// be replaced with a more subtle notification
-			JOptionPane.showMessageDialog(messageEnterTextArea,
-					"the maximum length for a message has been reached",
-					"maximum message length reached",
-					JOptionPane.WARNING_MESSAGE);
-		}
-	}
-
-	private void checkPostButton(String text) { postButton.setEnabled(!text.trim().isBlank()); }
-}
diff --git a/src/main/java/envoy/client/ui/container/ContactsChooserDialog.java b/src/main/java/envoy/client/ui/container/ContactsChooserDialog.java
deleted file mode 100755
index 4c81aad..0000000
--- a/src/main/java/envoy/client/ui/container/ContactsChooserDialog.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package envoy.client.ui.container;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.border.EmptyBorder;
-
-import envoy.client.data.Settings;
-import envoy.client.ui.Theme;
-import envoy.client.ui.list.ComponentList;
-import envoy.client.ui.list.ComponentList.SelectionMode;
-import envoy.client.ui.list.Model;
-import envoy.client.ui.list_component.UserComponent;
-import envoy.data.Message;
-import envoy.data.User;
-
-/**
- * This class defines a dialog to choose contacts from.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>ContactsChooserDialog.java</strong><br>
- * Created: <strong>15 Mar 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @since Envoy Client v0.1-beta
- */
-public class ContactsChooserDialog extends JDialog {
-
-	private static final long serialVersionUID = 0L;
-
-	private ComponentList<User>	contactList		= new ComponentList<User>().setModel(new Model<User>())
-		.setRenderer((list, user) -> new UserComponent(user));
-	private JButton				okButton		= new JButton("Ok");
-	private JButton				cancelButton	= new JButton("Cancel");
-
-	private final Theme theme = Settings.getInstance().getCurrentTheme();
-
-	private final JPanel contentPanel = new JPanel();
-
-	/**
-	 * Shows a modal contacts-chooser dialog and blocks until the
-	 * dialog is hidden. If the user presses the "OK" button, then
-	 * this method hides/disposes the dialog and returns the selected element (has
-	 * yet
-	 * to be casted back to its original type due to the limitations of Generics in
-	 * Java).
-	 * If the user presses the "Cancel" button or closes the dialog without
-	 * pressing "OK", then this method disposes the dialog and returns an empty
-	 * <code>ArrayList</code>.
-	 *
-	 * @param title   the title of the dialog
-	 * @param parent  this @{@link Component} will be parsed to
-	 *                {@link java.awt.Window#setLocationRelativeTo(Component)} in
-	 *                order to change the location of the dialog
-	 * @param message the {@link Message} to display on top of the Dialog
-	 * @param users   the users that should be displayed
-	 * @return the selected Element (yet has to be casted to the wanted type due to
-	 *         the Generics limitations in Java)
-	 * @since Envoy Client v0.1-beta
-	 */
-	public static List<User> showForwardingDialog(String title, Component parent, Message message, Collection<User> users) {
-		ContactsChooserDialog dialog = new ContactsChooserDialog(parent);
-		dialog.setTitle(title);
-		dialog.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
-		dialog.addCancelButtonActionListener(e -> dialog.dispose());
-
-		List<User> results = new ArrayList<>();
-		dialog.addOkButtonActionListener(e -> { results.addAll(dialog.getContactList().getSelectedElements()); dialog.dispose(); });
-		Model<User> contactListModel = dialog.getContactList().getModel();
-		users.forEach(contactListModel::add);
-
-		dialog.setModalityType(ModalityType.APPLICATION_MODAL);
-		dialog.setVisible(true);
-
-		return results;
-	}
-
-	/**
-	 * @param parent this @{@link Component} will be parsed to
-	 *               {@link java.awt.Window#setLocationRelativeTo(Component)}
-	 * @since Envoy Client v0.1-beta
-	 */
-	private ContactsChooserDialog(Component parent) {
-		contactList.setSelectionMode(SelectionMode.MULTIPLE);
-		contactList.setSelectionHandler((user, comp, isSelected) -> {
-			final var theme = Settings.getInstance().getCurrentTheme();
-			comp.setBackground(isSelected ? theme.getSelectionColor() : theme.getCellColor());
-		});
-		setLocationRelativeTo(parent);
-		getContentPane().setLayout(new BorderLayout());
-		setBackground(theme.getBackgroundColor());
-		setForeground(theme.getTextColor());
-		setSize(400, 400);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel, BorderLayout.CENTER);
-		contentPanel.setLayout(new BorderLayout(0, 0));
-		contentPanel.add(contactList, BorderLayout.CENTER);
-		{
-			JPanel buttonPane = new JPanel();
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-				okButton = new JButton("OK");
-				okButton.setMnemonic(KeyEvent.VK_ENTER);
-				okButton.setActionCommand("OK");
-				buttonPane.setLayout(new BorderLayout(0, 0));
-				buttonPane.add(okButton, BorderLayout.EAST);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				cancelButton = new JButton("Cancel");
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton, BorderLayout.WEST);
-			}
-		}
-		applyTheme(Settings.getInstance().getCurrentTheme());
-	}
-
-	private void applyTheme(Theme theme) {
-		contentPanel.setBackground(theme.getBackgroundColor());
-		contentPanel.setForeground(theme.getTextColor());
-		contactList.setBackground(theme.getCellColor());
-		okButton.setBackground(theme.getInteractableBackgroundColor());
-		okButton.setForeground(theme.getTextColor());
-		cancelButton.setBackground(theme.getInteractableBackgroundColor());
-		cancelButton.setForeground(theme.getTextColor());
-	}
-
-	/**
-	 * @return the underlying {@link ComponentList}
-	 * @since Envoy Client v0.1-beta
-	 */
-	private ComponentList<User> getContactList() { return contactList; }
-
-	private void addOkButtonActionListener(ActionListener l) { okButton.addActionListener(l); }
-
-	private void addCancelButtonActionListener(ActionListener l) { cancelButton.addActionListener(l); }
-}
diff --git a/src/main/java/envoy/client/ui/container/ContextMenu.java b/src/main/java/envoy/client/ui/container/ContextMenu.java
deleted file mode 100755
index 2043985..0000000
--- a/src/main/java/envoy/client/ui/container/ContextMenu.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package envoy.client.ui.container;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.*;
-
-import envoy.client.data.Settings;
-import envoy.client.ui.Theme;
-
-/**
- * This class defines a menu that will be automatically called if
- * {@link MouseEvent#isPopupTrigger()} returns true for the parent component.
- * The user has the possibility to directly add actions to be performed when
- * clicking on the element with the selected String. Additionally, for each
- * element an {@link Icon} can be added, but it must not be.
- * If the key(text) of an element starts with one of the predefined values, a
- * special component will be called: either a {@link JRadioButtonMenuItem}, a
- * {@link JCheckBoxMenuItem} or a {@link JMenu} will be created.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>ContextMenu.java</strong><br>
- * Created: <strong>17 Mar 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @since Envoy Client v0.1-beta
- */
-public class ContextMenu extends JPopupMenu {
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * If a key starts with this String, a {@link JCheckBoxMenuItem} will be created
-	 */
-	public static final String	checkboxMenuItem	= "ChBoMI";
-	/**
-	 * If a key starts with this String, a {@link JRadioButtonMenuItem} will be
-	 * created
-	 */
-	public static final String	radioButtonMenuItem	= "RaBuMI";
-	/**
-	 * If a key starts with this String, a {@link JMenu} will be created
-	 */
-	public static final String	subMenuItem			= "SubMI";
-
-	private Map<String, ActionListener>	items		= new HashMap<>();
-	private Map<String, Icon>			icons		= new HashMap<>();
-	private Map<String, Integer>		mnemonics	= new HashMap<>();
-
-	private ButtonGroup	radioButtonGroup	= new ButtonGroup();
-	private boolean		built				= false;
-	private boolean		visible				= false;
-
-	/**
-	 * @param parent the component which will call this
-	 *               {@link ContextMenu}
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContextMenu(Component parent) {
-		setInvoker(parent);
-		setOpaque(true);
-	}
-
-	/**
-	 * @param label            the string that a UI may use to display as a title
-	 *                         for the pop-up menu
-	 * @param parent           the component which will call this
-	 *                         {@link ContextMenu}
-	 * @param itemsWithActions a map of all strings to be displayed with according
-	 *                         actions
-	 * @param itemIcons        the icons to be displayed before a name, if wanted.
-	 *                         Only keys in here will have an Icon displayed. More
-	 *                         precisely, all keys here not included in the first
-	 *                         map will be thrown out.
-	 * @param itemMnemonics    the keyboard shortcuts that need to be pressed to
-	 *                         automatically execute the {@link JMenuItem} with the
-	 *                         given text
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContextMenu(String label, Component parent, Map<String, ActionListener> itemsWithActions, Map<String, Icon> itemIcons,
-			Map<String, Integer> itemMnemonics) {
-		this(label);
-		setInvoker(parent);
-		this.items		= (itemsWithActions != null) ? itemsWithActions : items;
-		this.icons		= (itemIcons != null) ? itemIcons : icons;
-		this.mnemonics	= (itemMnemonics != null) ? itemMnemonics : mnemonics;
-	}
-
-	/**
-	 * @param label the string that a UI may use to display as a title for the
-	 *              pop-up menu.
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContextMenu(String label) {
-		super(label);
-		setOpaque(true);
-	}
-
-	/**
-	 * Prepares the PopupMenu to be displayed. Should only be used once all map
-	 * values have been set.
-	 *
-	 * @return this instance of {@link ContextMenu} to allow chaining behind the
-	 *         constructor
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContextMenu build() {
-		items.forEach((text, action) -> {
-			// case radio button wanted
-			AbstractButton item;
-			if (text.startsWith(radioButtonMenuItem)) {
-				item = new JRadioButtonMenuItem(text.substring(radioButtonMenuItem.length()), icons.containsKey(text) ? icons.get(text) : null);
-				radioButtonGroup.add(item);
-				// case check box wanted
-			} else if (text.startsWith(checkboxMenuItem))
-				item = new JCheckBoxMenuItem(text.substring(checkboxMenuItem.length()), icons.containsKey(text) ? icons.get(text) : null);
-			// case sub-menu wanted
-			else if (text.startsWith(subMenuItem)) item = new JMenu(text.substring(subMenuItem.length()));
-			else // normal JMenuItem wanted
-				item = new JMenuItem(text, icons.containsKey(text) ? icons.get(text) : null);
-			item.addActionListener(action);
-			item.setOpaque(true);
-			if (mnemonics.containsKey(text)) item.setMnemonic(mnemonics.get(text));
-			add(item);
-		});
-		getInvoker().addMouseListener(getShowingListener());
-		applyTheme(Settings.getInstance().getCurrentTheme());
-		built = true;
-		return this;
-	}
-
-	private MouseAdapter getShowingListener() {
-		return new MouseAdapter() {
-
-			@Override
-			public void mouseClicked(MouseEvent e) { action(e); }
-
-			@Override
-			public void mousePressed(MouseEvent e) { action(e); }
-
-			@Override
-			public void mouseReleased(MouseEvent e) { action(e); }
-
-			private void action(MouseEvent e) {
-				if (!built) build();
-				if (e.isPopupTrigger()) {
-					// hides the menu if already visible
-					visible = !visible;
-					if (visible) show(e.getComponent(), e.getX(), e.getY());
-					else setVisible(false);
-
-				}
-			}
-		};
-	}
-
-	/**
-	 * Removes all subcomponents of this menu.
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void clear() {
-		removeAll();
-		items		= new HashMap<>();
-		icons		= new HashMap<>();
-		mnemonics	= new HashMap<>();
-	}
-
-	/**
-	 * @return the items
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Map<String, ActionListener> getItems() { return items; }
-
-	/**
-	 * @param items the items with the displayed text and the according action to
-	 *              take once called
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void setItems(Map<String, ActionListener> items) { this.items = items; }
-
-	/**
-	 * @return the icons
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Map<String, Icon> getIcons() { return icons; }
-
-	/**
-	 * @param icons the icons to set
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void setIcons(Map<String, Icon> icons) { this.icons = icons; }
-
-	/**
-	 * @return the mnemonics (the keyboard shortcuts that automatically execute the
-	 *         command for a {@link JMenuItem} with corresponding text)
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Map<String, Integer> getMnemonics() { return mnemonics; }
-
-	/**
-	 * @param mnemonics the keyboard shortcuts that need to be pressed to
-	 *                  automatically execute the {@link JMenuItem} with the given
-	 *                  text
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void setMnemonics(Map<String, Integer> mnemonics) { this.mnemonics = mnemonics; }
-
-	/**
-	 * {@inheritDoc}<br>
-	 * Additionally sets the foreground of all subcomponents of this
-	 * {@link ContextMenu}.
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	@Override
-	public void setForeground(Color color) {
-		super.setForeground(color);
-		for (MenuElement element : getSubElements())
-			((Component) element).setForeground(color);
-	}
-
-	/**
-	 * {@inheritDoc}<br>
-	 * Additionally sets the background of all subcomponents of this
-	 * {@link ContextMenu}.
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	@Override
-	public void setBackground(Color color) {
-		super.setBackground(color);
-		for (MenuElement element : getSubElements())
-			((Component) element).setBackground(color);
-	}
-
-	/**
-	 * Sets the fore- and background of all elements contained in this
-	 * {@link ContextMenu}
-	 * This method is to be only used by Envoy as {@link Theme} is an
-	 * Envoy-exclusive object.
-	 *
-	 * @param theme the theme to use
-	 * @since Envoy Client v0.1-beta
-	 */
-	protected void applyTheme(Theme theme) {
-		setBackground(theme.getCellColor());
-		setForeground(theme.getTextColor());
-	}
-}
diff --git a/src/main/java/envoy/client/ui/list/ComponentList.java b/src/main/java/envoy/client/ui/list/ComponentList.java
deleted file mode 100644
index c3cb2ec..0000000
--- a/src/main/java/envoy/client/ui/list/ComponentList.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package envoy.client.ui.list;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.swing.*;
-
-/**
- * Provides a vertical list layout of components provided in a
- * {@link Model}. Similar to {@link javax.swing.JList} but capable
- * of rendering {@link JPanel}s.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>ComponentList.java</strong><br>
- * Created: <strong>25.01.2020</strong><br>
- *
- * @param <E> the type of object displayed in this list
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.3-alpha
- */
-public class ComponentList<E> extends JPanel {
-
-	private Model<E>			model;
-	private Renderer<E>			renderer;
-	private SelectionHandler<E>	selectionHandler;
-	private SelectionMode		selectionMode	= SelectionMode.NONE;
-	private Set<Integer>		selection		= new HashSet<>();
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * Defines the possible modes of selection that can be performed by the user
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	public static enum SelectionMode {
-		/**
-		 * Selection is completely ignored.
-		 */
-		NONE,
-
-		/**
-		 * Only a single element can be selected.
-		 */
-		SINGLE,
-
-		/**
-		 * Multiple elements can be selected regardless of their position.
-		 */
-		MULTIPLE
-	}
-
-	/**
-	 * Creates an instance of {@link ComponentList}.
-	 *
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public ComponentList() { setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); }
-
-	/**
-	 * Removes all child components and then adds all components representing the
-	 * elements of the {@link Model}.
-	 *
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public void synchronizeModel() {
-		if (model != null) {
-			removeAll();
-			model.forEach(this::addElement);
-			revalidate();
-		}
-	}
-
-	/**
-	 * Selects a list element by index. If the element is already selected, it is
-	 * removed from the selection.
-	 *
-	 * @param index the index of the selected component
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void selectElement(int index) {
-		final JComponent element = getComponent(index);
-		if (selection.contains(index)) {
-
-			// Deselect if clicked again
-			if (selectionHandler != null) selectionHandler.selectionChanged(model.get(index), element, true);
-			selection.remove(index);
-
-		} else {
-
-			// Remove old selection if single selection is enabled
-			if (selectionMode == SelectionMode.SINGLE) clearSelection();
-
-			// Select item
-			if (selectionMode != SelectionMode.NONE) {
-
-				// Assign new selection
-				selection.add(index);
-
-				// Update element
-				if (selectionHandler != null) selectionHandler.selectionChanged(model.get(index), element, true);
-			}
-		}
-
-		revalidate();
-		repaint();
-	}
-
-	/**
-	 * Removes the current selection.
-	 *
-	 * @since Envoy Client v0.1-alpha
-	 */
-	public void clearSelection() {
-		if (selectionHandler != null) selection.forEach(i -> selectionHandler.selectionChanged(model.get(i), getComponent(i), false));
-		selection.clear();
-	}
-
-	/**
-	 * Adds an object to the list by rendering it with the current
-	 * {@link Renderer}.
-	 *
-	 * @param elem the element to add
-	 * @since Envoy Client v0.3-alpha
-	 */
-	void addElement(E elem) {
-		if (renderer != null) {
-			final JComponent component = renderer.getListCellComponent(this, elem);
-			component.addMouseListener(getSelectionListener(getComponentCount()));
-			add(component, getComponentCount());
-		}
-	}
-
-	/**
-	 * @param componentIndex the index of the list component to which the mouse
-	 *                       listener will be added
-	 * @return a mouse listener calling the
-	 *         {@link ComponentList#selectElement(int)} method with the
-	 *         component's index when a left click is performed by the user
-	 * @since Envoy Client v0.1-beta
-	 */
-	private MouseListener getSelectionListener(int componentIndex) {
-		return new MouseAdapter() {
-
-			@Override
-			public void mouseClicked(MouseEvent e) { if (SwingUtilities.isLeftMouseButton(e)) selectElement(componentIndex); }
-		};
-	}
-
-	@Override
-	public JComponent getComponent(int n) { return (JComponent) super.getComponent(n); }
-
-	/**
-	 * @return a set of all selected indices
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Set<Integer> getSelection() { return selection; }
-
-	/**
-	 * @return a set of all selected elements
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Set<E> getSelectedElements() {
-		var selectedElements = new HashSet<E>();
-		selection.forEach(i -> selectedElements.add(model.get(i)));
-		return selectedElements;
-	}
-
-	/**
-	 * @return the index of an arbitrary selected element
-	 * @throws java.util.NoSuchElementException if no selection is present
-	 * @since Envoy Client v0.1-beta
-	 */
-	public int getSingleSelection() { return selection.stream().findAny().get(); }
-
-	/**
-	 * @return an arbitrary selected element
-	 * @throws java.util.NoSuchElementException if no selection is present
-	 * @since Envoy Client v0.1-beta
-	 */
-	public E getSingleSelectedElement() { return model.get(getSingleSelection()); }
-
-	/**
-	 * @return the model
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Model<E> getModel() { return model; }
-
-	/**
-	 * Sets the list model providing the list elements to render. The rendered
-	 * components will be synchronized with the contents of the new model or removed
-	 * if the new model is {@code null}.
-	 *
-	 * @param model the list model to set
-	 * @return this component list
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public ComponentList<E> setModel(Model<E> model) {
-
-		// Remove old model
-		if (this.model != null) this.model.setComponentList(null);
-
-		// Synchronize with new model
-		this.model = model;
-		if (model != null) model.setComponentList(this);
-		synchronizeModel();
-
-		return this;
-	}
-
-	/**
-	 * @return the renderer
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Renderer<E> getRenderer() { return renderer; }
-
-	/**
-	 * @param renderer the renderer to set
-	 * @return this component list
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ComponentList<E> setRenderer(Renderer<E> renderer) {
-		this.renderer = renderer;
-		return this;
-	}
-
-	/**
-	 * @return the selection mode
-	 * @since Envoy Client v0.1-beta
-	 */
-	public SelectionMode getSelectionMode() { return selectionMode; }
-
-	/**
-	 * Sets a new selection mode. The current selection will be cleared during this
-	 * action.
-	 *
-	 * @param selectionMode the selection mode to set
-	 * @return this component list
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ComponentList<E> setSelectionMode(SelectionMode selectionMode) {
-		this.selectionMode = selectionMode;
-		clearSelection();
-		return this;
-	}
-
-	/**
-	 * @return the selection handler
-	 * @since Envoy Client v0.1-beta
-	 */
-	public SelectionHandler<E> getSelectionHandler() { return selectionHandler; }
-
-	/**
-	 * @param selectionHandler the selection handler to set
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void setSelectionHandler(SelectionHandler<E> selectionHandler) { this.selectionHandler = selectionHandler; }
-}
diff --git a/src/main/java/envoy/client/ui/list/Model.java b/src/main/java/envoy/client/ui/list/Model.java
deleted file mode 100644
index 4f13636..0000000
--- a/src/main/java/envoy/client/ui/list/Model.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package envoy.client.ui.list;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Stores objects that will be displayed in a {@link ComponentList}.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>Model.java</strong><br>
- * Created: <strong>25.01.2020</strong><br>
- *
- * @param <E> the type of object displayed in this list
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.3-alpha
- */
-public final class Model<E> implements Iterable<E>, Serializable {
-
-	private List<E>						elements	= new ArrayList<>();
-	transient private ComponentList<E>	componentList;
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * Adds an element to this model and notifies the associated
-	 * {@link ComponentList} to add the corresponding component.
-	 *
-	 * @param e the element to add
-	 * @return {@code true}
-	 * @see java.util.List#add(java.lang.Object)
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public boolean add(E e) {
-		if (componentList != null) {
-			componentList.addElement(e);
-			componentList.revalidate();
-		}
-		return elements.add(e);
-	}
-
-	/**
-	 * Removes all elements from this model and clears the associated
-	 * {@link ComponentList}.
-	 *
-	 * @see java.util.List#clear()
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public void clear() {
-		elements.clear();
-		if (componentList != null) componentList.removeAll();
-	}
-
-	/**
-	 * @param index the index to retrieve the element from
-	 * @return the element located at the index
-	 * @see java.util.List#get(int)
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public E get(int index) { return elements.get(index); }
-
-	/**
-	 * Removes the element at a specific index from this model and the corresponding
-	 * component from the {@link ComponentList}.
-	 *
-	 * @param index the index of the element to remove
-	 * @return the removed element
-	 * @see java.util.List#remove(int)
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public E remove(int index) {
-		if (componentList != null) componentList.remove(index);
-		return elements.remove(index);
-	}
-
-	/**
-	 * @return the amount of elements in this list model
-	 * @see java.util.List#size()
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public int size() { return elements.size(); }
-
-	/**
-	 * @return {@code true} if this model contains no elements
-	 * @see java.util.List#isEmpty()
-	 */
-	public boolean isEmpty() { return elements.isEmpty(); }
-
-	/**
-	 * @return an iterator over the elements of this list model
-	 * @see java.util.List#iterator()
-	 * @since Envoy Client v0.3-alpha
-	 */
-	@Override
-	public Iterator<E> iterator() {
-		return new Iterator<>() {
-
-			Iterator<E> iter = elements.iterator();
-
-			@Override
-			public boolean hasNext() { return iter.hasNext(); }
-
-			@Override
-			public E next() { return iter.next(); }
-		};
-	}
-
-	/**
-	 * Sets the component list displaying the elements of this model and triggers a
-	 * synchronization.
-	 *
-	 * @param componentList the component list to set
-	 * @since Envoy Client v0.3-alpha
-	 */
-	void setComponentList(ComponentList<E> componentList) {
-		this.componentList = componentList;
-		if (componentList != null && componentList.getRenderer() != null) componentList.synchronizeModel();
-	}
-}
diff --git a/src/main/java/envoy/client/ui/list/Renderer.java b/src/main/java/envoy/client/ui/list/Renderer.java
deleted file mode 100644
index f2d3ad9..0000000
--- a/src/main/java/envoy/client/ui/list/Renderer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package envoy.client.ui.list;
-
-import javax.swing.JComponent;
-
-/**
- * Allows a {@link ComponentList} convert its elements into Swing components
- * that can be rendered.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>Renderer.java</strong><br>
- * Created: <strong>25.01.2020</strong><br>
- *
- * @param <E> the type of object displayed in this list
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.3-alpha
- */
-@FunctionalInterface
-public interface Renderer<E> {
-
-	/**
-	 * Provides a Swing component representing a list element.
-	 *
-	 * @param list       the list in which the component will be displayed
-	 * @param value      the list element that will be converted
-	 * @param isSelected {@code true} if the user has selected the list cell in
-	 *                   which the list element is rendered
-	 * @return the component representing the list element
-	 * @since Envoy Client v0.3-alpha
-	 */
-	JComponent getListCellComponent(ComponentList<? extends E> list, E value);
-}
diff --git a/src/main/java/envoy/client/ui/list/SelectionHandler.java b/src/main/java/envoy/client/ui/list/SelectionHandler.java
deleted file mode 100644
index d8c1984..0000000
--- a/src/main/java/envoy/client/ui/list/SelectionHandler.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package envoy.client.ui.list;
-
-import javax.swing.JComponent;
-
-/**
- * Handles the selection of elements in a {@link ComponentList}.<br>
- * <br>
- * Project: <strong>envoy-client</strong>
- * File: <strong>SelectionHandler.java</strong>
- * Created: <strong>21.03.2020</strong>
- *
- * @author Kai S. K. Engelbart
- * @param <E> the type of the underlying {@link ComponentList}
- * @since Envoy Client v0.1-beta
- */
-@FunctionalInterface
-public interface SelectionHandler<E> {
-
-	/**
-	 * Notifies the handler about a selection.
-	 *
-	 * @param element    the selected element
-	 * @param component  the selected component
-	 * @param isSelected contains the selection state
-	 * @since Envoy Client v0.1-beta
-	 */
-	void selectionChanged(E element, JComponent component, boolean isSelected);
-}
diff --git a/src/main/java/envoy/client/ui/list/package-info.java b/src/main/java/envoy/client/ui/list/package-info.java
deleted file mode 100644
index 50d553b..0000000
--- a/src/main/java/envoy/client/ui/list/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This package defines a Swing component that can be used to display lists of
- * other components to the user.
- *
- * @author Kai S. K. Engelbart
- * @author Leon Hofmeister
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.3-alpha
- */
-package envoy.client.ui.list;
diff --git a/src/main/java/envoy/client/ui/list_component/ContactSearchComponent.java b/src/main/java/envoy/client/ui/list_component/ContactSearchComponent.java
deleted file mode 100644
index edba839..0000000
--- a/src/main/java/envoy/client/ui/list_component/ContactSearchComponent.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package envoy.client.ui.list_component;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-
-import javax.swing.*;
-
-import envoy.client.data.Settings;
-import envoy.client.event.SendEvent;
-import envoy.client.ui.list.ComponentList;
-import envoy.client.ui.primary.PrimaryButton;
-import envoy.data.User;
-import envoy.event.ContactOperationEvent;
-import envoy.event.EventBus;
-
-/**
- * Project: <strong>envoy-client</strong>
- * File: <strong>ContactSearchComponent.java</strong>
- * Created: <strong>21.03.2020</strong>
- *
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.1-beta
- */
-public class ContactSearchComponent extends JComponent {
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * @param list the {@link ComponentList} that is used to display search results
-	 * @param user the {@link User} that appears as a search result
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContactSearchComponent(ComponentList<? extends User> list, User user) {
-		setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
-
-		setBackground(list.getBackground());
-		setForeground(list.getForeground());
-
-		JLabel display = new JLabel(user.getName());
-		display.setForeground(Settings.getInstance().getCurrentTheme().getTextColor());
-		display.setAlignmentX(Component.LEFT_ALIGNMENT);
-		display.setAlignmentY(Component.CENTER_ALIGNMENT);
-		display.setFont(new Font("Arial", Font.PLAIN, 16));
-		add(display);
-
-		PrimaryButton add = new PrimaryButton("+");
-		add.setFont(new Font("Arial", Font.PLAIN, 19));
-		add.setPreferredSize(new Dimension(45, 45));
-		add.setMinimumSize(new Dimension(45, 45));
-		add.setMaximumSize(new Dimension(45, 45));
-
-		add.setBackground(list.getBackground());
-		add.setForeground(list.getForeground());
-
-		add.addActionListener(evt -> {
-			ContactOperationEvent contactsOperationEvent = new ContactOperationEvent(user, ContactOperationEvent.Operation.ADD);
-			EventBus.getInstance().dispatch(contactsOperationEvent);
-			EventBus.getInstance().dispatch(new SendEvent(contactsOperationEvent));
-		});
-
-		add(add);
-
-		// Define some space to the messages below
-		setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(0, 0, 15, 0), BorderFactory.createEtchedBorder()));
-
-		// Define a maximum height of 50px
-		Dimension size = new Dimension(435, 50);
-		setMaximumSize(size);
-		setMinimumSize(size);
-		setPreferredSize(size);
-	}
-}
diff --git a/src/main/java/envoy/client/ui/list_component/MessageComponent.java b/src/main/java/envoy/client/ui/list_component/MessageComponent.java
deleted file mode 100644
index 9ceb413..0000000
--- a/src/main/java/envoy/client/ui/list_component/MessageComponent.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package envoy.client.ui.list_component;
-
-import java.awt.*;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.EnumMap;
-
-import javax.swing.*;
-
-import envoy.client.data.Chat;
-import envoy.client.data.Settings;
-import envoy.client.ui.Color;
-import envoy.client.ui.IconUtil;
-import envoy.client.ui.list.ComponentList;
-import envoy.data.Message;
-import envoy.data.Message.MessageStatus;
-import envoy.data.User;
-
-/**
- * Project: <strong>envoy-client</strong>
- * File: <strong>MessageComponent.java</strong>
- * Created: <strong>21.03.2020</strong>
- *
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.1-beta
- */
-public class MessageComponent extends JPanel {
-
-	private static final long serialVersionUID = 0L;
-
-	private static EnumMap<MessageStatus, ImageIcon>	statusIcons;
-	private static ImageIcon							forwardIcon;
-
-	static {
-		try {
-			statusIcons	= IconUtil.loadByEnum(MessageStatus.class, 16);
-			forwardIcon	= IconUtil.load("/icons/forward.png", 16);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @param list     the {@link ComponentList} that displays this {@link Chat}
-	 * @param message  the {@link Message} to display
-	 * @param senderId the id of the {@link User} who sends messages from this
-	 *                 account
-	 * @since Envoy Client v0.1-beta
-	 */
-	public MessageComponent(ComponentList<? extends Message> list, Message message, long senderId) {
-		var			width	= list.getMaximumSize().width;
-		final var	theme	= Settings.getInstance().getCurrentTheme();
-		final int	padding	= (int) (width * 0.35);
-
-		GridBagLayout gbl_panel = new GridBagLayout();
-		gbl_panel.columnWidths	= new int[] { 1, 1 };
-		gbl_panel.rowHeights	= new int[] { 1, 1 };
-		gbl_panel.columnWeights	= new double[] { 1, 1 };
-		gbl_panel.rowWeights	= new double[] { 1, 1 };
-
-		setLayout(gbl_panel);
-		setBackground(theme.getCellColor());
-
-		// Date Label - The Label that displays the creation date of a message
-		var dateLabel = new JLabel(new SimpleDateFormat("dd.MM.yyyy HH:mm").format(message.getCreationDate()));
-		dateLabel.setForeground(theme.getDateColor());
-		dateLabel.setAlignmentX(1f);
-		dateLabel.setFont(new Font("Arial", Font.PLAIN, 12));
-		dateLabel.setPreferredSize(dateLabel.getPreferredSize());
-
-		var gbc_dateLabel = new GridBagConstraints();
-		gbc_dateLabel.fill	= GridBagConstraints.BOTH;
-		gbc_dateLabel.gridx	= 0;
-		gbc_dateLabel.gridy	= 0;
-		add(dateLabel, gbc_dateLabel);
-
-		// Message area - The JTextArea that displays the text content of a message.
-		var messageTextArea = new JTextArea(message.getText());
-		messageTextArea.setLineWrap(true);
-		messageTextArea.setWrapStyleWord(true);
-		messageTextArea.setForeground(theme.getTextColor());
-		messageTextArea.setAlignmentX(0.5f);
-		messageTextArea.setBackground(theme.getCellColor());
-		messageTextArea.setEditable(false);
-		var font = new Font("Arial", Font.PLAIN, 14);
-		messageTextArea.setFont(font);
-		messageTextArea.setSize(width - padding - 16, 10);
-
-		var gbc_messageTextArea = new GridBagConstraints();
-		gbc_messageTextArea.fill	= GridBagConstraints.HORIZONTAL;
-		gbc_messageTextArea.gridx	= 0;
-		gbc_messageTextArea.gridy	= 1;
-		add(messageTextArea, gbc_messageTextArea);
-
-		// Status Label - displays the status of the message
-		var statusLabel = new JLabel(statusIcons.get(message.getStatus()));
-
-		var gbc_statusLabel = new GridBagConstraints();
-		gbc_statusLabel.gridx	= 1;
-		gbc_statusLabel.gridy	= 1;
-		add(statusLabel, gbc_statusLabel);
-
-		// Forwarding
-		if (message.isForwarded()) {
-			var forwardLabel = new JLabel("Forwarded", forwardIcon, SwingConstants.CENTER);
-			forwardLabel.setBackground(getBackground());
-			forwardLabel.setForeground(Color.lightGray);
-
-			var gbc_forwardLabel = new GridBagConstraints();
-			gbc_forwardLabel.fill	= GridBagConstraints.BOTH;
-			gbc_forwardLabel.gridx	= 1;
-			gbc_forwardLabel.gridy	= 0;
-			add(forwardLabel, gbc_forwardLabel);
-		}
-
-		// Define an etched border and some space to the messages below
-		var ours = senderId == message.getSenderID();
-		setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(0, ours ? padding : 10, 10, ours ? 0 : padding),
-				BorderFactory.createEtchedBorder()));
-
-		var size = new Dimension(width - 50, getPreferredSize().height);
-
-		setPreferredSize(size);
-		setMinimumSize(size);
-		setMaximumSize(size);
-	}
-}
diff --git a/src/main/java/envoy/client/ui/list_component/UserComponent.java b/src/main/java/envoy/client/ui/list_component/UserComponent.java
deleted file mode 100644
index 4d3332e..0000000
--- a/src/main/java/envoy/client/ui/list_component/UserComponent.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package envoy.client.ui.list_component;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import envoy.client.data.Settings;
-import envoy.client.ui.Color;
-import envoy.client.ui.Theme;
-import envoy.data.User;
-import envoy.data.User.UserStatus;
-
-/**
- * Displays a {@link User}.<br>
- * <br>
- * Project: <strong>envoy-client</strong>
- * File: <strong>UserComponent.java</strong>
- * Created: <strong>21.03.2020</strong>
- *
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.1-beta
- */
-public class UserComponent extends JPanel {
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * @param user the {@link User} whose information is displayed
-	 * @since Envoy Client v0.1-beta
-	 */
-	public UserComponent(User user) {
-		final Theme theme = Settings.getInstance().getCurrentTheme();
-
-		setLayout(new BorderLayout());
-
-		// Panel background
-		setBackground(theme.getCellColor());
-		setOpaque(true);
-		setPreferredSize(new Dimension(100, 35));
-
-		// TODO add profile picture support in BorderLayout.West
-
-		JLabel username = new JLabel(user.getName());
-		username.setForeground(theme.getUserNameColor());
-		add(username, BorderLayout.CENTER);
-
-		final UserStatus	status		= user.getStatus();
-		JLabel				statusLabel	= new JLabel(status.toString());
-		Color				foreground;
-		switch (status) {
-			case AWAY:
-				foreground = Color.yellow;
-				break;
-			case BUSY:
-				foreground = Color.blue;
-				break;
-			case ONLINE:
-				foreground = Color.green;
-				break;
-			default:
-				foreground = Color.lightGray;
-				break;
-		}
-		statusLabel.setForeground(foreground);
-		add(statusLabel, BorderLayout.NORTH);
-	}
-}
diff --git a/src/main/java/envoy/client/ui/list_component/package-info.java b/src/main/java/envoy/client/ui/list_component/package-info.java
deleted file mode 100644
index 89da45c..0000000
--- a/src/main/java/envoy/client/ui/list_component/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * This package contains swing components that can be displayed by
- * {@link envoy.client.ui.list.ComponentList}.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>package-info.java</strong><br>
- * Created: <strong>21 Mar 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.1-beta
- */
-package envoy.client.ui.list_component;
diff --git a/src/main/java/envoy/client/ui/renderer/UserListRenderer.java b/src/main/java/envoy/client/ui/renderer/UserListRenderer.java
deleted file mode 100644
index 0ed15a2..0000000
--- a/src/main/java/envoy/client/ui/renderer/UserListRenderer.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package envoy.client.ui.renderer;
-
-import java.awt.Component;
-import java.awt.Dimension;
-
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.ListCellRenderer;
-
-import envoy.client.data.Settings;
-import envoy.data.User;
-import envoy.data.User.UserStatus;
-
-/**
- * Defines how the {@code UserList} is displayed.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>UserListRenderer.java</strong><br>
- * Created: <strong>12 Oct 2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.1-alpha
- */
-public class UserListRenderer extends JLabel implements ListCellRenderer<User> {
-
-	private static final long serialVersionUID = 5164417379767181198L;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Component getListCellRendererComponent(JList<? extends User> list, User value, int index, boolean isSelected, boolean cellHasFocus) {
-		if (isSelected) {
-			setBackground(list.getSelectionBackground());
-			setForeground(list.getSelectionForeground());
-		} else {
-			setBackground(list.getBackground());
-			setForeground(list.getForeground());
-		}
-
-		// Enable background rendering
-		setOpaque(true);
-
-		final String		name	= value.getName();
-		final UserStatus	status	= value.getStatus();
-
-		this.setPreferredSize(new Dimension(100, 35));
-
-		// Getting the UserNameColor of the current theme
-		String textColor = null;
-		textColor = Settings.getInstance().getCurrentTheme().getUserNameColor().toHex();
-		switch (status) {
-			case ONLINE:
-				setText(String
-					.format("<html><p style=\"color:#03fc20\"><b><small>%s</b></small><br><p style=\"color:%s\">%s</html>", status, textColor, name));
-				break;
-			case OFFLINE:
-				setText(String
-					.format("<html><p style=\"color:#fc0303\"><b><small>%s</b></small><br><p style=\"color:%s\">%s</html>", status, textColor, name));
-				break;
-		}
-		return this;
-	}
-}
diff --git a/src/main/java/envoy/client/ui/renderer/package-info.java b/src/main/java/envoy/client/ui/renderer/package-info.java
deleted file mode 100644
index 6a6f58e..0000000
--- a/src/main/java/envoy/client/ui/renderer/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * This package contains all Envoy-specific renderers for lists that store an
- * arbitrary number of JComponents.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>package-info.java</strong><br>
- * Created: <strong>14 Mar 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.1-beta
- */
-package envoy.client.ui.renderer;

From 487c6a657360988a4acbb75c5b3e9b7e4ef72cdb Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Thu, 2 Apr 2020 09:23:47 +0200
Subject: [PATCH 10/60] Added BASIC group capability (#128)

* Changed serialVersionUID everywhere to 0L

* Added support for GroupResizeEvents and NameChangeEvents

Co-authored-by: CyB3RC0nN0R <kske@outlook.de>
---
 src/main/java/envoy/client/data/Cache.java    |  2 +-
 src/main/java/envoy/client/data/Chat.java     | 21 +++++++---
 src/main/java/envoy/client/data/LocalDB.java  | 41 +++++++++++++++++--
 src/main/java/envoy/client/net/Client.java    |  6 +++
 src/main/java/envoy/client/ui/Color.java      |  2 +-
 .../client/ui/container/LoginDialog.java      |  2 +-
 .../client/ui/primary/PrimaryScrollPane.java  |  2 +-
 .../client/ui/primary/PrimaryTextArea.java    |  2 +-
 .../ui/settings/GeneralSettingsPanel.java     |  2 +-
 .../ui/settings/ThemeCustomizationPanel.java  |  2 +-
 10 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/src/main/java/envoy/client/data/Cache.java b/src/main/java/envoy/client/data/Cache.java
index 5a92463..8060d2e 100644
--- a/src/main/java/envoy/client/data/Cache.java
+++ b/src/main/java/envoy/client/data/Cache.java
@@ -25,7 +25,7 @@ public class Cache<T> implements Consumer<T>, Serializable {
 	private transient Consumer<T>	processor;
 
 	private static final Logger	logger				= EnvoyLog.getLogger(Cache.class);
-	private static final long	serialVersionUID	= 0L;
+	private static final long	serialVersionUID = 0L;
 
 	/**
 	 * Adds an element to the cache.
diff --git a/src/main/java/envoy/client/data/Chat.java b/src/main/java/envoy/client/data/Chat.java
index 839daa7..a9148e2 100644
--- a/src/main/java/envoy/client/data/Chat.java
+++ b/src/main/java/envoy/client/data/Chat.java
@@ -6,9 +6,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import envoy.client.net.WriteProxy;
-import envoy.data.Message;
+import envoy.data.*;
 import envoy.data.Message.MessageStatus;
-import envoy.data.User;
 import envoy.event.MessageStatusChangeEvent;
 
 /**
@@ -26,7 +25,7 @@ import envoy.event.MessageStatusChangeEvent;
  */
 public final class Chat implements Serializable {
 
-	private final User			recipient;
+	private final Contact		recipient;
 	private final List<Message>	messages	= new ArrayList<>();
 
 	private static final long serialVersionUID = 1L;
@@ -38,7 +37,7 @@ public final class Chat implements Serializable {
 	 * @param recipient the user who receives the messages
 	 * @since Envoy Client v0.1-alpha
 	 */
-	public Chat(User recipient) { this.recipient = recipient; }
+	public Chat(Contact recipient) { this.recipient = recipient; }
 
 	@Override
 	public String toString() { return String.format("Chat[recipient=%s,messages=%d]", recipient, messages.size()); }
@@ -82,5 +81,17 @@ public final class Chat implements Serializable {
 	 * @return the recipient of a message
 	 * @since Envoy Client v0.1-alpha
 	 */
-	public User getRecipient() { return recipient; }
+	public Contact getRecipient() { return recipient; }
+
+	/**
+	 * @return whether this {@link Chat} points at a {@link User}
+	 * @since Envoy Client v0.1-beta
+	 */
+	public boolean isUserChat() { return recipient instanceof User; }
+
+	/**
+	 * @return whether this {@link Chat} points at a {@link Group}
+	 * @since Envoy Client v0.1-beta
+	 */
+	public boolean isGroupChat() { return recipient instanceof Group; }
 }
diff --git a/src/main/java/envoy/client/data/LocalDB.java b/src/main/java/envoy/client/data/LocalDB.java
index 7de7383..256e701 100644
--- a/src/main/java/envoy/client/data/LocalDB.java
+++ b/src/main/java/envoy/client/data/LocalDB.java
@@ -2,10 +2,8 @@ package envoy.client.data;
 
 import java.util.*;
 
-import envoy.data.IDGenerator;
-import envoy.data.Message;
-import envoy.data.User;
-import envoy.event.MessageStatusChangeEvent;
+import envoy.data.*;
+import envoy.event.*;
 
 /**
  * Stores information about the current {@link User} and their {@link Chat}s.
@@ -155,4 +153,39 @@ public abstract class LocalDB {
 	public Message getMessage(long id) {
 		return chats.stream().map(Chat::getMessages).flatMap(List::stream).filter(m -> m.getID() == id).findAny().orElse(null);
 	}
+
+	/**
+	 * Performs a contact name change if the corresponding contact is present.
+	 *
+	 * @param event the {@link NameChangeEvent} to process
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void replaceContactName(NameChangeEvent event) {
+		chats.stream().map(Chat::getRecipient).filter(c -> c.getID() == event.getId()).findAny().ifPresent(c -> c.setName(event.get()));
+	}
+
+	/**
+	 * Performs a group resize operation if the corresponding group is present.
+	 *
+	 * @param event the {@link GroupResizeEvent} to process
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void updateGroup(GroupResizeEvent event) {
+		chats.stream()
+			.map(Chat::getRecipient)
+			.filter(Group.class::isInstance)
+			.filter(g -> g.getID() == event.getGroupID() && g.getID() != user.getID())
+			.map(Group.class::cast)
+			.findAny()
+			.ifPresent(group -> {
+				switch (event.getOperation()) {
+					case ADD:
+						group.getMemberIDs().add(event.get());
+						break;
+					case REMOVE:
+						group.getMemberIDs().remove(event.get());
+						break;
+				}
+			});
+	}
 }
diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index a07c0bc..a61d6de 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -145,12 +145,18 @@ public class Client implements Closeable {
 		// Process message ID generation
 		receiver.registerProcessor(IDGenerator.class, localDB::setIDGenerator);
 
+		// Process name changes
+		receiver.registerProcessor(NameChangeEvent.class, evt -> { localDB.replaceContactName(evt); EventBus.getInstance().dispatch(evt); });
+
 		// Process contact searches
 		receiver.registerProcessor(ContactSearchResult.class, EventBus.getInstance()::dispatch);
 
 		receiver.registerProcessor(Contacts.class,
 				contacts -> EventBus.getInstance().dispatch(new ContactOperationEvent(contacts.getContacts().get(0), Operation.ADD)));
 
+		// Process group size changes
+		receiver.registerProcessor(GroupResizeEvent.class, evt -> { localDB.updateGroup(evt); EventBus.getInstance().dispatch(evt); });
+
 		// Send event
 		EventBus.getInstance().register(SendEvent.class, evt -> {
 			try {
diff --git a/src/main/java/envoy/client/ui/Color.java b/src/main/java/envoy/client/ui/Color.java
index bb89943..da58bbb 100644
--- a/src/main/java/envoy/client/ui/Color.java
+++ b/src/main/java/envoy/client/ui/Color.java
@@ -81,7 +81,7 @@ public class Color extends java.awt.Color {
 	 */
 	public static final Color blue = new Color(0, 0, 255);
 
-	private static final long serialVersionUID = -9166233199998257344L;
+	private static final long serialVersionUID = 0L;
 
 	public Color(java.awt.Color other) { this(other.getRGB()); }
 
diff --git a/src/main/java/envoy/client/ui/container/LoginDialog.java b/src/main/java/envoy/client/ui/container/LoginDialog.java
index d2cad9f..0d9f034 100644
--- a/src/main/java/envoy/client/ui/container/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/container/LoginDialog.java
@@ -65,7 +65,7 @@ public class LoginDialog extends JDialog {
 
 	private static final ClientConfig	config				= ClientConfig.getInstance();
 	private static final Logger			logger				= EnvoyLog.getLogger(LoginDialog.class);
-	private static final long			serialVersionUID	= 0L;
+	private static final long			serialVersionUID = 0L;
 
 	/**
 	 * Displays a dialog enabling the user to enter their user name and password.
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java b/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
index a27b075..e02502b 100644
--- a/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
+++ b/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
@@ -14,7 +14,7 @@ import envoy.client.ui.Theme;
  */
 public class PrimaryScrollPane extends JScrollPane {
 
-	private static final long serialVersionUID = -4786837444056228439L;
+	private static final long serialVersionUID = 0L;
 
 	private int		verticalScrollBarMaximum	= getVerticalScrollBar().getMaximum();
 	private boolean	chatOpened					= false;
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java b/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
index 40bf167..37d05eb 100644
--- a/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
+++ b/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
@@ -16,7 +16,7 @@ import javax.swing.border.EmptyBorder;
  */
 public class PrimaryTextArea extends JTextArea {
 
-	private static final long	serialVersionUID	= 0L;
+	private static final long	serialVersionUID = 0L;
 	private int					arcSize;
 
 	/**
diff --git a/src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java b/src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java
index 5b88ce4..372478b 100644
--- a/src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java
+++ b/src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java
@@ -30,7 +30,7 @@ public class GeneralSettingsPanel extends SettingsPanel {
 
 	private static final String[]	items				= { "onCloseMode", "enterToSend" };
 	private static final Logger		logger				= EnvoyLog.getLogger(GeneralSettingsPanel.class);
-	private static final long		serialVersionUID	= 0L;
+	private static final long		serialVersionUID = 0L;
 
 	/**
 	 * This is the constructor for the General class. Here the user can set general
diff --git a/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java b/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
index 44eb026..b6eb832 100755
--- a/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
+++ b/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
@@ -39,7 +39,7 @@ public class ThemeCustomizationPanel extends SettingsPanel {
 	private final Insets	insets	= new Insets(5, 5, 5, 5);
 
 	private static final Logger	logger				= EnvoyLog.getLogger(ThemeCustomizationPanel.class);
-	private static final long	serialVersionUID	= 0L;
+	private static final long	serialVersionUID = 0L;
 
 	/**
 	 * Initializes a {@link ThemeCustomizationPanel} that enables the user to change

From 5d76bbbcb00dfc3d84cac6158d62b3bef822d27f Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Thu, 2 Apr 2020 22:03:43 +0200
Subject: [PATCH 11/60] restored compatibility with envoy common (and envoy
 server standalone)

---
 pom.xml                                       |  2 +-
 src/main/java/envoy/client/data/LocalDB.java  | 16 +++++----
 src/main/java/envoy/client/net/Client.java    | 35 ++++++++++---------
 .../client/net/UserStatusChangeProcessor.java |  3 +-
 .../envoy/client/ui/ChatSceneController.java  | 13 +++----
 src/main/java/envoy/client/ui/Startup.java    | 11 ++++--
 .../java/envoy/client/ui/UserListCell.java    | 19 +++++-----
 .../client/ui/container/LoginDialog.java      |  4 +--
 8 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/pom.xml b/pom.xml
index d036d0d..59bb365 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.github.informatik-ag-ngl</groupId>
 			<artifactId>envoy-common</artifactId>
-			<version>develop-SNAPSHOT</version>
+			<version>f~groups-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjfx</groupId>
diff --git a/src/main/java/envoy/client/data/LocalDB.java b/src/main/java/envoy/client/data/LocalDB.java
index 256e701..a9b0665 100644
--- a/src/main/java/envoy/client/data/LocalDB.java
+++ b/src/main/java/envoy/client/data/LocalDB.java
@@ -3,7 +3,9 @@ package envoy.client.data;
 import java.util.*;
 
 import envoy.data.*;
-import envoy.event.*;
+import envoy.event.GroupResizeEvent;
+import envoy.event.MessageStatusChangeEvent;
+import envoy.event.NameChangeEvent;
 
 /**
  * Stores information about the current {@link User} and their {@link Chat}s.
@@ -19,7 +21,7 @@ import envoy.event.*;
 public abstract class LocalDB {
 
 	protected User								user;
-	protected Map<String, User>					users			= new HashMap<>();
+	protected Map<String, Contact>				users			= new HashMap<>();
 	protected List<Chat>						chats			= new ArrayList<>();
 	protected IDGenerator						idGenerator;
 	protected Cache<Message>					messageCache	= new Cache<>();
@@ -69,12 +71,12 @@ public abstract class LocalDB {
 	 *         user names as keys
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public Map<String, User> getUsers() { return users; }
+	public Map<String, Contact> getUsers() { return users; }
 
 	/**
 	 * @param users the users to set
 	 */
-	public void setUsers(Map<String, User> users) { this.users = users; }
+	public void setUsers(Map<String, Contact> users) { this.users = users; }
 
 	/**
 	 * @return all saved {@link Chat} objects that list the client user as the
@@ -161,7 +163,7 @@ public abstract class LocalDB {
 	 * @since Envoy Client v0.1-beta
 	 */
 	public void replaceContactName(NameChangeEvent event) {
-		chats.stream().map(Chat::getRecipient).filter(c -> c.getID() == event.getId()).findAny().ifPresent(c -> c.setName(event.get()));
+		chats.stream().map(Chat::getRecipient).filter(c -> c.getID() == event.getID()).findAny().ifPresent(c -> c.setName(event.get()));
 	}
 
 	/**
@@ -180,10 +182,10 @@ public abstract class LocalDB {
 			.ifPresent(group -> {
 				switch (event.getOperation()) {
 					case ADD:
-						group.getMemberIDs().add(event.get());
+						group.getContacts().add(event.get());
 						break;
 					case REMOVE:
-						group.getMemberIDs().remove(event.get());
+						group.getContacts().remove(event.get());
 						break;
 				}
 			});
diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index a61d6de..9ae69fb 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.net.Socket;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 import javax.naming.TimeLimitExceededException;
@@ -15,7 +16,8 @@ import envoy.client.data.LocalDB;
 import envoy.client.event.SendEvent;
 import envoy.data.*;
 import envoy.event.*;
-import envoy.event.ContactOperationEvent.Operation;
+import envoy.event.contact.ContactOperationEvent;
+import envoy.event.contact.ContactSearchResult;
 import envoy.util.EnvoyLog;
 import envoy.util.SerializationUtils;
 
@@ -40,9 +42,9 @@ public class Client implements Closeable {
 	private boolean		online;
 
 	// Asynchronously initialized during handshake
-	private volatile User		sender;
-	private volatile Contacts	contacts;
-	private volatile boolean	rejected;
+	private volatile User					sender;
+	private volatile Set<? extends Contact>	contacts;
+	private volatile boolean				rejected;
 
 	// Configuration and logging
 	private static final ClientConfig	config	= ClientConfig.getInstance();
@@ -67,7 +69,6 @@ public class Client implements Closeable {
 	public void performHandshake(LoginCredentials credentials, Cache<Message> receivedMessageCache)
 			throws TimeLimitExceededException, IOException, InterruptedException {
 		if (online) throw new IllegalStateException("Handshake has already been performed successfully");
-
 		// Establish TCP connection
 		logger.info(String.format("Attempting connection to server %s:%d...", config.getServer(), config.getPort()));
 		socket = new Socket(config.getServer(), config.getPort());
@@ -77,8 +78,7 @@ public class Client implements Closeable {
 		receiver = new Receiver(socket.getInputStream());
 
 		// Register user creation processor, contact list processor and message cache
-		receiver.registerProcessor(User.class, sender -> this.sender = sender);
-		receiver.registerProcessor(Contacts.class, contacts -> this.contacts = contacts);
+		receiver.registerProcessor(User.class, sender -> { this.sender = sender; contacts = sender.getContacts(); });
 		receiver.registerProcessor(Message.class, receivedMessageCache);
 		receiver.registerProcessor(HandshakeRejectionEvent.class, evt -> { rejected = true; EventBus.getInstance().dispatch(evt); });
 
@@ -92,7 +92,7 @@ public class Client implements Closeable {
 
 		// Wait for a maximum of five seconds to acquire the sender object
 		long start = System.currentTimeMillis();
-		while (sender == null || contacts == null) {
+		while (sender == null) {
 
 			// Quit immediately after handshake rejection
 			// This method can then be called again
@@ -151,8 +151,9 @@ public class Client implements Closeable {
 		// Process contact searches
 		receiver.registerProcessor(ContactSearchResult.class, EventBus.getInstance()::dispatch);
 
-		receiver.registerProcessor(Contacts.class,
-				contacts -> EventBus.getInstance().dispatch(new ContactOperationEvent(contacts.getContacts().get(0), Operation.ADD)));
+		receiver.registerProcessor(Contact.class,
+				contacts -> EventBus.getInstance()
+					.dispatch(new ContactOperationEvent(contacts.getContacts().iterator().next(), ElementOperation.ADD)));
 
 		// Process group size changes
 		receiver.registerProcessor(GroupResizeEvent.class, evt -> { localDB.updateGroup(evt); EventBus.getInstance().dispatch(evt); });
@@ -218,10 +219,10 @@ public class Client implements Closeable {
 	 *         user names as keys
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public Map<String, User> getUsers() {
+	public Map<String, Contact> getUsers() {
 		checkOnline();
-		Map<String, User> users = new HashMap<>();
-		contacts.getContacts().forEach(u -> users.put(u.getName(), u));
+		Map<String, Contact> users = new HashMap<>();
+		contacts.forEach(u -> users.put(u.getName(), u));
 		return users;
 	}
 
@@ -245,10 +246,10 @@ public class Client implements Closeable {
 	/**
 	 * Sets the client user which is used to send messages.
 	 *
-	 * @param sender the client user to set
+	 * @param clientUser the client user to set
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void setSender(User sender) { this.sender = sender; }
+	public void setSender(User clientUser) { this.sender = clientUser; }
 
 	/**
 	 * @return the {@link Receiver} used by this {@link Client}
@@ -265,11 +266,11 @@ public class Client implements Closeable {
 	 * @return the contacts of this {@link Client}
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public Contacts getContacts() { return contacts; }
+	public Set<? extends Contact> getContacts() { return contacts; }
 
 	/**
 	 * @param contacts the contacts to set
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public void setContacts(Contacts contacts) { this.contacts = contacts; }
+	public void setContacts(Set<? extends Contact> contacts) { this.contacts = contacts; }
 }
diff --git a/src/main/java/envoy/client/net/UserStatusChangeProcessor.java b/src/main/java/envoy/client/net/UserStatusChangeProcessor.java
index 761f7d8..9120662 100644
--- a/src/main/java/envoy/client/net/UserStatusChangeProcessor.java
+++ b/src/main/java/envoy/client/net/UserStatusChangeProcessor.java
@@ -3,6 +3,7 @@ package envoy.client.net;
 import java.util.function.Consumer;
 
 import envoy.client.data.LocalDB;
+import envoy.data.User;
 import envoy.event.EventBus;
 import envoy.event.UserStatusChangeEvent;
 
@@ -26,7 +27,7 @@ public class UserStatusChangeProcessor implements Consumer<UserStatusChangeEvent
 
 	@Override
 	public void accept(UserStatusChangeEvent evt) {
-		localDB.getUsers().values().stream().filter(u -> u.getID() == evt.getID()).findFirst().get().setStatus(evt.get());
+		localDB.getUsers().values().stream().filter(u -> u.getID() == evt.getID()).map(User.class::cast).findFirst().get().setStatus(evt.get());
 		EventBus.getInstance().dispatch(evt);
 	}
 }
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 1b68322..1882fba 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -3,15 +3,16 @@ package envoy.client.ui;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import envoy.client.data.Chat;
 import envoy.client.data.LocalDB;
 import envoy.client.event.MessageCreationEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
+import envoy.data.Contact;
 import envoy.data.Message;
 import envoy.data.MessageBuilder;
-import envoy.data.User;
 import envoy.event.EventBus;
 import envoy.event.MessageStatusChangeEvent;
 import envoy.event.UserStatusChangeEvent;
@@ -26,7 +27,7 @@ import javafx.scene.input.KeyEvent;
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>ChatSceneController.java</strong><br>
  * Created: <strong>26.03.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
@@ -39,7 +40,7 @@ public final class ChatSceneController {
 	private ListView<Message> messageList;
 
 	@FXML
-	private ListView<User> userList;
+	private ListView<Contact> userList;
 
 	@FXML
 	private Button postButton;
@@ -95,13 +96,13 @@ public final class ChatSceneController {
 		this.writeProxy	= writeProxy;
 
 		// TODO: handle offline mode
-		userList.setItems(FXCollections.observableList(client.getContacts().getContacts()));
-		// userList.getItems().addAll(localDB.getChats().stream().map(Chat::getRecipient).collect(Collectors.toList()));
+		// userList.setItems(FXCollections.observableList(client.getContacts()));
+		userList.setItems(FXCollections.observableList(localDB.getUser().getContacts().stream().collect(Collectors.toList())));
 	}
 
 	@FXML
 	private void userListClicked() {
-		final User user = userList.getSelectionModel().getSelectedItem();
+		final Contact user = userList.getSelectionModel().getSelectedItem();
 		if (user != null && (currentChat == null || user.getID() != currentChat.getRecipient().getID())) {
 			contactLabel.setText(user.getName());
 
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index c392281..e007058 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -14,6 +14,7 @@ import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
 import envoy.client.ui.container.LoginDialog;
 import envoy.data.Message;
+import envoy.data.User;
 import envoy.data.User.UserStatus;
 import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
@@ -28,7 +29,7 @@ import javafx.stage.Stage;
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>Startup.java</strong><br>
  * Created: <strong>26.03.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
@@ -121,7 +122,12 @@ public final class Startup extends Application {
 			writeProxy.flushCache();
 		} else
 			// Set all contacts to offline mode
-			localDB.getUsers().values().stream().filter(u -> u != localDB.getUser()).forEach(u -> u.setStatus(UserStatus.OFFLINE));
+			localDB.getUsers()
+				.values()
+				.stream()
+				.filter(u -> u instanceof User && u != localDB.getUser())
+				.map(User.class::cast)
+				.forEach(u -> u.setStatus(UserStatus.OFFLINE));
 	}
 
 	/**
@@ -164,5 +170,6 @@ public final class Startup extends Application {
 		}
 	}
 
+	@SuppressWarnings("javadoc")
 	public static void main(String[] args) { launch(args); }
 }
diff --git a/src/main/java/envoy/client/ui/UserListCell.java b/src/main/java/envoy/client/ui/UserListCell.java
index f62f98a..cfc1fdf 100644
--- a/src/main/java/envoy/client/ui/UserListCell.java
+++ b/src/main/java/envoy/client/ui/UserListCell.java
@@ -1,5 +1,6 @@
 package envoy.client.ui;
 
+import envoy.data.Contact;
 import envoy.data.User;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
@@ -9,22 +10,24 @@ import javafx.scene.layout.VBox;
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>UserListCell.java</strong><br>
  * Created: <strong>28.03.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public class UserListCell extends ListCell<User> {
+public class UserListCell extends ListCell<Contact> {
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void updateItem(User user, boolean empty) {
-		super.updateItem(user, empty);
-		if (!empty && user != null) {
-			final Label	name	= new Label(user.getName());
-			final Label	status	= new Label(user.getStatus().toString());
-			setGraphic(new VBox(name, status));
+	protected void updateItem(Contact contact, boolean empty) {
+		super.updateItem(contact, empty);
+		if (!empty && contact != null) {
+			final Label name = new Label(contact.getName());
+			if (contact instanceof User) {
+				final Label status = new Label(((User) contact).getStatus().toString());
+				setGraphic(new VBox(name, status));
+			} else setGraphic(new VBox(name));
 		}
 	}
 }
diff --git a/src/main/java/envoy/client/ui/container/LoginDialog.java b/src/main/java/envoy/client/ui/container/LoginDialog.java
index 0d9f034..b523849 100644
--- a/src/main/java/envoy/client/ui/container/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/container/LoginDialog.java
@@ -65,7 +65,7 @@ public class LoginDialog extends JDialog {
 
 	private static final ClientConfig	config				= ClientConfig.getInstance();
 	private static final Logger			logger				= EnvoyLog.getLogger(LoginDialog.class);
-	private static final long			serialVersionUID = 0L;
+	private static final long			serialVersionUID	= 0L;
 
 	/**
 	 * Displays a dialog enabling the user to enter their user name and password.
@@ -143,7 +143,7 @@ public class LoginDialog extends JDialog {
 			try {
 				// Try entering offline mode
 				localDB.loadUsers();
-				User clientUser = localDB.getUsers().get(credentials.getIdentifier());
+				User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
 				if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
 				client.setSender(clientUser);
 				JOptionPane.showMessageDialog(null,

From 840ec53277e86c1be26e3676bbc6315abfdb2450 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Mon, 6 Apr 2020 15:08:00 +0200
Subject: [PATCH 12/60] Added JavaFX login dialog scene

---
 .../java/envoy/client/ui/LoginDialog.fxml     | 63 +++++++++++++++++++
 .../client/ui/LoginDialogController.java      | 53 ++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 src/main/java/envoy/client/ui/LoginDialog.fxml
 create mode 100644 src/main/java/envoy/client/ui/LoginDialogController.java

diff --git a/src/main/java/envoy/client/ui/LoginDialog.fxml b/src/main/java/envoy/client/ui/LoginDialog.fxml
new file mode 100644
index 0000000..45b2d60
--- /dev/null
+++ b/src/main/java/envoy/client/ui/LoginDialog.fxml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity"
+	minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+	prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1"
+	xmlns:fx="http://javafx.com/fxml/1"
+	fx:controller="envoy.client.ui.LoginDialogController">
+	<children>
+		<Label text="User Login">
+			<font>
+				<Font size="26.0" />
+			</font>
+		</Label>
+		<GridPane>
+			<columnConstraints>
+				<ColumnConstraints hgrow="SOMETIMES"
+					minWidth="10.0" percentWidth="40.0" prefWidth="100.0" />
+				<ColumnConstraints hgrow="SOMETIMES"
+					minWidth="10.0" prefWidth="100.0" />
+			</columnConstraints>
+			<rowConstraints>
+				<RowConstraints minHeight="10.0" prefHeight="30.0"
+					vgrow="SOMETIMES" />
+				<RowConstraints minHeight="10.0" prefHeight="30.0"
+					vgrow="SOMETIMES" />
+				<RowConstraints minHeight="10.0" prefHeight="30.0"
+					vgrow="SOMETIMES" />
+			</rowConstraints>
+			<children>
+				<Label text="User Name:" />
+				<Label text="Password" GridPane.rowIndex="1" />
+				<Label text="Repeat Password:" visible="false"
+					GridPane.rowIndex="2" fx:id="repeatPasswordLabel" />
+				<TextField GridPane.columnIndex="1" />
+				<PasswordField GridPane.columnIndex="1"
+					GridPane.rowIndex="1" fx:id="repeatPasswordField"/>
+				<PasswordField visible="false"
+					GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="repeatPasswordField"/>
+			</children>
+		</GridPane>
+		<CheckBox mnemonicParsing="false" text="Register" fx:id="registerCheckBox" onAction="#registerCheckboxChanged"/>
+		<HBox prefHeight="100.0" prefWidth="200.0">
+			<children>
+				<Button cancelButton="true" mnemonicParsing="false"
+					text="Cancel" onAction="#cancelButtonClicked"/>
+				<Button defaultButton="true" mnemonicParsing="false"
+					text="Submit" disable="true" onAction="#submitButtonClicked"/>
+			</children>
+		</HBox>
+	</children>
+</VBox>
diff --git a/src/main/java/envoy/client/ui/LoginDialogController.java b/src/main/java/envoy/client/ui/LoginDialogController.java
new file mode 100644
index 0000000..4513809
--- /dev/null
+++ b/src/main/java/envoy/client/ui/LoginDialogController.java
@@ -0,0 +1,53 @@
+package envoy.client.ui;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.stage.Stage;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>LoginDialogController.java</strong><br>
+ * Created: <strong>03.04.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public final class LoginDialogController {
+
+	@FXML
+	private PasswordField passwordField;
+
+	@FXML
+	private PasswordField repeatPasswordField;
+
+	@FXML
+	private Label repeatPasswordLabel;
+
+	@FXML
+	private CheckBox registerCheckBox;
+
+	@FXML
+	private void registerCheckboxChanged() {
+
+		// Make repeat password field and label visible / invisible
+		repeatPasswordField.setVisible(registerCheckBox.isSelected());
+		repeatPasswordLabel.setVisible(registerCheckBox.isSelected());
+
+		// Clear repeat password field if registration cancelled
+		if (!registerCheckBox.isSelected()) repeatPasswordField.clear();
+	}
+
+	@FXML
+	private void submitButtonClicked() {
+
+	}
+
+	@FXML
+	private void cancelButtonClicked(ActionEvent e) { closeStage(e); }
+
+	private void closeStage(ActionEvent e) { ((Stage) ((Node) e.getSource()).getScene().getWindow()).close(); }
+}

From d61cd8a36e83d8f3d8c06c2dd681c4ceaade2d2b Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Mon, 6 Apr 2020 22:55:59 +0200
Subject: [PATCH 13/60] slightly adapted some logging messages

---
 src/main/java/envoy/client/net/Client.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index 9ae69fb..ab555ab 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -70,9 +70,9 @@ public class Client implements Closeable {
 			throws TimeLimitExceededException, IOException, InterruptedException {
 		if (online) throw new IllegalStateException("Handshake has already been performed successfully");
 		// Establish TCP connection
-		logger.info(String.format("Attempting connection to server %s:%d...", config.getServer(), config.getPort()));
+		logger.finer(String.format("Attempting connection to server %s:%d...", config.getServer(), config.getPort()));
 		socket = new Socket(config.getServer(), config.getPort());
-		logger.info("Successfully connected to server.");
+		logger.fine("Successfully established TCP connection to server");
 
 		// Create message receiver
 		receiver = new Receiver(socket.getInputStream());

From de00601a2c0f5e554737955ec8e049811ce34255 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Thu, 9 Apr 2020 22:30:24 +0200
Subject: [PATCH 14/60] Performed updating of the UI on the UI thread

---
 .gitignore                                             | 5 ++++-
 src/main/java/envoy/client/ui/ChatSceneController.java | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a6f89c2..e01c619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-/target/
\ No newline at end of file
+/target/
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 1882fba..b8927d4 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -17,6 +17,7 @@ import envoy.event.EventBus;
 import envoy.event.MessageStatusChangeEvent;
 import envoy.event.UserStatusChangeEvent;
 import envoy.util.EnvoyLog;
+import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
@@ -74,7 +75,7 @@ public final class ChatSceneController {
 			chat.getMessages().add(message);
 
 			// Update UI if in current chat
-			if (chat == currentChat) messageList.getItems().add(message);
+			if (chat == currentChat) Platform.runLater(() -> messageList.getItems().add(message));
 		});
 
 		// Listen to message status changes
@@ -83,11 +84,11 @@ public final class ChatSceneController {
 			message.setStatus(e.get());
 
 			// Update UI if in current chat
-			if (currentChat != null && message.getSenderID() == currentChat.getRecipient().getID()) messageList.refresh();
+			if (currentChat != null && message.getSenderID() == currentChat.getRecipient().getID()) Platform.runLater(() -> messageList.refresh());
 		});
 
 		// Listen to user status changes
-		eventBus.register(UserStatusChangeEvent.class, e -> userList.refresh());
+		eventBus.register(UserStatusChangeEvent.class, e -> Platform.runLater(() -> userList.refresh()));
 	}
 
 	void initializeData(LocalDB localDB, Client client, WriteProxy writeProxy) {
@@ -96,7 +97,6 @@ public final class ChatSceneController {
 		this.writeProxy	= writeProxy;
 
 		// TODO: handle offline mode
-		// userList.setItems(FXCollections.observableList(client.getContacts()));
 		userList.setItems(FXCollections.observableList(localDB.getUser().getContacts().stream().collect(Collectors.toList())));
 	}
 

From 7285375447e863c61fe50e6d96c154072dd613be Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 10 Apr 2020 11:01:03 +0200
Subject: [PATCH 15/60] Moved the LoginDialogController class inside the
 LoginDialog class

---
 src/main/java/envoy/client/net/Client.java    | 20 ++---
 .../java/envoy/client/ui/LoginDialog.fxml     | 84 ++++++++-----------
 .../java/envoy/client/ui/LoginDialog.java     | 70 ++++++++++++++++
 .../client/ui/LoginDialogController.java      | 53 ------------
 src/main/java/envoy/client/ui/Startup.java    | 19 +++--
 5 files changed, 125 insertions(+), 121 deletions(-)
 create mode 100644 src/main/java/envoy/client/ui/LoginDialog.java
 delete mode 100644 src/main/java/envoy/client/ui/LoginDialogController.java

diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index 9ae69fb..50019f4 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -46,9 +46,10 @@ public class Client implements Closeable {
 	private volatile Set<? extends Contact>	contacts;
 	private volatile boolean				rejected;
 
-	// Configuration and logging
-	private static final ClientConfig	config	= ClientConfig.getInstance();
-	private static final Logger			logger	= EnvoyLog.getLogger(Client.class);
+	// Configuration, logging and event management
+	private static final ClientConfig	config		= ClientConfig.getInstance();
+	private static final Logger			logger		= EnvoyLog.getLogger(Client.class);
+	private static final EventBus		eventBus	= EventBus.getInstance();
 
 	/**
 	 * Enters the online mode by acquiring a user ID from the server. As a
@@ -80,7 +81,7 @@ public class Client implements Closeable {
 		// Register user creation processor, contact list processor and message cache
 		receiver.registerProcessor(User.class, sender -> { this.sender = sender; contacts = sender.getContacts(); });
 		receiver.registerProcessor(Message.class, receivedMessageCache);
-		receiver.registerProcessor(HandshakeRejectionEvent.class, evt -> { rejected = true; EventBus.getInstance().dispatch(evt); });
+		receiver.registerProcessor(HandshakeRejectionEvent.class, evt -> { rejected = true; eventBus.dispatch(evt); });
 
 		rejected = false;
 
@@ -146,20 +147,19 @@ public class Client implements Closeable {
 		receiver.registerProcessor(IDGenerator.class, localDB::setIDGenerator);
 
 		// Process name changes
-		receiver.registerProcessor(NameChangeEvent.class, evt -> { localDB.replaceContactName(evt); EventBus.getInstance().dispatch(evt); });
+		receiver.registerProcessor(NameChangeEvent.class, evt -> { localDB.replaceContactName(evt); eventBus.dispatch(evt); });
 
 		// Process contact searches
-		receiver.registerProcessor(ContactSearchResult.class, EventBus.getInstance()::dispatch);
+		receiver.registerProcessor(ContactSearchResult.class, eventBus::dispatch);
 
 		receiver.registerProcessor(Contact.class,
-				contacts -> EventBus.getInstance()
-					.dispatch(new ContactOperationEvent(contacts.getContacts().iterator().next(), ElementOperation.ADD)));
+				contacts -> eventBus.dispatch(new ContactOperationEvent(contacts.getContacts().iterator().next(), ElementOperation.ADD)));
 
 		// Process group size changes
-		receiver.registerProcessor(GroupResizeEvent.class, evt -> { localDB.updateGroup(evt); EventBus.getInstance().dispatch(evt); });
+		receiver.registerProcessor(GroupResizeEvent.class, evt -> { localDB.updateGroup(evt); eventBus.dispatch(evt); });
 
 		// Send event
-		EventBus.getInstance().register(SendEvent.class, evt -> {
+		eventBus.register(SendEvent.class, evt -> {
 			try {
 				sendEvent(evt.get());
 			} catch (IOException e) {
diff --git a/src/main/java/envoy/client/ui/LoginDialog.fxml b/src/main/java/envoy/client/ui/LoginDialog.fxml
index 45b2d60..30020e9 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.fxml
+++ b/src/main/java/envoy/client/ui/LoginDialog.fxml
@@ -2,6 +2,7 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.PasswordField?>
 <?import javafx.scene.control.TextField?>
@@ -12,52 +13,37 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity"
-	minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
-	prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1"
-	xmlns:fx="http://javafx.com/fxml/1"
-	fx:controller="envoy.client.ui.LoginDialogController">
-	<children>
-		<Label text="User Login">
-			<font>
-				<Font size="26.0" />
-			</font>
-		</Label>
-		<GridPane>
-			<columnConstraints>
-				<ColumnConstraints hgrow="SOMETIMES"
-					minWidth="10.0" percentWidth="40.0" prefWidth="100.0" />
-				<ColumnConstraints hgrow="SOMETIMES"
-					minWidth="10.0" prefWidth="100.0" />
-			</columnConstraints>
-			<rowConstraints>
-				<RowConstraints minHeight="10.0" prefHeight="30.0"
-					vgrow="SOMETIMES" />
-				<RowConstraints minHeight="10.0" prefHeight="30.0"
-					vgrow="SOMETIMES" />
-				<RowConstraints minHeight="10.0" prefHeight="30.0"
-					vgrow="SOMETIMES" />
-			</rowConstraints>
-			<children>
-				<Label text="User Name:" />
-				<Label text="Password" GridPane.rowIndex="1" />
-				<Label text="Repeat Password:" visible="false"
-					GridPane.rowIndex="2" fx:id="repeatPasswordLabel" />
-				<TextField GridPane.columnIndex="1" />
-				<PasswordField GridPane.columnIndex="1"
-					GridPane.rowIndex="1" fx:id="repeatPasswordField"/>
-				<PasswordField visible="false"
-					GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="repeatPasswordField"/>
-			</children>
-		</GridPane>
-		<CheckBox mnemonicParsing="false" text="Register" fx:id="registerCheckBox" onAction="#registerCheckboxChanged"/>
-		<HBox prefHeight="100.0" prefWidth="200.0">
-			<children>
-				<Button cancelButton="true" mnemonicParsing="false"
-					text="Cancel" onAction="#cancelButtonClicked"/>
-				<Button defaultButton="true" mnemonicParsing="false"
-					text="Submit" disable="true" onAction="#submitButtonClicked"/>
-			</children>
-		</HBox>
-	</children>
-</VBox>
+
+<DialogPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.LoginDialog$Controller">
+   <content>
+      <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0">
+      	<children>
+      		<Label text="User Login">
+      			<font>
+      				<Font size="26.0" />
+      			</font>
+      		</Label>
+      		<GridPane>
+      			<columnConstraints>
+      				<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="40.0" prefWidth="100.0" />
+      				<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+      			</columnConstraints>
+      			<rowConstraints>
+      				<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      				<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      				<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      			</rowConstraints>
+      			<children>
+      				<Label text="User Name:" />
+      				<Label text="Password" GridPane.rowIndex="1" />
+      				<Label fx:id="repeatPasswordLabel" text="Repeat Password:" visible="false" GridPane.rowIndex="2" />
+      				<TextField fx:id="userTextField" GridPane.columnIndex="1" />
+      				<PasswordField fx:id="repeatPasswordField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+      				<PasswordField fx:id="repeatPasswordField" visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+      			</children>
+      		</GridPane>
+      		<CheckBox fx:id="registerCheckBox" mnemonicParsing="false" onAction="#registerCheckboxChanged" text="Register" />
+      	</children>
+      </VBox>
+   </content>
+</DialogPane>
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
new file mode 100644
index 0000000..cb9453e
--- /dev/null
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -0,0 +1,70 @@
+package envoy.client.ui;
+
+import java.io.IOException;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>LoginDialog.java</strong><br>
+ * Created: <strong>03.04.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public final class LoginDialog extends Dialog<Void> {
+
+	/**
+	 * Loads the login dialog using the FXML file {@code LoginDialog.fxml}.
+	 * 
+	 * @throws IOException if an exception occurs during loading
+	 * @since Envoy Client v0.1-beta
+	 */
+	public LoginDialog() throws IOException {
+		final var dialogPane = FXMLLoader.<DialogPane>load(getClass().getResource("LoginDialog.fxml"));
+
+		// Configure buttons
+		dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
+
+		setDialogPane(dialogPane);
+	}
+
+	public static class Controller {
+
+		@FXML
+		private TextField userTextField;
+
+		@FXML
+		private PasswordField passwordField;
+
+		@FXML
+		private PasswordField repeatPasswordField;
+
+		@FXML
+		private Label repeatPasswordLabel;
+
+		@FXML
+		private CheckBox registerCheckBox;
+
+		@FXML
+		private void initialize() {
+
+			// Set initial cursor
+			Platform.runLater(userTextField::requestFocus);
+		}
+
+		@FXML
+		private void registerCheckboxChanged() {
+
+			// Make repeat password field and label visible / invisible
+			repeatPasswordField.setVisible(registerCheckBox.isSelected());
+			repeatPasswordLabel.setVisible(registerCheckBox.isSelected());
+
+			// Clear repeat password field if registration cancelled
+			if (!registerCheckBox.isSelected()) repeatPasswordField.clear();
+		}
+	}
+}
diff --git a/src/main/java/envoy/client/ui/LoginDialogController.java b/src/main/java/envoy/client/ui/LoginDialogController.java
deleted file mode 100644
index 4513809..0000000
--- a/src/main/java/envoy/client/ui/LoginDialogController.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package envoy.client.ui;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.PasswordField;
-import javafx.stage.Stage;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>LoginDialogController.java</strong><br>
- * Created: <strong>03.04.2020</strong><br>
- * 
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.1-beta
- */
-public final class LoginDialogController {
-
-	@FXML
-	private PasswordField passwordField;
-
-	@FXML
-	private PasswordField repeatPasswordField;
-
-	@FXML
-	private Label repeatPasswordLabel;
-
-	@FXML
-	private CheckBox registerCheckBox;
-
-	@FXML
-	private void registerCheckboxChanged() {
-
-		// Make repeat password field and label visible / invisible
-		repeatPasswordField.setVisible(registerCheckBox.isSelected());
-		repeatPasswordLabel.setVisible(registerCheckBox.isSelected());
-
-		// Clear repeat password field if registration cancelled
-		if (!registerCheckBox.isSelected()) repeatPasswordField.clear();
-	}
-
-	@FXML
-	private void submitButtonClicked() {
-
-	}
-
-	@FXML
-	private void cancelButtonClicked(ActionEvent e) { closeStage(e); }
-
-	private void closeStage(ActionEvent e) { ((Stage) ((Node) e.getSource()).getScene().getWindow()).close(); }
-}
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index e007058..94f1b38 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -12,7 +12,6 @@ import javax.swing.JOptionPane;
 import envoy.client.data.*;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
-import envoy.client.ui.container.LoginDialog;
 import envoy.data.Message;
 import envoy.data.User;
 import envoy.data.User.UserStatus;
@@ -91,9 +90,18 @@ public final class Startup extends Application {
 		// Initialize client and unread message cache
 		client	= new Client();
 		cache	= new Cache<>();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void start(Stage stage) throws Exception {
 
 		// Try to connect to the server
-		new LoginDialog(client, localDB, cache);
+		// new LoginDialog(client, localDB, cache);
+		new LoginDialog().showAndWait();
+		System.exit(0);
 
 		// Set client user in local database
 		localDB.setUser(client.getSender());
@@ -128,13 +136,6 @@ public final class Startup extends Application {
 				.filter(u -> u instanceof User && u != localDB.getUser())
 				.map(User.class::cast)
 				.forEach(u -> u.setStatus(UserStatus.OFFLINE));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void start(Stage stage) throws Exception {
 
 		// Prepare stage and load ChatScene
 		var	loader		= new FXMLLoader(getClass().getResource("ChatScene.fxml"));

From fb2f379dfc2a32edb7a01f931df96c0d134ec21c Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 10 Apr 2020 16:18:01 +0200
Subject: [PATCH 16/60] Completed LoginDialog implementation except for closing
 the dialog

---
 .../java/envoy/client/data/ClientConfig.java  |   9 +-
 .../event/HandshakeSuccessfulEvent.java       |  18 -
 src/main/java/envoy/client/net/Client.java    |   3 +-
 .../java/envoy/client/ui/LoginDialog.fxml     |  90 +++--
 .../java/envoy/client/ui/LoginDialog.java     | 148 ++++++--
 src/main/java/envoy/client/ui/Startup.java    |  31 +-
 .../client/ui/container/LoginDialog.java      | 346 ------------------
 .../client/ui/container/package-info.java     |  13 -
 8 files changed, 185 insertions(+), 473 deletions(-)
 delete mode 100644 src/main/java/envoy/client/event/HandshakeSuccessfulEvent.java
 delete mode 100644 src/main/java/envoy/client/ui/container/LoginDialog.java
 delete mode 100644 src/main/java/envoy/client/ui/container/package-info.java

diff --git a/src/main/java/envoy/client/data/ClientConfig.java b/src/main/java/envoy/client/data/ClientConfig.java
index 63381a0..0b11e40 100644
--- a/src/main/java/envoy/client/data/ClientConfig.java
+++ b/src/main/java/envoy/client/data/ClientConfig.java
@@ -1,7 +1,6 @@
 package envoy.client.data;
 
 import java.io.File;
-import java.security.NoSuchAlgorithmException;
 import java.util.function.Function;
 import java.util.logging.Level;
 
@@ -110,11 +109,5 @@ public class ClientConfig extends Config {
 	 *         the registration option
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public LoginCredentials getLoginCredentials() {
-		try {
-			return new LoginCredentials(getUser(), getPassword(), false);
-		} catch (NoSuchAlgorithmException e) {
-			return null;
-		}
-	}
+	public LoginCredentials getLoginCredentials() { return new LoginCredentials(getUser(), getPassword(), false); }
 }
diff --git a/src/main/java/envoy/client/event/HandshakeSuccessfulEvent.java b/src/main/java/envoy/client/event/HandshakeSuccessfulEvent.java
deleted file mode 100644
index a04b41a..0000000
--- a/src/main/java/envoy/client/event/HandshakeSuccessfulEvent.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package envoy.client.event;
-
-import envoy.event.Event;
-
-/**
- * This {@link Event} indicates that a handshake was completed successfully.
- *
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>HandshakeSuccessfulEvent.java</strong><br>
- * Created: <strong>8 Feb 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @since Envoy Client v0.3-alpha
- */
-public class HandshakeSuccessfulEvent extends Event.Valueless {
-
-	private static final long serialVersionUID = 0L;
-}
diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index 50019f4..d7951eb 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -107,11 +107,12 @@ public class Client implements Closeable {
 			Thread.sleep(500);
 		}
 
-		logger.info("Handshake completed.");
 		online = true;
 
 		// Remove user creation processor
 		receiver.removeAllProcessors();
+
+		logger.info("Handshake completed.");
 	}
 
 	/**
diff --git a/src/main/java/envoy/client/ui/LoginDialog.fxml b/src/main/java/envoy/client/ui/LoginDialog.fxml
index 30020e9..9a4c8a0 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.fxml
+++ b/src/main/java/envoy/client/ui/LoginDialog.fxml
@@ -13,37 +13,61 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-
-<DialogPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.LoginDialog$Controller">
-   <content>
-      <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0">
-      	<children>
-      		<Label text="User Login">
-      			<font>
-      				<Font size="26.0" />
-      			</font>
-      		</Label>
-      		<GridPane>
-      			<columnConstraints>
-      				<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="40.0" prefWidth="100.0" />
-      				<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-      			</columnConstraints>
-      			<rowConstraints>
-      				<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      				<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      				<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      			</rowConstraints>
-      			<children>
-      				<Label text="User Name:" />
-      				<Label text="Password" GridPane.rowIndex="1" />
-      				<Label fx:id="repeatPasswordLabel" text="Repeat Password:" visible="false" GridPane.rowIndex="2" />
-      				<TextField fx:id="userTextField" GridPane.columnIndex="1" />
-      				<PasswordField fx:id="repeatPasswordField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-      				<PasswordField fx:id="repeatPasswordField" visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-      			</children>
-      		</GridPane>
-      		<CheckBox fx:id="registerCheckBox" mnemonicParsing="false" onAction="#registerCheckboxChanged" text="Register" />
-      	</children>
-      </VBox>
-   </content>
+<DialogPane prefHeight="201.0" prefWidth="525.0"
+	xmlns="http://javafx.com/javafx/11.0.1"
+	xmlns:fx="http://javafx.com/fxml/1">
+	<content>
+		<VBox maxHeight="-Infinity" maxWidth="-Infinity"
+			minHeight="-Infinity" minWidth="-Infinity" prefHeight="217.0"
+			prefWidth="545.0">
+			<children>
+				<Label text="User Login">
+					<font>
+						<Font size="26.0" />
+					</font>
+				</Label>
+				<GridPane>
+					<columnConstraints>
+						<ColumnConstraints hgrow="SOMETIMES"
+							minWidth="10.0" percentWidth="40.0" prefWidth="100.0" />
+						<ColumnConstraints hgrow="SOMETIMES"
+							minWidth="10.0" prefWidth="100.0" />
+					</columnConstraints>
+					<rowConstraints>
+						<RowConstraints minHeight="10.0" prefHeight="30.0"
+							vgrow="SOMETIMES" />
+						<RowConstraints minHeight="10.0" prefHeight="30.0"
+							vgrow="SOMETIMES" />
+						<RowConstraints minHeight="10.0" prefHeight="30.0"
+							vgrow="SOMETIMES" />
+					</rowConstraints>
+					<children>
+						<Label text="User Name:" />
+						<Label text="Password" GridPane.rowIndex="1" />
+						<Label fx:id="repeatPasswordLabel" text="Repeat Password:"
+							visible="false" GridPane.rowIndex="2" />
+						<TextField fx:id="userTextField"
+							GridPane.columnIndex="1" />
+						<PasswordField fx:id="passwordField"
+							GridPane.columnIndex="1" GridPane.rowIndex="1" />
+						<PasswordField fx:id="repeatPasswordField"
+							visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+					</children>
+				</GridPane>
+				<HBox alignment="CENTER_RIGHT" prefHeight="100.0"
+					prefWidth="200.0">
+					<children>
+						<CheckBox fx:id="registerCheckBox"
+							mnemonicParsing="false" onAction="#registerCheckboxChanged"
+							text="Register" />
+						<Button alignment="CENTER_RIGHT" cancelButton="true"
+							mnemonicParsing="false" onAction="#abortLogin" text="Close" />
+						<Button alignment="CENTER_RIGHT" defaultButton="true"
+							mnemonicParsing="false" text="Login"
+							onAction="#loginButtonClicked" fx:id="loginButton" />
+					</children>
+				</HBox>
+			</children>
+		</VBox>
+	</content>
 </DialogPane>
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index cb9453e..ad748ff 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -1,11 +1,26 @@
 package envoy.client.ui;
 
 import java.io.IOException;
+import java.util.logging.Logger;
 
+import javax.naming.TimeLimitExceededException;
+
+import envoy.client.data.Cache;
+import envoy.client.data.ClientConfig;
+import envoy.client.data.LocalDB;
+import envoy.client.net.Client;
+import envoy.data.LoginCredentials;
+import envoy.data.Message;
+import envoy.data.User;
+import envoy.event.EventBus;
+import envoy.event.HandshakeRejectionEvent;
+import envoy.exception.EnvoyException;
+import envoy.util.EnvoyLog;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.*;
+import javafx.scene.control.Alert.AlertType;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -17,54 +32,125 @@ import javafx.scene.control.*;
  */
 public final class LoginDialog extends Dialog<Void> {
 
+	@FXML
+	private TextField userTextField;
+
+	@FXML
+	private PasswordField passwordField;
+
+	@FXML
+	private PasswordField repeatPasswordField;
+
+	@FXML
+	private Label repeatPasswordLabel;
+
+	@FXML
+	private CheckBox registerCheckBox;
+
+	@FXML
+	private Button loginButton;
+
+	private final Client			client;
+	private final LocalDB			localDB;
+	private final Cache<Message>	receivedMessageCache;
+
+	private static final Logger			logger		= EnvoyLog.getLogger(LoginDialog.class);
+	private static final EventBus		eventBus	= EventBus.getInstance();
+	private static final ClientConfig	config		= ClientConfig.getInstance();
+
 	/**
 	 * Loads the login dialog using the FXML file {@code LoginDialog.fxml}.
 	 * 
+	 * @param client               the client used to perform the handshake
+	 * @param localDB              the local database used for offline login
+	 * @param receivedMessageCache the cache storing messages received during the
+	 *                             handshake
 	 * @throws IOException if an exception occurs during loading
 	 * @since Envoy Client v0.1-beta
 	 */
-	public LoginDialog() throws IOException {
-		final var dialogPane = FXMLLoader.<DialogPane>load(getClass().getResource("LoginDialog.fxml"));
+	public LoginDialog(Client client, LocalDB localDB, Cache<Message> receivedMessageCache) throws IOException {
+		this.client					= client;
+		this.localDB				= localDB;
+		this.receivedMessageCache	= receivedMessageCache;
 
-		// Configure buttons
-		dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
-
-		setDialogPane(dialogPane);
+		final var loader = new FXMLLoader(getClass().getResource("LoginDialog.fxml"));
+		loader.setController(this);
+		setDialogPane(loader.load());
 	}
 
-	public static class Controller {
+	@FXML
+	private void initialize() {
 
-		@FXML
-		private TextField userTextField;
+		// Close the dialog when the user exits the dialog
+		getDialogPane().getScene().getWindow().setOnCloseRequest(e -> abortLogin());
 
-		@FXML
-		private PasswordField passwordField;
+		// Show an alert after an unsuccessful handshake
+		eventBus.register(HandshakeRejectionEvent.class,
+				e -> Platform.runLater(() -> { clearPasswordFields(); new Alert(AlertType.ERROR, e.get()).showAndWait(); }));
 
-		@FXML
-		private PasswordField repeatPasswordField;
+		// Set initial cursor
+		userTextField.requestFocus();
 
-		@FXML
-		private Label repeatPasswordLabel;
-
-		@FXML
-		private CheckBox registerCheckBox;
-
-		@FXML
-		private void initialize() {
-
-			// Set initial cursor
-			Platform.runLater(userTextField::requestFocus);
+		// Perform automatic login if configured
+		if (config.hasLoginCredentials()) {
+			performHandshake(config.getLoginCredentials());
+			hide();
 		}
+	}
 
-		@FXML
-		private void registerCheckboxChanged() {
+	@FXML
+	private void registerCheckboxChanged() {
 
-			// Make repeat password field and label visible / invisible
-			repeatPasswordField.setVisible(registerCheckBox.isSelected());
-			repeatPasswordLabel.setVisible(registerCheckBox.isSelected());
+		// Make repeat password field and label visible / invisible
+		repeatPasswordField.setVisible(registerCheckBox.isSelected());
+		repeatPasswordLabel.setVisible(registerCheckBox.isSelected());
 
-			// Clear repeat password field if registration cancelled
-			if (!registerCheckBox.isSelected()) repeatPasswordField.clear();
+		clearPasswordFields();
+	}
+
+	@FXML
+	private void abortLogin() {
+		logger.info("The login process has been cancelled. Exiting...");
+		System.exit(0);
+	}
+
+	@FXML
+	private void loginButtonClicked() {
+
+		// Prevent registration with unequal passwords
+		if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
+			clearPasswordFields();
+			new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
+		} else performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected()));
+	}
+
+	private void performHandshake(LoginCredentials credentials) {
+		try {
+			client.performHandshake(credentials, receivedMessageCache);
+			if (client.isOnline()) {
+				client.initReceiver(localDB, receivedMessageCache);
+				hide();
+			}
+		} catch (IOException | InterruptedException | TimeLimitExceededException e) {
+			logger.warning("Could not connect to server. Trying offline mode...");
+			e.printStackTrace();
+			try {
+				// Try entering offline mode
+				localDB.loadUsers();
+				User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
+				if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
+				client.setSender(clientUser);
+				new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.\n" + e).showAndWait();
+				hide();
+			} catch (Exception e1) {
+				new Alert(AlertType.ERROR, "Client error: " + e.toString()).showAndWait();
+				System.exit(1);
+			}
 		}
 	}
+
+	private void clearPasswordFields() {
+		passwordField.clear();
+		repeatPasswordField.clear();
+	}
 }
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 94f1b38..af33ae2 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -7,8 +7,6 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.swing.JOptionPane;
-
 import envoy.client.data.*;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
@@ -20,6 +18,8 @@ import envoy.util.EnvoyLog;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
 import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
@@ -46,7 +46,7 @@ public final class Startup extends Application {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void init() throws Exception {
+	public void start(Stage stage) throws Exception {
 		try {
 			// Load the configuration from client.properties first
 			Properties properties = new Properties();
@@ -60,7 +60,7 @@ public final class Startup extends Application {
 			// Check if all mandatory configuration values have been initialized
 			if (!config.isInitialized()) throw new EnvoyException("Configuration is not fully initialized");
 		} catch (Exception e) {
-			JOptionPane.showMessageDialog(null, "Error loading configuration values:\n" + e, "Configuration error", JOptionPane.ERROR_MESSAGE);
+			new Alert(AlertType.ERROR, "Error loading configuration values:\n" + e);
 			e.printStackTrace();
 			System.exit(1);
 		}
@@ -74,15 +74,12 @@ public final class Startup extends Application {
 		// Initialize the local database
 		if (config.isIgnoreLocalDB()) {
 			localDB = new TransientLocalDB();
-			JOptionPane.showMessageDialog(null,
-					"Ignoring local database.\nMessages will not be saved!",
-					"Local database warning",
-					JOptionPane.WARNING_MESSAGE);
+			new Alert(AlertType.WARNING, "Ignoring local database.\nMessages will not be saved!").showAndWait();
 		} else try {
 			localDB = new PersistentLocalDB(new File(config.getHomeDirectory(), config.getLocalDB().getPath()));
 		} catch (IOException e3) {
 			logger.log(Level.SEVERE, "Could not initialize local database", e3);
-			JOptionPane.showMessageDialog(null, "Could not initialize local database!\n" + e3, "Local database error", JOptionPane.ERROR_MESSAGE);
+			new Alert(AlertType.ERROR, "Could not initialize local database!\n" + e3).showAndWait();
 			System.exit(1);
 			return;
 		}
@@ -90,18 +87,9 @@ public final class Startup extends Application {
 		// Initialize client and unread message cache
 		client	= new Client();
 		cache	= new Cache<>();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void start(Stage stage) throws Exception {
 
 		// Try to connect to the server
-		// new LoginDialog(client, localDB, cache);
-		new LoginDialog().showAndWait();
-		System.exit(0);
+		new LoginDialog(client, localDB, cache).showAndWait();
 
 		// Set client user in local database
 		localDB.setUser(client.getSender());
@@ -114,10 +102,7 @@ public final class Startup extends Application {
 			// The local database file has not yet been created, probably first login
 		} catch (Exception e) {
 			e.printStackTrace();
-			JOptionPane.showMessageDialog(null,
-					"Error while loading local database: " + e + "\nChats will not be stored locally.",
-					"Local DB error",
-					JOptionPane.WARNING_MESSAGE);
+			new Alert(AlertType.ERROR, "Error while loading local database: " + e + "\nChats will not be stored locally.").showAndWait();
 		}
 
 		// Initialize write proxy
diff --git a/src/main/java/envoy/client/ui/container/LoginDialog.java b/src/main/java/envoy/client/ui/container/LoginDialog.java
deleted file mode 100644
index b523849..0000000
--- a/src/main/java/envoy/client/ui/container/LoginDialog.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package envoy.client.ui.container;
-
-import java.awt.*;
-import java.awt.event.ItemEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.logging.Logger;
-
-import javax.naming.TimeLimitExceededException;
-import javax.swing.*;
-import javax.swing.border.EmptyBorder;
-
-import envoy.client.data.*;
-import envoy.client.event.HandshakeSuccessfulEvent;
-import envoy.client.net.Client;
-import envoy.client.ui.Theme;
-import envoy.client.ui.primary.PrimaryButton;
-import envoy.data.LoginCredentials;
-import envoy.data.Message;
-import envoy.data.User;
-import envoy.event.EventBus;
-import envoy.event.HandshakeRejectionEvent;
-import envoy.exception.EnvoyException;
-import envoy.util.EnvoyLog;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>LoginDialog.java</strong><br>
- * Created: <strong>01.01.2020</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.3-alpha
- */
-public class LoginDialog extends JDialog {
-
-	private JPanel			contentPanel;
-	private JTextField		textField;
-	private JPasswordField	passwordField;
-	private JPasswordField	repeatPasswordField;
-
-	private JLabel	lblUserName;
-	private JLabel	lblPassword;
-	private JLabel	lblRepeatPassword;
-	private JLabel	errorMessage;
-
-	private GridBagConstraints	gbc_lblRepeatPassword;
-	private GridBagConstraints	gbc_repeatPasswordField;
-	private GridBagConstraints	gbc_errorMessage;
-
-	private JPanel			buttonPane;
-	private JTextPane		registerText;
-	private JCheckBox		registerCheckBox;
-	private PrimaryButton	okButton;
-	private PrimaryButton	cancelButton;
-
-	private LoginCredentials credentials;
-
-	private final Client			client;
-	private final LocalDB			localDB;
-	private final Cache<Message>	receivedMessageCache;
-
-	private static final ClientConfig	config				= ClientConfig.getInstance();
-	private static final Logger			logger				= EnvoyLog.getLogger(LoginDialog.class);
-	private static final long			serialVersionUID	= 0L;
-
-	/**
-	 * Displays a dialog enabling the user to enter their user name and password.
-	 *
-	 * @param client               the client used to perform the handshake
-	 * @param localDB              the local database in which data is persisted
-	 * @param receivedMessageCache the cache that stored messages received during
-	 *                             the handshake
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public LoginDialog(Client client, LocalDB localDB, Cache<Message> receivedMessageCache) {
-		this.client					= client;
-		this.localDB				= localDB;
-		this.receivedMessageCache	= receivedMessageCache;
-
-		// Prepare handshake
-		localDB.loadIDGenerator();
-
-		addWindowListener(new WindowAdapter() {
-
-			@Override
-			public void windowClosing(WindowEvent e) { abortLogin(); }
-		});
-
-		initUi();
-
-		okButton.addActionListener((evt) -> {
-			try {
-				if (registerCheckBox.isSelected()) {
-					// Check password equality
-					if (Arrays.equals(passwordField.getPassword(), repeatPasswordField.getPassword())) {
-						credentials = new LoginCredentials(textField.getText(), passwordField.getPassword(), true);
-						performHandshake();
-					} else {
-						JOptionPane.showMessageDialog(this, "The repeated password is not the original password!");
-						clearPasswordFields();
-					}
-				} else {
-					credentials = new LoginCredentials(textField.getText(), passwordField.getPassword(), false);
-					performHandshake();
-				}
-			} catch (NoSuchAlgorithmException e) {
-				e.printStackTrace();
-			}
-		});
-
-		// Listen to handshake rejections
-		EventBus.getInstance()
-			.register(HandshakeRejectionEvent.class,
-					evt -> { clearPasswordFields(); errorMessage.setVisible(true); errorMessage.setText(evt.get()); });
-
-		// Exit the application when the dialog is cancelled
-		cancelButton.addActionListener(evt -> abortLogin());
-
-		// Log in directly if configured
-		if (config.hasLoginCredentials()) {
-			credentials = config.getLoginCredentials();
-			performHandshake();
-			return;
-		}
-
-		setVisible(true);
-	}
-
-	private void performHandshake() {
-		try {
-			client.performHandshake(credentials, receivedMessageCache);
-			if (client.isOnline()) {
-				client.initReceiver(localDB, receivedMessageCache);
-				dispose();
-			}
-		} catch (IOException | InterruptedException | TimeLimitExceededException e) {
-			logger.warning("Could not connect to server. Trying offline mode...");
-			e.printStackTrace();
-			try {
-				// Try entering offline mode
-				localDB.loadUsers();
-				User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
-				if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
-				client.setSender(clientUser);
-				JOptionPane.showMessageDialog(null,
-						"A connection to the server could not be established. Starting in offline mode.\n" + e,
-						"Connection error",
-						JOptionPane.WARNING_MESSAGE);
-				dispose();
-			} catch (Exception e1) {
-				JOptionPane.showMessageDialog(null, e1, "Client error", JOptionPane.ERROR_MESSAGE);
-				System.exit(1);
-				return;
-			}
-		}
-	}
-
-	private void initUi() {
-		setSize(338, 123);
-		setLocationRelativeTo(null);
-		setResizable(false);
-		getContentPane().setLayout(new BorderLayout());
-		contentPanel = new JPanel();
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel, BorderLayout.CENTER);
-		GridBagLayout gbl_contentPanel = new GridBagLayout();
-		gbl_contentPanel.columnWidths	= new int[] { 0, 0, 0 };
-		gbl_contentPanel.rowHeights		= new int[] { 0, 0, 0 };
-		gbl_contentPanel.columnWeights	= new double[] { 0.0, 1.0, Double.MIN_VALUE };
-		gbl_contentPanel.rowWeights		= new double[] { 0.0, 0.0, Double.MIN_VALUE };
-		contentPanel.setLayout(gbl_contentPanel);
-
-		lblUserName = new JLabel("Username:");
-		GridBagConstraints gbc_lblUserName = new GridBagConstraints();
-		gbc_lblUserName.anchor	= GridBagConstraints.EAST;
-		gbc_lblUserName.insets	= new Insets(0, 0, 5, 5);
-		gbc_lblUserName.gridx	= 0;
-		gbc_lblUserName.gridy	= 0;
-		contentPanel.add(lblUserName, gbc_lblUserName);
-
-		textField = new JTextField();
-		textField.setBorder(null);
-		GridBagConstraints gbc_textField = new GridBagConstraints();
-		gbc_textField.insets	= new Insets(0, 0, 5, 0);
-		gbc_textField.fill		= GridBagConstraints.HORIZONTAL;
-		gbc_textField.gridx		= 1;
-		gbc_textField.gridy		= 0;
-		contentPanel.add(textField, gbc_textField);
-		textField.setColumns(10);
-
-		lblPassword = new JLabel("Password:");
-		GridBagConstraints gbc_lblPassword = new GridBagConstraints();
-		gbc_lblPassword.anchor	= GridBagConstraints.EAST;
-		gbc_lblPassword.insets	= new Insets(0, 0, 0, 5);
-		gbc_lblPassword.gridx	= 0;
-		gbc_lblPassword.gridy	= 1;
-		contentPanel.add(lblPassword, gbc_lblPassword);
-
-		passwordField = new JPasswordField();
-		passwordField.setBorder(null);
-		GridBagConstraints gbc_passwordField = new GridBagConstraints();
-		gbc_passwordField.fill	= GridBagConstraints.HORIZONTAL;
-		gbc_passwordField.gridx	= 1;
-		gbc_passwordField.gridy	= 1;
-		contentPanel.add(passwordField, gbc_passwordField);
-
-		lblRepeatPassword				= new JLabel("Repeat Password:");
-		gbc_lblRepeatPassword			= new GridBagConstraints();
-		gbc_lblRepeatPassword.anchor	= GridBagConstraints.EAST;
-		gbc_lblRepeatPassword.insets	= new Insets(0, 0, 0, 5);
-		gbc_lblRepeatPassword.gridx		= 0;
-		gbc_lblRepeatPassword.gridy		= 2;
-
-		repeatPasswordField				= new JPasswordField();
-		gbc_repeatPasswordField			= new GridBagConstraints();
-		gbc_repeatPasswordField.fill	= GridBagConstraints.HORIZONTAL;
-		gbc_repeatPasswordField.gridx	= 1;
-		gbc_repeatPasswordField.gridy	= 2;
-
-		errorMessage			= new JLabel();
-		gbc_errorMessage		= new GridBagConstraints();
-		gbc_errorMessage.gridx	= 1;
-		gbc_errorMessage.gridy	= 3;
-		gbc_errorMessage.fill	= GridBagConstraints.HORIZONTAL;
-		gbc_errorMessage.insets	= new Insets(5, 5, 5, 5);
-		errorMessage.setForeground(Color.RED);
-		errorMessage.setVisible(false);
-		contentPanel.add(errorMessage, gbc_errorMessage);
-
-		buttonPane = new JPanel();
-
-		registerText = new JTextPane();
-		registerText.setEditable(false);
-		registerText.setText("Register?");
-		registerText.setFont(new Font("Arial", Font.BOLD, 12));
-		registerText.setAlignmentX(LEFT_ALIGNMENT);
-		buttonPane.add(registerText);
-
-		registerCheckBox = new JCheckBox();
-		registerCheckBox.setAlignmentX(LEFT_ALIGNMENT);
-		registerCheckBox.addItemListener(e -> {
-			switch (e.getStateChange()) {
-				case ItemEvent.SELECTED:
-					contentPanel.add(lblRepeatPassword, gbc_lblRepeatPassword);
-					contentPanel.add(repeatPasswordField, gbc_repeatPasswordField);
-					setSize(338, 173);
-					break;
-
-				case ItemEvent.DESELECTED:
-					if (repeatPasswordField.getParent() == contentPanel) {
-						contentPanel.remove(lblRepeatPassword);
-						contentPanel.remove(repeatPasswordField);
-						setSize(338, 148);
-					}
-					break;
-			}
-			contentPanel.revalidate();
-			contentPanel.repaint();
-		});
-		buttonPane.add(registerCheckBox);
-
-		buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-		getContentPane().add(buttonPane, BorderLayout.SOUTH);
-		okButton = new PrimaryButton("OK");
-		okButton.setActionCommand("OK");
-		buttonPane.add(okButton);
-		getRootPane().setDefaultButton(okButton);
-
-		cancelButton = new PrimaryButton("Cancel");
-		cancelButton.setActionCommand("Cancel");
-		buttonPane.add(cancelButton);
-		setTheme();
-
-		setModalityType(Dialog.DEFAULT_MODALITY_TYPE);
-
-		EventBus.getInstance().register(HandshakeSuccessfulEvent.class, evt -> dispose());
-	}
-
-	/**
-	 * Resets the text stored in the password fields.
-	 *
-	 * @since Envoy Client v0.3-alpha
-	 */
-	private void clearPasswordFields() {
-		passwordField.setText(null);
-		repeatPasswordField.setText(null);
-	}
-
-	private void setTheme() {
-		Theme theme = Settings.getInstance().getCurrentTheme();
-
-		// Panels
-		contentPanel.setBackground(theme.getBackgroundColor());
-		contentPanel.setForeground(theme.getBackgroundColor());
-
-		buttonPane.setBackground(theme.getBackgroundColor());
-		buttonPane.setForeground(theme.getBackgroundColor());
-
-		// Input Fields
-		textField.setBackground(theme.getCellColor());
-		textField.setForeground(theme.getUserNameColor());
-
-		passwordField.setBackground(theme.getCellColor());
-		passwordField.setForeground(theme.getUserNameColor());
-
-		repeatPasswordField.setBackground(theme.getCellColor());
-		repeatPasswordField.setForeground(theme.getUserNameColor());
-
-		// JLabels
-		lblUserName.setBackground(theme.getCellColor());
-		lblUserName.setForeground(theme.getUserNameColor());
-
-		lblPassword.setBackground(theme.getCellColor());
-		lblPassword.setForeground(theme.getUserNameColor());
-
-		lblRepeatPassword.setBackground(theme.getCellColor());
-		lblRepeatPassword.setForeground(theme.getUserNameColor());
-
-		// Register
-		registerText.setBackground(theme.getCellColor());
-		registerText.setForeground(theme.getUserNameColor());
-
-		registerCheckBox.setBackground(theme.getCellColor());
-
-		// Buttons
-		okButton.setBackground(theme.getInteractableBackgroundColor());
-		okButton.setForeground(theme.getInteractableForegroundColor());
-
-		cancelButton.setBackground(theme.getInteractableBackgroundColor());
-		cancelButton.setForeground(theme.getInteractableForegroundColor());
-	}
-
-	/**
-	 * Shuts the system down properly if the login was aborted.
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	private void abortLogin() {
-		logger.info("The login process has been cancelled. Exiting...");
-		System.exit(0);
-	}
-}
diff --git a/src/main/java/envoy/client/ui/container/package-info.java b/src/main/java/envoy/client/ui/container/package-info.java
deleted file mode 100644
index aab40a5..0000000
--- a/src/main/java/envoy/client/ui/container/package-info.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * This package contains all graphical Containers, like Dialogs and Frames.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>package-info.java</strong><br>
- * Created: <strong>16 Mar 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.1-beta
- */
-package envoy.client.ui.container;

From 1e0722ac945c81accdb5ffa6a58d272b2c43b86f Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 10 Apr 2020 17:07:27 +0200
Subject: [PATCH 17/60] Using dialog buttons instead of custom ones

---
 .../java/envoy/client/ui/LoginDialog.fxml     | 15 +----
 .../java/envoy/client/ui/LoginDialog.java     | 61 +++++++++++--------
 2 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/main/java/envoy/client/ui/LoginDialog.fxml b/src/main/java/envoy/client/ui/LoginDialog.fxml
index 9a4c8a0..a1503f4 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.fxml
+++ b/src/main/java/envoy/client/ui/LoginDialog.fxml
@@ -54,19 +54,8 @@
 							visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
 					</children>
 				</GridPane>
-				<HBox alignment="CENTER_RIGHT" prefHeight="100.0"
-					prefWidth="200.0">
-					<children>
-						<CheckBox fx:id="registerCheckBox"
-							mnemonicParsing="false" onAction="#registerCheckboxChanged"
-							text="Register" />
-						<Button alignment="CENTER_RIGHT" cancelButton="true"
-							mnemonicParsing="false" onAction="#abortLogin" text="Close" />
-						<Button alignment="CENTER_RIGHT" defaultButton="true"
-							mnemonicParsing="false" text="Login"
-							onAction="#loginButtonClicked" fx:id="loginButton" />
-					</children>
-				</HBox>
+				<CheckBox fx:id="registerCheckBox" mnemonicParsing="false"
+					onAction="#registerCheckboxChanged" text="Register" />
 			</children>
 		</VBox>
 	</content>
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index ad748ff..5ef2ed9 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -17,6 +17,7 @@ import envoy.event.HandshakeRejectionEvent;
 import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 import javafx.application.Platform;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.*;
@@ -47,9 +48,6 @@ public final class LoginDialog extends Dialog<Void> {
 	@FXML
 	private CheckBox registerCheckBox;
 
-	@FXML
-	private Button loginButton;
-
 	private final Client			client;
 	private final LocalDB			localDB;
 	private final Cache<Message>	receivedMessageCache;
@@ -75,27 +73,43 @@ public final class LoginDialog extends Dialog<Void> {
 
 		final var loader = new FXMLLoader(getClass().getResource("LoginDialog.fxml"));
 		loader.setController(this);
-		setDialogPane(loader.load());
+		final var dialogPane = loader.<DialogPane>load();
+
+		// Configure dialog buttons
+		dialogPane.getButtonTypes().addAll(ButtonType.CLOSE, ButtonType.OK);
+
+		// Close button
+		dialogPane.lookupButton(ButtonType.CLOSE).addEventHandler(ActionEvent.ACTION, e -> abortLogin());
+
+		// Login button
+		final var loginButton = (Button) dialogPane.lookupButton(ButtonType.OK);
+		loginButton.setText("Login");
+		loginButton.addEventFilter(ActionEvent.ACTION, e -> {
+			e.consume();
+
+			// Prevent registration with unequal passwords
+			if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
+				clearPasswordFields();
+				new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
+			} else
+				performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected()));
+		});
+
+		// Perform automatic login if configured
+		setOnShown(e -> { if (config.hasLoginCredentials()) performHandshake(config.getLoginCredentials()); });
+
+		setDialogPane(dialogPane);
 	}
 
 	@FXML
 	private void initialize() {
 
-		// Close the dialog when the user exits the dialog
-		getDialogPane().getScene().getWindow().setOnCloseRequest(e -> abortLogin());
-
 		// Show an alert after an unsuccessful handshake
 		eventBus.register(HandshakeRejectionEvent.class,
 				e -> Platform.runLater(() -> { clearPasswordFields(); new Alert(AlertType.ERROR, e.get()).showAndWait(); }));
 
 		// Set initial cursor
 		userTextField.requestFocus();
-
-		// Perform automatic login if configured
-		if (config.hasLoginCredentials()) {
-			performHandshake(config.getLoginCredentials());
-			hide();
-		}
 	}
 
 	@FXML
@@ -114,22 +128,12 @@ public final class LoginDialog extends Dialog<Void> {
 		System.exit(0);
 	}
 
-	@FXML
-	private void loginButtonClicked() {
-
-		// Prevent registration with unequal passwords
-		if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
-			clearPasswordFields();
-			new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
-		} else performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected()));
-	}
-
 	private void performHandshake(LoginCredentials credentials) {
 		try {
 			client.performHandshake(credentials, receivedMessageCache);
 			if (client.isOnline()) {
 				client.initReceiver(localDB, receivedMessageCache);
-				hide();
+				Platform.runLater(this::hide);
 			}
 		} catch (IOException | InterruptedException | TimeLimitExceededException e) {
 			logger.warning("Could not connect to server. Trying offline mode...");
@@ -140,10 +144,13 @@ public final class LoginDialog extends Dialog<Void> {
 				User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
 				if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
 				client.setSender(clientUser);
-				new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.\n" + e).showAndWait();
-				hide();
+				Platform.runLater(() -> {
+					new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.\n" + e)
+						.showAndWait();
+					hide();
+				});
 			} catch (Exception e1) {
-				new Alert(AlertType.ERROR, "Client error: " + e.toString()).showAndWait();
+				Platform.runLater(() -> new Alert(AlertType.ERROR, "Client error: " + e.toString()).showAndWait());
 				System.exit(1);
 			}
 		}

From 873e2437c6c90a481a96f1575379f77c98809ac6 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 10 Apr 2020 20:42:20 +0200
Subject: [PATCH 18/60] Implemented review recommendations

---
 src/main/java/envoy/client/ui/LoginDialog.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index 5ef2ed9..bc84bcc 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -122,7 +122,6 @@ public final class LoginDialog extends Dialog<Void> {
 		clearPasswordFields();
 	}
 
-	@FXML
 	private void abortLogin() {
 		logger.info("The login process has been cancelled. Exiting...");
 		System.exit(0);

From ee4fa78f380a2ce5b95cca398f0cf97ddb62f5bd Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 10 Apr 2020 21:05:08 +0200
Subject: [PATCH 19/60] Grouping JavaFX package import statements

---
 .settings/org.eclipse.jdt.ui.prefs             |  2 +-
 .settings/org.hibernate.eclipse.console.prefs  |  3 +++
 src/main/java/envoy/client/ui/LoginDialog.java | 13 +++++++------
 src/main/java/envoy/client/ui/Startup.java     | 17 +++++++++--------
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 .settings/org.hibernate.eclipse.console.prefs

diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 62985b5..8fecd4f 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.importorder=java;javax;javafx;org;com;envoy;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.ondemandthreshold=4
 org.eclipse.jdt.ui.staticondemandthreshold=2
diff --git a/.settings/org.hibernate.eclipse.console.prefs b/.settings/org.hibernate.eclipse.console.prefs
new file mode 100644
index 0000000..21fefff
--- /dev/null
+++ b/.settings/org.hibernate.eclipse.console.prefs
@@ -0,0 +1,3 @@
+default.configuration=
+eclipse.preferences.version=1
+hibernate3.enabled=false
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index bc84bcc..679e9ee 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -5,6 +5,13 @@ import java.util.logging.Logger;
 
 import javax.naming.TimeLimitExceededException;
 
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+import javafx.scene.control.Alert.AlertType;
+
 import envoy.client.data.Cache;
 import envoy.client.data.ClientConfig;
 import envoy.client.data.LocalDB;
@@ -16,12 +23,6 @@ import envoy.event.EventBus;
 import envoy.event.HandshakeRejectionEvent;
 import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
-import javafx.application.Platform;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.control.*;
-import javafx.scene.control.Alert.AlertType;
 
 /**
  * Project: <strong>envoy-client</strong><br>
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index af33ae2..118fea6 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -7,14 +7,6 @@ import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import envoy.client.data.*;
-import envoy.client.net.Client;
-import envoy.client.net.WriteProxy;
-import envoy.data.Message;
-import envoy.data.User;
-import envoy.data.User.UserStatus;
-import envoy.exception.EnvoyException;
-import envoy.util.EnvoyLog;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
@@ -24,6 +16,15 @@ import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 
+import envoy.client.data.*;
+import envoy.client.net.Client;
+import envoy.client.net.WriteProxy;
+import envoy.data.Message;
+import envoy.data.User;
+import envoy.data.User.UserStatus;
+import envoy.exception.EnvoyException;
+import envoy.util.EnvoyLog;
+
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>Startup.java</strong><br>

From 3d1eec4ee08db749cdb5b4efc81b23009c1e45ea Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 10 Apr 2020 21:26:24 +0200
Subject: [PATCH 20/60] Moved all FXML files to the resource folder

---
 src/main/java/envoy/client/ui/LoginDialog.java                  | 2 +-
 src/main/java/envoy/client/ui/Startup.java                      | 2 +-
 .../{java/envoy/client/ui => resources/fxml}/ChatScene.fxml     | 0
 .../{java/envoy/client/ui => resources/fxml}/LoginDialog.fxml   | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/{java/envoy/client/ui => resources/fxml}/ChatScene.fxml (100%)
 rename src/main/{java/envoy/client/ui => resources/fxml}/LoginDialog.fxml (100%)

diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index 679e9ee..8fbd78d 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -72,7 +72,7 @@ public final class LoginDialog extends Dialog<Void> {
 		this.localDB				= localDB;
 		this.receivedMessageCache	= receivedMessageCache;
 
-		final var loader = new FXMLLoader(getClass().getResource("LoginDialog.fxml"));
+		final var loader = new FXMLLoader(getClass().getResource("/fxml/LoginDialog.fxml"));
 		loader.setController(this);
 		final var dialogPane = loader.<DialogPane>load();
 
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 118fea6..becc467 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -124,7 +124,7 @@ public final class Startup extends Application {
 				.forEach(u -> u.setStatus(UserStatus.OFFLINE));
 
 		// Prepare stage and load ChatScene
-		var	loader		= new FXMLLoader(getClass().getResource("ChatScene.fxml"));
+		var	loader		= new FXMLLoader(getClass().getResource("/fxml/ChatScene.fxml"));
 		var	anchorPane	= loader.<GridPane>load();
 		var	chatScene	= new Scene(anchorPane);
 		stage.setTitle("Envoy");
diff --git a/src/main/java/envoy/client/ui/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
similarity index 100%
rename from src/main/java/envoy/client/ui/ChatScene.fxml
rename to src/main/resources/fxml/ChatScene.fxml
diff --git a/src/main/java/envoy/client/ui/LoginDialog.fxml b/src/main/resources/fxml/LoginDialog.fxml
similarity index 100%
rename from src/main/java/envoy/client/ui/LoginDialog.fxml
rename to src/main/resources/fxml/LoginDialog.fxml

From 935ee58c4bdf0c57c930578372f6525373e45e8c Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 10 Apr 2020 21:52:19 +0200
Subject: [PATCH 21/60] Added a rudimentary settings scene with an empty
 controller

---
 .../client/ui/SettingsSceneController.java    | 13 +++++++++
 src/main/resources/fxml/SettingsScene.fxml    | 29 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 src/main/java/envoy/client/ui/SettingsSceneController.java
 create mode 100644 src/main/resources/fxml/SettingsScene.fxml

diff --git a/src/main/java/envoy/client/ui/SettingsSceneController.java b/src/main/java/envoy/client/ui/SettingsSceneController.java
new file mode 100644
index 0000000..1fa8be6
--- /dev/null
+++ b/src/main/java/envoy/client/ui/SettingsSceneController.java
@@ -0,0 +1,13 @@
+package envoy.client.ui;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>SettingsSceneController.java</strong><br>
+ * Created: <strong>10.04.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public class SettingsSceneController {
+
+}
diff --git a/src/main/resources/fxml/SettingsScene.fxml b/src/main/resources/fxml/SettingsScene.fxml
new file mode 100644
index 0000000..12edf7c
--- /dev/null
+++ b/src/main/resources/fxml/SettingsScene.fxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.TreeView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity"
+	minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+	prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1"
+	xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.SettingsSceneController">
+	<children>
+		<HBox prefHeight="100.0" prefWidth="200.0">
+			<children>
+				<TreeView prefHeight="200.0" prefWidth="200.0" />
+			</children>
+		</HBox>
+		<ButtonBar prefHeight="40.0" prefWidth="200.0">
+			<buttons>
+				<Button cancelButton="true" mnemonicParsing="false"
+					text="Cancel" />
+				<Button mnemonicParsing="false" text="Apply" />
+				<Button defaultButton="true" mnemonicParsing="false"
+					text="Apply &amp; Close" />
+			</buttons>
+		</ButtonBar>
+	</children>
+</VBox>

From 09f7f5482eb1a66804f3739ea4a42c5138bc4dde Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Fri, 10 Apr 2020 21:57:05 +0200
Subject: [PATCH 22/60] Replaced TimeLimitExceededException by TimeoutException

This allows the removal of the java.naming module dependency.
---
 src/main/java/envoy/client/net/Client.java     | 17 ++++++++---------
 src/main/java/envoy/client/ui/LoginDialog.java |  5 ++---
 src/main/java/module-info.java                 |  1 -
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index ea684a9..2440d8b 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -6,10 +6,9 @@ import java.net.Socket;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 
-import javax.naming.TimeLimitExceededException;
-
 import envoy.client.data.Cache;
 import envoy.client.data.ClientConfig;
 import envoy.client.data.LocalDB;
@@ -61,14 +60,14 @@ public class Client implements Closeable {
 	 * @param receivedMessageCache a message cache containing all unread messages
 	 *                             from the server that can be relayed after
 	 *                             initialization
-	 * @throws TimeLimitExceededException if the server could not be reached
-	 * @throws IOException                if the login credentials could not be
-	 *                                    written
-	 * @throws InterruptedException       if the current thread is interrupted while
-	 *                                    waiting for the handshake response
+	 * @throws TimeoutException     if the server could not be reached
+	 * @throws IOException          if the login credentials could not be
+	 *                              written
+	 * @throws InterruptedException if the current thread is interrupted while
+	 *                              waiting for the handshake response
 	 */
 	public void performHandshake(LoginCredentials credentials, Cache<Message> receivedMessageCache)
-			throws TimeLimitExceededException, IOException, InterruptedException {
+			throws TimeoutException, IOException, InterruptedException {
 		if (online) throw new IllegalStateException("Handshake has already been performed successfully");
 		// Establish TCP connection
 		logger.finer(String.format("Attempting connection to server %s:%d...", config.getServer(), config.getPort()));
@@ -103,7 +102,7 @@ public class Client implements Closeable {
 				return;
 			}
 
-			if (System.currentTimeMillis() - start > 5000) throw new TimeLimitExceededException("Did not log in after 5 seconds");
+			if (System.currentTimeMillis() - start > 5000) throw new TimeoutException("Did not log in after 5 seconds");
 			Thread.sleep(500);
 		}
 
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index 8fbd78d..9126a67 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -1,10 +1,9 @@
 package envoy.client.ui;
 
 import java.io.IOException;
+import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 
-import javax.naming.TimeLimitExceededException;
-
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -135,7 +134,7 @@ public final class LoginDialog extends Dialog<Void> {
 				client.initReceiver(localDB, receivedMessageCache);
 				Platform.runLater(this::hide);
 			}
-		} catch (IOException | InterruptedException | TimeLimitExceededException e) {
+		} catch (IOException | InterruptedException | TimeoutException e) {
 			logger.warning("Could not connect to server. Trying offline mode...");
 			e.printStackTrace();
 			try {
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 2de5fa8..3ac8357 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -12,7 +12,6 @@ module envoy {
 	requires transitive envoy.common;
 	requires transitive java.desktop;
 	requires transitive java.logging;
-	requires transitive java.naming;
 	requires transitive java.prefs;
 	requires javafx.controls;
 	requires javafx.fxml;

From 00edd59f977d753fb2a3e3d99773aad358ae64cb Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sat, 18 Apr 2020 10:34:03 +0200
Subject: [PATCH 23/60] Fixed bug duplicating messages

---
 src/main/java/envoy/client/net/Client.java         |  2 +-
 src/main/java/envoy/client/net/Receiver.java       |  2 +-
 .../java/envoy/client/ui/ChatSceneController.java  | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index 2440d8b..00a6ddf 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -231,7 +231,7 @@ public class Client implements Closeable {
 
 	private void writeObject(Object obj) throws IOException {
 		checkOnline();
-		logger.fine("Sending object " + obj);
+		logger.fine("Sending " + obj);
 		SerializationUtils.writeBytesWithLength(obj, socket.getOutputStream());
 	}
 
diff --git a/src/main/java/envoy/client/net/Receiver.java b/src/main/java/envoy/client/net/Receiver.java
index bdaf853..b3dd763 100644
--- a/src/main/java/envoy/client/net/Receiver.java
+++ b/src/main/java/envoy/client/net/Receiver.java
@@ -54,7 +54,7 @@ public class Receiver extends Thread {
 
 				try (ObjectInputStream oin = new ObjectInputStream(new ByteArrayInputStream(objBytes))) {
 					Object obj = oin.readObject();
-					logger.fine("Received object " + obj);
+					logger.fine("Received " + obj);
 
 					// Get appropriate processor
 					@SuppressWarnings("rawtypes")
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index b8927d4..f6d9b4f 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -5,6 +5,13 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+
 import envoy.client.data.Chat;
 import envoy.client.data.LocalDB;
 import envoy.client.event.MessageCreationEvent;
@@ -17,12 +24,6 @@ import envoy.event.EventBus;
 import envoy.event.MessageStatusChangeEvent;
 import envoy.event.UserStatusChangeEvent;
 import envoy.util.EnvoyLog;
-import javafx.application.Platform;
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -72,7 +73,6 @@ public final class ChatSceneController {
 		eventBus.register(MessageCreationEvent.class, e -> {
 			final var	message	= e.get();
 			final var	chat	= localDB.getChats().stream().filter(c -> c.getRecipient().getID() == message.getSenderID()).findAny().get();
-			chat.getMessages().add(message);
 
 			// Update UI if in current chat
 			if (chat == currentChat) Platform.runLater(() -> messageList.getItems().add(message));

From f18525476e01a1fbbcf72339bfcc9bfe07ec7af7 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 18 Apr 2020 11:03:06 +0200
Subject: [PATCH 24/60] Added SettingsScene selection infrastructure

---
 .../java/envoy/client/ui/SettingsPane.java    | 19 ++++++++++++
 .../client/ui/SettingsSceneController.java    | 28 +++++++++++++++++
 src/main/resources/fxml/SettingsScene.fxml    | 31 ++++++++-----------
 3 files changed, 60 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/envoy/client/ui/SettingsPane.java

diff --git a/src/main/java/envoy/client/ui/SettingsPane.java b/src/main/java/envoy/client/ui/SettingsPane.java
new file mode 100644
index 0000000..85d2d35
--- /dev/null
+++ b/src/main/java/envoy/client/ui/SettingsPane.java
@@ -0,0 +1,19 @@
+package envoy.client.ui;
+
+import javafx.scene.Node;
+
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>SettingsPane.java</strong><br>
+ * Created: <strong>18.04.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public abstract class SettingsPane extends Node {
+
+	protected String title;
+
+	public abstract String getTitle();
+}
diff --git a/src/main/java/envoy/client/ui/SettingsSceneController.java b/src/main/java/envoy/client/ui/SettingsSceneController.java
index 1fa8be6..761d8cb 100644
--- a/src/main/java/envoy/client/ui/SettingsSceneController.java
+++ b/src/main/java/envoy/client/ui/SettingsSceneController.java
@@ -1,5 +1,10 @@
 package envoy.client.ui;
 
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+
+import envoy.client.data.Settings;
+
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SettingsSceneController.java</strong><br>
@@ -10,4 +15,27 @@ package envoy.client.ui;
  */
 public class SettingsSceneController {
 
+	@FXML
+	private ListView<SettingsPane> settingsList;
+
+	@FXML
+	private TitledPane titledPane;
+
+	private static final Settings settings = Settings.getInstance();
+
+	@FXML
+	private void initialize() {
+		settingsList.setCellFactory(listView -> new ListCell<>() {
+
+			@Override
+			protected void updateItem(SettingsPane item, boolean empty) { if (!empty && item != null) setGraphic(new Label(item.getTitle())); };
+		});
+	}
+
+	@FXML
+	private void settingsListClicked() {
+		final var pane = settingsList.getSelectionModel().getSelectedItem();
+		titledPane.setText(pane.getTitle());
+		titledPane.setContent(pane);
+	}
 }
diff --git a/src/main/resources/fxml/SettingsScene.fxml b/src/main/resources/fxml/SettingsScene.fxml
index 12edf7c..3aaee9a 100644
--- a/src/main/resources/fxml/SettingsScene.fxml
+++ b/src/main/resources/fxml/SettingsScene.fxml
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.control.TreeView?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TitledPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity"
-	minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
-	prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1"
-	xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.SettingsSceneController">
+<VBox alignment="TOP_RIGHT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.SettingsSceneController">
 	<children>
 		<HBox prefHeight="100.0" prefWidth="200.0">
-			<children>
-				<TreeView prefHeight="200.0" prefWidth="200.0" />
-			</children>
+         <children>
+            <ListView fx:id="settingsList" onMouseClicked="#settingsListClicked" prefHeight="200.0" prefWidth="200.0" />
+            <TitledPane fx:id="titledPane" collapsible="false" prefHeight="200.0" prefWidth="200.0" />
+         </children>
 		</HBox>
-		<ButtonBar prefHeight="40.0" prefWidth="200.0">
-			<buttons>
-				<Button cancelButton="true" mnemonicParsing="false"
-					text="Cancel" />
-				<Button mnemonicParsing="false" text="Apply" />
-				<Button defaultButton="true" mnemonicParsing="false"
-					text="Apply &amp; Close" />
-			</buttons>
-		</ButtonBar>
+      <Button defaultButton="true" mnemonicParsing="false" onMouseClicked="#backButtonClicked" text="Back">
+         <opaqueInsets>
+            <Insets />
+         </opaqueInsets>
+      </Button>
 	</children>
 </VBox>

From 2cba9352df91cc3a6923411c7b651a89da4d6b49 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 18 Apr 2020 12:03:32 +0200
Subject: [PATCH 25/60] Added GeneralSettingsPane, added JavaFX support in
 SettingsItem

Also removed the old settings ui components.
---
 src/main/java/envoy/client/data/Settings.java |   2 +-
 .../java/envoy/client/data/SettingsItem.java  |  63 ++---
 .../envoy/client/ui/GeneralSettingsPane.java  |  21 ++
 .../java/envoy/client/ui/SettingsPane.java    |  13 +-
 .../client/ui/SettingsSceneController.java    |   6 +-
 .../ui/settings/GeneralSettingsPanel.java     |  89 -------
 .../client/ui/settings/NewThemeScreen.java    | 228 ----------------
 .../client/ui/settings/SettingsPanel.java     |  30 ---
 .../client/ui/settings/SettingsScreen.java    | 172 ------------
 .../ui/settings/ThemeCustomizationPanel.java  | 246 ------------------
 .../client/ui/settings/package-info.java      |   9 -
 11 files changed, 47 insertions(+), 832 deletions(-)
 create mode 100644 src/main/java/envoy/client/ui/GeneralSettingsPane.java
 delete mode 100644 src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java
 delete mode 100644 src/main/java/envoy/client/ui/settings/NewThemeScreen.java
 delete mode 100644 src/main/java/envoy/client/ui/settings/SettingsPanel.java
 delete mode 100644 src/main/java/envoy/client/ui/settings/SettingsScreen.java
 delete mode 100755 src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
 delete mode 100644 src/main/java/envoy/client/ui/settings/package-info.java

diff --git a/src/main/java/envoy/client/data/Settings.java b/src/main/java/envoy/client/data/Settings.java
index 5bff58c..fcde72a 100644
--- a/src/main/java/envoy/client/data/Settings.java
+++ b/src/main/java/envoy/client/data/Settings.java
@@ -103,7 +103,7 @@ public class Settings {
 	private void supplementDefaults() {
 		items.putIfAbsent("enterToSend", new SettingsItem<>(true, "Enter to send", "Sends a message by pressing the enter key."));
 		items.putIfAbsent("onCloseMode", new SettingsItem<>(true, "Hide on close", "Hides the chat window when it is closed."));
-		items.putIfAbsent("currentTheme", new SettingsItem<>("dark", null));
+		items.putIfAbsent("currentTheme", new SettingsItem<>("dark", "Current Theme Name", "The name of the currently selected theme."));
 	}
 
 	/**
diff --git a/src/main/java/envoy/client/data/SettingsItem.java b/src/main/java/envoy/client/data/SettingsItem.java
index 2c9ac39..e9c498c 100644
--- a/src/main/java/envoy/client/data/SettingsItem.java
+++ b/src/main/java/envoy/client/data/SettingsItem.java
@@ -4,10 +4,11 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 import javax.swing.JComponent;
 
-import envoy.client.ui.primary.PrimaryToggleSwitch;
+import javafx.scene.Node;
 
 /**
  * Encapsulates a persistent value that is directly or indirectly mutable by the
@@ -23,18 +24,18 @@ import envoy.client.ui.primary.PrimaryToggleSwitch;
  */
 public class SettingsItem<T> implements Serializable {
 
-	private T							value;
-	private Class<? extends JComponent>	componentClass;
-	private String						userFriendlyName, description;
+	private T		value;
+	private String	userFriendlyName, description;
 
-	transient private Consumer<T> changeHandler;
+	private transient Consumer<T>						changeHandler;
+	private transient Function<SettingsItem<?>, Node>	nodeCreator;
 
-	private static final Map<Class<?>, Class<? extends JComponent>> componentClasses = new HashMap<>();
+	private static final Map<Class<?>, Function<SettingsItem<?>, Node>> nodeCreators = new HashMap<>();
 
-	private static final long serialVersionUID = 0L;
+	private static final long serialVersionUID = 1L;
 
 	static {
-		componentClasses.put(Boolean.class, PrimaryToggleSwitch.class);
+
 	}
 
 	/**
@@ -48,37 +49,11 @@ public class SettingsItem<T> implements Serializable {
 	 * @since Envoy Client v0.3-alpha
 	 */
 	public SettingsItem(T value, String userFriendlyName, String description) {
-		this(value, componentClasses.get(value.getClass()));
+		this.value				= value;
 		this.userFriendlyName	= userFriendlyName;
 		this.description		= description;
-	}
 
-	/**
-	 * Initializes a {@link SettingsItem}. The default value's class will be mapped
-	 * to a specific {@link JComponent}. The mapping can also be disables if this
-	 * parameter is {@code null}. In that case a {@link NullPointerException} will
-	 * be thrown if the method {@link SettingsItem#getComponent()} is called.
-	 *
-	 * @param value          the default value
-	 * @param componentClass the class of the {@link JComponent} to represent this
-	 *                       {@link SettingsItem} with
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public SettingsItem(T value, Class<? extends JComponent> componentClass) {
-		this.value			= value;
-		this.componentClass	= componentClass;
-	}
-
-	/**
-	 * @return an instance of the {@link JComponent} that represents this
-	 *         {@link SettingsItem}
-	 * @throws ReflectiveOperationException if the component initialization failed
-	 * @throws SecurityException            if the component initialization failed
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public JComponent getComponent() throws ReflectiveOperationException, SecurityException {
-		if (componentClass == null) throw new NullPointerException("Component class is null");
-		return componentClass.getConstructor(SettingsItem.class).newInstance(this);
+		if (nodeCreators.containsKey(value.getClass())) nodeCreator = nodeCreators.get(value.getClass());
 	}
 
 	/**
@@ -99,18 +74,6 @@ public class SettingsItem<T> implements Serializable {
 		this.value = value;
 	}
 
-	/**
-	 * @return the componentClass
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public Class<? extends JComponent> getComponentClass() { return componentClass; }
-
-	/**
-	 * @param componentClass the componentClass to set
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public void setComponentClass(Class<? extends JComponent> componentClass) { this.componentClass = componentClass; }
-
 	/**
 	 * @return the userFriendlyName
 	 * @since Envoy Client v0.3-alpha
@@ -147,4 +110,8 @@ public class SettingsItem<T> implements Serializable {
 		this.changeHandler = changeHandler;
 		changeHandler.accept(value);
 	}
+
+	public boolean hasNodeCreator() { return nodeCreator != null; }
+
+	public Node getNode() { return nodeCreator.apply(this); }
 }
diff --git a/src/main/java/envoy/client/ui/GeneralSettingsPane.java b/src/main/java/envoy/client/ui/GeneralSettingsPane.java
new file mode 100644
index 0000000..20f74f0
--- /dev/null
+++ b/src/main/java/envoy/client/ui/GeneralSettingsPane.java
@@ -0,0 +1,21 @@
+package envoy.client.ui;
+
+import envoy.client.data.Settings;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>GeneralSettingsPane.java</strong><br>
+ * Created: <strong>18.04.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public class GeneralSettingsPane extends SettingsPane {
+
+	private static final Settings settings = Settings.getInstance();
+
+	/**
+	 * @since Envoy Client v0.1-beta
+	 */
+	public GeneralSettingsPane() { super("General"); }
+}
diff --git a/src/main/java/envoy/client/ui/SettingsPane.java b/src/main/java/envoy/client/ui/SettingsPane.java
index 85d2d35..79bec4b 100644
--- a/src/main/java/envoy/client/ui/SettingsPane.java
+++ b/src/main/java/envoy/client/ui/SettingsPane.java
@@ -1,7 +1,6 @@
 package envoy.client.ui;
 
-import javafx.scene.Node;
-
+import javafx.scene.layout.Pane;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -11,9 +10,15 @@ import javafx.scene.Node;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public abstract class SettingsPane extends Node {
+public abstract class SettingsPane extends Pane {
 
 	protected String title;
 
-	public abstract String getTitle();
+	protected SettingsPane(String title) { this.title = title; }
+
+	/**
+	 * @return the title of this settings pane
+	 * @since Envoy Client v0.1-beta
+	 */
+	public String getTitle() { return title; }
 }
diff --git a/src/main/java/envoy/client/ui/SettingsSceneController.java b/src/main/java/envoy/client/ui/SettingsSceneController.java
index 761d8cb..2d6eccd 100644
--- a/src/main/java/envoy/client/ui/SettingsSceneController.java
+++ b/src/main/java/envoy/client/ui/SettingsSceneController.java
@@ -3,8 +3,6 @@ package envoy.client.ui;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
-import envoy.client.data.Settings;
-
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SettingsSceneController.java</strong><br>
@@ -13,7 +11,7 @@ import envoy.client.data.Settings;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public class SettingsSceneController {
+public final class SettingsSceneController {
 
 	@FXML
 	private ListView<SettingsPane> settingsList;
@@ -21,8 +19,6 @@ public class SettingsSceneController {
 	@FXML
 	private TitledPane titledPane;
 
-	private static final Settings settings = Settings.getInstance();
-
 	@FXML
 	private void initialize() {
 		settingsList.setCellFactory(listView -> new ListCell<>() {
diff --git a/src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java b/src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java
deleted file mode 100644
index 372478b..0000000
--- a/src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package envoy.client.ui.settings;
-
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.swing.JComponent;
-import javax.swing.JTextPane;
-
-import envoy.client.data.Settings;
-import envoy.client.data.SettingsItem;
-import envoy.client.ui.Theme;
-import envoy.util.EnvoyLog;
-
-/**
- * Displays GUI components that allow general settings regarding the client.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>GeneralSettingsPanel.java</strong><br>
- * Created: <strong>21 Dec 2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.3-alpha
- */
-public class GeneralSettingsPanel extends SettingsPanel {
-
-	private Theme theme;
-
-	private static final String[]	items				= { "onCloseMode", "enterToSend" };
-	private static final Logger		logger				= EnvoyLog.getLogger(GeneralSettingsPanel.class);
-	private static final long		serialVersionUID = 0L;
-
-	/**
-	 * This is the constructor for the General class. Here the user can set general
-	 * settings for the client.
-	 *
-	 * @param parent the {@link SettingsScreen} as a part of which this
-	 *               {@link SettingsPanel} is displayed
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public GeneralSettingsPanel(SettingsScreen parent) {
-		super(parent);
-		theme = Settings.getInstance().getCurrentTheme();
-
-		setBackground(theme.getCellColor());
-
-		GridBagLayout gbl_general = new GridBagLayout();
-		gbl_general.columnWidths	= new int[] { 1, 1 };
-		gbl_general.rowHeights		= new int[] { 1, 1, 1 };
-		gbl_general.columnWeights	= new double[] { 1.0, 0.1 };
-		gbl_general.rowWeights		= new double[] { 0.02, 0.02, 1.0 };
-
-		setLayout(gbl_general);
-
-		for (int i = 0; i < items.length; i++)
-			try {
-				createSettingElement(i, Settings.getInstance().getItems().get(items[i]));
-			} catch (SecurityException | ReflectiveOperationException e) {
-				logger.log(Level.WARNING, "Could not create settings item", e);
-			}
-	}
-
-	private void createSettingElement(int gridy, SettingsItem<?> settingsItem) throws SecurityException, ReflectiveOperationException {
-		JTextPane descriptionText = new JTextPane();
-
-		JComponent settingComponent = settingsItem.getComponent();
-
-		GridBagConstraints gbc_toggleSwitch = new GridBagConstraints();
-		gbc_toggleSwitch.gridx	= 1;
-		gbc_toggleSwitch.gridy	= gridy;
-
-		add(settingComponent, gbc_toggleSwitch);
-
-		descriptionText.setText(settingsItem.getDescription());
-		descriptionText.setBackground(theme.getBackgroundColor());
-		descriptionText.setForeground(theme.getBackgroundColor().invert());
-		descriptionText.setEditable(false);
-
-		GridBagConstraints gbc_descriptionText = new GridBagConstraints();
-		gbc_descriptionText.fill	= GridBagConstraints.BOTH;
-		gbc_descriptionText.gridx	= 0;
-		gbc_descriptionText.gridy	= gridy;
-		gbc_descriptionText.insets	= new Insets(5, 5, 5, 5);
-
-		add(descriptionText, gbc_descriptionText);
-	}
-}
diff --git a/src/main/java/envoy/client/ui/settings/NewThemeScreen.java b/src/main/java/envoy/client/ui/settings/NewThemeScreen.java
deleted file mode 100644
index a486e85..0000000
--- a/src/main/java/envoy/client/ui/settings/NewThemeScreen.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package envoy.client.ui.settings;
-
-import java.awt.*;
-import java.util.function.Consumer;
-
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.JTextPane;
-
-import envoy.client.data.Settings;
-import envoy.client.ui.Theme;
-import envoy.client.ui.primary.PrimaryButton;
-import envoy.client.ui.primary.PrimaryTextArea;
-
-/**
- * Displays window where you can choose a name for the new {@link Theme}.
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>NewThemeScreen.java</strong><br>
- * Created: <strong>26 Dec 2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.3-alpha
- */
-public class NewThemeScreen extends JDialog {
-
-	private final JPanel	standardPanel		= new JPanel();
-	private final JPanel	secondaryPanel		= new JPanel();
-	private JTextPane		text				= new JTextPane();
-	private PrimaryTextArea	nameEnterTextArea	= new PrimaryTextArea(4);
-	private PrimaryButton	confirmButton		= new PrimaryButton("Confirm");
-
-	private JTextPane		errorText	= new JTextPane();
-	private PrimaryButton	otherName	= new PrimaryButton("Other Name");
-	private PrimaryButton	overwrite	= new PrimaryButton("Overwrite");
-
-	private final Consumer<String> newThemeAction, modifyThemeAction;
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * Creates a window, where you can choose a name for a new {@link Theme}. <br>
-	 * There are two versions of this Window. The first one is responsible for
-	 * choosing the name, the second one appears, if the name already exists.
-	 *
-	 * @param parent            the dialog is launched with its location relative to
-	 *                          this {@link SettingsScreen}
-	 * @param newThemeAction    is executed when a new theme name is entered
-	 * @param modifyThemeAction is executed when an existing theme name is entered
-	 *                          and confirmed
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public NewThemeScreen(SettingsScreen parent, Consumer<String> newThemeAction, Consumer<String> modifyThemeAction) {
-		this.newThemeAction		= newThemeAction;
-		this.modifyThemeAction	= modifyThemeAction;
-
-		setLocationRelativeTo(parent);
-		setTitle("New Theme");
-		setModal(true);
-
-		setDimensions(true);
-		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-
-		Theme theme = Settings.getInstance().getCurrentTheme();
-
-		getContentPane().setLayout(new BorderLayout());
-		standardPanel.setBackground(theme.getBackgroundColor());
-		secondaryPanel.setBackground(theme.getBackgroundColor());
-		loadStandardContent(theme);
-	}
-
-	private void setDimensions(boolean isStandard) {
-		Dimension size = isStandard ? new Dimension(300, 170) : new Dimension(300, 225);
-		setPreferredSize(size);
-		setMinimumSize(size);
-		setMaximumSize(size);
-	}
-
-	private void loadStandardContent(Theme theme) {
-		getContentPane().removeAll();
-
-		// ContentPane
-		GridBagLayout gbl_contentPanel = new GridBagLayout();
-
-		gbl_contentPanel.columnWidths	= new int[] { 1, 1 };
-		gbl_contentPanel.rowHeights		= new int[] { 1, 1, 1 };
-		gbl_contentPanel.columnWeights	= new double[] { 1, 1 };
-		gbl_contentPanel.rowWeights		= new double[] { 1, 1, 1 };
-
-		getContentPane().add(standardPanel, BorderLayout.CENTER);
-		standardPanel.setLayout(gbl_contentPanel);
-
-		// text.setFont(new Font());
-		text.setText("Please enter a name for the new Theme");
-		text.setAlignmentX(CENTER_ALIGNMENT);
-		text.setBackground(theme.getCellColor());
-		text.setForeground(theme.getUserNameColor());
-		text.setEditable(false);
-
-		GridBagConstraints gbc_text = new GridBagConstraints();
-		gbc_text.fill		= GridBagConstraints.HORIZONTAL;
-		gbc_text.gridx		= 0;
-		gbc_text.gridy		= 0;
-		gbc_text.gridwidth	= 2;
-		gbc_text.insets		= new Insets(5, 5, 5, 5);
-
-		standardPanel.add(text, gbc_text);
-
-		nameEnterTextArea.setBackground(theme.getCellColor());
-		nameEnterTextArea.setForeground(theme.getTypingMessageColor());
-		nameEnterTextArea.setText("");
-		nameEnterTextArea.setEditable(true);
-
-		GridBagConstraints gbc_input = new GridBagConstraints();
-		gbc_input.fill		= GridBagConstraints.HORIZONTAL;
-		gbc_input.gridx		= 0;
-		gbc_input.gridy		= 1;
-		gbc_input.gridwidth	= 2;
-		gbc_input.insets	= new Insets(5, 5, 5, 5);
-
-		standardPanel.add(nameEnterTextArea, gbc_input);
-
-		confirmButton.setBackground(theme.getInteractableBackgroundColor());
-		confirmButton.setForeground(theme.getInteractableForegroundColor());
-
-		GridBagConstraints gbc_confirmButton = new GridBagConstraints();
-		gbc_confirmButton.gridx		= 0;
-		gbc_confirmButton.gridy		= 2;
-		gbc_confirmButton.gridwidth	= 2;
-		gbc_confirmButton.insets	= new Insets(5, 5, 5, 5);
-
-		standardPanel.add(confirmButton, gbc_confirmButton);
-
-		confirmButton.addActionListener((evt) -> {
-			if (!nameEnterTextArea.getText().isEmpty()) if (Settings.getInstance().getThemes().containsKey(nameEnterTextArea.getText())) {
-				// load other panel
-				setDimensions(false);
-				loadSecondaryPage(theme);
-			} else {
-				newThemeAction.accept(nameEnterTextArea.getText());
-				dispose();
-			}
-		});
-	}
-
-	private void loadSecondaryPage(Theme theme) {
-		// ContentPane
-		getContentPane().removeAll();
-
-		GridBagLayout gbl_secondaryPanel = new GridBagLayout();
-
-		gbl_secondaryPanel.columnWidths		= new int[] { 1, 1 };
-		gbl_secondaryPanel.rowHeights		= new int[] { 1, 1, 1, 1 };
-		gbl_secondaryPanel.columnWeights	= new double[] { 1, 1 };
-		gbl_secondaryPanel.rowWeights		= new double[] { 1, 1, 1, 1 };
-
-		getContentPane().add(secondaryPanel, BorderLayout.CENTER);
-		secondaryPanel.setLayout(gbl_secondaryPanel);
-
-		// text.setFont(new Font());
-		text.setText("Please enter a name for the new Theme");
-		text.setAlignmentX(CENTER_ALIGNMENT);
-		text.setBackground(theme.getCellColor());
-		text.setForeground(theme.getUserNameColor());
-		text.setEditable(false);
-
-		GridBagConstraints gbc_text = new GridBagConstraints();
-		gbc_text.fill		= GridBagConstraints.HORIZONTAL;
-		gbc_text.gridx		= 0;
-		gbc_text.gridy		= 0;
-		gbc_text.gridwidth	= 2;
-		gbc_text.insets		= new Insets(5, 5, 5, 5);
-
-		secondaryPanel.add(text, gbc_text);
-
-		nameEnterTextArea.setBackground(theme.getCellColor());
-		nameEnterTextArea.setForeground(theme.getTypingMessageColor());
-		nameEnterTextArea.setEditable(false);
-
-		GridBagConstraints gbc_input = new GridBagConstraints();
-		gbc_input.fill		= GridBagConstraints.HORIZONTAL;
-		gbc_input.gridx		= 0;
-		gbc_input.gridy		= 1;
-		gbc_input.gridwidth	= 2;
-		gbc_input.insets	= new Insets(5, 5, 5, 5);
-
-		secondaryPanel.add(nameEnterTextArea, gbc_input);
-
-		errorText.setText("The name does already exist. Choose another one or overwrite the old theme.");
-		errorText.setAlignmentX(CENTER_ALIGNMENT);
-		errorText.setBackground(theme.getCellColor());
-		errorText.setForeground(theme.getUserNameColor());
-		errorText.setEditable(false);
-
-		GridBagConstraints gbc_errorText = new GridBagConstraints();
-		gbc_errorText.fill		= GridBagConstraints.HORIZONTAL;
-		gbc_errorText.gridx		= 0;
-		gbc_errorText.gridy		= 2;
-		gbc_errorText.gridwidth	= 2;
-		gbc_errorText.insets	= new Insets(5, 5, 5, 5);
-
-		secondaryPanel.add(errorText, gbc_errorText);
-
-		otherName.setBackground(theme.getInteractableBackgroundColor());
-		otherName.setForeground(theme.getInteractableForegroundColor());
-
-		GridBagConstraints gbc_otherName = new GridBagConstraints();
-		gbc_otherName.gridx		= 0;
-		gbc_otherName.gridy		= 3;
-		gbc_otherName.insets	= new Insets(5, 5, 5, 5);
-
-		secondaryPanel.add(otherName, gbc_otherName);
-
-		overwrite.setBackground(theme.getInteractableBackgroundColor());
-		overwrite.setForeground(theme.getInteractableForegroundColor());
-
-		GridBagConstraints gbc_overwrite = new GridBagConstraints();
-		gbc_overwrite.gridx		= 1;
-		gbc_overwrite.gridy		= 3;
-		gbc_overwrite.insets	= new Insets(5, 5, 5, 5);
-
-		secondaryPanel.add(overwrite, gbc_overwrite);
-
-		otherName.addActionListener((evt) -> { setDimensions(true); loadStandardContent(theme); });
-
-		overwrite.addActionListener((evt) -> { modifyThemeAction.accept(nameEnterTextArea.getText()); dispose(); });
-	}
-}
diff --git a/src/main/java/envoy/client/ui/settings/SettingsPanel.java b/src/main/java/envoy/client/ui/settings/SettingsPanel.java
deleted file mode 100644
index b72eb66..0000000
--- a/src/main/java/envoy/client/ui/settings/SettingsPanel.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package envoy.client.ui.settings;
-
-import javax.swing.JPanel;
-
-/**
- * Serves as an interface between {@link SettingsScreen} and different
- * {@link JPanel}s with actual settings that are defined as sub classes of this
- * class.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>SettingsPanel.java</strong><br>
- * Created: <strong>20 Dec 2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.2-alpha
- */
-public abstract class SettingsPanel extends JPanel {
-
-	protected final SettingsScreen parent;
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * Initializes a {@link SettingsPanel}.
-	 *
-	 * @param parent the {@link SettingsScreen} as a part of which this
-	 *               {@link SettingsPanel} is displayed
-	 */
-	public SettingsPanel(SettingsScreen parent) { this.parent = parent; }
-}
diff --git a/src/main/java/envoy/client/ui/settings/SettingsScreen.java b/src/main/java/envoy/client/ui/settings/SettingsScreen.java
deleted file mode 100644
index 87482d2..0000000
--- a/src/main/java/envoy/client/ui/settings/SettingsScreen.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package envoy.client.ui.settings;
-
-import java.awt.*;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.swing.*;
-
-import envoy.client.data.Settings;
-import envoy.client.event.ThemeChangeEvent;
-import envoy.client.ui.Theme;
-import envoy.client.ui.primary.PrimaryButton;
-import envoy.event.EventBus;
-import envoy.util.EnvoyLog;
-
-/**
- * This class provides the GUI to change the user specific settings.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>SettingsScreen.java</strong><br>
- * Created: <strong>31 Oct 2019</strong><br>
- *
- * @author Leon Hofmeister
- * @author Maximilian K&auml;fer
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.2-alpha
- */
-public class SettingsScreen extends JDialog {
-
-	private static final long serialVersionUID = 0L;
-
-	private final JPanel contentPanel = new JPanel();
-
-	// Settings panel list
-	private final DefaultListModel<String>	optionsListModel	= new DefaultListModel<>();
-	private final JList<String>				options				= new JList<>(optionsListModel);
-
-	// OK and cancel buttons
-	private final JPanel		buttonPane		= new JPanel();
-	private final PrimaryButton	cancelButton	= new PrimaryButton("Cancel");
-
-	private final Insets insets = new Insets(5, 5, 5, 5);
-
-	private SettingsPanel settingsPanel;
-
-	private static final Logger logger = EnvoyLog.getLogger(SettingsScreen.class);
-
-	/**
-	 * Initializes the settings screen.
-	 *
-	 * @since Envoy Client v0.1-alpha
-	 */
-	public SettingsScreen() {
-		// Initialize settings pages
-		Map<String, Class<? extends SettingsPanel>> panels = new HashMap<>();
-		panels.put("General", GeneralSettingsPanel.class);
-		panels.put("Color Themes", ThemeCustomizationPanel.class);
-
-		setBounds(10, 10, 450, 650);
-		getContentPane().setLayout(new BorderLayout());
-		{
-			// ContentPane
-			GridBagLayout gbl_contentPanel = new GridBagLayout();
-
-			gbl_contentPanel.columnWidths	= new int[] { 1, 1 };
-			gbl_contentPanel.rowHeights		= new int[] { 1 };
-			gbl_contentPanel.columnWeights	= new double[] { 0.05, 1.0 };
-			gbl_contentPanel.rowWeights		= new double[] { 1.0 };
-
-			getContentPane().add(contentPanel, BorderLayout.CENTER);
-			contentPanel.setLayout(gbl_contentPanel);
-
-			// Constraints for the settings panel
-			GridBagConstraints gbc_panel = new GridBagConstraints();
-			gbc_panel.fill		= GridBagConstraints.BOTH;
-			gbc_panel.gridx		= 1;
-			gbc_panel.gridy		= 0;
-			gbc_panel.anchor	= GridBagConstraints.PAGE_START;
-			gbc_panel.insets	= insets;
-
-			options.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-			options.addListSelectionListener((listSelectionEvent) -> {
-				if (!listSelectionEvent.getValueIsAdjusting()) {
-					// Get selected settings panel
-					final String option = options.getSelectedValue();
-					logger.log(Level.FINEST, "Selected settings panel: " + option);
-
-					// Remove previous settings panel
-					if (settingsPanel != null) contentPanel.remove(settingsPanel);
-
-					try {
-						settingsPanel = panels.get(option).getDeclaredConstructor(getClass()).newInstance(this);
-
-						// Add selected settings panel
-						contentPanel.add(settingsPanel, gbc_panel);
-						revalidate();
-						repaint();
-					} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
-							| NoSuchMethodException | SecurityException e) {
-						logger.log(Level.SEVERE, "Failed to invoke constructor of SettingsPanel " + option, e);
-					}
-				}
-			});
-			options.setFont(new Font("Arial", Font.PLAIN, 14));
-
-			GridBagConstraints gbc_optionsList = new GridBagConstraints();
-			gbc_optionsList.fill	= GridBagConstraints.BOTH;
-			gbc_optionsList.gridx	= 0;
-			gbc_optionsList.gridy	= 0;
-			gbc_optionsList.anchor	= GridBagConstraints.PAGE_START;
-			gbc_optionsList.insets	= insets;
-
-			panels.keySet().forEach(name -> optionsListModel.addElement(name));
-			contentPanel.add(options, gbc_optionsList);
-
-			// ButtonPane
-			GridBagLayout gbl_buttonPane = new GridBagLayout();
-			gbl_buttonPane.columnWidths		= new int[] { 1, 1 };
-			gbl_buttonPane.rowHeights		= new int[] { 25 };
-			gbl_buttonPane.columnWeights	= new double[] { 1.0, 1.0 };
-			gbl_buttonPane.rowWeights		= new double[] { 0.0 };
-
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			buttonPane.setLayout(gbl_buttonPane);
-			{
-				cancelButton.setActionCommand("Cancel");
-				cancelButton.setBorderPainted(false);
-				GridBagConstraints gbc_cancelButton = new GridBagConstraints();
-				gbc_cancelButton.anchor	= GridBagConstraints.NORTHWEST;
-				gbc_cancelButton.insets	= insets;
-				gbc_cancelButton.gridx	= 0;
-				gbc_cancelButton.gridy	= 0;
-				buttonPane.add(cancelButton, gbc_cancelButton);
-
-				cancelButton.addActionListener((evt) -> { dispose(); });
-			}
-		}
-
-		// Apply current theme
-		applyTheme(Settings.getInstance().getCurrentTheme());
-
-		// Respond to theme changes
-		EventBus.getInstance().register(ThemeChangeEvent.class, evt -> applyTheme(evt.get()));
-
-		setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-		setModal(true);
-	}
-
-	private void applyTheme(Theme theme) {
-		// JDialog
-		setBackground(theme.getBackgroundColor());
-
-		// contentPanel
-		contentPanel.setBackground(theme.getBackgroundColor());
-
-		// buttonPane
-		buttonPane.setBackground(theme.getCellColor());
-
-		// cancelButton
-		cancelButton.setBackground(theme.getInteractableBackgroundColor());
-		cancelButton.setForeground(theme.getInteractableForegroundColor());
-
-		// options
-		options.setSelectionForeground(theme.getUserNameColor());
-		options.setSelectionBackground(theme.getSelectionColor());
-		options.setForeground(theme.getUserNameColor());
-		options.setBackground(theme.getCellColor());
-	}
-}
diff --git a/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java b/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
deleted file mode 100755
index b6eb832..0000000
--- a/src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package envoy.client.ui.settings;
-
-import java.awt.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.swing.*;
-
-import envoy.client.data.Settings;
-import envoy.client.event.ThemeChangeEvent;
-import envoy.client.ui.Color;
-import envoy.client.ui.Theme;
-import envoy.client.ui.primary.PrimaryButton;
-import envoy.event.EventBus;
-import envoy.util.EnvoyLog;
-
-/**
- * Displays GUI components that allow changing the current {@Theme} and creating
- * new ones.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>ThemeCustomizationPanel.java</strong><br>
- * Created: <strong>20 Dec 2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-public class ThemeCustomizationPanel extends SettingsPanel {
-
-	private JPanel colorsPanel = new JPanel();
-
-	private DefaultComboBoxModel<String>	themesModel;
-	private JComboBox<String>				themes;
-	private Theme							temporaryTheme;
-	private PrimaryButton					createThemeButton	= new PrimaryButton("Create Theme");
-
-	private boolean			themeChanged;
-	private final Insets	insets	= new Insets(5, 5, 5, 5);
-
-	private static final Logger	logger				= EnvoyLog.getLogger(ThemeCustomizationPanel.class);
-	private static final long	serialVersionUID = 0L;
-
-	/**
-	 * Initializes a {@link ThemeCustomizationPanel} that enables the user to change
-	 * the current {@link Theme} and create new themes as part of the
-	 * {@link SettingsScreen}.
-	 *
-	 * @param parent the {@link SettingsScreen} as a part of which this
-	 *               {@link SettingsPanel} is displayed
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public ThemeCustomizationPanel(SettingsScreen parent) {
-		super(parent);
-		temporaryTheme = new Theme("temporaryTheme", Settings.getInstance().getCurrentTheme());
-
-		var		themeNames			= Settings.getInstance().getThemes().keySet().toArray(new String[0]);
-		String	currentThemeName	= Settings.getInstance().getCurrentThemeName();
-		for (int i = 0; i < themeNames.length; i++)
-			if (currentThemeName.equals(themeNames[i])) {
-				themeNames[i]	= themeNames[0];
-				themeNames[0]	= currentThemeName;
-				break;
-			}
-		themesModel	= new DefaultComboBoxModel<>(themeNames);
-		themes		= new JComboBox<>(themesModel);
-		GridBagLayout gbl_themeLayout = new GridBagLayout();
-
-		gbl_themeLayout.columnWidths	= new int[] { 1, 1 };
-		gbl_themeLayout.rowHeights		= new int[] { 1, 1, 1 };
-		gbl_themeLayout.columnWeights	= new double[] { 1.0, 1.0 };
-		gbl_themeLayout.rowWeights		= new double[] { 0.01, 1.0, 0.01 };
-
-		setLayout(gbl_themeLayout);
-
-		themes.setSelectedItem(Settings.getInstance().getCurrentTheme());
-
-		GridBagConstraints gbc_themes = new GridBagConstraints();
-		gbc_themes.fill			= GridBagConstraints.HORIZONTAL;
-		gbc_themes.gridwidth	= 2;
-		gbc_themes.gridx		= 0;
-		gbc_themes.gridy		= 0;
-		gbc_themes.anchor		= GridBagConstraints.NORTHWEST;
-		gbc_themes.insets		= new Insets(10, 10, 20, 10);
-
-		add(themes, gbc_themes);
-		GridBagLayout gbl_colorCustomizations = new GridBagLayout();
-
-		gbl_colorCustomizations.columnWidths	= new int[] { 1, 1 };
-		gbl_colorCustomizations.rowHeights		= new int[] { 1, 1, 1, 1, 1, 1, 1, 1, 1 };
-		gbl_colorCustomizations.columnWeights	= new double[] { 1, 1 };
-		gbl_colorCustomizations.rowWeights		= new double[] { 1, 1, 1, 1, 1, 1, 1, 1 };
-
-		colorsPanel.setLayout(gbl_colorCustomizations);
-
-		Theme theme = Settings.getInstance().getCurrentTheme();
-		buildCustomizeElements(theme);
-
-		GridBagConstraints gbc_colorsPanel = new GridBagConstraints();
-		gbc_colorsPanel.fill		= GridBagConstraints.HORIZONTAL;
-		gbc_colorsPanel.gridx		= 0;
-		gbc_colorsPanel.gridy		= 1;
-		gbc_colorsPanel.gridwidth	= 2;
-		gbc_colorsPanel.anchor		= GridBagConstraints.NORTHWEST;
-		gbc_colorsPanel.insets		= insets;
-
-		add(colorsPanel, gbc_colorsPanel);
-
-		createThemeButton.addActionListener((evt) -> {
-			if (themeChanged) {
-				new NewThemeScreen(parent, name -> {
-					// Create new theme
-					logger.log(Level.FINEST, name);
-					Settings.getInstance().addNewThemeToMap(new Theme(name, temporaryTheme));
-
-					// Add new theme name to combo box
-					themesModel.addElement(name);
-
-					// Select new theme name
-					themes.setSelectedIndex(themesModel.getSize() - 1);
-				}, name -> {
-					// Modify theme
-					Settings.getInstance().getThemes().replace(name, new Theme(name, temporaryTheme));
-					if (themes.getSelectedItem().equals(name))
-						EventBus.getInstance().dispatch(new ThemeChangeEvent(Settings.getInstance().getTheme(name)));
-					else themes.setSelectedItem(name);
-				}).setVisible(true);
-				themeChanged = false;
-			}
-		});
-		GridBagConstraints gbc_createThemeButton = new GridBagConstraints();
-		gbc_createThemeButton.fill		= GridBagConstraints.HORIZONTAL;
-		gbc_createThemeButton.gridx		= 0;
-		gbc_createThemeButton.gridy		= 2;
-		gbc_createThemeButton.anchor	= GridBagConstraints.CENTER;
-		gbc_createThemeButton.insets	= insets;
-		add(createThemeButton, gbc_createThemeButton);
-
-		colorsPanel.setBackground(theme.getCellColor());
-
-		// Apply theme upon selection
-		themes.addItemListener(e -> {
-			String selectedValue = (String) themes.getSelectedItem();
-			logger.log(Level.FINEST, "Selected theme: " + selectedValue);
-
-			final Theme currentTheme = Settings.getInstance().getTheme(selectedValue);
-			Settings.getInstance().setCurrentTheme(selectedValue);
-			EventBus.getInstance().dispatch(new ThemeChangeEvent(currentTheme));
-		});
-
-		// Apply current theme
-		applyTheme(theme);
-
-		// Respond to theme changes
-		EventBus.getInstance()
-			.register(ThemeChangeEvent.class,
-					evt -> {
-						final Theme currentTheme = evt.get();
-						temporaryTheme = new Theme("temporaryTheme", currentTheme);
-						applyTheme(currentTheme);
-					});
-	}
-
-	private void applyTheme(Theme theme) {
-		// themeContent
-		setForeground(theme.getUserNameColor());
-		setBackground(theme.getCellColor());
-
-		// createThemeButton
-		createThemeButton.setForeground(theme.getInteractableForegroundColor());
-		createThemeButton.setBackground(theme.getInteractableBackgroundColor());
-
-		// themes
-		themes.setBackground(theme.getInteractableBackgroundColor());
-		themes.setForeground(theme.getInteractableForegroundColor());
-		colorsPanel.setBackground(theme.getCellColor());
-
-		// Color panel
-		updateColorVariables(theme);
-
-		revalidate();
-		repaint();
-	}
-
-	private void updateColorVariables(Theme theme) {
-		colorsPanel.removeAll();
-		buildCustomizeElements(theme);
-	}
-
-	private void buildCustomizeElements(Theme theme) {
-		buildCustomizeElement(theme, theme.getBackgroundColor(), "Background", "backgroundColor", 1);
-		buildCustomizeElement(theme, theme.getCellColor(), "Cells", "cellColor", 2);
-		buildCustomizeElement(theme, theme.getInteractableForegroundColor(), "Interactable Foreground", "interactableForegroundColor", 3);
-		buildCustomizeElement(theme, theme.getInteractableBackgroundColor(), "Interactable Background", "interactableBackgroundColor", 4);
-		buildCustomizeElement(theme, theme.getTextColor(), "Text Color", "textColor", 5);
-		buildCustomizeElement(theme, theme.getDateColor(), "Date Chat", "dateColorChat", 6);
-		buildCustomizeElement(theme, theme.getSelectionColor(), "Selection", "selectionColor", 7);
-		buildCustomizeElement(theme, theme.getTypingMessageColor(), "Typing Message", "typingMessageColor", 8);
-		buildCustomizeElement(theme, theme.getUserNameColor(), "User Names", "userNameColor", 9);
-	}
-
-	private void buildCustomizeElement(Theme theme, Color color, String name, String colorName, int gridy) {
-		JButton		button		= new JButton();
-		JTextPane	textPane	= new JTextPane();
-
-		textPane.setFont(new Font("Arial", Font.PLAIN, 14));
-		textPane.setBackground(theme.getBackgroundColor());
-		textPane.setForeground(theme.getBackgroundColor().invert());
-		textPane.setText(name);
-		textPane.setEditable(false);
-
-		button.setBackground(color);
-		button.setPreferredSize(new Dimension(25, 25));
-
-		button.addActionListener((evt) -> {
-			java.awt.Color c = JColorChooser.showDialog(null, "Choose a color", color);
-			if (c != null) {
-				Color newColor = new Color(c);
-				if (!color.equals(newColor)) {
-					logger.log(Level.FINEST, "New Color: " + newColor);
-					temporaryTheme.setColor(colorName, newColor);
-					themeChanged = true;
-				}
-				button.setBackground(newColor);
-			}
-		});
-
-		GridBagConstraints gbc_textPane = new GridBagConstraints();
-		gbc_textPane.fill	= GridBagConstraints.BOTH;
-		gbc_textPane.gridx	= 0;
-		gbc_textPane.gridy	= gridy;
-		gbc_textPane.anchor	= GridBagConstraints.CENTER;
-		gbc_textPane.insets	= insets;
-
-		colorsPanel.add(textPane, gbc_textPane);
-
-		GridBagConstraints gbc_button = new GridBagConstraints();
-		gbc_button.fill		= GridBagConstraints.BOTH;
-		gbc_button.gridx	= 1;
-		gbc_button.gridy	= gridy;
-		gbc_button.anchor	= GridBagConstraints.CENTER;
-		gbc_button.insets	= insets;
-
-		colorsPanel.add(button, gbc_button);
-	}
-}
diff --git a/src/main/java/envoy/client/ui/settings/package-info.java b/src/main/java/envoy/client/ui/settings/package-info.java
deleted file mode 100644
index 5325a73..0000000
--- a/src/main/java/envoy/client/ui/settings/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * This package contains user interface classes related to the settings screen.
- *
- * @author Kai S. K. Engelbart
- * @author Leon Hofmeister
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-package envoy.client.ui.settings;

From e4e903b8bf530df1de4f22756e7907f84b33c20d Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 18 Apr 2020 16:04:47 +0200
Subject: [PATCH 26/60] Added SettingsToggleButton

---
 .../java/envoy/client/data/SettingsItem.java  | 18 +++++----------
 .../envoy/client/ui/GeneralSettingsPane.java  | 10 +++++++-
 .../envoy/client/ui/SettingsToggleButton.java | 23 +++++++++++++++++++
 src/main/java/module-info.java                |  1 +
 4 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/envoy/client/ui/SettingsToggleButton.java

diff --git a/src/main/java/envoy/client/data/SettingsItem.java b/src/main/java/envoy/client/data/SettingsItem.java
index e9c498c..fc8552c 100644
--- a/src/main/java/envoy/client/data/SettingsItem.java
+++ b/src/main/java/envoy/client/data/SettingsItem.java
@@ -1,8 +1,6 @@
 package envoy.client.data;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -10,11 +8,13 @@ import javax.swing.JComponent;
 
 import javafx.scene.Node;
 
+import envoy.client.ui.SettingsToggleButton;
+
 /**
  * Encapsulates a persistent value that is directly or indirectly mutable by the
  * user.<br>
  * <br>
- * Project: <strong>envoy-clientChess</strong><br>
+ * Project: <strong>envoy-client</strong><br>
  * File: <strong>SettingsItem.java</strong><br>
  * Created: <strong>23.12.2019</strong><br>
  *
@@ -27,17 +27,11 @@ public class SettingsItem<T> implements Serializable {
 	private T		value;
 	private String	userFriendlyName, description;
 
-	private transient Consumer<T>						changeHandler;
-	private transient Function<SettingsItem<?>, Node>	nodeCreator;
-
-	private static final Map<Class<?>, Function<SettingsItem<?>, Node>> nodeCreators = new HashMap<>();
+	private transient Consumer<T>								changeHandler;
+	private transient Function<SettingsItem<?>, ? extends Node>	nodeCreator;
 
 	private static final long serialVersionUID = 1L;
 
-	static {
-
-	}
-
 	/**
 	 * Initializes a {@link SettingsItem}. The default value's class will be mapped
 	 * to a {@link JComponent} that can be used to display this {@link SettingsItem}
@@ -53,7 +47,7 @@ public class SettingsItem<T> implements Serializable {
 		this.userFriendlyName	= userFriendlyName;
 		this.description		= description;
 
-		if (nodeCreators.containsKey(value.getClass())) nodeCreator = nodeCreators.get(value.getClass());
+		if (value.getClass() == Boolean.class) nodeCreator = s -> new SettingsToggleButton((SettingsItem<Boolean>) s);
 	}
 
 	/**
diff --git a/src/main/java/envoy/client/ui/GeneralSettingsPane.java b/src/main/java/envoy/client/ui/GeneralSettingsPane.java
index 20f74f0..29c65d2 100644
--- a/src/main/java/envoy/client/ui/GeneralSettingsPane.java
+++ b/src/main/java/envoy/client/ui/GeneralSettingsPane.java
@@ -1,5 +1,7 @@
 package envoy.client.ui;
 
+import javafx.scene.layout.VBox;
+
 import envoy.client.data.Settings;
 
 /**
@@ -17,5 +19,11 @@ public class GeneralSettingsPane extends SettingsPane {
 	/**
 	 * @since Envoy Client v0.1-beta
 	 */
-	public GeneralSettingsPane() { super("General"); }
+	public GeneralSettingsPane() {
+		super("General");
+		var vbox = new VBox();
+		for (var name : new String[] { "onCloseMode", "enterToSend" })
+			vbox.getChildren().add(settings.getItems().get(name).getNode());
+		getChildren().add(vbox);
+	}
 }
diff --git a/src/main/java/envoy/client/ui/SettingsToggleButton.java b/src/main/java/envoy/client/ui/SettingsToggleButton.java
new file mode 100644
index 0000000..f91f7cb
--- /dev/null
+++ b/src/main/java/envoy/client/ui/SettingsToggleButton.java
@@ -0,0 +1,23 @@
+package envoy.client.ui;
+
+import javafx.event.ActionEvent;
+import javafx.scene.control.ToggleButton;
+
+import envoy.client.data.SettingsItem;
+
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>SettingsToggleButton.java</strong><br>
+ * Created: <strong>18.04.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public final class SettingsToggleButton extends ToggleButton {
+
+	public SettingsToggleButton(SettingsItem<Boolean> settingsItem) {
+		super(settingsItem.getUserFriendlyName());
+		addEventHandler(ActionEvent.ACTION, e -> settingsItem.set(!settingsItem.get()));
+	}
+}
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 2de5fa8..9413967 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -17,6 +17,7 @@ module envoy {
 	requires javafx.controls;
 	requires javafx.fxml;
 	requires javafx.base;
+	requires javafx.graphics;
 
 	opens envoy.client.ui to javafx.graphics, javafx.fxml;
 }

From 970f190389edfcc0762c2af5bb7ebf140b15fb0d Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sat, 18 Apr 2020 19:46:04 +0200
Subject: [PATCH 27/60] added inelegant capability to switch scenes

---
 .../envoy/client/ui/ChatSceneController.java  | 30 +++++---
 .../client/ui/SettingsSceneController.java    | 22 +++++-
 src/main/java/envoy/client/ui/Startup.java    | 75 +++++++++++++++++--
 3 files changed, 107 insertions(+), 20 deletions(-)

diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index b8927d4..e181121 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -5,6 +5,14 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
+import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.VBox;
+
 import envoy.client.data.Chat;
 import envoy.client.data.LocalDB;
 import envoy.client.event.MessageCreationEvent;
@@ -17,12 +25,6 @@ import envoy.event.EventBus;
 import envoy.event.MessageStatusChangeEvent;
 import envoy.event.UserStatusChangeEvent;
 import envoy.util.EnvoyLog;
-import javafx.application.Platform;
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -58,6 +60,8 @@ public final class ChatSceneController {
 
 	private Chat currentChat;
 
+	private Startup startup;
+
 	private static final EventBus	eventBus	= EventBus.getInstance();
 	private static final Logger		logger		= EnvoyLog.getLogger(ChatSceneController.class);
 
@@ -91,10 +95,11 @@ public final class ChatSceneController {
 		eventBus.register(UserStatusChangeEvent.class, e -> Platform.runLater(() -> userList.refresh()));
 	}
 
-	void initializeData(LocalDB localDB, Client client, WriteProxy writeProxy) {
-		this.localDB	= localDB;
-		this.client		= client;
-		this.writeProxy	= writeProxy;
+	void initializeData(Startup startup, LocalDB localDB, Client client, WriteProxy writeProxy) {
+		this.startup	= startup;
+		this.localDB		= localDB;
+		this.client			= client;
+		this.writeProxy		= writeProxy;
 
 		// TODO: handle offline mode
 		userList.setItems(FXCollections.observableList(localDB.getUser().getContacts().stream().collect(Collectors.toList())));
@@ -123,7 +128,10 @@ public final class ChatSceneController {
 	private void postButtonClicked() { postMessage(); }
 
 	@FXML
-	private void settingsButtonClicked() { logger.info("Settings Button clicked."); }
+	private void settingsButtonClicked() {
+		startup.changeScene("/fxml/SettingsScene.fxml", new VBox(), true);
+		Platform.runLater(() -> { ((SettingsSceneController) startup.getCurrentController()).initializeData(startup); });
+	}
 
 	@FXML
 	private void messageTextUpdated(KeyEvent e) {
diff --git a/src/main/java/envoy/client/ui/SettingsSceneController.java b/src/main/java/envoy/client/ui/SettingsSceneController.java
index 2d6eccd..743a58c 100644
--- a/src/main/java/envoy/client/ui/SettingsSceneController.java
+++ b/src/main/java/envoy/client/ui/SettingsSceneController.java
@@ -7,25 +7,36 @@ import javafx.scene.control.*;
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SettingsSceneController.java</strong><br>
  * Created: <strong>10.04.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public final class SettingsSceneController {
+public class SettingsSceneController {
 
+	private Startup					startup;
 	@FXML
-	private ListView<SettingsPane> settingsList;
+	private ListView<SettingsPane>	settingsList;
 
 	@FXML
 	private TitledPane titledPane;
 
+	/**
+	 * initializes the object needed to reset the scene
+	 * 
+	 * @param startup the instance of startup that stores the stage
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void initializeData(Startup startup) { this.startup = startup; }
+
 	@FXML
 	private void initialize() {
 		settingsList.setCellFactory(listView -> new ListCell<>() {
 
 			@Override
-			protected void updateItem(SettingsPane item, boolean empty) { if (!empty && item != null) setGraphic(new Label(item.getTitle())); };
+			protected void updateItem(SettingsPane item, boolean empty) { if (!empty && item != null) setGraphic(new Label(item.getTitle())); }
 		});
+
+		// settingsList.getItems().add(new GeneralSettingsPane());
 	}
 
 	@FXML
@@ -34,4 +45,7 @@ public final class SettingsSceneController {
 		titledPane.setText(pane.getTitle());
 		titledPane.setContent(pane);
 	}
+
+	@FXML
+	private void backButtonClicked() { startup.restoreScene(false); }
 }
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index becc467..9b5405a 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -8,12 +8,14 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javafx.application.Application;
+import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
 import envoy.client.data.*;
@@ -40,6 +42,11 @@ public final class Startup extends Application {
 	private WriteProxy		writeProxy;
 	private Cache<Message>	cache;
 
+	private FXMLLoader	loader	= new FXMLLoader();
+	private Stage		stage;
+
+	private Scene previousScene;
+
 	private static final ClientConfig	config	= ClientConfig.getInstance();
 	private static final Logger			logger	= EnvoyLog.getLogger(Startup.class);
 
@@ -48,6 +55,7 @@ public final class Startup extends Application {
 	 */
 	@Override
 	public void start(Stage stage) throws Exception {
+		this.stage = stage;
 		try {
 			// Load the configuration from client.properties first
 			Properties properties = new Properties();
@@ -124,20 +132,67 @@ public final class Startup extends Application {
 				.forEach(u -> u.setStatus(UserStatus.OFFLINE));
 
 		// Prepare stage and load ChatScene
-		var	loader		= new FXMLLoader(getClass().getResource("/fxml/ChatScene.fxml"));
-		var	anchorPane	= loader.<GridPane>load();
-		var	chatScene	= new Scene(anchorPane);
+		changeScene("/fxml/ChatScene.fxml", new GridPane(), false);
+		Platform.runLater(() -> { ((ChatSceneController) loader.getController()).initializeData(this, localDB, client, writeProxy); });
 		stage.setTitle("Envoy");
 		stage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
-		stage.setScene(chatScene);
 
-		loader.<ChatSceneController>getController().initializeData(localDB, client, writeProxy);
 		stage.show();
 
 		// Relay unread messages from cache
 		if (cache != null && client.isOnline()) cache.relay();
 	}
 
+	/**
+	 * Changes the scene of the stage.
+	 *
+	 * @param <T>          the type of the layout to use
+	 * @param fxmlLocation the location of the fxml file
+	 * @param layout       the layout to use
+	 * @param savePrevious if true, the previous stage will be stored in this
+	 *                     instance of Startup, else the variable storing it will be
+	 *                     set to null
+	 * @since Envoy Client v0.1-beta
+	 */
+	public <T extends Pane> void changeScene(String fxmlLocation, T layout, boolean savePrevious) {
+		Platform.runLater(() -> {
+			try {
+				// Clearing the loader so that a new Scene can be initialised
+				loader = new FXMLLoader();
+				var	rootNode	= loader.<T>load(getClass().getResourceAsStream(fxmlLocation));
+				var	chatScene	= new Scene(rootNode);
+				previousScene = (savePrevious) ? stage.getScene() : null;
+				stage.setScene(chatScene);
+				stage.show();
+				// return loader.getController();
+			} catch (IOException e) {
+				new Alert(AlertType.ERROR, "The screen could not be updated due to reasons. (...bad programming...)");
+				e.printStackTrace();
+				logger.severe("Something happened (while loading the new scene from " + fxmlLocation + ")");
+			}
+		});
+	}
+
+	/**
+	 * Changes the visual scene back to the saved value. The currently active scene
+	 * can be saved.
+	 *
+	 * @param storeCurrent the old scene to store, if wanted. Can be null
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void restoreScene(boolean storeCurrent) {
+		Platform.runLater(() -> {
+			if (previousScene == null) throw new IllegalStateException("Someone tried restoring a null scene. (Something happened)");
+			else {
+				// switching previous and current
+				var temp = (storeCurrent) ? stage.getScene() : null;
+				stage.setScene(previousScene);
+				previousScene = temp;
+				stage.show();
+			}
+		});
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */
@@ -159,4 +214,14 @@ public final class Startup extends Application {
 
 	@SuppressWarnings("javadoc")
 	public static void main(String[] args) { launch(args); }
+
+	/**
+	 * @return the controller of the current scene or a {@link NullPointerException}
+	 *         if there is none
+	 * @since Envoy Client v0.1-beta
+	 */
+	public Object getCurrentController() {
+		if (loader.getController() == null) throw new NullPointerException("Cannot deliver current controller as its undefined (duh!)");
+		else return loader.getController();
+	}
 }

From 55bea0d8462705115f5d55a5223a18f54fa6f3ca Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 18 Apr 2020 21:37:44 +0200
Subject: [PATCH 28/60] Fixed settings pane selection

---
 src/main/java/envoy/client/data/Settings.java       |  4 ++--
 src/main/java/envoy/client/data/SettingsItem.java   | 12 ------------
 .../java/envoy/client/ui/GeneralSettingsPane.java   | 12 ++++++++++--
 .../envoy/client/ui/SettingsSceneController.java    | 13 +++++++++----
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/main/java/envoy/client/data/Settings.java b/src/main/java/envoy/client/data/Settings.java
index fcde72a..419d22a 100644
--- a/src/main/java/envoy/client/data/Settings.java
+++ b/src/main/java/envoy/client/data/Settings.java
@@ -88,11 +88,11 @@ public class Settings {
 	/**
 	 * Updates the preferences when the save button is clicked.
 	 *
-	 * @throws IOException if an error occurs while saving the themes to the theme
-	 *                     file
+	 * @throws IOException if an error occurs while saving the themes
 	 * @since Envoy Client v0.2-alpha
 	 */
 	public void save() throws IOException {
+
 		// Save settings to settings file
 		SerializationUtils.write(settingsFile, items);
 
diff --git a/src/main/java/envoy/client/data/SettingsItem.java b/src/main/java/envoy/client/data/SettingsItem.java
index fc8552c..98a562d 100644
--- a/src/main/java/envoy/client/data/SettingsItem.java
+++ b/src/main/java/envoy/client/data/SettingsItem.java
@@ -2,14 +2,9 @@ package envoy.client.data;
 
 import java.io.Serializable;
 import java.util.function.Consumer;
-import java.util.function.Function;
 
 import javax.swing.JComponent;
 
-import javafx.scene.Node;
-
-import envoy.client.ui.SettingsToggleButton;
-
 /**
  * Encapsulates a persistent value that is directly or indirectly mutable by the
  * user.<br>
@@ -28,7 +23,6 @@ public class SettingsItem<T> implements Serializable {
 	private String	userFriendlyName, description;
 
 	private transient Consumer<T>								changeHandler;
-	private transient Function<SettingsItem<?>, ? extends Node>	nodeCreator;
 
 	private static final long serialVersionUID = 1L;
 
@@ -46,8 +40,6 @@ public class SettingsItem<T> implements Serializable {
 		this.value				= value;
 		this.userFriendlyName	= userFriendlyName;
 		this.description		= description;
-
-		if (value.getClass() == Boolean.class) nodeCreator = s -> new SettingsToggleButton((SettingsItem<Boolean>) s);
 	}
 
 	/**
@@ -104,8 +96,4 @@ public class SettingsItem<T> implements Serializable {
 		this.changeHandler = changeHandler;
 		changeHandler.accept(value);
 	}
-
-	public boolean hasNodeCreator() { return nodeCreator != null; }
-
-	public Node getNode() { return nodeCreator.apply(this); }
 }
diff --git a/src/main/java/envoy/client/ui/GeneralSettingsPane.java b/src/main/java/envoy/client/ui/GeneralSettingsPane.java
index 29c65d2..b207867 100644
--- a/src/main/java/envoy/client/ui/GeneralSettingsPane.java
+++ b/src/main/java/envoy/client/ui/GeneralSettingsPane.java
@@ -1,8 +1,11 @@
 package envoy.client.ui;
 
+import java.util.List;
+
 import javafx.scene.layout.VBox;
 
 import envoy.client.data.Settings;
+import envoy.client.data.SettingsItem;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -22,8 +25,13 @@ public class GeneralSettingsPane extends SettingsPane {
 	public GeneralSettingsPane() {
 		super("General");
 		var vbox = new VBox();
-		for (var name : new String[] { "onCloseMode", "enterToSend" })
-			vbox.getChildren().add(settings.getItems().get(name).getNode());
+
+		// TODO: Support other value types
+		List.of("onCloseMode", "enterToSend")
+			.stream()
+			.map(settings.getItems()::get)
+			.map(i -> new SettingsToggleButton((SettingsItem<Boolean>) i))
+			.forEach(vbox.getChildren()::add);
 		getChildren().add(vbox);
 	}
 }
diff --git a/src/main/java/envoy/client/ui/SettingsSceneController.java b/src/main/java/envoy/client/ui/SettingsSceneController.java
index 743a58c..33f45a6 100644
--- a/src/main/java/envoy/client/ui/SettingsSceneController.java
+++ b/src/main/java/envoy/client/ui/SettingsSceneController.java
@@ -33,17 +33,22 @@ public class SettingsSceneController {
 		settingsList.setCellFactory(listView -> new ListCell<>() {
 
 			@Override
-			protected void updateItem(SettingsPane item, boolean empty) { if (!empty && item != null) setGraphic(new Label(item.getTitle())); }
+			protected void updateItem(SettingsPane item, boolean empty) {
+				super.updateItem(item, empty);
+				if (!empty && item != null) setGraphic(new Label(item.getTitle()));
+			}
 		});
 
-		// settingsList.getItems().add(new GeneralSettingsPane());
+		settingsList.getItems().add(new GeneralSettingsPane());
 	}
 
 	@FXML
 	private void settingsListClicked() {
 		final var pane = settingsList.getSelectionModel().getSelectedItem();
-		titledPane.setText(pane.getTitle());
-		titledPane.setContent(pane);
+		if (pane != null) {
+			titledPane.setText(pane.getTitle());
+			titledPane.setContent(pane);
+		}
 	}
 
 	@FXML

From aba51abc10d35ba9a242642132498907aaf3b540 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sun, 19 Apr 2020 19:57:40 +0200
Subject: [PATCH 29/60] created ui.settings package

---
 .../java/envoy/client/ui/ChatSceneController.java  |  1 +
 src/main/java/envoy/client/ui/package-info.java    |  2 +-
 .../ui/{ => settings}/GeneralSettingsPane.java     |  2 +-
 .../client/ui/{ => settings}/SettingsPane.java     |  2 +-
 .../ui/{ => settings}/SettingsSceneController.java |  4 +++-
 .../ui/{ => settings}/SettingsToggleButton.java    |  2 +-
 .../envoy/client/ui/settings/package-info.java     | 14 ++++++++++++++
 src/main/java/module-info.java                     |  1 +
 src/main/resources/fxml/SettingsScene.fxml         |  2 +-
 9 files changed, 24 insertions(+), 6 deletions(-)
 rename src/main/java/envoy/client/ui/{ => settings}/GeneralSettingsPane.java (96%)
 rename src/main/java/envoy/client/ui/{ => settings}/SettingsPane.java (93%)
 rename src/main/java/envoy/client/ui/{ => settings}/SettingsSceneController.java (95%)
 rename src/main/java/envoy/client/ui/{ => settings}/SettingsToggleButton.java (94%)
 create mode 100644 src/main/java/envoy/client/ui/settings/package-info.java

diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index e181121..956a896 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -18,6 +18,7 @@ import envoy.client.data.LocalDB;
 import envoy.client.event.MessageCreationEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
+import envoy.client.ui.settings.SettingsSceneController;
 import envoy.data.Contact;
 import envoy.data.Message;
 import envoy.data.MessageBuilder;
diff --git a/src/main/java/envoy/client/ui/package-info.java b/src/main/java/envoy/client/ui/package-info.java
index 10bf4ee..9f94ac2 100644
--- a/src/main/java/envoy/client/ui/package-info.java
+++ b/src/main/java/envoy/client/ui/package-info.java
@@ -1,8 +1,8 @@
 /**
  * This package contains classes defining the user interface.
  *
- * @author Kai S. K. Engelbart
  * @author Leon Hofmeister
+ * @author Kai S. K. Engelbart
  * @author Maximilian K&auml;fer
  * @since Envoy Client v0.1-beta
  */
diff --git a/src/main/java/envoy/client/ui/GeneralSettingsPane.java b/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
similarity index 96%
rename from src/main/java/envoy/client/ui/GeneralSettingsPane.java
rename to src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
index b207867..6c561f0 100644
--- a/src/main/java/envoy/client/ui/GeneralSettingsPane.java
+++ b/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
@@ -1,4 +1,4 @@
-package envoy.client.ui;
+package envoy.client.ui.settings;
 
 import java.util.List;
 
diff --git a/src/main/java/envoy/client/ui/SettingsPane.java b/src/main/java/envoy/client/ui/settings/SettingsPane.java
similarity index 93%
rename from src/main/java/envoy/client/ui/SettingsPane.java
rename to src/main/java/envoy/client/ui/settings/SettingsPane.java
index 79bec4b..7c84221 100644
--- a/src/main/java/envoy/client/ui/SettingsPane.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsPane.java
@@ -1,4 +1,4 @@
-package envoy.client.ui;
+package envoy.client.ui.settings;
 
 import javafx.scene.layout.Pane;
 
diff --git a/src/main/java/envoy/client/ui/SettingsSceneController.java b/src/main/java/envoy/client/ui/settings/SettingsSceneController.java
similarity index 95%
rename from src/main/java/envoy/client/ui/SettingsSceneController.java
rename to src/main/java/envoy/client/ui/settings/SettingsSceneController.java
index 33f45a6..e3cc4fb 100644
--- a/src/main/java/envoy/client/ui/SettingsSceneController.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsSceneController.java
@@ -1,8 +1,10 @@
-package envoy.client.ui;
+package envoy.client.ui.settings;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
+import envoy.client.ui.Startup;
+
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SettingsSceneController.java</strong><br>
diff --git a/src/main/java/envoy/client/ui/SettingsToggleButton.java b/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
similarity index 94%
rename from src/main/java/envoy/client/ui/SettingsToggleButton.java
rename to src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
index f91f7cb..adb7b92 100644
--- a/src/main/java/envoy/client/ui/SettingsToggleButton.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
@@ -1,4 +1,4 @@
-package envoy.client.ui;
+package envoy.client.ui.settings;
 
 import javafx.event.ActionEvent;
 import javafx.scene.control.ToggleButton;
diff --git a/src/main/java/envoy/client/ui/settings/package-info.java b/src/main/java/envoy/client/ui/settings/package-info.java
new file mode 100644
index 0000000..9774362
--- /dev/null
+++ b/src/main/java/envoy/client/ui/settings/package-info.java
@@ -0,0 +1,14 @@
+/**
+ * This package contains classes used for representing the settings
+ * visually.<br>
+ * <br>
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>package-info.java</strong><br>
+ * Created: <strong>19 Apr 2020</strong><br>
+ *
+ * @author Leon Hofmeister
+ * @author Kai S. K. Engelbart
+ * @author Maximilian K&auml;fer
+ * @since Envoy Client v0.1-beta
+ */
+package envoy.client.ui.settings;
\ No newline at end of file
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 9413967..c34aeff 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -19,5 +19,6 @@ module envoy {
 	requires javafx.base;
 	requires javafx.graphics;
 
+	opens envoy.client.ui.settings to javafx.graphics, javafx.fxml;
 	opens envoy.client.ui to javafx.graphics, javafx.fxml;
 }
diff --git a/src/main/resources/fxml/SettingsScene.fxml b/src/main/resources/fxml/SettingsScene.fxml
index 3aaee9a..d61fb53 100644
--- a/src/main/resources/fxml/SettingsScene.fxml
+++ b/src/main/resources/fxml/SettingsScene.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="TOP_RIGHT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.SettingsSceneController">
+<VBox alignment="TOP_RIGHT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.settings.SettingsSceneController">
 	<children>
 		<HBox prefHeight="100.0" prefWidth="200.0">
          <children>

From 5c4356f1e790d4bd12048e9f79734d06076d6a4f Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sun, 19 Apr 2020 22:01:12 +0200
Subject: [PATCH 30/60] Readded enterToSend-Capability, ToggleButtons display
 current value

additionally added developer comments (most important feature of
v0.1-beta!).
---
 .settings/org.eclipse.jdt.ui.prefs              |  2 +-
 .../java/envoy/client/DeveloperComments.java    | 17 +++++++++++++++++
 .../envoy/client/ui/ChatSceneController.java    | 12 +++++++-----
 .../ui/settings/SettingsToggleButton.java       | 13 +++++++++++--
 .../envoy/client/ui/settings/package-info.java  |  2 +-
 5 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/envoy/client/DeveloperComments.java

diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index 8fecd4f..d1f3908 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -4,4 +4,4 @@ org.eclipse.jdt.ui.importorder=java;javax;javafx;org;com;envoy;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.ondemandthreshold=4
 org.eclipse.jdt.ui.staticondemandthreshold=2
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * Project\: &lt;strong&gt;${project_name}&lt;/strong&gt;&lt;br&gt;\n * File\: &lt;strong&gt;${file_name}&lt;/strong&gt;&lt;br&gt;\n * Created\: &lt;strong&gt;${date}&lt;/strong&gt;&lt;br&gt;\n * \n * @author ${user}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="modulecomment_context" deleted\="false" description\="Comment for modules" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.modulecomment" name\="modulecomment">/**\n * @author ${user}\n *\n * ${tags}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * {@inheritDoc}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * Project\: &lt;strong&gt;${project_name}&lt;/strong&gt;&lt;br&gt;\n * File\: &lt;strong&gt;${file_name}&lt;/strong&gt;&lt;br&gt;\n * Created\: &lt;strong&gt;${date}&lt;/strong&gt;&lt;br&gt;\n * \n * @author ${user}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="modulecomment_context" deleted\="false" description\="Comment for modules" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.modulecomment" name\="modulecomment">/**\n * @author ${user}\n *\n * ${tags}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * {@inheritDoc}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n * @since Envoy Client v0.1-beta\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/src/main/java/envoy/client/DeveloperComments.java b/src/main/java/envoy/client/DeveloperComments.java
new file mode 100644
index 0000000..781d58c
--- /dev/null
+++ b/src/main/java/envoy/client/DeveloperComments.java
@@ -0,0 +1,17 @@
+package envoy.client;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>DeveloperComments.java</strong><br>
+ * Created: <strong>19 Apr 2020</strong><br>
+ * 
+ * @author Leon Hofmeister
+ * @since Envoy Client v0.1-beta
+ */
+public class DeveloperComments {
+
+	// "Schau, es hat sich behindert" - Kai, 2020
+
+	// LEON: JFC <===> JAVA FRIED CHICKEN <=/=> Java Foundation Classes
+	
+}
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 956a896..ba39bec 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -15,6 +15,7 @@ import javafx.scene.layout.VBox;
 
 import envoy.client.data.Chat;
 import envoy.client.data.LocalDB;
+import envoy.client.data.Settings;
 import envoy.client.event.MessageCreationEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
@@ -63,6 +64,7 @@ public final class ChatSceneController {
 
 	private Startup startup;
 
+	private static final Settings	settings	= Settings.getInstance();
 	private static final EventBus	eventBus	= EventBus.getInstance();
 	private static final Logger		logger		= EnvoyLog.getLogger(ChatSceneController.class);
 
@@ -98,9 +100,9 @@ public final class ChatSceneController {
 
 	void initializeData(Startup startup, LocalDB localDB, Client client, WriteProxy writeProxy) {
 		this.startup	= startup;
-		this.localDB		= localDB;
-		this.client			= client;
-		this.writeProxy		= writeProxy;
+		this.localDB	= localDB;
+		this.client		= client;
+		this.writeProxy	= writeProxy;
 
 		// TODO: handle offline mode
 		userList.setItems(FXCollections.observableList(localDB.getUser().getContacts().stream().collect(Collectors.toList())));
@@ -131,12 +133,12 @@ public final class ChatSceneController {
 	@FXML
 	private void settingsButtonClicked() {
 		startup.changeScene("/fxml/SettingsScene.fxml", new VBox(), true);
-		Platform.runLater(() -> { ((SettingsSceneController) startup.getCurrentController()).initializeData(startup); });
+		Platform.runLater(() -> ((SettingsSceneController) startup.getCurrentController()).initializeData(startup));
 	}
 
 	@FXML
 	private void messageTextUpdated(KeyEvent e) {
-		if (e.getCode() == KeyCode.ENTER) postMessage();
+		if (settings.isEnterToSend() && e.getCode() == KeyCode.ENTER || !settings.isEnterToSend() && e.getCode() == KeyCode.CONTROL) postMessage();
 		else postButton.setDisable(messageTextArea.getText().isBlank());
 	}
 
diff --git a/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java b/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
index adb7b92..767f44d 100644
--- a/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
@@ -5,19 +5,28 @@ import javafx.scene.control.ToggleButton;
 
 import envoy.client.data.SettingsItem;
 
-
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SettingsToggleButton.java</strong><br>
  * Created: <strong>18.04.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
 public final class SettingsToggleButton extends ToggleButton {
 
+	/**
+	 * Creates an instance of {@link SettingsToggleButton}.
+	 *
+	 * @param settingsItem the {@link SettingsItem} whose values could be adapted
+	 * @since Envoy Client v0.1-beta
+	 */
 	public SettingsToggleButton(SettingsItem<Boolean> settingsItem) {
 		super(settingsItem.getUserFriendlyName());
+		setSelected(settingsItem.get());
+		
+		// "Schau, es hat sich behindert" - Kai, 2020
+		
 		addEventHandler(ActionEvent.ACTION, e -> settingsItem.set(!settingsItem.get()));
 	}
 }
diff --git a/src/main/java/envoy/client/ui/settings/package-info.java b/src/main/java/envoy/client/ui/settings/package-info.java
index 9774362..f31317e 100644
--- a/src/main/java/envoy/client/ui/settings/package-info.java
+++ b/src/main/java/envoy/client/ui/settings/package-info.java
@@ -11,4 +11,4 @@
  * @author Maximilian K&auml;fer
  * @since Envoy Client v0.1-beta
  */
-package envoy.client.ui.settings;
\ No newline at end of file
+package envoy.client.ui.settings;

From 6523e98d2d2aa6953ac76ef0939e6b9b1fc3a6b9 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 9 May 2020 09:50:41 +0200
Subject: [PATCH 31/60] Remove ui.primary package

---
 .../client/ui/primary/PrimaryButton.java      |  63 ---------
 .../client/ui/primary/PrimaryScrollBar.java   | 126 ------------------
 .../client/ui/primary/PrimaryScrollPane.java  |  85 ------------
 .../client/ui/primary/PrimaryTextArea.java    |  70 ----------
 .../ui/primary/PrimaryToggleSwitch.java       |  61 ---------
 .../envoy/client/ui/primary/package-info.java |  17 ---
 6 files changed, 422 deletions(-)
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryButton.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryScrollBar.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryToggleSwitch.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/package-info.java

diff --git a/src/main/java/envoy/client/ui/primary/PrimaryButton.java b/src/main/java/envoy/client/ui/primary/PrimaryButton.java
deleted file mode 100644
index de7852c..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryButton.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package envoy.client.ui.primary;
-
-import java.awt.Graphics;
-
-import javax.swing.JButton;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryButton.javaEvent.java</strong><br>
- * Created: <strong>07.12.2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-public class PrimaryButton extends JButton {
-
-	private static final long serialVersionUID = 0L;
-
-	private int arcSize;
-
-	/**
-	 * Creates a primary button
-	 *
-	 * @param title the title of the button
-	 * @since Envoy 0.2-alpha
-	 */
-	public PrimaryButton(String title) { this(title, 6); }
-
-	/**
-	 * Creates a primary button
-	 *
-	 * @param title   the title of the button
-	 * @param arcSize the size of the arc used to draw the round button edges
-	 * @since Envoy 0.2-alpha
-	 */
-	public PrimaryButton(String title, int arcSize) {
-		super(title);
-		setBorderPainted(false);
-		setFocusPainted(false);
-		setContentAreaFilled(false);
-		this.arcSize = arcSize;
-	}
-
-	@Override
-	protected void paintComponent(Graphics g) {
-		g.setColor(getBackground());
-		g.fillRoundRect(0, 0, getWidth(), getHeight(), arcSize, arcSize);
-		super.paintComponent(g);
-	}
-
-	/**
-	 * @return the arcSize
-	 * @since Envoy 0.2-alpha
-	 */
-	public int getArcSize() { return arcSize; }
-
-	/**
-	 * @param arcSize the arcSize to set
-	 * @since Envoy 0.2-alpha
-	 */
-	public void setArcSize(int arcSize) { this.arcSize = arcSize; }
-}
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryScrollBar.java b/src/main/java/envoy/client/ui/primary/PrimaryScrollBar.java
deleted file mode 100644
index 371bd05..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryScrollBar.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package envoy.client.ui.primary;
-
-import java.awt.*;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JScrollBar;
-import javax.swing.plaf.basic.BasicScrollBarUI;
-
-import envoy.client.data.Settings;
-import envoy.client.ui.Theme;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryScrollBar.java</strong><br>
- * Created: <strong>14.12.2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-public class PrimaryScrollBar extends BasicScrollBarUI {
-
-	private final Dimension	d	= new Dimension();
-	private final int		arcSize;
-	private final Color		scrollBarColor;
-	private final Color		hoverColor;
-	private final Color		draggingColor;
-	private final boolean	isVertical;
-
-	/**
-	 * Initializes a {@link PrimaryScrollBar} with a color scheme.
-	 *
-	 * @param arcSize        the size of the arc used to draw the round scroll bar
-	 *                       edges
-	 * @param scrollBarColor the default color
-	 * @param hoverColor     the color while hovering
-	 * @param draggingColor  the color while dragging
-	 * @param isVertical     indicates whether this is a vertical
-	 *                       {@link PrimaryScrollBar}
-	 */
-	public PrimaryScrollBar(int arcSize, Color scrollBarColor, Color hoverColor, Color draggingColor, boolean isVertical) {
-		this.arcSize		= arcSize;
-		this.scrollBarColor	= scrollBarColor;
-		this.hoverColor		= hoverColor;
-		this.draggingColor	= draggingColor;
-		this.isVertical		= isVertical;
-	}
-
-	/**
-	 * Initializes a {@link PrimaryScrollBar} using a color scheme specified in a
-	 * {@link Theme}
-	 *
-	 * @param theme      the {@link Theme} to be applied to this
-	 *                   {@link PrimaryScrollBar}
-	 * @param isVertical indicates whether this is a vertical
-	 *                   {@link PrimaryScrollBar}
-	 */
-	public PrimaryScrollBar(Theme theme, boolean isVertical) {
-		this(5, theme.getInteractableBackgroundColor(), new Color(theme.getInteractableBackgroundColor().getRGB() - 50),
-				new Color(theme.getInteractableBackgroundColor().getRGB() + 170), isVertical);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected JButton createDecreaseButton(int orientation) {
-		JButton button = new JButton();
-		button.setPreferredSize(d);
-		return button;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected JButton createIncreaseButton(int orientation) {
-		JButton button = new JButton();
-		button.setPreferredSize(d);
-		return button;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void paintTrack(Graphics g, JComponent c, Rectangle r) {}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void paintThumb(Graphics g, JComponent c, Rectangle r) {
-		Graphics2D g2 = (Graphics2D) g.create();
-		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		Color		color;
-		JScrollBar	sb	= (JScrollBar) c;
-
-		if (!sb.isEnabled()) return;
-
-		if (isDragging) color = draggingColor;
-		else if (isThumbRollover()) color = hoverColor;
-		else color = scrollBarColor;
-
-		g2.setPaint(color);
-		if (isVertical) {
-			g2.fillRoundRect(r.x - 9, r.y, r.width, r.height, arcSize, arcSize);
-			g2.setPaint(Settings.getInstance().getCurrentTheme().getCellColor());
-			g2.drawRoundRect(r.x - 9, r.y, r.width, r.height, arcSize, arcSize);
-		} else {
-			g2.fillRoundRect(r.x, r.y + 9, r.width, r.height - 10, arcSize, arcSize);
-			g2.setPaint(Settings.getInstance().getCurrentTheme().getCellColor());
-			g2.drawRoundRect(r.x, r.y + 9, r.width, r.height - 10, arcSize, arcSize);
-		}
-		g2.dispose();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void setThumbBounds(int x, int y, int width, int height) {
-		super.setThumbBounds(x, y, width, height);
-		scrollbar.repaint();
-	}
-}
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java b/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
deleted file mode 100644
index e02502b..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package envoy.client.ui.primary;
-
-import javax.swing.JScrollPane;
-
-import envoy.client.ui.Theme;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryScrollPane.java</strong><br>
- * Created: <strong>15 Dec 2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- */
-public class PrimaryScrollPane extends JScrollPane {
-
-	private static final long serialVersionUID = 0L;
-
-	private int		verticalScrollBarMaximum	= getVerticalScrollBar().getMaximum();
-	private boolean	chatOpened					= false;
-
-	/**
-	 * Initializes a {@link JScrollPane} with the primary Envoy design scheme
-	 *
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public PrimaryScrollPane() { setBorder(null); }
-
-	/**
-	 * Styles the vertical and horizontal scroll bars.
-	 *
-	 * @param theme the color set used to color the component
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public void applyTheme(Theme theme) {
-		setForeground(theme.getBackgroundColor());
-		setBackground(theme.getCellColor());
-
-		getVerticalScrollBar().setBackground(theme.getCellColor());
-		getVerticalScrollBar().setUI(new PrimaryScrollBar(theme, true));
-
-		getHorizontalScrollBar().setBackground(theme.getCellColor());
-		getHorizontalScrollBar().setUI(new PrimaryScrollBar(theme, false));
-	}
-
-	/**
-	 * Implements <b>autoscroll functionality</b> for the vertical scroll bar. </br>
-	 * </br>
-	 * Functionality to automatically scroll down when user views </br>
-	 * the bottom of the chat while there are new messages added. </br>
-	 * </br>
-	 * When chat is opened, the vertical scroll bar starts at the bottom. </br>
-	 * </br>
-	 * When rereading messages, the chat doesn't scroll down if new messages </br>
-	 * are added. (Besides see first point)
-	 *
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public void autoscroll() {
-		// Automatic scrolling to the bottom
-		getVerticalScrollBar().addAdjustmentListener(e -> {
-			if (verticalScrollBarMaximum == e.getAdjustable().getMaximum()) return;
-
-			if (chatOpened) {
-				e.getAdjustable().setValue(e.getAdjustable().getMaximum());
-				verticalScrollBarMaximum	= getVerticalScrollBar().getMaximum();
-				chatOpened					= false;
-				return;
-			}
-			if (getVerticalScrollBar().getValue() + getVerticalScrollBar().getVisibleAmount() + 100 >= getVerticalScrollBar().getMaximum()) {
-				e.getAdjustable().setValue(e.getAdjustable().getMaximum());
-				verticalScrollBarMaximum = getVerticalScrollBar().getMaximum();
-			}
-		});
-	}
-
-	/**
-	 * Indicates a chat being opened by the user to this {@link PrimaryScrollPane}
-	 * triggering it to automatically scroll down.
-	 *
-	 * @param chatOpened indicates the chat opening status
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public void setChatOpened(boolean chatOpened) { this.chatOpened = chatOpened; }
-}
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java b/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
deleted file mode 100644
index 37d05eb..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package envoy.client.ui.primary;
-
-import java.awt.Font;
-import java.awt.Graphics;
-
-import javax.swing.JTextArea;
-import javax.swing.border.EmptyBorder;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryTextArea.javaEvent.java</strong><br>
- * Created: <strong>07.12.2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-public class PrimaryTextArea extends JTextArea {
-
-	private static final long	serialVersionUID = 0L;
-	private int					arcSize;
-
-	/**
-	 * Creates the text area
-	 *
-	 * @param borderSpace the space between components
-	 * @since Envoy 0.2-alpha
-	 */
-	public PrimaryTextArea(int borderSpace) { this(6, borderSpace); }
-
-	/**
-	 * Creates the text area
-	 *
-	 * @param arcSize     is the diameter of the arc at the four corners.
-	 * @param borderSpace is the insets of the border on all four sides.
-	 * @since Envoy 0.2-alpha
-	 */
-	public PrimaryTextArea(int arcSize, int borderSpace) {
-		super();
-		setWrapStyleWord(true);
-		setLineWrap(true);
-		setBorder(null);
-		setFont(new Font("Arial", Font.PLAIN, 17));
-		setBorder(new EmptyBorder(borderSpace, borderSpace, borderSpace, borderSpace));
-		setOpaque(false);
-
-		this.arcSize = arcSize;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void paintComponent(Graphics g) {
-		g.setColor(getBackground());
-		g.fillRoundRect(0, 0, getWidth(), getHeight(), arcSize, arcSize);
-		super.paintComponent(g);
-	}
-
-	/**
-	 * @return the arcSize - the diameter of the arc at the four corners.
-	 * @since Envoy 0.2-alpha
-	 */
-	public int getArcSize() { return arcSize; }
-
-	/**
-	 * @param arcSize the arcSize to set
-	 * @since Envoy 0.2-alpha
-	 */
-	public void setArcSize(int arcSize) { this.arcSize = arcSize; }
-}
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryToggleSwitch.java b/src/main/java/envoy/client/ui/primary/PrimaryToggleSwitch.java
deleted file mode 100644
index 87afed9..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryToggleSwitch.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package envoy.client.ui.primary;
-
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.swing.JButton;
-
-import envoy.client.data.Settings;
-import envoy.client.data.SettingsItem;
-import envoy.client.ui.Color;
-
-/**
- * This component can be used to toggle between two options. This will change
- * the state of a {@code boolean} {@link SettingsItem}.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryToggleSwitch.java</strong><br>
- * Created: <strong>21 Dec 2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.3-alpha
- */
-public class PrimaryToggleSwitch extends JButton {
-
-	private boolean state;
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * Initializes a {@link PrimaryToggleSwitch}.
-	 *
-	 * @param settingsItem the {@link SettingsItem} that is controlled by this
-	 *                     {@link PrimaryToggleSwitch}
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public PrimaryToggleSwitch(SettingsItem<Boolean> settingsItem) {
-		setPreferredSize(new Dimension(50, 25));
-		setMinimumSize(new Dimension(50, 25));
-		setMaximumSize(new Dimension(50, 25));
-
-		setBorderPainted(false);
-		setFocusPainted(false);
-		setContentAreaFilled(false);
-
-		state = settingsItem.get();
-		addActionListener((evt) -> { state = !state; settingsItem.set(state); revalidate(); repaint(); });
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void paintComponent(Graphics g) {
-		g.setColor(state ? Color.GREEN : Color.LIGHT_GRAY);
-		g.fillRoundRect(0, 0, getWidth(), getHeight(), 25, 25);
-
-		g.setColor(Settings.getInstance().getCurrentTheme().getInteractableBackgroundColor());
-		g.fillRoundRect(state ? 25 : 0, 0, 25, 25, 25, 25);
-	}
-}
diff --git a/src/main/java/envoy/client/ui/primary/package-info.java b/src/main/java/envoy/client/ui/primary/package-info.java
deleted file mode 100644
index d4c54fa..0000000
--- a/src/main/java/envoy/client/ui/primary/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This package defines all "primary" components that were defined specifically
- * for the visual improvement of Envoy. However, they can still be used in
- * general for other projects.<br>
- * Primary elements are supposed to provide the main functionality of a UI
- * component.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>package-info.java</strong><br>
- * Created: <strong>14 Mar 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.1-beta
- */
-package envoy.client.ui.primary;

From 067cbbdcf841ef66621af627ee315948aeb229f2 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sat, 9 May 2020 10:57:30 +0200
Subject: [PATCH 32/60] added fundamental css files, theoretically added css
 support

---
 src/main/java/envoy/client/data/Settings.java | 92 +++++++++++++------
 src/main/java/envoy/client/ui/Startup.java    | 46 ++++++++--
 src/main/resources/fxml/themes/base.css       |  5 +
 src/main/resources/fxml/themes/custom.css     |  0
 src/main/resources/fxml/themes/dark.css       |  7 ++
 src/main/resources/fxml/themes/light.css      |  0
 6 files changed, 114 insertions(+), 36 deletions(-)
 create mode 100644 src/main/resources/fxml/themes/base.css
 create mode 100644 src/main/resources/fxml/themes/custom.css
 create mode 100644 src/main/resources/fxml/themes/dark.css
 create mode 100644 src/main/resources/fxml/themes/light.css

diff --git a/src/main/java/envoy/client/data/Settings.java b/src/main/java/envoy/client/data/Settings.java
index 419d22a..fbbe108 100644
--- a/src/main/java/envoy/client/data/Settings.java
+++ b/src/main/java/envoy/client/data/Settings.java
@@ -27,8 +27,8 @@ import envoy.util.SerializationUtils;
 public class Settings {
 
 	// Actual settings accessible by the rest of the application
-	private Map<String, SettingsItem<?>>	items;
-	private Map<String, Theme>				themes;
+	private Map<String, SettingsItem<?>> items;
+	private Map<String, Theme> themes;
 
 	/**
 	 * Settings are stored in this file.
@@ -46,8 +46,8 @@ public class Settings {
 	private static Settings settings = new Settings();
 
 	/**
-	 * The way to instantiate the settings.
-	 * Is set to private to deny other instances of that object.
+	 * The way to instantiate the settings. Is set to private to deny other
+	 * instances of that object.
 	 *
 	 * @since Envoy Client v0.2-alpha
 	 */
@@ -69,12 +69,10 @@ public class Settings {
 		}
 
 		// Load standard themes not defined in the themes file
-		themes.put("dark",
-				new Theme("dark", Color.black, Color.darkGray, Color.white, new Color(165, 60, 232), Color.white, Color.orange, Color.blue,
-						Color.white, Color.white));
-		themes.put("light",
-				new Theme("light", new Color(235, 235, 235), Color.white, Color.white, Color.darkGray, Color.black, Color.orange, Color.darkGray,
-						Color.black, Color.black));
+		themes.put("dark", new Theme("dark", Color.black, Color.darkGray, Color.white, new Color(165, 60, 232),
+				Color.white, Color.orange, Color.blue, Color.white, Color.white));
+		themes.put("light", new Theme("light", new Color(235, 235, 235), Color.white, Color.white, Color.darkGray,
+				Color.black, Color.orange, Color.darkGray, Color.black, Color.black));
 	}
 
 	/**
@@ -83,7 +81,9 @@ public class Settings {
 	 * @return the instance of Settings
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public static Settings getInstance() { return settings; }
+	public static Settings getInstance() {
+		return settings;
+	}
 
 	/**
 	 * Updates the preferences when the save button is clicked.
@@ -101,9 +101,12 @@ public class Settings {
 	}
 
 	private void supplementDefaults() {
-		items.putIfAbsent("enterToSend", new SettingsItem<>(true, "Enter to send", "Sends a message by pressing the enter key."));
-		items.putIfAbsent("onCloseMode", new SettingsItem<>(true, "Hide on close", "Hides the chat window when it is closed."));
-		items.putIfAbsent("currentTheme", new SettingsItem<>("dark", "Current Theme Name", "The name of the currently selected theme."));
+		items.putIfAbsent("enterToSend",
+				new SettingsItem<>(true, "Enter to send", "Sends a message by pressing the enter key."));
+		items.putIfAbsent("onCloseMode",
+				new SettingsItem<>(true, "Hide on close", "Hides the chat window when it is closed."));
+		items.putIfAbsent("currentTheme",
+				new SettingsItem<>("dark", "Current Theme Name", "The name of the currently selected theme."));
 	}
 
 	/**
@@ -112,19 +115,25 @@ public class Settings {
 	 * @param theme the {@link Theme} to add
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void addNewThemeToMap(Theme theme) { getThemes().put(theme.getThemeName(), theme); }
+	public void addNewThemeToMap(Theme theme) {
+		getThemes().put(theme.getThemeName(), theme);
+	}
 
 	/**
 	 * @return the name of the currently active {@link Theme}
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public String getCurrentThemeName() { return (String) items.get("currentTheme").get(); }
+	public String getCurrentThemeName() {
+		return (String) items.get("currentTheme").get();
+	}
 
 	/**
 	 * @return the currently active {@link Theme}
 	 * @since Envoy Client v0.1-beta
 	 */
-	public Theme getCurrentTheme() { return getTheme(getCurrentThemeName()); }
+	public Theme getCurrentTheme() {
+		return getTheme(getCurrentThemeName());
+	}
 
 	/**
 	 * Sets the name of the current {@link Theme}.
@@ -132,7 +141,18 @@ public class Settings {
 	 * @param themeName the name to set
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void setCurrentTheme(String themeName) { ((SettingsItem<String>) items.get("currentTheme")).set(themeName); }
+	public void setCurrentTheme(String themeName) {
+		((SettingsItem<String>) items.get("currentTheme")).set(themeName);
+	}
+
+	/**
+	 * @return whether the current {@link Theme} is one of the default themes.
+	 *         Currently checks for dark and light theme.
+	 * @since Envoy Client v0.1-beta
+	 */
+	public boolean isUsingDefaultTheme() {
+		return getCurrentThemeName().equals("dark") || getCurrentThemeName().equals("light");
+	}
 
 	/**
 	 * @return {@code true}, if pressing the {@code Enter} key suffices to send a
@@ -140,7 +160,9 @@ public class Settings {
 	 *         {@code Control} key.
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public Boolean isEnterToSend() { return (Boolean) items.get("enterToSend").get(); }
+	public Boolean isEnterToSend() {
+		return (Boolean) items.get("enterToSend").get();
+	}
 
 	/**
 	 * Changes the keystrokes performed by the user to send a message.
@@ -150,13 +172,17 @@ public class Settings {
 	 *                    conjunction with the {@code Control} key.
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void setEnterToSend(boolean enterToSend) { ((SettingsItem<Boolean>) items.get("enterToSend")).set(enterToSend); }
+	public void setEnterToSend(boolean enterToSend) {
+		((SettingsItem<Boolean>) items.get("enterToSend")).set(enterToSend);
+	}
 
 	/**
 	 * @return the current on close mode.
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public Boolean getCurrentOnCloseMode() { return (Boolean) items.get("onCloseMode").get(); }
+	public Boolean getCurrentOnCloseMode() {
+		return (Boolean) items.get("onCloseMode").get();
+	}
 
 	/**
 	 * Sets the current on close mode.
@@ -164,23 +190,31 @@ public class Settings {
 	 * @param currentOnCloseMode the on close mode that should be set.
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public void setCurrentOnCloseMode(boolean currentOnCloseMode) { ((SettingsItem<Boolean>) items.get("onCloseMode")).set(currentOnCloseMode); }
+	public void setCurrentOnCloseMode(boolean currentOnCloseMode) {
+		((SettingsItem<Boolean>) items.get("onCloseMode")).set(currentOnCloseMode);
+	}
 
 	/**
 	 * @return the items
 	 */
-	public Map<String, SettingsItem<?>> getItems() { return items; }
+	public Map<String, SettingsItem<?>> getItems() {
+		return items;
+	}
 
 	/**
 	 * @param items the items to set
 	 */
-	public void setItems(Map<String, SettingsItem<?>> items) { this.items = items; }
+	public void setItems(Map<String, SettingsItem<?>> items) {
+		this.items = items;
+	}
 
 	/**
 	 * @return a {@code Map<String, Theme>} of all themes with their names as keys
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public Map<String, Theme> getThemes() { return themes; }
+	public Map<String, Theme> getThemes() {
+		return themes;
+	}
 
 	/**
 	 * Sets the {@code Map<String, Theme>} of all themes with their names as keys
@@ -188,12 +222,16 @@ public class Settings {
 	 * @param themes the theme map to set
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void setThemes(Map<String, Theme> themes) { this.themes = themes; }
+	public void setThemes(Map<String, Theme> themes) {
+		this.themes = themes;
+	}
 
 	/**
 	 * @param themeName the name of the {@link Theme} to get
 	 * @return the {@link Theme} with the specified name
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public Theme getTheme(String themeName) { return themes.get(themeName); }
+	public Theme getTheme(String themeName) {
+		return themes.get(themeName);
+	}
 }
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 9b5405a..12d54e4 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -3,6 +3,7 @@ package envoy.client.ui;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -44,11 +45,14 @@ public final class Startup extends Application {
 
 	private FXMLLoader	loader	= new FXMLLoader();
 	private Stage		stage;
+	private Scene		previousScene;
 
-	private Scene previousScene;
+	private final String[] CSSPaths = { "file://./src/main/resources/fxml/themes/base.css",
+			"file://./src/main/resources/fxml/themes/" + (settings.isUsingDefaultTheme() ? settings.getCurrentThemeName() : "custom") + ".css" };
 
-	private static final ClientConfig	config	= ClientConfig.getInstance();
-	private static final Logger			logger	= EnvoyLog.getLogger(Startup.class);
+	private static final Settings		settings	= Settings.getInstance();
+	private static final ClientConfig	config		= ClientConfig.getInstance();
+	private static final Logger			logger		= EnvoyLog.getLogger(Startup.class);
 
 	/**
 	 * {@inheritDoc}
@@ -150,7 +154,8 @@ public final class Startup extends Application {
 	 * @param fxmlLocation the location of the fxml file
 	 * @param layout       the layout to use
 	 * @param savePrevious if true, the previous stage will be stored in this
-	 *                     instance of Startup, else the variable storing it will be
+	 *                     instance of Startup, else the variable storing it will
+	 *                     be
 	 *                     set to null
 	 * @since Envoy Client v0.1-beta
 	 */
@@ -160,13 +165,17 @@ public final class Startup extends Application {
 				// Clearing the loader so that a new Scene can be initialised
 				loader = new FXMLLoader();
 				var	rootNode	= loader.<T>load(getClass().getResourceAsStream(fxmlLocation));
-				var	chatScene	= new Scene(rootNode);
-				previousScene = (savePrevious) ? stage.getScene() : null;
-				stage.setScene(chatScene);
+				var	scene		= new Scene(rootNode);
+				previousScene = savePrevious ? stage.getScene() : null;
+				// Setting the visual appearance
+				scene.getStylesheets().addAll(CSSPaths);
+				System.out.println(Paths.get(".").toAbsolutePath().normalize().toString());
+				stage.setScene(scene);
 				stage.show();
 				// return loader.getController();
 			} catch (IOException e) {
 				new Alert(AlertType.ERROR, "The screen could not be updated due to reasons. (...bad programming...)");
+				System.err.println("input: FXMLLocation: " + fxmlLocation + ", CSS paths: " + CSSPaths);
 				e.printStackTrace();
 				logger.severe("Something happened (while loading the new scene from " + fxmlLocation + ")");
 			}
@@ -175,7 +184,7 @@ public final class Startup extends Application {
 
 	/**
 	 * Changes the visual scene back to the saved value. The currently active scene
-	 * can be saved.
+	 * can be saved, but must not be.
 	 *
 	 * @param storeCurrent the old scene to store, if wanted. Can be null
 	 * @since Envoy Client v0.1-beta
@@ -185,7 +194,7 @@ public final class Startup extends Application {
 			if (previousScene == null) throw new IllegalStateException("Someone tried restoring a null scene. (Something happened)");
 			else {
 				// switching previous and current
-				var temp = (storeCurrent) ? stage.getScene() : null;
+				var temp = storeCurrent ? stage.getScene() : null;
 				stage.setScene(previousScene);
 				previousScene = temp;
 				stage.show();
@@ -224,4 +233,23 @@ public final class Startup extends Application {
 		if (loader.getController() == null) throw new NullPointerException("Cannot deliver current controller as its undefined (duh!)");
 		else return loader.getController();
 	}
+
+	/**
+	 * @return the CSSPaths
+	 * @since Envoy Client v0.1-beta
+	 */
+	public String[] getCSSPaths() { return CSSPaths; }
+
+	/**
+	 * Changes the currently displayed theme
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void changeTheme() {
+		// the base.css file should never be changed during runtime
+		CSSPaths[1] = "file://.fxml/themes/" + (settings.isUsingDefaultTheme() ? settings.getCurrentThemeName() : "custom") + ".css";
+		var styleSheets = stage.getScene().getStylesheets();
+		styleSheets.remove(styleSheets.size() - 1);
+		styleSheets.add(CSSPaths[1]);
+	}
 }
diff --git a/src/main/resources/fxml/themes/base.css b/src/main/resources/fxml/themes/base.css
new file mode 100644
index 0000000..8cfc8ca
--- /dev/null
+++ b/src/main/resources/fxml/themes/base.css
@@ -0,0 +1,5 @@
+.root{
+	-fx-font: 200pt "Serif";
+	--background=#00FF00;
+	background: var(--background);
+}
\ No newline at end of file
diff --git a/src/main/resources/fxml/themes/custom.css b/src/main/resources/fxml/themes/custom.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/resources/fxml/themes/dark.css b/src/main/resources/fxml/themes/dark.css
new file mode 100644
index 0000000..06326dd
--- /dev/null
+++ b/src/main/resources/fxml/themes/dark.css
@@ -0,0 +1,7 @@
+.root{
+	--background=#000000;
+	background: var(--background);
+}
+.button{
+	color: rgb(105,0,153);
+}
\ No newline at end of file
diff --git a/src/main/resources/fxml/themes/light.css b/src/main/resources/fxml/themes/light.css
new file mode 100644
index 0000000..e69de29

From 50a9026b0190870a5fa0cb90b8e9ff2f7a1da529 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 9 May 2020 09:50:41 +0200
Subject: [PATCH 33/60] Remove ui.primary package

---
 .../client/ui/primary/PrimaryButton.java      |  63 ---------
 .../client/ui/primary/PrimaryScrollBar.java   | 126 ------------------
 .../client/ui/primary/PrimaryScrollPane.java  |  85 ------------
 .../client/ui/primary/PrimaryTextArea.java    |  70 ----------
 .../ui/primary/PrimaryToggleSwitch.java       |  61 ---------
 .../envoy/client/ui/primary/package-info.java |  17 ---
 6 files changed, 422 deletions(-)
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryButton.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryScrollBar.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/PrimaryToggleSwitch.java
 delete mode 100644 src/main/java/envoy/client/ui/primary/package-info.java

diff --git a/src/main/java/envoy/client/ui/primary/PrimaryButton.java b/src/main/java/envoy/client/ui/primary/PrimaryButton.java
deleted file mode 100644
index de7852c..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryButton.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package envoy.client.ui.primary;
-
-import java.awt.Graphics;
-
-import javax.swing.JButton;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryButton.javaEvent.java</strong><br>
- * Created: <strong>07.12.2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-public class PrimaryButton extends JButton {
-
-	private static final long serialVersionUID = 0L;
-
-	private int arcSize;
-
-	/**
-	 * Creates a primary button
-	 *
-	 * @param title the title of the button
-	 * @since Envoy 0.2-alpha
-	 */
-	public PrimaryButton(String title) { this(title, 6); }
-
-	/**
-	 * Creates a primary button
-	 *
-	 * @param title   the title of the button
-	 * @param arcSize the size of the arc used to draw the round button edges
-	 * @since Envoy 0.2-alpha
-	 */
-	public PrimaryButton(String title, int arcSize) {
-		super(title);
-		setBorderPainted(false);
-		setFocusPainted(false);
-		setContentAreaFilled(false);
-		this.arcSize = arcSize;
-	}
-
-	@Override
-	protected void paintComponent(Graphics g) {
-		g.setColor(getBackground());
-		g.fillRoundRect(0, 0, getWidth(), getHeight(), arcSize, arcSize);
-		super.paintComponent(g);
-	}
-
-	/**
-	 * @return the arcSize
-	 * @since Envoy 0.2-alpha
-	 */
-	public int getArcSize() { return arcSize; }
-
-	/**
-	 * @param arcSize the arcSize to set
-	 * @since Envoy 0.2-alpha
-	 */
-	public void setArcSize(int arcSize) { this.arcSize = arcSize; }
-}
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryScrollBar.java b/src/main/java/envoy/client/ui/primary/PrimaryScrollBar.java
deleted file mode 100644
index 371bd05..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryScrollBar.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package envoy.client.ui.primary;
-
-import java.awt.*;
-
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JScrollBar;
-import javax.swing.plaf.basic.BasicScrollBarUI;
-
-import envoy.client.data.Settings;
-import envoy.client.ui.Theme;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryScrollBar.java</strong><br>
- * Created: <strong>14.12.2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-public class PrimaryScrollBar extends BasicScrollBarUI {
-
-	private final Dimension	d	= new Dimension();
-	private final int		arcSize;
-	private final Color		scrollBarColor;
-	private final Color		hoverColor;
-	private final Color		draggingColor;
-	private final boolean	isVertical;
-
-	/**
-	 * Initializes a {@link PrimaryScrollBar} with a color scheme.
-	 *
-	 * @param arcSize        the size of the arc used to draw the round scroll bar
-	 *                       edges
-	 * @param scrollBarColor the default color
-	 * @param hoverColor     the color while hovering
-	 * @param draggingColor  the color while dragging
-	 * @param isVertical     indicates whether this is a vertical
-	 *                       {@link PrimaryScrollBar}
-	 */
-	public PrimaryScrollBar(int arcSize, Color scrollBarColor, Color hoverColor, Color draggingColor, boolean isVertical) {
-		this.arcSize		= arcSize;
-		this.scrollBarColor	= scrollBarColor;
-		this.hoverColor		= hoverColor;
-		this.draggingColor	= draggingColor;
-		this.isVertical		= isVertical;
-	}
-
-	/**
-	 * Initializes a {@link PrimaryScrollBar} using a color scheme specified in a
-	 * {@link Theme}
-	 *
-	 * @param theme      the {@link Theme} to be applied to this
-	 *                   {@link PrimaryScrollBar}
-	 * @param isVertical indicates whether this is a vertical
-	 *                   {@link PrimaryScrollBar}
-	 */
-	public PrimaryScrollBar(Theme theme, boolean isVertical) {
-		this(5, theme.getInteractableBackgroundColor(), new Color(theme.getInteractableBackgroundColor().getRGB() - 50),
-				new Color(theme.getInteractableBackgroundColor().getRGB() + 170), isVertical);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected JButton createDecreaseButton(int orientation) {
-		JButton button = new JButton();
-		button.setPreferredSize(d);
-		return button;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected JButton createIncreaseButton(int orientation) {
-		JButton button = new JButton();
-		button.setPreferredSize(d);
-		return button;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void paintTrack(Graphics g, JComponent c, Rectangle r) {}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void paintThumb(Graphics g, JComponent c, Rectangle r) {
-		Graphics2D g2 = (Graphics2D) g.create();
-		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-		Color		color;
-		JScrollBar	sb	= (JScrollBar) c;
-
-		if (!sb.isEnabled()) return;
-
-		if (isDragging) color = draggingColor;
-		else if (isThumbRollover()) color = hoverColor;
-		else color = scrollBarColor;
-
-		g2.setPaint(color);
-		if (isVertical) {
-			g2.fillRoundRect(r.x - 9, r.y, r.width, r.height, arcSize, arcSize);
-			g2.setPaint(Settings.getInstance().getCurrentTheme().getCellColor());
-			g2.drawRoundRect(r.x - 9, r.y, r.width, r.height, arcSize, arcSize);
-		} else {
-			g2.fillRoundRect(r.x, r.y + 9, r.width, r.height - 10, arcSize, arcSize);
-			g2.setPaint(Settings.getInstance().getCurrentTheme().getCellColor());
-			g2.drawRoundRect(r.x, r.y + 9, r.width, r.height - 10, arcSize, arcSize);
-		}
-		g2.dispose();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void setThumbBounds(int x, int y, int width, int height) {
-		super.setThumbBounds(x, y, width, height);
-		scrollbar.repaint();
-	}
-}
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java b/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
deleted file mode 100644
index e02502b..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package envoy.client.ui.primary;
-
-import javax.swing.JScrollPane;
-
-import envoy.client.ui.Theme;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryScrollPane.java</strong><br>
- * Created: <strong>15 Dec 2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- */
-public class PrimaryScrollPane extends JScrollPane {
-
-	private static final long serialVersionUID = 0L;
-
-	private int		verticalScrollBarMaximum	= getVerticalScrollBar().getMaximum();
-	private boolean	chatOpened					= false;
-
-	/**
-	 * Initializes a {@link JScrollPane} with the primary Envoy design scheme
-	 *
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public PrimaryScrollPane() { setBorder(null); }
-
-	/**
-	 * Styles the vertical and horizontal scroll bars.
-	 *
-	 * @param theme the color set used to color the component
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public void applyTheme(Theme theme) {
-		setForeground(theme.getBackgroundColor());
-		setBackground(theme.getCellColor());
-
-		getVerticalScrollBar().setBackground(theme.getCellColor());
-		getVerticalScrollBar().setUI(new PrimaryScrollBar(theme, true));
-
-		getHorizontalScrollBar().setBackground(theme.getCellColor());
-		getHorizontalScrollBar().setUI(new PrimaryScrollBar(theme, false));
-	}
-
-	/**
-	 * Implements <b>autoscroll functionality</b> for the vertical scroll bar. </br>
-	 * </br>
-	 * Functionality to automatically scroll down when user views </br>
-	 * the bottom of the chat while there are new messages added. </br>
-	 * </br>
-	 * When chat is opened, the vertical scroll bar starts at the bottom. </br>
-	 * </br>
-	 * When rereading messages, the chat doesn't scroll down if new messages </br>
-	 * are added. (Besides see first point)
-	 *
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public void autoscroll() {
-		// Automatic scrolling to the bottom
-		getVerticalScrollBar().addAdjustmentListener(e -> {
-			if (verticalScrollBarMaximum == e.getAdjustable().getMaximum()) return;
-
-			if (chatOpened) {
-				e.getAdjustable().setValue(e.getAdjustable().getMaximum());
-				verticalScrollBarMaximum	= getVerticalScrollBar().getMaximum();
-				chatOpened					= false;
-				return;
-			}
-			if (getVerticalScrollBar().getValue() + getVerticalScrollBar().getVisibleAmount() + 100 >= getVerticalScrollBar().getMaximum()) {
-				e.getAdjustable().setValue(e.getAdjustable().getMaximum());
-				verticalScrollBarMaximum = getVerticalScrollBar().getMaximum();
-			}
-		});
-	}
-
-	/**
-	 * Indicates a chat being opened by the user to this {@link PrimaryScrollPane}
-	 * triggering it to automatically scroll down.
-	 *
-	 * @param chatOpened indicates the chat opening status
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public void setChatOpened(boolean chatOpened) { this.chatOpened = chatOpened; }
-}
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java b/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
deleted file mode 100644
index 37d05eb..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package envoy.client.ui.primary;
-
-import java.awt.Font;
-import java.awt.Graphics;
-
-import javax.swing.JTextArea;
-import javax.swing.border.EmptyBorder;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryTextArea.javaEvent.java</strong><br>
- * Created: <strong>07.12.2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-public class PrimaryTextArea extends JTextArea {
-
-	private static final long	serialVersionUID = 0L;
-	private int					arcSize;
-
-	/**
-	 * Creates the text area
-	 *
-	 * @param borderSpace the space between components
-	 * @since Envoy 0.2-alpha
-	 */
-	public PrimaryTextArea(int borderSpace) { this(6, borderSpace); }
-
-	/**
-	 * Creates the text area
-	 *
-	 * @param arcSize     is the diameter of the arc at the four corners.
-	 * @param borderSpace is the insets of the border on all four sides.
-	 * @since Envoy 0.2-alpha
-	 */
-	public PrimaryTextArea(int arcSize, int borderSpace) {
-		super();
-		setWrapStyleWord(true);
-		setLineWrap(true);
-		setBorder(null);
-		setFont(new Font("Arial", Font.PLAIN, 17));
-		setBorder(new EmptyBorder(borderSpace, borderSpace, borderSpace, borderSpace));
-		setOpaque(false);
-
-		this.arcSize = arcSize;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	protected void paintComponent(Graphics g) {
-		g.setColor(getBackground());
-		g.fillRoundRect(0, 0, getWidth(), getHeight(), arcSize, arcSize);
-		super.paintComponent(g);
-	}
-
-	/**
-	 * @return the arcSize - the diameter of the arc at the four corners.
-	 * @since Envoy 0.2-alpha
-	 */
-	public int getArcSize() { return arcSize; }
-
-	/**
-	 * @param arcSize the arcSize to set
-	 * @since Envoy 0.2-alpha
-	 */
-	public void setArcSize(int arcSize) { this.arcSize = arcSize; }
-}
diff --git a/src/main/java/envoy/client/ui/primary/PrimaryToggleSwitch.java b/src/main/java/envoy/client/ui/primary/PrimaryToggleSwitch.java
deleted file mode 100644
index 87afed9..0000000
--- a/src/main/java/envoy/client/ui/primary/PrimaryToggleSwitch.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package envoy.client.ui.primary;
-
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.swing.JButton;
-
-import envoy.client.data.Settings;
-import envoy.client.data.SettingsItem;
-import envoy.client.ui.Color;
-
-/**
- * This component can be used to toggle between two options. This will change
- * the state of a {@code boolean} {@link SettingsItem}.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>PrimaryToggleSwitch.java</strong><br>
- * Created: <strong>21 Dec 2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.3-alpha
- */
-public class PrimaryToggleSwitch extends JButton {
-
-	private boolean state;
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * Initializes a {@link PrimaryToggleSwitch}.
-	 *
-	 * @param settingsItem the {@link SettingsItem} that is controlled by this
-	 *                     {@link PrimaryToggleSwitch}
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public PrimaryToggleSwitch(SettingsItem<Boolean> settingsItem) {
-		setPreferredSize(new Dimension(50, 25));
-		setMinimumSize(new Dimension(50, 25));
-		setMaximumSize(new Dimension(50, 25));
-
-		setBorderPainted(false);
-		setFocusPainted(false);
-		setContentAreaFilled(false);
-
-		state = settingsItem.get();
-		addActionListener((evt) -> { state = !state; settingsItem.set(state); revalidate(); repaint(); });
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public void paintComponent(Graphics g) {
-		g.setColor(state ? Color.GREEN : Color.LIGHT_GRAY);
-		g.fillRoundRect(0, 0, getWidth(), getHeight(), 25, 25);
-
-		g.setColor(Settings.getInstance().getCurrentTheme().getInteractableBackgroundColor());
-		g.fillRoundRect(state ? 25 : 0, 0, 25, 25, 25, 25);
-	}
-}
diff --git a/src/main/java/envoy/client/ui/primary/package-info.java b/src/main/java/envoy/client/ui/primary/package-info.java
deleted file mode 100644
index d4c54fa..0000000
--- a/src/main/java/envoy/client/ui/primary/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * This package defines all "primary" components that were defined specifically
- * for the visual improvement of Envoy. However, they can still be used in
- * general for other projects.<br>
- * Primary elements are supposed to provide the main functionality of a UI
- * component.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>package-info.java</strong><br>
- * Created: <strong>14 Mar 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @author Kai S. K. Engelbart
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.1-beta
- */
-package envoy.client.ui.primary;

From fa42516c6f9084bb1e79f45d95f0bf9e33098f4a Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sat, 30 May 2020 15:28:11 +0200
Subject: [PATCH 34/60] Added ability to load CSS files

---
 src/main/java/envoy/client/ui/Startup.java    | 70 ++++++++-----------
 src/main/resources/client.properties          |  4 +-
 src/main/resources/css/base.css               |  4 ++
 .../resources/{fxml/themes => css}/custom.css |  0
 .../resources/{fxml/themes => css}/dark.css   |  0
 .../resources/{fxml/themes => css}/light.css  |  0
 src/main/resources/fxml/themes/base.css       |  5 --
 7 files changed, 37 insertions(+), 46 deletions(-)
 create mode 100644 src/main/resources/css/base.css
 rename src/main/resources/{fxml/themes => css}/custom.css (100%)
 rename src/main/resources/{fxml/themes => css}/dark.css (100%)
 rename src/main/resources/{fxml/themes => css}/light.css (100%)
 delete mode 100644 src/main/resources/fxml/themes/base.css

diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 12d54e4..8e367a6 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -3,7 +3,6 @@ package envoy.client.ui;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -20,11 +19,13 @@ import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
 import envoy.client.data.*;
+import envoy.client.event.ThemeChangeEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
 import envoy.data.Message;
 import envoy.data.User;
 import envoy.data.User.UserStatus;
+import envoy.event.EventBus;
 import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 
@@ -47,9 +48,6 @@ public final class Startup extends Application {
 	private Stage		stage;
 	private Scene		previousScene;
 
-	private final String[] CSSPaths = { "file://./src/main/resources/fxml/themes/base.css",
-			"file://./src/main/resources/fxml/themes/" + (settings.isUsingDefaultTheme() ? settings.getCurrentThemeName() : "custom") + ".css" };
-
 	private static final Settings		settings	= Settings.getInstance();
 	private static final ClientConfig	config		= ClientConfig.getInstance();
 	private static final Logger			logger		= EnvoyLog.getLogger(Startup.class);
@@ -62,17 +60,17 @@ public final class Startup extends Application {
 		this.stage = stage;
 		try {
 			// Load the configuration from client.properties first
-			Properties properties = new Properties();
+			final Properties properties = new Properties();
 			properties.load(Startup.class.getClassLoader().getResourceAsStream("client.properties"));
 			config.load(properties);
 
 			// Override configuration values with command line arguments
-			String[] args = getParameters().getRaw().toArray(new String[0]);
+			final String[] args = getParameters().getRaw().toArray(new String[0]);
 			if (args.length > 0) config.load(args);
 
 			// Check if all mandatory configuration values have been initialized
 			if (!config.isInitialized()) throw new EnvoyException("Configuration is not fully initialized");
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			new Alert(AlertType.ERROR, "Error loading configuration values:\n" + e);
 			e.printStackTrace();
 			System.exit(1);
@@ -90,7 +88,7 @@ public final class Startup extends Application {
 			new Alert(AlertType.WARNING, "Ignoring local database.\nMessages will not be saved!").showAndWait();
 		} else try {
 			localDB = new PersistentLocalDB(new File(config.getHomeDirectory(), config.getLocalDB().getPath()));
-		} catch (IOException e3) {
+		} catch (final IOException e3) {
 			logger.log(Level.SEVERE, "Could not initialize local database", e3);
 			new Alert(AlertType.ERROR, "Could not initialize local database!\n" + e3).showAndWait();
 			System.exit(1);
@@ -111,9 +109,9 @@ public final class Startup extends Application {
 		try {
 			localDB.initializeUserStorage();
 			localDB.loadUserData();
-		} catch (FileNotFoundException e) {
+		} catch (final FileNotFoundException e) {
 			// The local database file has not yet been created, probably first login
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			e.printStackTrace();
 			new Alert(AlertType.ERROR, "Error while loading local database: " + e + "\nChats will not be stored locally.").showAndWait();
 		}
@@ -140,8 +138,10 @@ public final class Startup extends Application {
 		Platform.runLater(() -> { ((ChatSceneController) loader.getController()).initializeData(this, localDB, client, writeProxy); });
 		stage.setTitle("Envoy");
 		stage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
-
 		stage.show();
+		// TODO: Add capability to change custom CSS. In case of switching to a default
+		// theme, no further action is required
+		EventBus.getInstance().register(ThemeChangeEvent.class, theme -> applyCSS());
 
 		// Relay unread messages from cache
 		if (cache != null && client.isOnline()) cache.relay();
@@ -154,8 +154,7 @@ public final class Startup extends Application {
 	 * @param fxmlLocation the location of the fxml file
 	 * @param layout       the layout to use
 	 * @param savePrevious if true, the previous stage will be stored in this
-	 *                     instance of Startup, else the variable storing it will
-	 *                     be
+	 *                     instance of Startup, else the variable storing it will be
 	 *                     set to null
 	 * @since Envoy Client v0.1-beta
 	 */
@@ -164,18 +163,16 @@ public final class Startup extends Application {
 			try {
 				// Clearing the loader so that a new Scene can be initialised
 				loader = new FXMLLoader();
-				var	rootNode	= loader.<T>load(getClass().getResourceAsStream(fxmlLocation));
-				var	scene		= new Scene(rootNode);
+				final var	rootNode	= loader.<T>load(getClass().getResourceAsStream(fxmlLocation));
+				final var	scene		= new Scene(rootNode);
 				previousScene = savePrevious ? stage.getScene() : null;
 				// Setting the visual appearance
-				scene.getStylesheets().addAll(CSSPaths);
-				System.out.println(Paths.get(".").toAbsolutePath().normalize().toString());
 				stage.setScene(scene);
+				applyCSS();
 				stage.show();
-				// return loader.getController();
-			} catch (IOException e) {
+			} catch (final IOException e) {
 				new Alert(AlertType.ERROR, "The screen could not be updated due to reasons. (...bad programming...)");
-				System.err.println("input: FXMLLocation: " + fxmlLocation + ", CSS paths: " + CSSPaths);
+				System.err.println("input: FXMLLocation: " + fxmlLocation);
 				e.printStackTrace();
 				logger.severe("Something happened (while loading the new scene from " + fxmlLocation + ")");
 			}
@@ -194,8 +191,9 @@ public final class Startup extends Application {
 			if (previousScene == null) throw new IllegalStateException("Someone tried restoring a null scene. (Something happened)");
 			else {
 				// switching previous and current
-				var temp = storeCurrent ? stage.getScene() : null;
+				final var temp = storeCurrent ? stage.getScene() : null;
 				stage.setScene(previousScene);
+				applyCSS();
 				previousScene = temp;
 				stage.show();
 			}
@@ -208,7 +206,6 @@ public final class Startup extends Application {
 	@Override
 	public void stop() throws Exception {
 		try {
-
 			// Save Settings and PersistentLocalDB on shutdown
 			logger.info("Closing connection...");
 			client.close();
@@ -216,14 +213,11 @@ public final class Startup extends Application {
 			logger.info("Saving local database and settings...");
 			localDB.save();
 			Settings.getInstance().save();
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			logger.log(Level.SEVERE, "Unable to save local files", e);
 		}
 	}
 
-	@SuppressWarnings("javadoc")
-	public static void main(String[] args) { launch(args); }
-
 	/**
 	 * @return the controller of the current scene or a {@link NullPointerException}
 	 *         if there is none
@@ -235,21 +229,19 @@ public final class Startup extends Application {
 	}
 
 	/**
-	 * @return the CSSPaths
-	 * @since Envoy Client v0.1-beta
-	 */
-	public String[] getCSSPaths() { return CSSPaths; }
-
-	/**
-	 * Changes the currently displayed theme
+	 * Sets the CSS files used for each scene. Should be called when the theme
+	 * changes.
 	 *
 	 * @since Envoy Client v0.1-beta
 	 */
-	public void changeTheme() {
-		// the base.css file should never be changed during runtime
-		CSSPaths[1] = "file://.fxml/themes/" + (settings.isUsingDefaultTheme() ? settings.getCurrentThemeName() : "custom") + ".css";
-		var styleSheets = stage.getScene().getStylesheets();
-		styleSheets.remove(styleSheets.size() - 1);
-		styleSheets.add(CSSPaths[1]);
+	public void applyCSS() {
+		final var styleSheets = stage.getScene().getStylesheets();
+		styleSheets.clear();
+		styleSheets.add(getClass().getResource("/css/base.css").toExternalForm());
+		styleSheets.add(getClass().getResource("/css/" + (settings.isUsingDefaultTheme() ? settings.getCurrentThemeName() : "custom") + ".css")
+			.toExternalForm());
 	}
+
+	@SuppressWarnings("javadoc")
+	public static void main(String[] args) { launch(args); }
 }
diff --git a/src/main/resources/client.properties b/src/main/resources/client.properties
index 2641927..609d61a 100644
--- a/src/main/resources/client.properties
+++ b/src/main/resources/client.properties
@@ -1,3 +1,3 @@
-server=http://kske.feste-ip.net
-port=43315
+server=localhost
+port=8080
 localDB=.\\localDB
diff --git a/src/main/resources/css/base.css b/src/main/resources/css/base.css
new file mode 100644
index 0000000..059fefb
--- /dev/null
+++ b/src/main/resources/css/base.css
@@ -0,0 +1,4 @@
+*{
+	-fx-font: 14pt "Serif";
+    -fx-background-color:#000000;
+    }
diff --git a/src/main/resources/fxml/themes/custom.css b/src/main/resources/css/custom.css
similarity index 100%
rename from src/main/resources/fxml/themes/custom.css
rename to src/main/resources/css/custom.css
diff --git a/src/main/resources/fxml/themes/dark.css b/src/main/resources/css/dark.css
similarity index 100%
rename from src/main/resources/fxml/themes/dark.css
rename to src/main/resources/css/dark.css
diff --git a/src/main/resources/fxml/themes/light.css b/src/main/resources/css/light.css
similarity index 100%
rename from src/main/resources/fxml/themes/light.css
rename to src/main/resources/css/light.css
diff --git a/src/main/resources/fxml/themes/base.css b/src/main/resources/fxml/themes/base.css
deleted file mode 100644
index 8cfc8ca..0000000
--- a/src/main/resources/fxml/themes/base.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.root{
-	-fx-font: 200pt "Serif";
-	--background=#00FF00;
-	background: var(--background);
-}
\ No newline at end of file

From ca9b72b1dec516522ba5895788e889d0abe18d35 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 6 Jun 2020 10:19:33 +0200
Subject: [PATCH 35/60] Add proper layout to ChatWindow, fix user field
 selection in LoginDialog

---
 .settings/org.eclipse.jdt.core.prefs          | 361 ++++++++++++++++++
 .settings/org.eclipse.jdt.ui.prefs            |   2 +
 .../java/envoy/client/ui/LoginDialog.java     |  13 +-
 src/main/resources/css/base.css               |   8 +-
 src/main/resources/fxml/ChatScene.fxml        |  44 +--
 src/main/resources/fxml/LoginDialog.fxml      |  40 +-
 6 files changed, 399 insertions(+), 69 deletions(-)

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 7d167b0..5e625c6 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -128,3 +128,364 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=true
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=true
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=true
+org.eclipse.jdt.core.formatter.align_with_spaces=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=84
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=80
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=20
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=84
+org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_if_single_item
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=true
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_if_single_item
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_always
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_if_empty
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_if_single_item
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=true
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.lineSplit=150
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=separate_lines_if_wrapped
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.text_block_indentation=0
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index d1f3908..f6a7cc1 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,6 @@
 eclipse.preferences.version=1
+formatter_profile=_KSKE
+formatter_settings_version=18
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;javafx;org;com;envoy;
 org.eclipse.jdt.ui.javadoc=true
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index 9126a67..de8d618 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -61,8 +61,8 @@ public final class LoginDialog extends Dialog<Void> {
 	 * 
 	 * @param client               the client used to perform the handshake
 	 * @param localDB              the local database used for offline login
-	 * @param receivedMessageCache the cache storing messages received during the
-	 *                             handshake
+	 * @param receivedMessageCache the cache storing messages received during
+	 *                             the handshake
 	 * @throws IOException if an exception occurs during loading
 	 * @since Envoy Client v0.1-beta
 	 */
@@ -99,6 +99,9 @@ public final class LoginDialog extends Dialog<Void> {
 		setOnShown(e -> { if (config.hasLoginCredentials()) performHandshake(config.getLoginCredentials()); });
 
 		setDialogPane(dialogPane);
+
+		// Set initial cursor
+		Platform.runLater(userTextField::requestFocus);
 	}
 
 	@FXML
@@ -107,9 +110,6 @@ public final class LoginDialog extends Dialog<Void> {
 		// Show an alert after an unsuccessful handshake
 		eventBus.register(HandshakeRejectionEvent.class,
 				e -> Platform.runLater(() -> { clearPasswordFields(); new Alert(AlertType.ERROR, e.get()).showAndWait(); }));
-
-		// Set initial cursor
-		userTextField.requestFocus();
 	}
 
 	@FXML
@@ -144,7 +144,8 @@ public final class LoginDialog extends Dialog<Void> {
 				if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
 				client.setSender(clientUser);
 				Platform.runLater(() -> {
-					new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.\n" + e)
+					new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.\n"
+							+ e)
 						.showAndWait();
 					hide();
 				});
diff --git a/src/main/resources/css/base.css b/src/main/resources/css/base.css
index 059fefb..be1533f 100644
--- a/src/main/resources/css/base.css
+++ b/src/main/resources/css/base.css
@@ -1,4 +1,4 @@
-*{
-	-fx-font: 14pt "Serif";
-    -fx-background-color:#000000;
-    }
+* {
+	/* -fx-font: 14.0pt "Serif"; */
+    /* -fx-background-color:#000000; */
+}
diff --git a/src/main/resources/fxml/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
index 43af60d..34e444a 100644
--- a/src/main/resources/fxml/ChatScene.fxml
+++ b/src/main/resources/fxml/ChatScene.fxml
@@ -8,41 +8,23 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane id="recipientLabel" maxHeight="-Infinity"
-	maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
-	prefHeight="400.0" prefWidth="600.0"
-	xmlns="http://javafx.com/javafx/11.0.1"
-	xmlns:fx="http://javafx.com/fxml/1"
-	fx:controller="envoy.client.ui.ChatSceneController">
+<GridPane id="recipientLabel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ChatSceneController">
 	<columnConstraints>
-		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
-			prefWidth="100.0" />
-		<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"
-			prefWidth="100.0" />
+		<ColumnConstraints hgrow="SOMETIMES" maxWidth="161.0" minWidth="10.0" prefWidth="161.0" />
+		<ColumnConstraints hgrow="SOMETIMES" maxWidth="393.7142639160156" minWidth="10.0" prefWidth="357.0" />
+      <ColumnConstraints hgrow="SOMETIMES" maxWidth="195.4285888671875" minWidth="6.285736083984375" prefWidth="48.000030517578125" />
 	</columnConstraints>
 	<rowConstraints>
-		<RowConstraints minHeight="10.0" prefHeight="30.0"
-			vgrow="SOMETIMES" />
-		<RowConstraints minHeight="10.0" prefHeight="30.0"
-			vgrow="SOMETIMES" />
-		<RowConstraints minHeight="10.0" prefHeight="30.0"
-			vgrow="SOMETIMES" />
+		<RowConstraints maxHeight="60.57145036969865" minHeight="10.0" prefHeight="18.857155936104903" vgrow="SOMETIMES" />
+		<RowConstraints maxHeight="326.2857404436384" minHeight="10.0" prefHeight="326.2857404436384" vgrow="SOMETIMES" />
+		<RowConstraints maxHeight="153.28569902692522" minHeight="10.0" prefHeight="36.428545270647305" vgrow="SOMETIMES" />
 	</rowConstraints>
 	<children>
-		<ListView fx:id="userList" prefHeight="211.0"
-			prefWidth="300.0" GridPane.rowIndex="1"
-			onMouseClicked="#userListClicked" />
-		<Label text="Select a contact to chat with" fx:id="contactLabel" />
-		<Button fx:id="settingsButton" mnemonicParsing="false"
-			text="Settings" GridPane.columnIndex="1"
-			onAction="#settingsButtonClicked" />
-		<ListView fx:id="messageList" prefHeight="257.0"
-			prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-		<Button fx:id="postButton" mnemonicParsing="false" text="Post"
-			GridPane.columnIndex="1" GridPane.rowIndex="2"
-			onAction="#postButtonClicked" disable="true" />
-		<TextArea fx:id="messageTextArea" prefHeight="200.0"
-			prefWidth="200.0" GridPane.rowIndex="2"
-			onKeyReleased="#messageTextUpdated" />
+		<ListView fx:id="userList" onMouseClicked="#userListClicked" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="1" GridPane.rowSpan="2" />
+		<Label fx:id="contactLabel" text="Select a contact to chat with" />
+		<Button fx:id="settingsButton" mnemonicParsing="false" onAction="#settingsButtonClicked" text="Settings" GridPane.columnIndex="2" />
+		<ListView fx:id="messageList" prefHeight="257.0" prefWidth="155.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" />
+		<Button fx:id="postButton" disable="true" mnemonicParsing="false" onAction="#postButtonClicked" text="Post" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+		<TextArea fx:id="messageTextArea" onKeyReleased="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
 	</children>
 </GridPane>
diff --git a/src/main/resources/fxml/LoginDialog.fxml b/src/main/resources/fxml/LoginDialog.fxml
index a1503f4..1d3cc2f 100644
--- a/src/main/resources/fxml/LoginDialog.fxml
+++ b/src/main/resources/fxml/LoginDialog.fxml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
@@ -8,18 +7,13 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<DialogPane prefHeight="201.0" prefWidth="525.0"
-	xmlns="http://javafx.com/javafx/11.0.1"
-	xmlns:fx="http://javafx.com/fxml/1">
+<DialogPane prefHeight="201.0" prefWidth="525.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
 	<content>
-		<VBox maxHeight="-Infinity" maxWidth="-Infinity"
-			minHeight="-Infinity" minWidth="-Infinity" prefHeight="217.0"
-			prefWidth="545.0">
+		<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="217.0" prefWidth="545.0">
 			<children>
 				<Label text="User Login">
 					<font>
@@ -28,34 +22,24 @@
 				</Label>
 				<GridPane>
 					<columnConstraints>
-						<ColumnConstraints hgrow="SOMETIMES"
-							minWidth="10.0" percentWidth="40.0" prefWidth="100.0" />
-						<ColumnConstraints hgrow="SOMETIMES"
-							minWidth="10.0" prefWidth="100.0" />
+						<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="40.0" prefWidth="100.0" />
+						<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
 					</columnConstraints>
 					<rowConstraints>
-						<RowConstraints minHeight="10.0" prefHeight="30.0"
-							vgrow="SOMETIMES" />
-						<RowConstraints minHeight="10.0" prefHeight="30.0"
-							vgrow="SOMETIMES" />
-						<RowConstraints minHeight="10.0" prefHeight="30.0"
-							vgrow="SOMETIMES" />
+						<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+						<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+						<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
 					</rowConstraints>
 					<children>
 						<Label text="User Name:" />
 						<Label text="Password" GridPane.rowIndex="1" />
-						<Label fx:id="repeatPasswordLabel" text="Repeat Password:"
-							visible="false" GridPane.rowIndex="2" />
-						<TextField fx:id="userTextField"
-							GridPane.columnIndex="1" />
-						<PasswordField fx:id="passwordField"
-							GridPane.columnIndex="1" GridPane.rowIndex="1" />
-						<PasswordField fx:id="repeatPasswordField"
-							visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+						<Label fx:id="repeatPasswordLabel" text="Repeat Password:" visible="false" GridPane.rowIndex="2" />
+						<TextField fx:id="userTextField" GridPane.columnIndex="1" />
+						<PasswordField fx:id="passwordField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+						<PasswordField fx:id="repeatPasswordField" visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
 					</children>
 				</GridPane>
-				<CheckBox fx:id="registerCheckBox" mnemonicParsing="false"
-					onAction="#registerCheckboxChanged" text="Register" />
+				<CheckBox fx:id="registerCheckBox" mnemonicParsing="false" onAction="#registerCheckboxChanged" prefHeight="17.0" prefWidth="181.0" text="Register" />
 			</children>
 		</VBox>
 	</content>

From 16ae619f7d450c9f779bd8c44761e990b0cb6f8a Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 6 Jun 2020 10:50:23 +0200
Subject: [PATCH 36/60] Load JavaFX Images in IconUtil, display Envoy logo

---
 src/main/java/envoy/client/ui/IconUtil.java   | 24 ++++++++++++-------
 .../java/envoy/client/ui/LoginDialog.java     |  3 +++
 src/main/java/envoy/client/ui/Startup.java    |  3 +--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/main/java/envoy/client/ui/IconUtil.java b/src/main/java/envoy/client/ui/IconUtil.java
index 0092483..e2577ec 100644
--- a/src/main/java/envoy/client/ui/IconUtil.java
+++ b/src/main/java/envoy/client/ui/IconUtil.java
@@ -1,12 +1,10 @@
 package envoy.client.ui;
 
-import java.awt.Image;
 import java.io.IOException;
 import java.util.EnumMap;
 import java.util.EnumSet;
 
-import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
+import javafx.scene.image.Image;
 
 /**
  * Provides static utility methods for loading icons from the resource
@@ -24,7 +22,17 @@ public class IconUtil {
 	private IconUtil() {}
 
 	/**
-	 * Loads an icon from resource folder and scales it to a given size.
+	 * Loads an icon from the resource folder.
+	 * 
+	 * @param path the path to the icon inside the resource folder
+	 * @return the icon
+	 * @throws IOException if the loading process failed
+	 * @since Envoy Client v0.1-beta
+	 */
+	public static Image load(String path) throws IOException { return new Image(IconUtil.class.getResource(path).toExternalForm()); }
+
+	/**
+	 * Loads an icon from the resource folder and scales it to a given size.
 	 * 
 	 * @param path the path to the icon inside the resource folder
 	 * @param size the size to scale the icon to
@@ -32,8 +40,8 @@ public class IconUtil {
 	 * @throws IOException if the loading process failed
 	 * @since Envoy Client v0.1-beta
 	 */
-	public static ImageIcon load(String path, int size) throws IOException {
-		return new ImageIcon(ImageIO.read(IconUtil.class.getResourceAsStream(path)).getScaledInstance(size, size, Image.SCALE_SMOOTH));
+	public static Image load(String path, int size) throws IOException {
+		return new Image(IconUtil.class.getResource(path).toExternalForm(), size, size, true, true);
 	}
 
 	/**
@@ -51,8 +59,8 @@ public class IconUtil {
 	 * @throws IOException if the loading process failed
 	 * @since Envoy Client v0.1-beta
 	 */
-	public static <T extends Enum<T>> EnumMap<T, ImageIcon> loadByEnum(Class<T> enumClass, int size) throws IOException {
-		var	icons	= new EnumMap<T, ImageIcon>(enumClass);
+	public static <T extends Enum<T>> EnumMap<T, Image> loadByEnum(Class<T> enumClass, int size) throws IOException {
+		var	icons	= new EnumMap<T, Image>(enumClass);
 		var	path	= "/icons/" + enumClass.getSimpleName().toLowerCase() + "/";
 		for (var e : EnumSet.allOf(enumClass))
 			icons.put(e, load(path + e.toString().toLowerCase() + ".png", size));
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index de8d618..cba70c9 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -10,6 +10,7 @@ import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
+import javafx.stage.Stage;
 
 import envoy.client.data.Cache;
 import envoy.client.data.ClientConfig;
@@ -75,6 +76,8 @@ public final class LoginDialog extends Dialog<Void> {
 		loader.setController(this);
 		final var dialogPane = loader.<DialogPane>load();
 
+		((Stage) getDialogPane().getScene().getWindow()).getIcons().add(IconUtil.load("/icons/envoy_logo.png"));
+		
 		// Configure dialog buttons
 		dialogPane.getButtonTypes().addAll(ButtonType.CLOSE, ButtonType.OK);
 
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 8e367a6..b6de986 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -13,7 +13,6 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-import javafx.scene.image.Image;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
@@ -137,7 +136,7 @@ public final class Startup extends Application {
 		changeScene("/fxml/ChatScene.fxml", new GridPane(), false);
 		Platform.runLater(() -> { ((ChatSceneController) loader.getController()).initializeData(this, localDB, client, writeProxy); });
 		stage.setTitle("Envoy");
-		stage.getIcons().add(new Image(getClass().getResourceAsStream("/icons/envoy_logo.png")));
+		stage.getIcons().add(IconUtil.load("/icons/envoy_logo.png"));
 		stage.show();
 		// TODO: Add capability to change custom CSS. In case of switching to a default
 		// theme, no further action is required

From 5fd6fc77e1be8729a8eae74c794cf4b64abe3d63 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 6 Jun 2020 15:03:43 +0200
Subject: [PATCH 37/60] Cleanup and Reformatting

---
 .../java/envoy/client/DeveloperComments.java  | 17 ----
 src/main/java/envoy/client/data/Settings.java | 83 ++++++-------------
 2 files changed, 26 insertions(+), 74 deletions(-)
 delete mode 100644 src/main/java/envoy/client/DeveloperComments.java

diff --git a/src/main/java/envoy/client/DeveloperComments.java b/src/main/java/envoy/client/DeveloperComments.java
deleted file mode 100644
index 781d58c..0000000
--- a/src/main/java/envoy/client/DeveloperComments.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package envoy.client;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>DeveloperComments.java</strong><br>
- * Created: <strong>19 Apr 2020</strong><br>
- * 
- * @author Leon Hofmeister
- * @since Envoy Client v0.1-beta
- */
-public class DeveloperComments {
-
-	// "Schau, es hat sich behindert" - Kai, 2020
-
-	// LEON: JFC <===> JAVA FRIED CHICKEN <=/=> Java Foundation Classes
-	
-}
diff --git a/src/main/java/envoy/client/data/Settings.java b/src/main/java/envoy/client/data/Settings.java
index fbbe108..4e36369 100644
--- a/src/main/java/envoy/client/data/Settings.java
+++ b/src/main/java/envoy/client/data/Settings.java
@@ -27,8 +27,8 @@ import envoy.util.SerializationUtils;
 public class Settings {
 
 	// Actual settings accessible by the rest of the application
-	private Map<String, SettingsItem<?>> items;
-	private Map<String, Theme> themes;
+	private Map<String, SettingsItem<?>>	items;
+	private Map<String, Theme>				themes;
 
 	/**
 	 * Settings are stored in this file.
@@ -69,10 +69,12 @@ public class Settings {
 		}
 
 		// Load standard themes not defined in the themes file
-		themes.put("dark", new Theme("dark", Color.black, Color.darkGray, Color.white, new Color(165, 60, 232),
-				Color.white, Color.orange, Color.blue, Color.white, Color.white));
-		themes.put("light", new Theme("light", new Color(235, 235, 235), Color.white, Color.white, Color.darkGray,
-				Color.black, Color.orange, Color.darkGray, Color.black, Color.black));
+		themes.put("dark",
+				new Theme("dark", Color.black, Color.darkGray, Color.white, new Color(165, 60, 232), Color.white, Color.orange, Color.blue,
+						Color.white, Color.white));
+		themes.put("light",
+				new Theme("light", new Color(235, 235, 235), Color.white, Color.white, Color.darkGray, Color.black, Color.orange, Color.darkGray,
+						Color.black, Color.black));
 	}
 
 	/**
@@ -81,9 +83,7 @@ public class Settings {
 	 * @return the instance of Settings
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public static Settings getInstance() {
-		return settings;
-	}
+	public static Settings getInstance() { return settings; }
 
 	/**
 	 * Updates the preferences when the save button is clicked.
@@ -101,12 +101,9 @@ public class Settings {
 	}
 
 	private void supplementDefaults() {
-		items.putIfAbsent("enterToSend",
-				new SettingsItem<>(true, "Enter to send", "Sends a message by pressing the enter key."));
-		items.putIfAbsent("onCloseMode",
-				new SettingsItem<>(true, "Hide on close", "Hides the chat window when it is closed."));
-		items.putIfAbsent("currentTheme",
-				new SettingsItem<>("dark", "Current Theme Name", "The name of the currently selected theme."));
+		items.putIfAbsent("enterToSend", new SettingsItem<>(true, "Enter to send", "Sends a message by pressing the enter key."));
+		items.putIfAbsent("onCloseMode", new SettingsItem<>(true, "Hide on close", "Hides the chat window when it is closed."));
+		items.putIfAbsent("currentTheme", new SettingsItem<>("dark", "Current Theme Name", "The name of the currently selected theme."));
 	}
 
 	/**
@@ -115,25 +112,19 @@ public class Settings {
 	 * @param theme the {@link Theme} to add
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void addNewThemeToMap(Theme theme) {
-		getThemes().put(theme.getThemeName(), theme);
-	}
+	public void addNewThemeToMap(Theme theme) { getThemes().put(theme.getThemeName(), theme); }
 
 	/**
 	 * @return the name of the currently active {@link Theme}
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public String getCurrentThemeName() {
-		return (String) items.get("currentTheme").get();
-	}
+	public String getCurrentThemeName() { return (String) items.get("currentTheme").get(); }
 
 	/**
 	 * @return the currently active {@link Theme}
 	 * @since Envoy Client v0.1-beta
 	 */
-	public Theme getCurrentTheme() {
-		return getTheme(getCurrentThemeName());
-	}
+	public Theme getCurrentTheme() { return getTheme(getCurrentThemeName()); }
 
 	/**
 	 * Sets the name of the current {@link Theme}.
@@ -141,18 +132,14 @@ public class Settings {
 	 * @param themeName the name to set
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void setCurrentTheme(String themeName) {
-		((SettingsItem<String>) items.get("currentTheme")).set(themeName);
-	}
+	public void setCurrentTheme(String themeName) { ((SettingsItem<String>) items.get("currentTheme")).set(themeName); }
 
 	/**
 	 * @return whether the current {@link Theme} is one of the default themes.
 	 *         Currently checks for dark and light theme.
 	 * @since Envoy Client v0.1-beta
 	 */
-	public boolean isUsingDefaultTheme() {
-		return getCurrentThemeName().equals("dark") || getCurrentThemeName().equals("light");
-	}
+	public boolean isUsingDefaultTheme() { return getCurrentThemeName().equals("dark") || getCurrentThemeName().equals("light"); }
 
 	/**
 	 * @return {@code true}, if pressing the {@code Enter} key suffices to send a
@@ -160,9 +147,7 @@ public class Settings {
 	 *         {@code Control} key.
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public Boolean isEnterToSend() {
-		return (Boolean) items.get("enterToSend").get();
-	}
+	public Boolean isEnterToSend() { return (Boolean) items.get("enterToSend").get(); }
 
 	/**
 	 * Changes the keystrokes performed by the user to send a message.
@@ -172,17 +157,13 @@ public class Settings {
 	 *                    conjunction with the {@code Control} key.
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void setEnterToSend(boolean enterToSend) {
-		((SettingsItem<Boolean>) items.get("enterToSend")).set(enterToSend);
-	}
+	public void setEnterToSend(boolean enterToSend) { ((SettingsItem<Boolean>) items.get("enterToSend")).set(enterToSend); }
 
 	/**
 	 * @return the current on close mode.
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public Boolean getCurrentOnCloseMode() {
-		return (Boolean) items.get("onCloseMode").get();
-	}
+	public Boolean getCurrentOnCloseMode() { return (Boolean) items.get("onCloseMode").get(); }
 
 	/**
 	 * Sets the current on close mode.
@@ -190,31 +171,23 @@ public class Settings {
 	 * @param currentOnCloseMode the on close mode that should be set.
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public void setCurrentOnCloseMode(boolean currentOnCloseMode) {
-		((SettingsItem<Boolean>) items.get("onCloseMode")).set(currentOnCloseMode);
-	}
+	public void setCurrentOnCloseMode(boolean currentOnCloseMode) { ((SettingsItem<Boolean>) items.get("onCloseMode")).set(currentOnCloseMode); }
 
 	/**
 	 * @return the items
 	 */
-	public Map<String, SettingsItem<?>> getItems() {
-		return items;
-	}
+	public Map<String, SettingsItem<?>> getItems() { return items; }
 
 	/**
 	 * @param items the items to set
 	 */
-	public void setItems(Map<String, SettingsItem<?>> items) {
-		this.items = items;
-	}
+	public void setItems(Map<String, SettingsItem<?>> items) { this.items = items; }
 
 	/**
 	 * @return a {@code Map<String, Theme>} of all themes with their names as keys
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public Map<String, Theme> getThemes() {
-		return themes;
-	}
+	public Map<String, Theme> getThemes() { return themes; }
 
 	/**
 	 * Sets the {@code Map<String, Theme>} of all themes with their names as keys
@@ -222,16 +195,12 @@ public class Settings {
 	 * @param themes the theme map to set
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public void setThemes(Map<String, Theme> themes) {
-		this.themes = themes;
-	}
+	public void setThemes(Map<String, Theme> themes) { this.themes = themes; }
 
 	/**
 	 * @param themeName the name of the {@link Theme} to get
 	 * @return the {@link Theme} with the specified name
 	 * @since Envoy Client v0.3-alpha
 	 */
-	public Theme getTheme(String themeName) {
-		return themes.get(themeName);
-	}
+	public Theme getTheme(String themeName) { return themes.get(themeName); }
 }

From 4c79141e291a1873a11bd48d9bdb44ad6ca489d6 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 6 Jun 2020 15:29:29 +0200
Subject: [PATCH 38/60] Fix condition for posting messages

---
 src/main/java/envoy/client/ui/ChatSceneController.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 68eca80..d2a77d9 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -137,8 +137,10 @@ public final class ChatSceneController {
 
 	@FXML
 	private void messageTextUpdated(KeyEvent e) {
-		if (settings.isEnterToSend() && e.getCode() == KeyCode.ENTER || !settings.isEnterToSend() && e.getCode() == KeyCode.CONTROL) postMessage();
-		else postButton.setDisable(messageTextArea.getText().isBlank());
+		if (!postButton.isDisabled() && settings.isEnterToSend() && e.getCode() == KeyCode.ENTER
+				|| !settings.isEnterToSend() && e.getCode() == KeyCode.CONTROL)
+			postMessage();
+		else postButton.setDisable(messageTextArea.getText().isBlank() || currentChat == null);
 	}
 
 	/**

From ec72b6fc6714be7aed912434655776b590c71d0b Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sat, 6 Jun 2020 18:30:09 +0200
Subject: [PATCH 39/60] Externalized scene loading and management into
 SceneContext

---
 .../envoy/client/ui/ChatSceneController.java  |  28 ++---
 .../java/envoy/client/ui/SceneContext.java    |  98 +++++++++++++++++
 src/main/java/envoy/client/ui/Startup.java    | 104 ++----------------
 .../ui/settings/SettingsSceneController.java  |  15 ++-
 4 files changed, 129 insertions(+), 116 deletions(-)
 create mode 100644 src/main/java/envoy/client/ui/SceneContext.java

diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index d2a77d9..56fbe2c 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -11,7 +11,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.VBox;
 
 import envoy.client.data.Chat;
 import envoy.client.data.LocalDB;
@@ -56,14 +55,13 @@ public final class ChatSceneController {
 	@FXML
 	private TextArea messageTextArea;
 
-	private LocalDB		localDB;
-	private Client		client;
-	private WriteProxy	writeProxy;
+	private LocalDB			localDB;
+	private Client			client;
+	private WriteProxy		writeProxy;
+	private SceneContext	sceneContext;
 
 	private Chat currentChat;
 
-	private Startup startup;
-
 	private static final Settings	settings	= Settings.getInstance();
 	private static final EventBus	eventBus	= EventBus.getInstance();
 	private static final Logger		logger		= EnvoyLog.getLogger(ChatSceneController.class);
@@ -97,11 +95,11 @@ public final class ChatSceneController {
 		eventBus.register(UserStatusChangeEvent.class, e -> Platform.runLater(() -> userList.refresh()));
 	}
 
-	void initializeData(Startup startup, LocalDB localDB, Client client, WriteProxy writeProxy) {
-		this.startup	= startup;
-		this.localDB	= localDB;
-		this.client		= client;
-		this.writeProxy	= writeProxy;
+	void initializeData(SceneContext sceneContext, LocalDB localDB, Client client, WriteProxy writeProxy) {
+		this.sceneContext	= sceneContext;
+		this.localDB		= localDB;
+		this.client			= client;
+		this.writeProxy		= writeProxy;
 
 		// TODO: handle offline mode
 		userList.setItems(FXCollections.observableList(localDB.getUser().getContacts().stream().collect(Collectors.toList())));
@@ -131,8 +129,12 @@ public final class ChatSceneController {
 
 	@FXML
 	private void settingsButtonClicked() {
-		startup.changeScene("/fxml/SettingsScene.fxml", new VBox(), true);
-		Platform.runLater(() -> ((SettingsSceneController) startup.getCurrentController()).initializeData(startup));
+		try {
+			sceneContext.load(SceneContext.SceneInfo.SETTINGS_SCENE);
+			sceneContext.<SettingsSceneController>getController().initializeData(sceneContext);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
 	}
 
 	@FXML
diff --git a/src/main/java/envoy/client/ui/SceneContext.java b/src/main/java/envoy/client/ui/SceneContext.java
new file mode 100644
index 0000000..1644955
--- /dev/null
+++ b/src/main/java/envoy/client/ui/SceneContext.java
@@ -0,0 +1,98 @@
+package envoy.client.ui;
+
+import java.io.IOException;
+import java.util.Stack;
+
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import envoy.client.data.Settings;
+import envoy.client.event.ThemeChangeEvent;
+import envoy.event.EventBus;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>SceneContext.java</strong><br>
+ * Created: <strong>06.06.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+public final class SceneContext {
+
+	static enum SceneInfo {
+
+		CHAT_SCENE("/fxml/ChatScene.fxml"), SETTINGS_SCENE("/fxml/SettingsScene.fxml"), CONTACT_SEARCH_SCENE("/fxml/ContactSearchScene.fxml");
+
+		public final String path;
+
+		SceneInfo(String path) { this.path = path; }
+	}
+
+	private final Stage			stage;
+	private final FXMLLoader	loader		= new FXMLLoader();
+	private final Stack<Scene>	sceneStack	= new Stack<>();
+
+	private static final Settings settings = Settings.getInstance();
+
+	/**
+	 * Initializes the scene context.
+	 * 
+	 * @param stage the stage in which scenes will be displayed
+	 * @since Envoy Client v0.1-beta
+	 */
+	public SceneContext(Stage stage) {
+		this.stage = stage;
+		EventBus.getInstance().register(ThemeChangeEvent.class, theme -> applyCSS());
+	}
+
+	/**
+	 * Loads a new scene specified by a scene info.
+	 * 
+	 * @param sceneInfo specifies the scene to load
+	 * @throws IOException if the loading process fails
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void load(SceneInfo sceneInfo) throws IOException {
+		loader.setRoot(null);
+		loader.setController(null);
+
+		final var	rootNode	= (Parent) loader.load(getClass().getResourceAsStream(sceneInfo.path));
+		final var	scene		= new Scene(rootNode);
+
+		sceneStack.push(scene);
+		stage.setScene(scene);
+		applyCSS();
+		stage.show();
+	}
+
+	/**
+	 * Removes the current scene and displays the previous one.
+	 * 
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void pop() {
+		sceneStack.pop();
+		stage.setScene(sceneStack.peek());
+		applyCSS();
+		stage.show();
+	}
+
+	private void applyCSS() {
+		if (!sceneStack.isEmpty()) {
+			final var	styleSheets	= stage.getScene().getStylesheets();
+			final var	themeCSS	= "/css/" + (settings.isUsingDefaultTheme() ? settings.getCurrentThemeName() : "custom") + ".css";
+			styleSheets.clear();
+			styleSheets.addAll(getClass().getResource("/css/base.css").toExternalForm(), getClass().getResource(themeCSS).toExternalForm());
+		}
+	}
+
+	/**
+	 * @param <T> the type of the controller
+	 * @return the controller used by the current scene
+	 * @since Envoy Client v0.1-beta
+	 */
+	public <T> T getController() { return loader.getController(); }
+}
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index b6de986..acca4f1 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -8,23 +8,16 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 
 import envoy.client.data.*;
-import envoy.client.event.ThemeChangeEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
 import envoy.data.Message;
 import envoy.data.User;
 import envoy.data.User.UserStatus;
-import envoy.event.EventBus;
 import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 
@@ -43,20 +36,14 @@ public final class Startup extends Application {
 	private WriteProxy		writeProxy;
 	private Cache<Message>	cache;
 
-	private FXMLLoader	loader	= new FXMLLoader();
-	private Stage		stage;
-	private Scene		previousScene;
-
-	private static final Settings		settings	= Settings.getInstance();
-	private static final ClientConfig	config		= ClientConfig.getInstance();
-	private static final Logger			logger		= EnvoyLog.getLogger(Startup.class);
+	private static final ClientConfig	config	= ClientConfig.getInstance();
+	private static final Logger			logger	= EnvoyLog.getLogger(Startup.class);
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public void start(Stage stage) throws Exception {
-		this.stage = stage;
 		try {
 			// Load the configuration from client.properties first
 			final Properties properties = new Properties();
@@ -133,72 +120,17 @@ public final class Startup extends Application {
 				.forEach(u -> u.setStatus(UserStatus.OFFLINE));
 
 		// Prepare stage and load ChatScene
-		changeScene("/fxml/ChatScene.fxml", new GridPane(), false);
-		Platform.runLater(() -> { ((ChatSceneController) loader.getController()).initializeData(this, localDB, client, writeProxy); });
+		final var sceneContext = new SceneContext(stage);
+		sceneContext.load(SceneContext.SceneInfo.CHAT_SCENE);
+		sceneContext.<ChatSceneController>getController().initializeData(sceneContext, localDB, client, writeProxy);
 		stage.setTitle("Envoy");
 		stage.getIcons().add(IconUtil.load("/icons/envoy_logo.png"));
 		stage.show();
-		// TODO: Add capability to change custom CSS. In case of switching to a default
-		// theme, no further action is required
-		EventBus.getInstance().register(ThemeChangeEvent.class, theme -> applyCSS());
 
 		// Relay unread messages from cache
 		if (cache != null && client.isOnline()) cache.relay();
 	}
 
-	/**
-	 * Changes the scene of the stage.
-	 *
-	 * @param <T>          the type of the layout to use
-	 * @param fxmlLocation the location of the fxml file
-	 * @param layout       the layout to use
-	 * @param savePrevious if true, the previous stage will be stored in this
-	 *                     instance of Startup, else the variable storing it will be
-	 *                     set to null
-	 * @since Envoy Client v0.1-beta
-	 */
-	public <T extends Pane> void changeScene(String fxmlLocation, T layout, boolean savePrevious) {
-		Platform.runLater(() -> {
-			try {
-				// Clearing the loader so that a new Scene can be initialised
-				loader = new FXMLLoader();
-				final var	rootNode	= loader.<T>load(getClass().getResourceAsStream(fxmlLocation));
-				final var	scene		= new Scene(rootNode);
-				previousScene = savePrevious ? stage.getScene() : null;
-				// Setting the visual appearance
-				stage.setScene(scene);
-				applyCSS();
-				stage.show();
-			} catch (final IOException e) {
-				new Alert(AlertType.ERROR, "The screen could not be updated due to reasons. (...bad programming...)");
-				System.err.println("input: FXMLLocation: " + fxmlLocation);
-				e.printStackTrace();
-				logger.severe("Something happened (while loading the new scene from " + fxmlLocation + ")");
-			}
-		});
-	}
-
-	/**
-	 * Changes the visual scene back to the saved value. The currently active scene
-	 * can be saved, but must not be.
-	 *
-	 * @param storeCurrent the old scene to store, if wanted. Can be null
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void restoreScene(boolean storeCurrent) {
-		Platform.runLater(() -> {
-			if (previousScene == null) throw new IllegalStateException("Someone tried restoring a null scene. (Something happened)");
-			else {
-				// switching previous and current
-				final var temp = storeCurrent ? stage.getScene() : null;
-				stage.setScene(previousScene);
-				applyCSS();
-				previousScene = temp;
-				stage.show();
-			}
-		});
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -218,29 +150,11 @@ public final class Startup extends Application {
 	}
 
 	/**
-	 * @return the controller of the current scene or a {@link NullPointerException}
-	 *         if there is none
+	 * Starts the application.
+	 * 
+	 * @param args the command line arguments are processed by the
+	 *             {@link ClientConfig}
 	 * @since Envoy Client v0.1-beta
 	 */
-	public Object getCurrentController() {
-		if (loader.getController() == null) throw new NullPointerException("Cannot deliver current controller as its undefined (duh!)");
-		else return loader.getController();
-	}
-
-	/**
-	 * Sets the CSS files used for each scene. Should be called when the theme
-	 * changes.
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void applyCSS() {
-		final var styleSheets = stage.getScene().getStylesheets();
-		styleSheets.clear();
-		styleSheets.add(getClass().getResource("/css/base.css").toExternalForm());
-		styleSheets.add(getClass().getResource("/css/" + (settings.isUsingDefaultTheme() ? settings.getCurrentThemeName() : "custom") + ".css")
-			.toExternalForm());
-	}
-
-	@SuppressWarnings("javadoc")
 	public static void main(String[] args) { launch(args); }
 }
diff --git a/src/main/java/envoy/client/ui/settings/SettingsSceneController.java b/src/main/java/envoy/client/ui/settings/SettingsSceneController.java
index e3cc4fb..795a57f 100644
--- a/src/main/java/envoy/client/ui/settings/SettingsSceneController.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsSceneController.java
@@ -3,7 +3,7 @@ package envoy.client.ui.settings;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
-import envoy.client.ui.Startup;
+import envoy.client.ui.SceneContext;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -15,20 +15,19 @@ import envoy.client.ui.Startup;
  */
 public class SettingsSceneController {
 
-	private Startup					startup;
 	@FXML
-	private ListView<SettingsPane>	settingsList;
+	private ListView<SettingsPane> settingsList;
 
 	@FXML
 	private TitledPane titledPane;
 
+	private SceneContext sceneContext;
+
 	/**
-	 * initializes the object needed to reset the scene
-	 * 
-	 * @param startup the instance of startup that stores the stage
+	 * @param sceneContext enables the user to return to the chat scene
 	 * @since Envoy Client v0.1-beta
 	 */
-	public void initializeData(Startup startup) { this.startup = startup; }
+	public void initializeData(SceneContext sceneContext) { this.sceneContext = sceneContext; }
 
 	@FXML
 	private void initialize() {
@@ -54,5 +53,5 @@ public class SettingsSceneController {
 	}
 
 	@FXML
-	private void backButtonClicked() { startup.restoreScene(false); }
+	private void backButtonClicked() { sceneContext.pop(); }
 }

From 9e7bde1d4d0e1ef3f73166418030b7773cb19e06 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sat, 6 Jun 2020 18:33:24 +0200
Subject: [PATCH 40/60] Improved visual appearance of ChatScene

Additionally added minimum height of application and basic
ContactSearchScene.fxml file.
---
 src/main/java/envoy/client/ui/Startup.java    |  4 ++-
 src/main/resources/css/base.css               |  5 +--
 src/main/resources/fxml/ChatScene.fxml        | 33 +++++++++++--------
 .../resources/fxml/ContactSearchScene.fxml    |  8 +++++
 4 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 src/main/resources/fxml/ContactSearchScene.fxml

diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index acca4f1..fa9fac0 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -124,6 +124,8 @@ public final class Startup extends Application {
 		sceneContext.load(SceneContext.SceneInfo.CHAT_SCENE);
 		sceneContext.<ChatSceneController>getController().initializeData(sceneContext, localDB, client, writeProxy);
 		stage.setTitle("Envoy");
+		stage.setMinHeight(400);
+		stage.setMinWidth(350);
 		stage.getIcons().add(IconUtil.load("/icons/envoy_logo.png"));
 		stage.show();
 
@@ -151,7 +153,7 @@ public final class Startup extends Application {
 
 	/**
 	 * Starts the application.
-	 * 
+	 *
 	 * @param args the command line arguments are processed by the
 	 *             {@link ClientConfig}
 	 * @since Envoy Client v0.1-beta
diff --git a/src/main/resources/css/base.css b/src/main/resources/css/base.css
index be1533f..a2728c5 100644
--- a/src/main/resources/css/base.css
+++ b/src/main/resources/css/base.css
@@ -1,4 +1,5 @@
 * {
-	/* -fx-font: 14.0pt "Serif"; */
-    /* -fx-background-color:#000000; */
+	 /* -fx-font: 14.0pt "Serif"; 
+     -fx-background-color:#000000; */
+     -fx-opacity:1;
 }
diff --git a/src/main/resources/fxml/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
index 34e444a..fa234ca 100644
--- a/src/main/resources/fxml/ChatScene.fxml
+++ b/src/main/resources/fxml/ChatScene.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
@@ -8,23 +9,29 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane id="recipientLabel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ChatSceneController">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="400.0" minWidth="350.0" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ChatSceneController">
 	<columnConstraints>
-		<ColumnConstraints hgrow="SOMETIMES" maxWidth="161.0" minWidth="10.0" prefWidth="161.0" />
-		<ColumnConstraints hgrow="SOMETIMES" maxWidth="393.7142639160156" minWidth="10.0" prefWidth="357.0" />
-      <ColumnConstraints hgrow="SOMETIMES" maxWidth="195.4285888671875" minWidth="6.285736083984375" prefWidth="48.000030517578125" />
+		<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="20.0" prefWidth="161.0" />
+		<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="65.0" prefWidth="357.0" />
+      <ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="6.285736083984375" percentWidth="15.0" prefWidth="48.000030517578125" />
 	</columnConstraints>
 	<rowConstraints>
-		<RowConstraints maxHeight="60.57145036969865" minHeight="10.0" prefHeight="18.857155936104903" vgrow="SOMETIMES" />
-		<RowConstraints maxHeight="326.2857404436384" minHeight="10.0" prefHeight="326.2857404436384" vgrow="SOMETIMES" />
-		<RowConstraints maxHeight="153.28569902692522" minHeight="10.0" prefHeight="36.428545270647305" vgrow="SOMETIMES" />
+		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="10.0" prefHeight="70.0" vgrow="SOMETIMES" />
+		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="60.0" prefHeight="326.2857404436384" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="15.0" prefHeight="50.0" vgrow="SOMETIMES" />
+		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="15.0" prefHeight="100.0" vgrow="SOMETIMES" />
 	</rowConstraints>
 	<children>
-		<ListView fx:id="userList" onMouseClicked="#userListClicked" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="1" GridPane.rowSpan="2" />
-		<Label fx:id="contactLabel" text="Select a contact to chat with" />
-		<Button fx:id="settingsButton" mnemonicParsing="false" onAction="#settingsButtonClicked" text="Settings" GridPane.columnIndex="2" />
-		<ListView fx:id="messageList" prefHeight="257.0" prefWidth="155.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" />
-		<Button fx:id="postButton" disable="true" mnemonicParsing="false" onAction="#postButtonClicked" text="Post" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-		<TextArea fx:id="messageTextArea" onKeyReleased="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+		<ListView fx:id="userList" onMouseClicked="#userListClicked" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="1" GridPane.rowSpan="2147483647" />
+		<Label fx:id="contactLabel" prefHeight="16.0" prefWidth="250.0" text="Select a contact to chat with" GridPane.columnSpan="2" />
+		<Button fx:id="settingsButton" mnemonicParsing="false" onAction="#settingsButtonClicked" text="Settings" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
+		<ListView fx:id="messageList" prefHeight="257.0" prefWidth="155.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2" />
+		<Button fx:id="postButton" defaultButton="true" disable="true" mnemonicParsing="false" onAction="#postButtonClicked" prefHeight="10.0" prefWidth="65.0" text="Post" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
+      	<TextArea fx:id="messageTextArea" onKeyReleased="#messageTextUpdated" onInputMethodTextChanged="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+      <Button mnemonicParsing="false" text="Add Contacts" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
+         <padding>
+            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+         </padding>
+      </Button>
 	</children>
 </GridPane>
diff --git a/src/main/resources/fxml/ContactSearchScene.fxml b/src/main/resources/fxml/ContactSearchScene.fxml
new file mode 100644
index 0000000..43eaa5f
--- /dev/null
+++ b/src/main/resources/fxml/ContactSearchScene.fxml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.VBox?>
+
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ContactSearchSceneController"
+	<!-- TODO Add Nodes -->
+</VBox>
+

From 2409c5b2f7ad9b113df1609bda442eca99f53f1f Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sun, 7 Jun 2020 16:26:54 +0200
Subject: [PATCH 41/60] Fix offline mode and local DB initialization

---
 .../envoy/client/data/PersistentLocalDB.java  | 14 +++++++-------
 src/main/java/envoy/client/net/Client.java    |  1 +
 .../java/envoy/client/ui/LoginDialog.java     | 19 +++++++++----------
 src/main/java/envoy/client/ui/Startup.java    |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/envoy/client/data/PersistentLocalDB.java b/src/main/java/envoy/client/data/PersistentLocalDB.java
index a4fe390..66bf167 100644
--- a/src/main/java/envoy/client/data/PersistentLocalDB.java
+++ b/src/main/java/envoy/client/data/PersistentLocalDB.java
@@ -40,18 +40,18 @@ public class PersistentLocalDB extends LocalDB {
 	 * Constructs an empty local database. To serialize any chats to the file
 	 * system, call {@link PersistentLocalDB#initializeUserStorage()}.
 	 *
-	 * @param localDbDir the directory in which to store users and chats
+	 * @param localDBDir the directory in which to store users and chats
 	 * @throws IOException if the PersistentLocalDB could not be initialized
 	 * @since Envoy Client v0.1-alpha
 	 */
-	public PersistentLocalDB(File localDbDir) throws IOException {
-		localDBDir = localDbDir;
+	public PersistentLocalDB(File localDBDir) throws IOException {
+		this.localDBDir = localDBDir;
 
 		// Initialize local database directory
-		if (localDbDir.exists() && !localDbDir.isDirectory())
-			throw new IOException(String.format("LocalDbDir '%s' is not a directory!", localDbDir.getAbsolutePath()));
-		usersFile		= new File(localDbDir, "users.db");
-		idGeneratorFile	= new File(localDbDir, "id_generator.db");
+		if (localDBDir.exists() && !localDBDir.isDirectory())
+			throw new IOException(String.format("LocalDbDir '%s' is not a directory!", localDBDir.getAbsolutePath()));
+		usersFile		= new File(localDBDir, "users.db");
+		idGeneratorFile	= new File(localDBDir, "id_generator.db");
 	}
 
 	/**
diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index 00a6ddf..ce9b3a6 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -223,6 +223,7 @@ public class Client implements Closeable {
 		checkOnline();
 		Map<String, Contact> users = new HashMap<>();
 		contacts.forEach(u -> users.put(u.getName(), u));
+		users.put(sender.getName(), sender);
 		return users;
 	}
 
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index cba70c9..4c52b0c 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -72,12 +72,15 @@ public final class LoginDialog extends Dialog<Void> {
 		this.localDB				= localDB;
 		this.receivedMessageCache	= receivedMessageCache;
 
+		// Prepare handshake
+		localDB.loadIDGenerator();
+
 		final var loader = new FXMLLoader(getClass().getResource("/fxml/LoginDialog.fxml"));
 		loader.setController(this);
 		final var dialogPane = loader.<DialogPane>load();
 
 		((Stage) getDialogPane().getScene().getWindow()).getIcons().add(IconUtil.load("/icons/envoy_logo.png"));
-		
+
 		// Configure dialog buttons
 		dialogPane.getButtonTypes().addAll(ButtonType.CLOSE, ButtonType.OK);
 
@@ -138,22 +141,18 @@ public final class LoginDialog extends Dialog<Void> {
 				Platform.runLater(this::hide);
 			}
 		} catch (IOException | InterruptedException | TimeoutException e) {
-			logger.warning("Could not connect to server. Trying offline mode...");
-			e.printStackTrace();
+			logger.warning("Could not connect to server: " + e);
+			logger.finer("Attempting offline mode...");
 			try {
 				// Try entering offline mode
 				localDB.loadUsers();
 				User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
 				if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
 				client.setSender(clientUser);
-				Platform.runLater(() -> {
-					new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.\n"
-							+ e)
-						.showAndWait();
-					hide();
-				});
+				new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.\n" + e).showAndWait();
+				hide();
 			} catch (Exception e1) {
-				Platform.runLater(() -> new Alert(AlertType.ERROR, "Client error: " + e.toString()).showAndWait());
+				new Alert(AlertType.ERROR, "Client error: " + e).showAndWait();
 				System.exit(1);
 			}
 		}
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index fa9fac0..1b5397d 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -115,7 +115,7 @@ public final class Startup extends Application {
 			localDB.getUsers()
 				.values()
 				.stream()
-				.filter(u -> u instanceof User && u != localDB.getUser())
+				.filter(User.class::isInstance)
 				.map(User.class::cast)
 				.forEach(u -> u.setStatus(UserStatus.OFFLINE));
 

From 33abd461a580e2e7ea7b197ac80b2ac09520d6c7 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Sun, 7 Jun 2020 17:03:02 +0200
Subject: [PATCH 42/60] Add offline mode check box and connection label to
 login dialog

---
 .../java/envoy/client/ui/LoginDialog.java     | 53 ++++++++++++-------
 src/main/resources/fxml/LoginDialog.fxml      |  4 +-
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/LoginDialog.java
index 4c52b0c..2968727 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/LoginDialog.java
@@ -49,6 +49,12 @@ public final class LoginDialog extends Dialog<Void> {
 	@FXML
 	private CheckBox registerCheckBox;
 
+	@FXML
+	private CheckBox offlineCheckBox;
+
+	@FXML
+	private Label connectionLabel;
+
 	private final Client			client;
 	private final LocalDB			localDB;
 	private final Cache<Message>	receivedMessageCache;
@@ -97,8 +103,12 @@ public final class LoginDialog extends Dialog<Void> {
 			if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
 				clearPasswordFields();
 				new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
-			} else
-				performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected()));
+			} else {
+				final var credentials = new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(),
+						registerCheckBox.isSelected());
+				if (!offlineCheckBox.isSelected()) performHandshake(credentials);
+				else attemptOfflineMode(credentials);
+			}
 		});
 
 		// Perform automatic login if configured
@@ -112,6 +122,7 @@ public final class LoginDialog extends Dialog<Void> {
 
 	@FXML
 	private void initialize() {
+		connectionLabel.setText("Server: " + config.getServer() + ":" + config.getPort());
 
 		// Show an alert after an unsuccessful handshake
 		eventBus.register(HandshakeRejectionEvent.class,
@@ -128,11 +139,6 @@ public final class LoginDialog extends Dialog<Void> {
 		clearPasswordFields();
 	}
 
-	private void abortLogin() {
-		logger.info("The login process has been cancelled. Exiting...");
-		System.exit(0);
-	}
-
 	private void performHandshake(LoginCredentials credentials) {
 		try {
 			client.performHandshake(credentials, receivedMessageCache);
@@ -143,18 +149,22 @@ public final class LoginDialog extends Dialog<Void> {
 		} catch (IOException | InterruptedException | TimeoutException e) {
 			logger.warning("Could not connect to server: " + e);
 			logger.finer("Attempting offline mode...");
-			try {
-				// Try entering offline mode
-				localDB.loadUsers();
-				User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
-				if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
-				client.setSender(clientUser);
-				new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.\n" + e).showAndWait();
-				hide();
-			} catch (Exception e1) {
-				new Alert(AlertType.ERROR, "Client error: " + e).showAndWait();
-				System.exit(1);
-			}
+			attemptOfflineMode(credentials);
+		}
+	}
+
+	private void attemptOfflineMode(LoginCredentials credentials) {
+		try {
+			// Try entering offline mode
+			localDB.loadUsers();
+			User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
+			if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
+			client.setSender(clientUser);
+			new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.").showAndWait();
+			hide();
+		} catch (Exception e) {
+			new Alert(AlertType.ERROR, "Client error: " + e).showAndWait();
+			System.exit(1);
 		}
 	}
 
@@ -162,4 +172,9 @@ public final class LoginDialog extends Dialog<Void> {
 		passwordField.clear();
 		repeatPasswordField.clear();
 	}
+
+	private void abortLogin() {
+		logger.info("The login process has been cancelled. Exiting...");
+		System.exit(0);
+	}
 }
diff --git a/src/main/resources/fxml/LoginDialog.fxml b/src/main/resources/fxml/LoginDialog.fxml
index 1d3cc2f..b3dd3e4 100644
--- a/src/main/resources/fxml/LoginDialog.fxml
+++ b/src/main/resources/fxml/LoginDialog.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<DialogPane prefHeight="201.0" prefWidth="525.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<DialogPane prefHeight="265.0" prefWidth="545.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
 	<content>
 		<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="217.0" prefWidth="545.0">
 			<children>
@@ -40,6 +40,8 @@
 					</children>
 				</GridPane>
 				<CheckBox fx:id="registerCheckBox" mnemonicParsing="false" onAction="#registerCheckboxChanged" prefHeight="17.0" prefWidth="181.0" text="Register" />
+            <Label fx:id="connectionLabel" />
+            <CheckBox fx:id="offlineCheckBox" layoutX="20.0" layoutY="144.0" mnemonicParsing="false" prefHeight="17.0" prefWidth="181.0" text="Offline mode" />
 			</children>
 		</VBox>
 	</content>

From a0e11d99ca99934dbcd3cfb5ffe28a3145acb55d Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sun, 7 Jun 2020 20:46:04 +0200
Subject: [PATCH 43/60] Implemented ContactSearchScene completely

additionally added default keyboard shortcuts for all buttons
---
 .../envoy/client/ui/ChatSceneController.java  |  38 +++++-
 .../ui/ContactSearchSceneController.java      | 117 ++++++++++++++++++
 src/main/resources/fxml/ChatScene.fxml        |  11 +-
 .../resources/fxml/ContactSearchScene.fxml    |  65 +++++++++-
 src/main/resources/fxml/LoginDialog.fxml      |   6 +-
 src/main/resources/fxml/SettingsScene.fxml    |   2 +-
 6 files changed, 223 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/envoy/client/ui/ContactSearchSceneController.java

diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index 56fbe2c..bcf8a19 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -25,6 +25,7 @@ import envoy.data.MessageBuilder;
 import envoy.event.EventBus;
 import envoy.event.MessageStatusChangeEvent;
 import envoy.event.UserStatusChangeEvent;
+import envoy.event.contact.ContactOperationEvent;
 import envoy.util.EnvoyLog;
 
 /**
@@ -90,9 +91,25 @@ public final class ChatSceneController {
 			// Update UI if in current chat
 			if (currentChat != null && message.getSenderID() == currentChat.getRecipient().getID()) Platform.runLater(() -> messageList.refresh());
 		});
-
 		// Listen to user status changes
-		eventBus.register(UserStatusChangeEvent.class, e -> Platform.runLater(() -> userList.refresh()));
+		eventBus.register(UserStatusChangeEvent.class, e -> Platform.runLater(userList::refresh));
+
+		// Listen to contacts changes
+		eventBus.register(ContactOperationEvent.class, e -> {
+			final var contact = e.get();
+			Platform.runLater(() -> {
+				switch (e.getOperationType()) {
+					case ADD:
+						localDB.getUsers().put(contact.getName(), contact);
+						localDB.getChats().add(new Chat(contact));
+						userList.getItems().add(contact);// TODO might cause contact duplication
+						break;
+					case REMOVE:
+						// TODO add deletion capability
+						break;
+				}
+			});
+		});
 	}
 
 	void initializeData(SceneContext sceneContext, LocalDB localDB, Client client, WriteProxy writeProxy) {
@@ -118,10 +135,11 @@ public final class ChatSceneController {
 				.stream()
 				.filter(c -> c.getRecipient().getID() == user.getID())
 				.findAny()
-				.orElseGet(() -> { var chat = new Chat(user); localDB.getChats().add(chat); return chat; });
+				.orElseGet(() -> { final var chat = new Chat(user); localDB.getChats().add(chat); return chat; });
 
 			messageList.setItems(FXCollections.observableList(currentChat.getMessages()));
 		}
+		messageTextArea.setDisable(currentChat == null);
 	}
 
 	@FXML
@@ -132,7 +150,17 @@ public final class ChatSceneController {
 		try {
 			sceneContext.load(SceneContext.SceneInfo.SETTINGS_SCENE);
 			sceneContext.<SettingsSceneController>getController().initializeData(sceneContext);
-		} catch (IOException e) {
+		} catch (final IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@FXML
+	private void addContactButtonClicked() {
+		try {
+			sceneContext.load(SceneContext.SceneInfo.CONTACT_SEARCH_SCENE);
+			sceneContext.<ContactSearchSceneController>getController().initializeData(sceneContext);
+		} catch (final IOException e) {
 			e.printStackTrace();
 		}
 	}
@@ -182,7 +210,7 @@ public final class ChatSceneController {
 			// Request a new ID generator if all IDs were used
 			if (!localDB.getIDGenerator().hasNext() && client.isOnline()) client.requestIdGenerator();
 
-		} catch (IOException e) {
+		} catch (final IOException e) {
 			logger.log(Level.SEVERE, "Error sending message", e);
 		}
 	}
diff --git a/src/main/java/envoy/client/ui/ContactSearchSceneController.java b/src/main/java/envoy/client/ui/ContactSearchSceneController.java
new file mode 100644
index 0000000..da4e2c0
--- /dev/null
+++ b/src/main/java/envoy/client/ui/ContactSearchSceneController.java
@@ -0,0 +1,117 @@
+package envoy.client.ui;
+
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ListView;
+import javafx.scene.control.TextField;
+
+import envoy.client.event.SendEvent;
+import envoy.data.Contact;
+import envoy.event.ElementOperation;
+import envoy.event.EventBus;
+import envoy.event.contact.ContactOperationEvent;
+import envoy.event.contact.ContactSearchRequest;
+import envoy.event.contact.ContactSearchResult;
+import envoy.util.EnvoyLog;
+
+/**
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>ContactSearchSceneController.java</strong><br>
+ * Created: <strong>07.06.2020</strong><br>
+ *
+ * @author Leon Hofmeister
+ * @since Envoy Client v0.1-beta
+ */
+public class ContactSearchSceneController {
+
+	@FXML
+	private Button backButton;
+
+	@FXML
+	private Button clearButton;
+
+	@FXML
+	private Button searchButton;
+
+	@FXML
+	private TextField searchBar;
+
+	@FXML
+	private ListView<Contact> contactList;
+
+	private SceneContext sceneContext;
+
+	private static EventBus		eventBus	= EventBus.getInstance();
+	private static final Logger	logger		= EnvoyLog.getLogger(ChatSceneController.class);
+
+	/**
+	 * @param sceneContext enables the user to return to the chat scene
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void initializeData(SceneContext sceneContext) { this.sceneContext = sceneContext; }
+
+	@FXML
+	private void initialize() {
+		contactList.setCellFactory(e -> new UserListCell());
+		eventBus.register(ContactSearchResult.class, response -> Optional.of(response.get()).ifPresent(list -> contactList.getItems().addAll(list)));
+	}
+
+	/**
+	 * Disables the clear and search button if no text is present in the search bar.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
+	@FXML
+	private void checkClearButton() {
+		final var containsContent = searchBar.getText().strip().isEmpty();
+		clearButton.setDisable(containsContent);
+		searchButton.setDisable(containsContent);
+	}
+
+	/**
+	 * Sends a {@link ContactSearchRequest} to the server.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
+	@FXML
+	private void suggestContacts() { eventBus.dispatch(new SendEvent(new ContactSearchRequest(searchBar.getText()))); }
+
+	/**
+	 * Clears the text in the search bar and the items shown in the list.
+	 * Additionally disables both clear and search button.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
+	@FXML
+	private void clear() {
+		searchBar.setText(null);
+		contactList.getItems().clear();
+		clearButton.setDisable(true);
+		searchButton.setDisable(true);
+	}
+
+	/**
+	 * Sends an {@link ContactOperationEvent} for every selected contact to the
+	 * server.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
+	@FXML
+	private void contactListClicked() {
+		Optional.ofNullable(contactList.getSelectionModel().getSelectedItems()).ifPresent(contacts -> contacts.forEach(contact -> {
+			final var event = new ContactOperationEvent(contact, ElementOperation.ADD);
+			// Sends the event to the server
+			eventBus.dispatch(new SendEvent(event));
+			// Updates the UI
+			eventBus.dispatch(event);
+			logger.log(Level.INFO, "Added contact " + contact);
+		}));
+	}
+
+	@FXML
+	private void backButtonClicked() { sceneContext.pop(); }
+}
diff --git a/src/main/resources/fxml/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
index fa234ca..cd18dd8 100644
--- a/src/main/resources/fxml/ChatScene.fxml
+++ b/src/main/resources/fxml/ChatScene.fxml
@@ -24,14 +24,17 @@
 	<children>
 		<ListView fx:id="userList" onMouseClicked="#userListClicked" prefHeight="211.0" prefWidth="300.0" GridPane.rowIndex="1" GridPane.rowSpan="2147483647" />
 		<Label fx:id="contactLabel" prefHeight="16.0" prefWidth="250.0" text="Select a contact to chat with" GridPane.columnSpan="2" />
-		<Button fx:id="settingsButton" mnemonicParsing="false" onAction="#settingsButtonClicked" text="Settings" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
+		<Button fx:id="settingsButton" mnemonicParsing="true" onAction="#settingsButtonClicked" text="_Settings" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
 		<ListView fx:id="messageList" prefHeight="257.0" prefWidth="155.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2" />
-		<Button fx:id="postButton" defaultButton="true" disable="true" mnemonicParsing="false" onAction="#postButtonClicked" prefHeight="10.0" prefWidth="65.0" text="Post" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
-      	<TextArea fx:id="messageTextArea" onKeyReleased="#messageTextUpdated" onInputMethodTextChanged="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-      <Button mnemonicParsing="false" text="Add Contacts" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
+		<Button fx:id="postButton" defaultButton="true" disable="true" mnemonicParsing="true" onAction="#postButtonClicked" prefHeight="10.0" prefWidth="65.0" text="_Post" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
+      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyReleased="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+      <Button mnemonicParsing="true" onAction="#addContactButtonClicked" text="_Add Contacts" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
          <padding>
             <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
          </padding>
+         <GridPane.margin>
+            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+         </GridPane.margin>
       </Button>
 	</children>
 </GridPane>
diff --git a/src/main/resources/fxml/ContactSearchScene.fxml b/src/main/resources/fxml/ContactSearchScene.fxml
index 43eaa5f..a50d6be 100644
--- a/src/main/resources/fxml/ContactSearchScene.fxml
+++ b/src/main/resources/fxml/ContactSearchScene.fxml
@@ -1,8 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ContactSearchSceneController"
-	<!-- TODO Add Nodes -->
-</VBox>
 
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ContactSearchSceneController">
+   <children>
+      <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+         <children>
+            <TextField fx:id="searchBar" onInputMethodTextChanged="#checkClearButton" onKeyTyped="#checkClearButton" prefColumnCount="22" promptText="Enter username to search for">
+               <HBox.margin>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </HBox.margin>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+               <tooltip>
+                  <Tooltip text="Enter a name. If an account by that name exists, it will be displayed below." wrapText="true" />
+               </tooltip>
+            </TextField>
+            <Button fx:id="clearButton" disable="true" mnemonicParsing="true" onAction="#clear" text="Clea_r">
+               <tooltip>
+                  <Tooltip autoHide="true" text="Clears the text to the left and the elements below" wrapText="true" />
+               </tooltip>
+            </Button>
+            <Pane disable="true" maxWidth="20.0" prefWidth="20.0" visible="false">
+               <HBox.margin>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </HBox.margin>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </Pane>
+            <Button fx:id="searchButton" disable="true" defaultButton="true" mnemonicParsing="true" onAction="#suggestContacts" prefHeight="26.0" prefWidth="71.0" text="_Search" textOverrun="LEADING_WORD_ELLIPSIS">
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+               <HBox.margin>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </HBox.margin>
+               <tooltip>
+                  <Tooltip autoHide="true" text="Search for accounts with the name entered to the left" wrapText="true" />
+               </tooltip>
+            </Button>
+         </children>
+      </HBox>
+      <ListView fx:id="contactList" onMouseClicked="#contactListClicked" prefHeight="314.0" prefWidth="600.0" />
+      <Button fx:id="backButton" cancelButton="true" mnemonicParsing="true" onAction="#backButtonClicked" text="_Back">
+         <VBox.margin>
+            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+         </VBox.margin>
+         <padding>
+            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+         </padding>
+         <tooltip>
+            <Tooltip autoHide="true" text="Takes you back to the screen where you can chat with others" wrapText="true" />
+         </tooltip>
+      </Button>
+   </children>
+</VBox>
diff --git a/src/main/resources/fxml/LoginDialog.fxml b/src/main/resources/fxml/LoginDialog.fxml
index b3dd3e4..3da8595 100644
--- a/src/main/resources/fxml/LoginDialog.fxml
+++ b/src/main/resources/fxml/LoginDialog.fxml
@@ -36,12 +36,12 @@
 						<Label fx:id="repeatPasswordLabel" text="Repeat Password:" visible="false" GridPane.rowIndex="2" />
 						<TextField fx:id="userTextField" GridPane.columnIndex="1" />
 						<PasswordField fx:id="passwordField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-						<PasswordField fx:id="repeatPasswordField" visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+						<PasswordField fx:id="repeatPasswordField" promptText="Repeat the chosen password" visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2" />
 					</children>
 				</GridPane>
-				<CheckBox fx:id="registerCheckBox" mnemonicParsing="false" onAction="#registerCheckboxChanged" prefHeight="17.0" prefWidth="181.0" text="Register" />
+				<CheckBox fx:id="registerCheckBox" mnemonicParsing="true" onAction="#registerCheckboxChanged" prefHeight="17.0" prefWidth="181.0" text="_Register" />
             <Label fx:id="connectionLabel" />
-            <CheckBox fx:id="offlineCheckBox" layoutX="20.0" layoutY="144.0" mnemonicParsing="false" prefHeight="17.0" prefWidth="181.0" text="Offline mode" />
+            <CheckBox fx:id="offlineCheckBox" layoutX="20.0" layoutY="144.0" mnemonicParsing="true" prefHeight="17.0" prefWidth="181.0" text="_Offline mode" />
 			</children>
 		</VBox>
 	</content>
diff --git a/src/main/resources/fxml/SettingsScene.fxml b/src/main/resources/fxml/SettingsScene.fxml
index d61fb53..0620305 100644
--- a/src/main/resources/fxml/SettingsScene.fxml
+++ b/src/main/resources/fxml/SettingsScene.fxml
@@ -15,7 +15,7 @@
             <TitledPane fx:id="titledPane" collapsible="false" prefHeight="200.0" prefWidth="200.0" />
          </children>
 		</HBox>
-      <Button defaultButton="true" mnemonicParsing="false" onMouseClicked="#backButtonClicked" text="Back">
+      <Button defaultButton="true" mnemonicParsing="true" onMouseClicked="#backButtonClicked" text="_Back">
          <opaqueInsets>
             <Insets />
          </opaqueInsets>

From a3add72838330dafa0a875155bb9cff7794174e1 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Sun, 7 Jun 2020 23:28:25 +0200
Subject: [PATCH 44/60] Added elegant way of displaying remaining characters
 for a message

additionally FOUND (not fixed) a bug automatically posting a message
when ctrl is no longer pressed
---
 .../envoy/client/ui/ChatSceneController.java  | 32 +++++++++++++++++--
 src/main/resources/fxml/ChatScene.fxml        | 14 ++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/ChatSceneController.java
index bcf8a19..14b1a7e 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/ChatSceneController.java
@@ -11,6 +11,7 @@ import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.paint.Color;
 
 import envoy.client.data.Chat;
 import envoy.client.data.LocalDB;
@@ -56,6 +57,9 @@ public final class ChatSceneController {
 	@FXML
 	private TextArea messageTextArea;
 
+	@FXML
+	private Label remainingChars;
+
 	private LocalDB			localDB;
 	private Client			client;
 	private WriteProxy		writeProxy;
@@ -63,9 +67,10 @@ public final class ChatSceneController {
 
 	private Chat currentChat;
 
-	private static final Settings	settings	= Settings.getInstance();
-	private static final EventBus	eventBus	= EventBus.getInstance();
-	private static final Logger		logger		= EnvoyLog.getLogger(ChatSceneController.class);
+	private static final Settings	settings			= Settings.getInstance();
+	private static final EventBus	eventBus			= EventBus.getInstance();
+	private static final Logger		logger				= EnvoyLog.getLogger(ChatSceneController.class);
+	private static final int		MAX_MESSAGE_LENGTH	= 255;
 
 	@FXML
 	private void initialize() {
@@ -138,6 +143,10 @@ public final class ChatSceneController {
 				.orElseGet(() -> { final var chat = new Chat(user); localDB.getChats().add(chat); return chat; });
 
 			messageList.setItems(FXCollections.observableList(currentChat.getMessages()));
+
+			remainingChars.setVisible(true);
+			remainingChars
+				.setText(String.format("remaining chars: %d/%d", MAX_MESSAGE_LENGTH - messageTextArea.getText().length(), MAX_MESSAGE_LENGTH));
 		}
 		messageTextArea.setDisable(currentChat == null);
 	}
@@ -167,10 +176,27 @@ public final class ChatSceneController {
 
 	@FXML
 	private void messageTextUpdated(KeyEvent e) {
+		// TODO: Letting go of ctrl automatically posts a message. Needs to be fixed
+		// soon.
+
+		// Automatic sending of messages via (ctrl +) enter
 		if (!postButton.isDisabled() && settings.isEnterToSend() && e.getCode() == KeyCode.ENTER
 				|| !settings.isEnterToSend() && e.getCode() == KeyCode.CONTROL)
 			postMessage();
 		else postButton.setDisable(messageTextArea.getText().isBlank() || currentChat == null);
+
+		// Truncating messages that are too long and staying at the same position
+		if (messageTextArea.getText().length() >= MAX_MESSAGE_LENGTH) {
+			messageTextArea.setText(messageTextArea.getText().substring(0, MAX_MESSAGE_LENGTH));
+			messageTextArea.positionCaret(MAX_MESSAGE_LENGTH);
+			messageTextArea.setScrollTop(Double.MAX_VALUE);
+		}
+
+		// Redesigning the remainingChars - Label
+		final int	currentLength	= messageTextArea.getText().length();
+		final int	remainingLength	= MAX_MESSAGE_LENGTH - currentLength;
+		remainingChars.setText(String.format("remaining chars: %d/%d", remainingLength, MAX_MESSAGE_LENGTH));
+		remainingChars.setTextFill(Color.rgb(currentLength, remainingLength, 0, 1));
 	}
 
 	/**
diff --git a/src/main/resources/fxml/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
index cd18dd8..6f2b0b8 100644
--- a/src/main/resources/fxml/ChatScene.fxml
+++ b/src/main/resources/fxml/ChatScene.fxml
@@ -17,8 +17,8 @@
 	</columnConstraints>
 	<rowConstraints>
 		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="10.0" prefHeight="70.0" vgrow="SOMETIMES" />
-		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="60.0" prefHeight="326.2857404436384" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="15.0" prefHeight="50.0" vgrow="SOMETIMES" />
+		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="70.0" prefHeight="326.2857404436384" vgrow="SOMETIMES" />
+      <RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="5.0" prefHeight="50.0" vgrow="SOMETIMES" />
 		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="15.0" prefHeight="100.0" vgrow="SOMETIMES" />
 	</rowConstraints>
 	<children>
@@ -27,7 +27,7 @@
 		<Button fx:id="settingsButton" mnemonicParsing="true" onAction="#settingsButtonClicked" text="_Settings" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
 		<ListView fx:id="messageList" prefHeight="257.0" prefWidth="155.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2" />
 		<Button fx:id="postButton" defaultButton="true" disable="true" mnemonicParsing="true" onAction="#postButtonClicked" prefHeight="10.0" prefWidth="65.0" text="_Post" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
-      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyReleased="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyTyped="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <Button mnemonicParsing="true" onAction="#addContactButtonClicked" text="_Add Contacts" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
          <padding>
             <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
@@ -36,5 +36,13 @@
             <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
          </GridPane.margin>
       </Button>
+      <Label fx:id="remainingChars" disable="true" ellipsisString="" maxHeight="30.0" maxWidth="180.0" prefHeight="30.0" prefWidth="180.0" text="remaining chars: 0/x" textFill="LIME" textOverrun="LEADING_WORD_ELLIPSIS" visible="false" GridPane.columnIndex="1" GridPane.rowIndex="2">
+         <GridPane.margin>
+            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+         </GridPane.margin>
+         <padding>
+            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+         </padding>
+      </Label>
 	</children>
 </GridPane>

From 6974d449585e99f8c09764aef977757c3d7d139c Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Mon, 8 Jun 2020 08:45:15 +0200
Subject: [PATCH 45/60] Fix minor error when popping the last scene

---
 src/main/java/envoy/client/ui/SceneContext.java | 10 ++++++++--
 src/main/java/envoy/client/ui/Startup.java      |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/envoy/client/ui/SceneContext.java b/src/main/java/envoy/client/ui/SceneContext.java
index 1644955..d261000 100644
--- a/src/main/java/envoy/client/ui/SceneContext.java
+++ b/src/main/java/envoy/client/ui/SceneContext.java
@@ -13,6 +13,10 @@ import envoy.client.event.ThemeChangeEvent;
 import envoy.event.EventBus;
 
 /**
+ * Manages a stack of scenes. The most recently added scene is displayed inside
+ * a stage. When a scene is removed from the stack, its predecessor is
+ * displayed.<br>
+ * <br>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SceneContext.java</strong><br>
  * Created: <strong>06.06.2020</strong><br>
@@ -75,8 +79,10 @@ public final class SceneContext {
 	 */
 	public void pop() {
 		sceneStack.pop();
-		stage.setScene(sceneStack.peek());
-		applyCSS();
+		if (!sceneStack.isEmpty()) {
+			stage.setScene(sceneStack.peek());
+			applyCSS();
+		}
 		stage.show();
 	}
 
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 1b5397d..55afb40 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -123,6 +123,7 @@ public final class Startup extends Application {
 		final var sceneContext = new SceneContext(stage);
 		sceneContext.load(SceneContext.SceneInfo.CHAT_SCENE);
 		sceneContext.<ChatSceneController>getController().initializeData(sceneContext, localDB, client, writeProxy);
+
 		stage.setTitle("Envoy");
 		stage.setMinHeight(400);
 		stage.setMinWidth(350);
@@ -137,7 +138,7 @@ public final class Startup extends Application {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void stop() throws Exception {
+	public void stop() {
 		try {
 			// Save Settings and PersistentLocalDB on shutdown
 			logger.info("Closing connection...");

From 5e73334e354a1a7fe6a64bd07c73d577093841c2 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Mon, 8 Jun 2020 09:14:57 +0200
Subject: [PATCH 46/60] Remove Theme class and code related to it

This is a preparation for loading themes from CSS files.
---
 src/main/java/envoy/client/data/Settings.java |  73 +------
 .../java/envoy/client/data/SettingsItem.java  |   2 +-
 .../envoy/client/event/ThemeChangeEvent.java  |   9 +-
 src/main/java/envoy/client/ui/Color.java      | 114 ----------
 .../java/envoy/client/ui/ContextMenu.java     | 198 ------------------
 .../java/envoy/client/ui/SceneContext.java    |   9 +-
 src/main/java/envoy/client/ui/Theme.java      | 146 -------------
 src/main/resources/css/custom.css             |   0
 8 files changed, 13 insertions(+), 538 deletions(-)
 delete mode 100644 src/main/java/envoy/client/ui/Color.java
 delete mode 100644 src/main/java/envoy/client/ui/ContextMenu.java
 delete mode 100755 src/main/java/envoy/client/ui/Theme.java
 delete mode 100644 src/main/resources/css/custom.css

diff --git a/src/main/java/envoy/client/data/Settings.java b/src/main/java/envoy/client/data/Settings.java
index 4e36369..3b1718c 100644
--- a/src/main/java/envoy/client/data/Settings.java
+++ b/src/main/java/envoy/client/data/Settings.java
@@ -6,8 +6,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.prefs.Preferences;
 
-import envoy.client.ui.Color;
-import envoy.client.ui.Theme;
 import envoy.util.SerializationUtils;
 
 /**
@@ -28,18 +26,12 @@ public class Settings {
 
 	// Actual settings accessible by the rest of the application
 	private Map<String, SettingsItem<?>>	items;
-	private Map<String, Theme>				themes;
 
 	/**
 	 * Settings are stored in this file.
 	 */
 	private static final File settingsFile = new File(ClientConfig.getInstance().getHomeDirectory(), "settings.ser");
 
-	/**
-	 * User-defined themes are stored inside this file.
-	 */
-	private static final File themeFile = new File(ClientConfig.getInstance().getHomeDirectory(), "themes.ser");
-
 	/**
 	 * Singleton instance of this class.
 	 */
@@ -59,22 +51,6 @@ public class Settings {
 			items = new HashMap<>();
 		}
 		supplementDefaults();
-
-		// Load themes from theme file
-		try {
-			themes = SerializationUtils.read(themeFile, HashMap.class);
-		} catch (ClassNotFoundException | IOException e1) {
-			themes = new HashMap<>();
-			setCurrentTheme("dark");
-		}
-
-		// Load standard themes not defined in the themes file
-		themes.put("dark",
-				new Theme("dark", Color.black, Color.darkGray, Color.white, new Color(165, 60, 232), Color.white, Color.orange, Color.blue,
-						Color.white, Color.white));
-		themes.put("light",
-				new Theme("light", new Color(235, 235, 235), Color.white, Color.white, Color.darkGray, Color.black, Color.orange, Color.darkGray,
-						Color.black, Color.black));
 	}
 
 	/**
@@ -95,9 +71,6 @@ public class Settings {
 
 		// Save settings to settings file
 		SerializationUtils.write(settingsFile, items);
-
-		// Save themes to theme file
-		SerializationUtils.write(themeFile, themes);
 	}
 
 	private void supplementDefaults() {
@@ -107,40 +80,19 @@ public class Settings {
 	}
 
 	/**
-	 * Adds new theme to the theme map.
-	 *
-	 * @param theme the {@link Theme} to add
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public void addNewThemeToMap(Theme theme) { getThemes().put(theme.getThemeName(), theme); }
-
-	/**
-	 * @return the name of the currently active {@link Theme}
+	 * @return the name of the currently active theme
 	 * @since Envoy Client v0.2-alpha
 	 */
 	public String getCurrentThemeName() { return (String) items.get("currentTheme").get(); }
 
 	/**
-	 * @return the currently active {@link Theme}
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Theme getCurrentTheme() { return getTheme(getCurrentThemeName()); }
-
-	/**
-	 * Sets the name of the current {@link Theme}.
+	 * Sets the name of the current theme.
 	 *
 	 * @param themeName the name to set
 	 * @since Envoy Client v0.2-alpha
 	 */
 	public void setCurrentTheme(String themeName) { ((SettingsItem<String>) items.get("currentTheme")).set(themeName); }
 
-	/**
-	 * @return whether the current {@link Theme} is one of the default themes.
-	 *         Currently checks for dark and light theme.
-	 * @since Envoy Client v0.1-beta
-	 */
-	public boolean isUsingDefaultTheme() { return getCurrentThemeName().equals("dark") || getCurrentThemeName().equals("light"); }
-
 	/**
 	 * @return {@code true}, if pressing the {@code Enter} key suffices to send a
 	 *         message. Otherwise it has to be pressed in conjunction with the
@@ -182,25 +134,4 @@ public class Settings {
 	 * @param items the items to set
 	 */
 	public void setItems(Map<String, SettingsItem<?>> items) { this.items = items; }
-
-	/**
-	 * @return a {@code Map<String, Theme>} of all themes with their names as keys
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Map<String, Theme> getThemes() { return themes; }
-
-	/**
-	 * Sets the {@code Map<String, Theme>} of all themes with their names as keys
-	 *
-	 * @param themes the theme map to set
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public void setThemes(Map<String, Theme> themes) { this.themes = themes; }
-
-	/**
-	 * @param themeName the name of the {@link Theme} to get
-	 * @return the {@link Theme} with the specified name
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public Theme getTheme(String themeName) { return themes.get(themeName); }
 }
diff --git a/src/main/java/envoy/client/data/SettingsItem.java b/src/main/java/envoy/client/data/SettingsItem.java
index 98a562d..8638c05 100644
--- a/src/main/java/envoy/client/data/SettingsItem.java
+++ b/src/main/java/envoy/client/data/SettingsItem.java
@@ -22,7 +22,7 @@ public class SettingsItem<T> implements Serializable {
 	private T		value;
 	private String	userFriendlyName, description;
 
-	private transient Consumer<T>								changeHandler;
+	private transient Consumer<T> changeHandler;
 
 	private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/envoy/client/event/ThemeChangeEvent.java b/src/main/java/envoy/client/event/ThemeChangeEvent.java
index 0967fc0..572476b 100644
--- a/src/main/java/envoy/client/event/ThemeChangeEvent.java
+++ b/src/main/java/envoy/client/event/ThemeChangeEvent.java
@@ -1,6 +1,5 @@
 package envoy.client.event;
 
-import envoy.client.ui.Theme;
 import envoy.event.Event;
 
 /**
@@ -11,16 +10,16 @@ import envoy.event.Event;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.2-alpha
  */
-public class ThemeChangeEvent extends Event<Theme> {
+public class ThemeChangeEvent extends Event<String> {
 
 	private static final long serialVersionUID = 0L;
 
 	/**
 	 * Initializes a {@link ThemeChangeEvent} conveying information about the change
-	 * of the {@link Theme} currently in use
+	 * of the theme currently in use.
 	 *
-	 * @param theme the new currently used {@link Theme} object
+	 * @param theme the name of the new theme
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public ThemeChangeEvent(Theme theme) { super(theme); }
+	public ThemeChangeEvent(String theme) { super(theme); }
 }
diff --git a/src/main/java/envoy/client/ui/Color.java b/src/main/java/envoy/client/ui/Color.java
deleted file mode 100644
index da58bbb..0000000
--- a/src/main/java/envoy/client/ui/Color.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package envoy.client.ui;
-
-import java.awt.color.ColorSpace;
-
-/**
- * This class further develops {@link java.awt.Color} by adding extra methods
- * and more default colors.
- *
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>Color.java</strong><br>
- * Created: <strong>23.12.2019</strong><br>
- *
- * @author Kai S. K. Engelbart
- * @since Envoy Client v0.3-alpha
- */
-@SuppressWarnings("javadoc")
-public class Color extends java.awt.Color {
-
-	/**
-	 * The color white. In the default sRGB space.
-	 */
-	public static final Color white = new Color(255, 255, 255);
-
-	/**
-	 * The color light gray. In the default sRGB space.
-	 */
-	public static final Color lightGray = new Color(192, 192, 192);
-
-	/**
-	 * The color gray. In the default sRGB space.
-	 */
-	public static final Color gray = new Color(128, 128, 128);
-
-	/**
-	 * The color dark gray. In the default sRGB space.
-	 */
-	public static final Color darkGray = new Color(64, 64, 64);
-
-	/**
-	 * The color black. In the default sRGB space.
-	 */
-	public static final Color black = new Color(0, 0, 0);
-
-	/**
-	 * The color red. In the default sRGB space.
-	 */
-	public static final Color red = new Color(255, 0, 0);
-
-	/**
-	 * The color pink. In the default sRGB space.
-	 */
-	public static final Color pink = new Color(255, 175, 175);
-
-	/**
-	 * The color orange. In the default sRGB space.
-	 */
-	public static final Color orange = new Color(255, 200, 0);
-
-	/**
-	 * The color yellow. In the default sRGB space.
-	 */
-	public static final Color yellow = new Color(255, 255, 0);
-
-	/**
-	 * The color green. In the default sRGB space.
-	 */
-	public static final Color green = new Color(0, 255, 0);
-
-	/**
-	 * The color magenta. In the default sRGB space.
-	 */
-	public static final Color magenta = new Color(255, 0, 255);
-
-	/**
-	 * The color cyan. In the default sRGB space.
-	 */
-	public static final Color cyan = new Color(0, 255, 255);
-
-	/**
-	 * The color blue. In the default sRGB space.
-	 */
-	public static final Color blue = new Color(0, 0, 255);
-
-	private static final long serialVersionUID = 0L;
-
-	public Color(java.awt.Color other) { this(other.getRGB()); }
-
-	public Color(int rgb) { super(rgb); }
-
-	public Color(int rgba, boolean hasalpha) { super(rgba, hasalpha); }
-
-	public Color(int r, int g, int b) { super(r, g, b); }
-
-	public Color(float r, float g, float b) { super(r, g, b); }
-
-	public Color(ColorSpace cspace, float[] components, float alpha) { super(cspace, components, alpha); }
-
-	public Color(int r, int g, int b, int a) { super(r, g, b, a); }
-
-	public Color(float r, float g, float b, float a) { super(r, g, b, a); }
-
-	/**
-	 * @return the inversion of this {@link Color} by replacing the red, green and
-	 *         blue values by subtracting them form 255
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public Color invert() { return new Color(255 - getRed(), 255 - getGreen(), 255 - getBlue()); }
-
-	/**
-	 * @return the hex value of this {@link Color}
-	 * @since Envoy Client v0.3-alpha
-	 */
-	public String toHex() { return String.format("#%02x%02x%02x", getRed(), getGreen(), getBlue()); }
-}
diff --git a/src/main/java/envoy/client/ui/ContextMenu.java b/src/main/java/envoy/client/ui/ContextMenu.java
deleted file mode 100644
index 64e3abb..0000000
--- a/src/main/java/envoy/client/ui/ContextMenu.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package envoy.client.ui;
-
-import java.awt.Component;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.*;
-
-/**
- * This class defines a menu that will be automatically called if
- * {@link MouseEvent#isPopupTrigger()} returns true for the parent component.
- * The user has the possibility to directly add actions to be performed when
- * clicking on the element with the selected String. Additionally, for each
- * element an {@link Icon} can be added, but it must not be.
- * If the key(text) of an element starts with one of the predefined values, a
- * special component will be called: either a {@link JRadioButtonMenuItem}, a
- * {@link JCheckBoxMenuItem} or a {@link JMenu} will be created.<br>
- * <br>
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>ContextMenu.java</strong><br>
- * Created: <strong>17 Mar 2020</strong><br>
- *
- * @author Leon Hofmeister
- * @since Envoy Client v0.1-beta
- */
-public class ContextMenu extends JPopupMenu {
-
-	private static final long serialVersionUID = 0L;
-
-	/**
-	 * If a key starts with this String, a {@link JCheckBoxMenuItem} will be created
-	 */
-	public static final String	checkboxMenuItem	= "ChBoMI";
-	/**
-	 * If a key starts with this String, a {@link JRadioButtonMenuItem} will be
-	 * created
-	 */
-	public static final String	radioButtonMenuItem	= "RaBuMI";
-	/**
-	 * If a key starts with this String, a {@link JMenu} will be created
-	 */
-	public static final String	subMenuItem			= "SubMI";
-
-	private Map<String, ActionListener>	items		= new HashMap<>();
-	private Map<String, Icon>			icons		= new HashMap<>();
-	private Map<String, Integer>		mnemonics	= new HashMap<>();
-
-	private ButtonGroup	radioButtonGroup	= new ButtonGroup();
-	private boolean		built				= false;
-
-	/**
-	 * @param parent the component which will call this
-	 *               {@link ContextMenu}
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContextMenu(Component parent) { setInvoker(parent); }
-
-	/**
-	 * @param label            the string that a UI may use to display as a title
-	 *                         for the pop-up menu
-	 * @param parent           the component which will call this
-	 *                         {@link ContextMenu}
-	 * @param itemsWithActions a map of all strings to be displayed with according
-	 *                         actions
-	 * @param itemIcons        the icons to be displayed before a name, if wanted.
-	 *                         Only keys in here will have an Icon displayed. More
-	 *                         precisely, all keys here not included in the first
-	 *                         map will be thrown out.
-	 * @param itemMnemonics    the keyboard shortcuts that need to be pressed to
-	 *                         automatically execute the {@link JMenuItem} with the
-	 *                         given text
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContextMenu(String label, Component parent, Map<String, ActionListener> itemsWithActions, Map<String, Icon> itemIcons,
-			Map<String, Integer> itemMnemonics) {
-		super(label);
-		setInvoker(parent);
-		this.items		= (itemsWithActions != null) ? itemsWithActions : items;
-		this.icons		= (itemIcons != null) ? itemIcons : icons;
-		this.mnemonics	= (itemMnemonics != null) ? itemMnemonics : mnemonics;
-	}
-
-	/**
-	 * Prepares the PopupMenu to be displayed. Should only be used once all map
-	 * values have been set.
-	 *
-	 * @return this instance of {@link ContextMenu} to allow chaining behind the
-	 *         constructor
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContextMenu build() {
-		items.forEach((text, action) -> {
-			// case radio button wanted
-			AbstractButton item;
-			if (text.startsWith(radioButtonMenuItem)) {
-				item = new JRadioButtonMenuItem(text.substring(radioButtonMenuItem.length()), icons.containsKey(text) ? icons.get(text) : null);
-				radioButtonGroup.add(item);
-				// case check box wanted
-			} else if (text.startsWith(checkboxMenuItem))
-				item = new JCheckBoxMenuItem(text.substring(checkboxMenuItem.length()), icons.containsKey(text) ? icons.get(text) : null);
-			// case sub-menu wanted
-			else if (text.startsWith(subMenuItem)) item = new JMenu(text.substring(subMenuItem.length()));
-			else // normal JMenuItem wanted
-				item = new JMenuItem(text, icons.containsKey(text) ? icons.get(text) : null);
-			item.addActionListener(action);
-			if (mnemonics.containsKey(text)) item.setMnemonic(mnemonics.get(text));
-			add(item);
-		});
-		if (getInvoker() != null) {
-			getInvoker().addMouseListener(getShowingListener());
-			built = true;
-		}
-		return this;
-	}
-
-	/**
-	 * @param label the string that a UI may use to display as a title for the
-	 *              pop-up menu.
-	 * @since Envoy Client v0.1-beta
-	 */
-	public ContextMenu(String label) { super(label); }
-
-	private MouseAdapter getShowingListener() {
-		return new MouseAdapter() {
-
-			@Override
-			public void mouseClicked(MouseEvent e) { action(e); }
-
-			@Override
-			public void mousePressed(MouseEvent e) { action(e); }
-
-			@Override
-			public void mouseReleased(MouseEvent e) { action(e); }
-
-			private void action(MouseEvent e) {
-				if (!built) build();
-				if (e.isPopupTrigger()) // hides the menu if already visible
-					if (!isVisible()) show(e.getComponent(), e.getX(), e.getY());
-				else setVisible(false);
-			}
-		};
-	}
-
-	/**
-	 * Removes all subcomponents of this menu.
-	 *
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void clear() {
-		removeAll();
-		items		= new HashMap<>();
-		icons		= new HashMap<>();
-		mnemonics	= new HashMap<>();
-	}
-
-	/**
-	 * @return the items
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Map<String, ActionListener> getItems() { return items; }
-
-	/**
-	 * @param items the items with the displayed text and the according action to
-	 *              take once called
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void setItems(Map<String, ActionListener> items) { this.items = items; }
-
-	/**
-	 * @return the icons
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Map<String, Icon> getIcons() { return icons; }
-
-	/**
-	 * @param icons the icons to set
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void setIcons(Map<String, Icon> icons) { this.icons = icons; }
-
-	/**
-	 * @return the mnemonics (the keyboard shortcuts that automatically execute the
-	 *         command for a {@link JMenuItem} with corresponding text)
-	 * @since Envoy Client v0.1-beta
-	 */
-	public Map<String, Integer> getMnemonics() { return mnemonics; }
-
-	/**
-	 * @param mnemonics the keyboard shortcuts that need to be pressed to
-	 *                  automatically execute the {@link JMenuItem} with the given
-	 *                  text
-	 * @since Envoy Client v0.1-beta
-	 */
-	public void setMnemonics(Map<String, Integer> mnemonics) { this.mnemonics = mnemonics; }
-}
diff --git a/src/main/java/envoy/client/ui/SceneContext.java b/src/main/java/envoy/client/ui/SceneContext.java
index d261000..3149b4d 100644
--- a/src/main/java/envoy/client/ui/SceneContext.java
+++ b/src/main/java/envoy/client/ui/SceneContext.java
@@ -15,8 +15,11 @@ import envoy.event.EventBus;
 /**
  * Manages a stack of scenes. The most recently added scene is displayed inside
  * a stage. When a scene is removed from the stack, its predecessor is
- * displayed.<br>
- * <br>
+ * displayed.
+ * <p>
+ * When a scene is loaded, the style sheet for the current theme is applied to
+ * it.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SceneContext.java</strong><br>
  * Created: <strong>06.06.2020</strong><br>
@@ -89,7 +92,7 @@ public final class SceneContext {
 	private void applyCSS() {
 		if (!sceneStack.isEmpty()) {
 			final var	styleSheets	= stage.getScene().getStylesheets();
-			final var	themeCSS	= "/css/" + (settings.isUsingDefaultTheme() ? settings.getCurrentThemeName() : "custom") + ".css";
+			final var	themeCSS	= "/css/" + settings.getCurrentThemeName() + ".css";
 			styleSheets.clear();
 			styleSheets.addAll(getClass().getResource("/css/base.css").toExternalForm(), getClass().getResource(themeCSS).toExternalForm());
 		}
diff --git a/src/main/java/envoy/client/ui/Theme.java b/src/main/java/envoy/client/ui/Theme.java
deleted file mode 100755
index 7c4bb79..0000000
--- a/src/main/java/envoy/client/ui/Theme.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package envoy.client.ui;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Project: <strong>envoy-client</strong><br>
- * File: <strong>Theme.java</strong><br>
- * Created: <strong>23 Nov 2019</strong><br>
- *
- * @author Maximilian K&auml;fer
- * @since Envoy Client v0.2-alpha
- */
-public class Theme implements Serializable {
-
-	private static final long serialVersionUID = 0L;
-
-	private String				themeName;
-	private Map<String, Color>	colors	= new HashMap<>();
-
-	/**
-	 * Initializes a {@link Theme} with all colors relevant to the application GUI.
-	 *
-	 * @param themeName                   the name of the {@link Theme}
-	 * @param backgroundColor             the background color
-	 * @param cellColor                   the cell color
-	 * @param interactableForegroundColor the color of interactable foreground UI
-	 *                                    elements
-	 * @param interactableBackgroundColor the color of interactable background UI
-	 *                                    elements
-	 * @param textColor                   the color normal text should be displayed
-	 *                                    in
-	 * @param dateColorChat               the color of chat message metadata
-	 * @param selectionColor              the section color
-	 * @param typingMessageColor          the color of currently typed messages
-	 * @param userNameColor               the color of user names
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Theme(String themeName, Color backgroundColor, Color cellColor, Color interactableForegroundColor, Color interactableBackgroundColor,
-			Color textColor, Color dateColorChat, Color selectionColor, Color typingMessageColor, Color userNameColor) {
-
-		this.themeName = themeName;
-
-		colors.put("backgroundColor", backgroundColor);
-		colors.put("cellColor", cellColor);
-		colors.put("interactableForegroundColor", interactableForegroundColor);
-		colors.put("interactableBackgroundColor", interactableBackgroundColor);
-		colors.put("textColor", textColor);
-		colors.put("dateColorChat", dateColorChat);
-		colors.put("selectionColor", selectionColor);
-		colors.put("typingMessageColor", typingMessageColor);
-		colors.put("userNameColor", userNameColor);
-	}
-
-	/**
-	 * Initializes a {@link Theme} by copying all parameters except for the name
-	 * from another {@link Theme} instance.
-	 *
-	 * @param name  the name of the {@link Theme}
-	 * @param other the {@link Theme} to copy
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Theme(String name, Theme other) {
-		themeName = name;
-		colors.putAll(other.colors);
-	}
-
-	/**
-	 * @return a {@code Map<String, Color>} of all colors defined for this theme
-	 *         with their names as keys
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Map<String, Color> getColors() { return colors; }
-
-	/**
-	 * @return name of the theme
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public String getThemeName() { return themeName; }
-
-	/**
-	 * @return interactableForegroundColor
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getInteractableForegroundColor() { return colors.get("interactableForegroundColor"); }
-
-	/**
-	 * @return the {@link Color} in which the text content of a message should be
-	 *         displayed
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getTextColor() { return colors.get("textColor"); }
-
-	/**
-	 * @return the {@link Color} in which the creation date of a message should be
-	 *         displayed
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getDateColor() { return colors.get("dateColorChat"); }
-
-	/**
-	 * @return selectionColor
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getSelectionColor() { return colors.get("selectionColor"); }
-
-	/**
-	 * @return typingMessageColor
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getTypingMessageColor() { return colors.get("typingMessageColor"); }
-
-	/**
-	 * @return backgroundColor
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getBackgroundColor() { return colors.get("backgroundColor"); }
-
-	/**
-	 * @return cellColor
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getCellColor() { return colors.get("cellColor"); }
-
-	/**
-	 * @return interactableBackgroundColor
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getInteractableBackgroundColor() { return colors.get("interactableBackgroundColor"); }
-
-	/**
-	 * @return userNameColor
-	 * @since Envoy Client v0.2-alpha
-	 */
-	public Color getUserNameColor() { return colors.get("userNameColor"); }
-
-	/**
-	 * Sets the a specific {@link Color} in this theme to a new {@link Color}
-	 *
-	 * @param colorName the name of the {@link Color} to set
-	 * @param newColor  the new {@link Color} to be set
-	 * @since Envoy 0.2-alpha
-	 */
-	public void setColor(String colorName, Color newColor) { colors.put(colorName, newColor); }
-}
diff --git a/src/main/resources/css/custom.css b/src/main/resources/css/custom.css
deleted file mode 100644
index e69de29..0000000

From 1761044e9efa81061fbb419b7f7ed0ec80e2283c Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Mon, 8 Jun 2020 10:02:39 +0200
Subject: [PATCH 47/60] Add theme selection in settings

---
 src/main/java/envoy/client/data/Settings.java      |  2 +-
 src/main/java/envoy/client/ui/SceneContext.java    |  2 +-
 .../client/ui/settings/GeneralSettingsPane.java    | 14 +++++++++++++-
 ...ingsToggleButton.java => SettingsCheckbox.java} | 10 +++++-----
 src/main/resources/css/base.css                    |  6 ++----
 src/main/resources/css/dark.css                    |  7 ++-----
 src/main/resources/css/light.css                   |  3 +++
 7 files changed, 27 insertions(+), 17 deletions(-)
 rename src/main/java/envoy/client/ui/settings/{SettingsToggleButton.java => SettingsCheckbox.java} (65%)

diff --git a/src/main/java/envoy/client/data/Settings.java b/src/main/java/envoy/client/data/Settings.java
index 3b1718c..c8bed6a 100644
--- a/src/main/java/envoy/client/data/Settings.java
+++ b/src/main/java/envoy/client/data/Settings.java
@@ -83,7 +83,7 @@ public class Settings {
 	 * @return the name of the currently active theme
 	 * @since Envoy Client v0.2-alpha
 	 */
-	public String getCurrentThemeName() { return (String) items.get("currentTheme").get(); }
+	public String getCurrentTheme() { return (String) items.get("currentTheme").get(); }
 
 	/**
 	 * Sets the name of the current theme.
diff --git a/src/main/java/envoy/client/ui/SceneContext.java b/src/main/java/envoy/client/ui/SceneContext.java
index 3149b4d..a8986f4 100644
--- a/src/main/java/envoy/client/ui/SceneContext.java
+++ b/src/main/java/envoy/client/ui/SceneContext.java
@@ -92,7 +92,7 @@ public final class SceneContext {
 	private void applyCSS() {
 		if (!sceneStack.isEmpty()) {
 			final var	styleSheets	= stage.getScene().getStylesheets();
-			final var	themeCSS	= "/css/" + settings.getCurrentThemeName() + ".css";
+			final var	themeCSS	= "/css/" + settings.getCurrentTheme() + ".css";
 			styleSheets.clear();
 			styleSheets.addAll(getClass().getResource("/css/base.css").toExternalForm(), getClass().getResource(themeCSS).toExternalForm());
 		}
diff --git a/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java b/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
index 6c561f0..12cbaf5 100644
--- a/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
+++ b/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
@@ -2,10 +2,13 @@ package envoy.client.ui.settings;
 
 import java.util.List;
 
+import javafx.scene.control.ComboBox;
 import javafx.scene.layout.VBox;
 
 import envoy.client.data.Settings;
 import envoy.client.data.SettingsItem;
+import envoy.client.event.ThemeChangeEvent;
+import envoy.event.EventBus;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -30,8 +33,17 @@ public class GeneralSettingsPane extends SettingsPane {
 		List.of("onCloseMode", "enterToSend")
 			.stream()
 			.map(settings.getItems()::get)
-			.map(i -> new SettingsToggleButton((SettingsItem<Boolean>) i))
+			.map(i -> new SettingsCheckbox((SettingsItem<Boolean>) i))
 			.forEach(vbox.getChildren()::add);
+
+		var combobox = new ComboBox<String>();
+		combobox.getItems().add("dark");
+		combobox.getItems().add("light");
+		combobox.setValue(settings.getCurrentTheme());
+		combobox.setOnAction(
+				e -> { settings.setCurrentTheme(combobox.getValue()); EventBus.getInstance().dispatch(new ThemeChangeEvent(combobox.getValue())); });
+		vbox.getChildren().add(combobox);
+
 		getChildren().add(vbox);
 	}
 }
diff --git a/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java b/src/main/java/envoy/client/ui/settings/SettingsCheckbox.java
similarity index 65%
rename from src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
rename to src/main/java/envoy/client/ui/settings/SettingsCheckbox.java
index 767f44d..b672d5a 100644
--- a/src/main/java/envoy/client/ui/settings/SettingsToggleButton.java
+++ b/src/main/java/envoy/client/ui/settings/SettingsCheckbox.java
@@ -1,7 +1,7 @@
 package envoy.client.ui.settings;
 
 import javafx.event.ActionEvent;
-import javafx.scene.control.ToggleButton;
+import javafx.scene.control.CheckBox;
 
 import envoy.client.data.SettingsItem;
 
@@ -13,20 +13,20 @@ import envoy.client.data.SettingsItem;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public final class SettingsToggleButton extends ToggleButton {
+public final class SettingsCheckbox extends CheckBox {
 
 	/**
-	 * Creates an instance of {@link SettingsToggleButton}.
+	 * Creates an instance of {@link SettingsCheckbox}.
 	 *
 	 * @param settingsItem the {@link SettingsItem} whose values could be adapted
 	 * @since Envoy Client v0.1-beta
 	 */
-	public SettingsToggleButton(SettingsItem<Boolean> settingsItem) {
+	public SettingsCheckbox(SettingsItem<Boolean> settingsItem) {
 		super(settingsItem.getUserFriendlyName());
 		setSelected(settingsItem.get());
 		
 		// "Schau, es hat sich behindert" - Kai, 2020
 		
-		addEventHandler(ActionEvent.ACTION, e -> settingsItem.set(!settingsItem.get()));
+		addEventHandler(ActionEvent.ACTION, e -> settingsItem.set(isSelected()));
 	}
 }
diff --git a/src/main/resources/css/base.css b/src/main/resources/css/base.css
index a2728c5..eeff6ef 100644
--- a/src/main/resources/css/base.css
+++ b/src/main/resources/css/base.css
@@ -1,5 +1,3 @@
-* {
-	 /* -fx-font: 14.0pt "Serif"; 
-     -fx-background-color:#000000; */
-     -fx-opacity:1;
+.button {
+	-fx-background-radius: 5em;
 }
diff --git a/src/main/resources/css/dark.css b/src/main/resources/css/dark.css
index 06326dd..4a899b2 100644
--- a/src/main/resources/css/dark.css
+++ b/src/main/resources/css/dark.css
@@ -1,7 +1,4 @@
-.root{
-	--background=#000000;
-	background: var(--background);
-}
 .button{
-	color: rgb(105,0,153);
+	-fx-background-color: rgb(105,0,153);
+	-fx-text-fill: white;
 }
\ No newline at end of file
diff --git a/src/main/resources/css/light.css b/src/main/resources/css/light.css
index e69de29..a529c0f 100644
--- a/src/main/resources/css/light.css
+++ b/src/main/resources/css/light.css
@@ -0,0 +1,3 @@
+.button{
+	-fx-background-color: snow;
+}
\ No newline at end of file

From e5768779436c417de9a48af4feb95dbfc85bb0de Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Mon, 8 Jun 2020 10:36:30 +0200
Subject: [PATCH 48/60] Move scene controllers to separate package

---
 src/main/java/envoy/client/ui/SceneContext.java  |  2 +-
 src/main/java/envoy/client/ui/Startup.java       |  3 ++-
 .../ChatScene.java}                              | 16 +++++++++-------
 .../ContactSearchScene.java}                     |  8 +++++---
 .../SettingsScene.java}                          |  6 ++++--
 .../envoy/client/ui/controller/package-info.java | 11 +++++++++++
 src/main/java/module-info.java                   |  2 +-
 src/main/resources/fxml/ChatScene.fxml           |  2 +-
 src/main/resources/fxml/ContactSearchScene.fxml  |  2 +-
 src/main/resources/fxml/SettingsScene.fxml       |  2 +-
 10 files changed, 36 insertions(+), 18 deletions(-)
 rename src/main/java/envoy/client/ui/{ChatSceneController.java => controller/ChatScene.java} (94%)
 rename src/main/java/envoy/client/ui/{ContactSearchSceneController.java => controller/ContactSearchScene.java} (95%)
 rename src/main/java/envoy/client/ui/{settings/SettingsSceneController.java => controller/SettingsScene.java} (88%)
 create mode 100644 src/main/java/envoy/client/ui/controller/package-info.java

diff --git a/src/main/java/envoy/client/ui/SceneContext.java b/src/main/java/envoy/client/ui/SceneContext.java
index a8986f4..42dbc59 100644
--- a/src/main/java/envoy/client/ui/SceneContext.java
+++ b/src/main/java/envoy/client/ui/SceneContext.java
@@ -29,7 +29,7 @@ import envoy.event.EventBus;
  */
 public final class SceneContext {
 
-	static enum SceneInfo {
+	public static enum SceneInfo {
 
 		CHAT_SCENE("/fxml/ChatScene.fxml"), SETTINGS_SCENE("/fxml/SettingsScene.fxml"), CONTACT_SEARCH_SCENE("/fxml/ContactSearchScene.fxml");
 
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 55afb40..8464ae6 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -15,6 +15,7 @@ import javafx.stage.Stage;
 import envoy.client.data.*;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
+import envoy.client.ui.controller.ChatScene;
 import envoy.data.Message;
 import envoy.data.User;
 import envoy.data.User.UserStatus;
@@ -122,7 +123,7 @@ public final class Startup extends Application {
 		// Prepare stage and load ChatScene
 		final var sceneContext = new SceneContext(stage);
 		sceneContext.load(SceneContext.SceneInfo.CHAT_SCENE);
-		sceneContext.<ChatSceneController>getController().initializeData(sceneContext, localDB, client, writeProxy);
+		sceneContext.<ChatScene>getController().initializeData(sceneContext, localDB, client, writeProxy);
 
 		stage.setTitle("Envoy");
 		stage.setMinHeight(400);
diff --git a/src/main/java/envoy/client/ui/ChatSceneController.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
similarity index 94%
rename from src/main/java/envoy/client/ui/ChatSceneController.java
rename to src/main/java/envoy/client/ui/controller/ChatScene.java
index 14b1a7e..ea59c90 100644
--- a/src/main/java/envoy/client/ui/ChatSceneController.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -1,4 +1,4 @@
-package envoy.client.ui;
+package envoy.client.ui.controller;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -19,7 +19,9 @@ import envoy.client.data.Settings;
 import envoy.client.event.MessageCreationEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
-import envoy.client.ui.settings.SettingsSceneController;
+import envoy.client.ui.MessageListCell;
+import envoy.client.ui.SceneContext;
+import envoy.client.ui.UserListCell;
 import envoy.data.Contact;
 import envoy.data.Message;
 import envoy.data.MessageBuilder;
@@ -37,7 +39,7 @@ import envoy.util.EnvoyLog;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public final class ChatSceneController {
+public final class ChatScene {
 
 	@FXML
 	private Label contactLabel;
@@ -69,7 +71,7 @@ public final class ChatSceneController {
 
 	private static final Settings	settings			= Settings.getInstance();
 	private static final EventBus	eventBus			= EventBus.getInstance();
-	private static final Logger		logger				= EnvoyLog.getLogger(ChatSceneController.class);
+	private static final Logger		logger				= EnvoyLog.getLogger(ChatScene.class);
 	private static final int		MAX_MESSAGE_LENGTH	= 255;
 
 	@FXML
@@ -117,7 +119,7 @@ public final class ChatSceneController {
 		});
 	}
 
-	void initializeData(SceneContext sceneContext, LocalDB localDB, Client client, WriteProxy writeProxy) {
+	public void initializeData(SceneContext sceneContext, LocalDB localDB, Client client, WriteProxy writeProxy) {
 		this.sceneContext	= sceneContext;
 		this.localDB		= localDB;
 		this.client			= client;
@@ -158,7 +160,7 @@ public final class ChatSceneController {
 	private void settingsButtonClicked() {
 		try {
 			sceneContext.load(SceneContext.SceneInfo.SETTINGS_SCENE);
-			sceneContext.<SettingsSceneController>getController().initializeData(sceneContext);
+			sceneContext.<SettingsScene>getController().initializeData(sceneContext);
 		} catch (final IOException e) {
 			e.printStackTrace();
 		}
@@ -168,7 +170,7 @@ public final class ChatSceneController {
 	private void addContactButtonClicked() {
 		try {
 			sceneContext.load(SceneContext.SceneInfo.CONTACT_SEARCH_SCENE);
-			sceneContext.<ContactSearchSceneController>getController().initializeData(sceneContext);
+			sceneContext.<ContactSearchScene>getController().initializeData(sceneContext);
 		} catch (final IOException e) {
 			e.printStackTrace();
 		}
diff --git a/src/main/java/envoy/client/ui/ContactSearchSceneController.java b/src/main/java/envoy/client/ui/controller/ContactSearchScene.java
similarity index 95%
rename from src/main/java/envoy/client/ui/ContactSearchSceneController.java
rename to src/main/java/envoy/client/ui/controller/ContactSearchScene.java
index da4e2c0..d6c34b6 100644
--- a/src/main/java/envoy/client/ui/ContactSearchSceneController.java
+++ b/src/main/java/envoy/client/ui/controller/ContactSearchScene.java
@@ -1,4 +1,4 @@
-package envoy.client.ui;
+package envoy.client.ui.controller;
 
 import java.util.Optional;
 import java.util.logging.Level;
@@ -10,6 +10,8 @@ import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
 
 import envoy.client.event.SendEvent;
+import envoy.client.ui.SceneContext;
+import envoy.client.ui.UserListCell;
 import envoy.data.Contact;
 import envoy.event.ElementOperation;
 import envoy.event.EventBus;
@@ -26,7 +28,7 @@ import envoy.util.EnvoyLog;
  * @author Leon Hofmeister
  * @since Envoy Client v0.1-beta
  */
-public class ContactSearchSceneController {
+public class ContactSearchScene {
 
 	@FXML
 	private Button backButton;
@@ -46,7 +48,7 @@ public class ContactSearchSceneController {
 	private SceneContext sceneContext;
 
 	private static EventBus		eventBus	= EventBus.getInstance();
-	private static final Logger	logger		= EnvoyLog.getLogger(ChatSceneController.class);
+	private static final Logger	logger		= EnvoyLog.getLogger(ChatScene.class);
 
 	/**
 	 * @param sceneContext enables the user to return to the chat scene
diff --git a/src/main/java/envoy/client/ui/settings/SettingsSceneController.java b/src/main/java/envoy/client/ui/controller/SettingsScene.java
similarity index 88%
rename from src/main/java/envoy/client/ui/settings/SettingsSceneController.java
rename to src/main/java/envoy/client/ui/controller/SettingsScene.java
index 795a57f..b7cc49d 100644
--- a/src/main/java/envoy/client/ui/settings/SettingsSceneController.java
+++ b/src/main/java/envoy/client/ui/controller/SettingsScene.java
@@ -1,9 +1,11 @@
-package envoy.client.ui.settings;
+package envoy.client.ui.controller;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 
 import envoy.client.ui.SceneContext;
+import envoy.client.ui.settings.GeneralSettingsPane;
+import envoy.client.ui.settings.SettingsPane;
 
 /**
  * Project: <strong>envoy-client</strong><br>
@@ -13,7 +15,7 @@ import envoy.client.ui.SceneContext;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public class SettingsSceneController {
+public class SettingsScene {
 
 	@FXML
 	private ListView<SettingsPane> settingsList;
diff --git a/src/main/java/envoy/client/ui/controller/package-info.java b/src/main/java/envoy/client/ui/controller/package-info.java
new file mode 100644
index 0000000..51d18e8
--- /dev/null
+++ b/src/main/java/envoy/client/ui/controller/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * Contains JavaFX scene controllers.
+ * <p>
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>package-info.java</strong><br>
+ * Created: <strong>08.06.2020</strong><br>
+ * 
+ * @author Kai S. K. Engelbart
+ * @since Envoy Client v0.1-beta
+ */
+package envoy.client.ui.controller;
\ No newline at end of file
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 905a52a..1f0d0b1 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -18,6 +18,6 @@ module envoy {
 	requires javafx.base;
 	requires javafx.graphics;
 
-	opens envoy.client.ui.settings to javafx.graphics, javafx.fxml;
 	opens envoy.client.ui to javafx.graphics, javafx.fxml;
+	opens envoy.client.ui.controller to javafx.graphics, javafx.fxml;
 }
diff --git a/src/main/resources/fxml/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
index 6f2b0b8..d56a195 100644
--- a/src/main/resources/fxml/ChatScene.fxml
+++ b/src/main/resources/fxml/ChatScene.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="400.0" minWidth="350.0" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ChatSceneController">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="400.0" minWidth="350.0" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.ChatScene">
 	<columnConstraints>
 		<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="20.0" prefWidth="161.0" />
 		<ColumnConstraints hgrow="SOMETIMES" maxWidth="1.7976931348623157E308" minWidth="10.0" percentWidth="65.0" prefWidth="357.0" />
diff --git a/src/main/resources/fxml/ContactSearchScene.fxml b/src/main/resources/fxml/ContactSearchScene.fxml
index a50d6be..c1fe70b 100644
--- a/src/main/resources/fxml/ContactSearchScene.fxml
+++ b/src/main/resources/fxml/ContactSearchScene.fxml
@@ -10,7 +10,7 @@
 <?import javafx.scene.layout.VBox?>
 
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.ContactSearchSceneController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.ContactSearchScene">
    <children>
       <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
          <children>
diff --git a/src/main/resources/fxml/SettingsScene.fxml b/src/main/resources/fxml/SettingsScene.fxml
index 0620305..865bb9b 100644
--- a/src/main/resources/fxml/SettingsScene.fxml
+++ b/src/main/resources/fxml/SettingsScene.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="TOP_RIGHT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.settings.SettingsSceneController">
+<VBox alignment="TOP_RIGHT" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.SettingsScene">
 	<children>
 		<HBox prefHeight="100.0" prefWidth="200.0">
          <children>

From 7b480bbbc8d690447049ae13d3937d8a56bc8556 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Mon, 8 Jun 2020 10:48:33 +0200
Subject: [PATCH 49/60] Fixed bug invalidating enterToSend option

---
 src/main/resources/fxml/ChatScene.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/fxml/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
index d56a195..a81cd00 100644
--- a/src/main/resources/fxml/ChatScene.fxml
+++ b/src/main/resources/fxml/ChatScene.fxml
@@ -27,7 +27,7 @@
 		<Button fx:id="settingsButton" mnemonicParsing="true" onAction="#settingsButtonClicked" text="_Settings" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
 		<ListView fx:id="messageList" prefHeight="257.0" prefWidth="155.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2" />
 		<Button fx:id="postButton" defaultButton="true" disable="true" mnemonicParsing="true" onAction="#postButtonClicked" prefHeight="10.0" prefWidth="65.0" text="_Post" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
-      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyTyped="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyPressed="#messageTextUpdated" onKeyTyped="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <Button mnemonicParsing="true" onAction="#addContactButtonClicked" text="_Add Contacts" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
          <padding>
             <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />

From 933232e2a41fe2e876db00fe3c34005db8eb19fa Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Mon, 8 Jun 2020 11:58:57 +0200
Subject: [PATCH 50/60] Converted the login dialog into a scene

---
 .../java/envoy/client/ui/SceneContext.java    |  63 ++++++-
 src/main/java/envoy/client/ui/Startup.java    |  55 +-----
 .../envoy/client/ui/controller/ChatScene.java |  24 +--
 .../LoginScene.java}                          | 177 ++++++++++--------
 .../{LoginDialog.fxml => LoginScene.fxml}     |  26 +--
 5 files changed, 187 insertions(+), 158 deletions(-)
 rename src/main/java/envoy/client/ui/{LoginDialog.java => controller/LoginScene.java} (57%)
 rename src/main/resources/fxml/{LoginDialog.fxml => LoginScene.fxml} (70%)

diff --git a/src/main/java/envoy/client/ui/SceneContext.java b/src/main/java/envoy/client/ui/SceneContext.java
index 42dbc59..0c40bf3 100644
--- a/src/main/java/envoy/client/ui/SceneContext.java
+++ b/src/main/java/envoy/client/ui/SceneContext.java
@@ -29,10 +29,45 @@ import envoy.event.EventBus;
  */
 public final class SceneContext {
 
+	/**
+	 * Contains information about different scenes and their FXML resource files.
+	 * 
+	 * @author Kai S. K. Engelbart
+	 * @since Envoy Client v0.1-beta
+	 */
 	public static enum SceneInfo {
 
-		CHAT_SCENE("/fxml/ChatScene.fxml"), SETTINGS_SCENE("/fxml/SettingsScene.fxml"), CONTACT_SEARCH_SCENE("/fxml/ContactSearchScene.fxml");
+		/**
+		 * The main scene in which chats are displayed.
+		 * 
+		 * @since Envoy Client v0.1-beta
+		 */
+		CHAT_SCENE("/fxml/ChatScene.fxml"),
 
+		/**
+		 * The scene in which settings are displayed.
+		 * 
+		 * @since Envoy Client v0.1-beta
+		 */
+		SETTINGS_SCENE("/fxml/SettingsScene.fxml"),
+
+		/**
+		 * The scene in which the contact search is displayed.
+		 * 
+		 * @since Envoy Client v0.1-beta
+		 */
+		CONTACT_SEARCH_SCENE("/fxml/ContactSearchScene.fxml"),
+
+		/**
+		 * The scene in which the login screen is displayed.
+		 * 
+		 * @since Envoy Client v0.1-beta
+		 */
+		LOGIN_SCENE("/fxml/LoginScene.fxml");
+
+		/**
+		 * The path to the FXML resource.
+		 */
 		public final String path;
 
 		SceneInfo(String path) { this.path = path; }
@@ -59,20 +94,24 @@ public final class SceneContext {
 	 * Loads a new scene specified by a scene info.
 	 * 
 	 * @param sceneInfo specifies the scene to load
-	 * @throws IOException if the loading process fails
+	 * @throws RuntimeException if the loading process fails
 	 * @since Envoy Client v0.1-beta
 	 */
-	public void load(SceneInfo sceneInfo) throws IOException {
+	public void load(SceneInfo sceneInfo) {
 		loader.setRoot(null);
 		loader.setController(null);
 
-		final var	rootNode	= (Parent) loader.load(getClass().getResourceAsStream(sceneInfo.path));
-		final var	scene		= new Scene(rootNode);
+		try {
+			final var	rootNode	= (Parent) loader.load(getClass().getResourceAsStream(sceneInfo.path));
+			final var	scene		= new Scene(rootNode);
 
-		sceneStack.push(scene);
-		stage.setScene(scene);
-		applyCSS();
-		stage.show();
+			sceneStack.push(scene);
+			stage.setScene(scene);
+			applyCSS();
+			stage.show();
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	/**
@@ -104,4 +143,10 @@ public final class SceneContext {
 	 * @since Envoy Client v0.1-beta
 	 */
 	public <T> T getController() { return loader.getController(); }
+
+	/**
+	 * @return the stage in which the scenes are displayed
+	 * @since Envoy Client v0.1-beta
+	 */
+	public Stage getStage() { return stage; }
 }
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index 8464ae6..ce5afb1 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -1,7 +1,6 @@
 package envoy.client.ui;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -14,11 +13,9 @@ import javafx.stage.Stage;
 
 import envoy.client.data.*;
 import envoy.client.net.Client;
-import envoy.client.net.WriteProxy;
-import envoy.client.ui.controller.ChatScene;
+import envoy.client.ui.SceneContext.SceneInfo;
+import envoy.client.ui.controller.LoginScene;
 import envoy.data.Message;
-import envoy.data.User;
-import envoy.data.User.UserStatus;
 import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 
@@ -34,7 +31,6 @@ public final class Startup extends Application {
 
 	private LocalDB			localDB;
 	private Client			client;
-	private WriteProxy		writeProxy;
 	private Cache<Message>	cache;
 
 	private static final ClientConfig	config	= ClientConfig.getInstance();
@@ -86,53 +82,12 @@ public final class Startup extends Application {
 		client	= new Client();
 		cache	= new Cache<>();
 
-		// Try to connect to the server
-		new LoginDialog(client, localDB, cache).showAndWait();
-
-		// Set client user in local database
-		localDB.setUser(client.getSender());
-
-		// Initialize chats in local database
-		try {
-			localDB.initializeUserStorage();
-			localDB.loadUserData();
-		} catch (final FileNotFoundException e) {
-			// The local database file has not yet been created, probably first login
-		} catch (final Exception e) {
-			e.printStackTrace();
-			new Alert(AlertType.ERROR, "Error while loading local database: " + e + "\nChats will not be stored locally.").showAndWait();
-		}
-
-		// Initialize write proxy
-		writeProxy = client.createWriteProxy(localDB);
-
-		if (client.isOnline()) {
-
-			// Save all users to the local database and flush cache
-			localDB.setUsers(client.getUsers());
-			writeProxy.flushCache();
-		} else
-			// Set all contacts to offline mode
-			localDB.getUsers()
-				.values()
-				.stream()
-				.filter(User.class::isInstance)
-				.map(User.class::cast)
-				.forEach(u -> u.setStatus(UserStatus.OFFLINE));
-
-		// Prepare stage and load ChatScene
-		final var sceneContext = new SceneContext(stage);
-		sceneContext.load(SceneContext.SceneInfo.CHAT_SCENE);
-		sceneContext.<ChatScene>getController().initializeData(sceneContext, localDB, client, writeProxy);
-
 		stage.setTitle("Envoy");
-		stage.setMinHeight(400);
-		stage.setMinWidth(350);
 		stage.getIcons().add(IconUtil.load("/icons/envoy_logo.png"));
-		stage.show();
 
-		// Relay unread messages from cache
-		if (cache != null && client.isOnline()) cache.relay();
+		final var sceneContext = new SceneContext(stage);
+		sceneContext.load(SceneInfo.LOGIN_SCENE);
+		sceneContext.<LoginScene>getController().initializeData(client, localDB, cache, sceneContext);
 	}
 
 	/**
diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index ea59c90..e406060 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -119,6 +119,14 @@ public final class ChatScene {
 		});
 	}
 
+	/**
+	 * @param sceneContext the scene context used to load other scenes
+	 * @param localDB      the local database form which chats and users are loaded
+	 * @param client       the client used to request ID generators
+	 * @param writeProxy   the write proxy used to send messages and other data to
+	 *                     the server
+	 * @since Envoy Client v0.1-beta
+	 */
 	public void initializeData(SceneContext sceneContext, LocalDB localDB, Client client, WriteProxy writeProxy) {
 		this.sceneContext	= sceneContext;
 		this.localDB		= localDB;
@@ -158,22 +166,14 @@ public final class ChatScene {
 
 	@FXML
 	private void settingsButtonClicked() {
-		try {
-			sceneContext.load(SceneContext.SceneInfo.SETTINGS_SCENE);
-			sceneContext.<SettingsScene>getController().initializeData(sceneContext);
-		} catch (final IOException e) {
-			e.printStackTrace();
-		}
+		sceneContext.load(SceneContext.SceneInfo.SETTINGS_SCENE);
+		sceneContext.<SettingsScene>getController().initializeData(sceneContext);
 	}
 
 	@FXML
 	private void addContactButtonClicked() {
-		try {
-			sceneContext.load(SceneContext.SceneInfo.CONTACT_SEARCH_SCENE);
-			sceneContext.<ContactSearchScene>getController().initializeData(sceneContext);
-		} catch (final IOException e) {
-			e.printStackTrace();
-		}
+		sceneContext.load(SceneContext.SceneInfo.CONTACT_SEARCH_SCENE);
+		sceneContext.<ContactSearchScene>getController().initializeData(sceneContext);
 	}
 
 	@FXML
diff --git a/src/main/java/envoy/client/ui/LoginDialog.java b/src/main/java/envoy/client/ui/controller/LoginScene.java
similarity index 57%
rename from src/main/java/envoy/client/ui/LoginDialog.java
rename to src/main/java/envoy/client/ui/controller/LoginScene.java
index 2968727..4f13149 100644
--- a/src/main/java/envoy/client/ui/LoginDialog.java
+++ b/src/main/java/envoy/client/ui/controller/LoginScene.java
@@ -1,24 +1,24 @@
-package envoy.client.ui;
+package envoy.client.ui.controller;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 
 import javafx.application.Platform;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
-import javafx.stage.Stage;
 
 import envoy.client.data.Cache;
 import envoy.client.data.ClientConfig;
 import envoy.client.data.LocalDB;
 import envoy.client.net.Client;
+import envoy.client.ui.SceneContext;
 import envoy.data.LoginCredentials;
 import envoy.data.Message;
 import envoy.data.User;
+import envoy.data.User.UserStatus;
 import envoy.event.EventBus;
 import envoy.event.HandshakeRejectionEvent;
 import envoy.exception.EnvoyException;
@@ -32,7 +32,7 @@ import envoy.util.EnvoyLog;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public final class LoginDialog extends Dialog<Void> {
+public final class LoginScene {
 
 	@FXML
 	private TextField userTextField;
@@ -49,77 +49,18 @@ public final class LoginDialog extends Dialog<Void> {
 	@FXML
 	private CheckBox registerCheckBox;
 
-	@FXML
-	private CheckBox offlineCheckBox;
-
 	@FXML
 	private Label connectionLabel;
 
-	private final Client			client;
-	private final LocalDB			localDB;
-	private final Cache<Message>	receivedMessageCache;
+	private Client			client;
+	private LocalDB			localDB;
+	private Cache<Message>	receivedMessageCache;
+	private SceneContext	sceneContext;
 
-	private static final Logger			logger		= EnvoyLog.getLogger(LoginDialog.class);
+	private static final Logger			logger		= EnvoyLog.getLogger(LoginScene.class);
 	private static final EventBus		eventBus	= EventBus.getInstance();
 	private static final ClientConfig	config		= ClientConfig.getInstance();
 
-	/**
-	 * Loads the login dialog using the FXML file {@code LoginDialog.fxml}.
-	 * 
-	 * @param client               the client used to perform the handshake
-	 * @param localDB              the local database used for offline login
-	 * @param receivedMessageCache the cache storing messages received during
-	 *                             the handshake
-	 * @throws IOException if an exception occurs during loading
-	 * @since Envoy Client v0.1-beta
-	 */
-	public LoginDialog(Client client, LocalDB localDB, Cache<Message> receivedMessageCache) throws IOException {
-		this.client					= client;
-		this.localDB				= localDB;
-		this.receivedMessageCache	= receivedMessageCache;
-
-		// Prepare handshake
-		localDB.loadIDGenerator();
-
-		final var loader = new FXMLLoader(getClass().getResource("/fxml/LoginDialog.fxml"));
-		loader.setController(this);
-		final var dialogPane = loader.<DialogPane>load();
-
-		((Stage) getDialogPane().getScene().getWindow()).getIcons().add(IconUtil.load("/icons/envoy_logo.png"));
-
-		// Configure dialog buttons
-		dialogPane.getButtonTypes().addAll(ButtonType.CLOSE, ButtonType.OK);
-
-		// Close button
-		dialogPane.lookupButton(ButtonType.CLOSE).addEventHandler(ActionEvent.ACTION, e -> abortLogin());
-
-		// Login button
-		final var loginButton = (Button) dialogPane.lookupButton(ButtonType.OK);
-		loginButton.setText("Login");
-		loginButton.addEventFilter(ActionEvent.ACTION, e -> {
-			e.consume();
-
-			// Prevent registration with unequal passwords
-			if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
-				clearPasswordFields();
-				new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
-			} else {
-				final var credentials = new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(),
-						registerCheckBox.isSelected());
-				if (!offlineCheckBox.isSelected()) performHandshake(credentials);
-				else attemptOfflineMode(credentials);
-			}
-		});
-
-		// Perform automatic login if configured
-		setOnShown(e -> { if (config.hasLoginCredentials()) performHandshake(config.getLoginCredentials()); });
-
-		setDialogPane(dialogPane);
-
-		// Set initial cursor
-		Platform.runLater(userTextField::requestFocus);
-	}
-
 	@FXML
 	private void initialize() {
 		connectionLabel.setText("Server: " + config.getServer() + ":" + config.getPort());
@@ -129,6 +70,50 @@ public final class LoginDialog extends Dialog<Void> {
 				e -> Platform.runLater(() -> { clearPasswordFields(); new Alert(AlertType.ERROR, e.get()).showAndWait(); }));
 	}
 
+	/**
+	 * Loads the login dialog using the FXML file {@code LoginDialog.fxml}.
+	 * 
+	 * @param client               the client used to perform the handshake
+	 * @param localDB              the local database used for offline login
+	 * @param receivedMessageCache the cache storing messages received during
+	 *                             the handshake
+	 * @param sceneContext         the scene context used to initialize the chat
+	 *                             scene
+	 * @since Envoy Client v0.1-beta
+	 */
+	public void initializeData(Client client, LocalDB localDB, Cache<Message> receivedMessageCache, SceneContext sceneContext) {
+		this.client					= client;
+		this.localDB				= localDB;
+		this.receivedMessageCache	= receivedMessageCache;
+		this.sceneContext			= sceneContext;
+
+		// Prepare handshake
+		localDB.loadIDGenerator();
+
+		// Set initial cursor
+		userTextField.requestFocus();
+
+		// Perform automatic login if configured
+		if (config.hasLoginCredentials()) performHandshake(config.getLoginCredentials());
+	}
+
+	@FXML
+	private void loginButtonPressed() {
+
+		// Prevent registration with unequal passwords
+		if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
+			clearPasswordFields();
+			new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
+		} else {
+			performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected()));
+		}
+	}
+
+	@FXML
+	private void offlineModeButtonPressed() {
+		attemptOfflineMode(new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), false));
+	}
+
 	@FXML
 	private void registerCheckboxChanged() {
 
@@ -139,12 +124,18 @@ public final class LoginDialog extends Dialog<Void> {
 		clearPasswordFields();
 	}
 
+	@FXML
+	private void abortLogin() {
+		logger.info("The login process has been cancelled. Exiting...");
+		System.exit(0);
+	}
+
 	private void performHandshake(LoginCredentials credentials) {
 		try {
 			client.performHandshake(credentials, receivedMessageCache);
 			if (client.isOnline()) {
 				client.initReceiver(localDB, receivedMessageCache);
-				Platform.runLater(this::hide);
+				loadChatScene();
 			}
 		} catch (IOException | InterruptedException | TimeoutException e) {
 			logger.warning("Could not connect to server: " + e);
@@ -161,20 +152,54 @@ public final class LoginDialog extends Dialog<Void> {
 			if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
 			client.setSender(clientUser);
 			new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.").showAndWait();
-			hide();
+			loadChatScene();
 		} catch (Exception e) {
 			new Alert(AlertType.ERROR, "Client error: " + e).showAndWait();
 			System.exit(1);
 		}
 	}
 
+	private void loadChatScene() {
+
+		// Set client user in local database
+		localDB.setUser(client.getSender());
+
+		// Initialize chats in local database
+		try {
+			localDB.initializeUserStorage();
+			localDB.loadUserData();
+		} catch (final FileNotFoundException e) {
+			// The local database file has not yet been created, probably first login
+		} catch (final Exception e) {
+			e.printStackTrace();
+			new Alert(AlertType.ERROR, "Error while loading local database: " + e + "\nChats will not be stored locally.").showAndWait();
+		}
+
+		// Initialize write proxy
+		final var writeProxy = client.createWriteProxy(localDB);
+
+		if (client.isOnline()) {
+
+			// Save all users to the local database and flush cache
+			localDB.setUsers(client.getUsers());
+			writeProxy.flushCache();
+		} else
+			// Set all contacts to offline mode
+			localDB.getUsers().values().stream().filter(User.class::isInstance).map(User.class::cast).forEach(u -> u.setStatus(UserStatus.OFFLINE));
+
+		// Load ChatScene
+		sceneContext.pop();
+		sceneContext.getStage().setMinHeight(400);
+		sceneContext.getStage().setMinWidth(350);
+		sceneContext.load(SceneContext.SceneInfo.CHAT_SCENE);
+		sceneContext.<ChatScene>getController().initializeData(sceneContext, localDB, client, writeProxy);
+
+		// Relay unread messages from cache
+		if (receivedMessageCache != null && client.isOnline()) receivedMessageCache.relay();
+	}
+
 	private void clearPasswordFields() {
 		passwordField.clear();
 		repeatPasswordField.clear();
 	}
-
-	private void abortLogin() {
-		logger.info("The login process has been cancelled. Exiting...");
-		System.exit(0);
-	}
 }
diff --git a/src/main/resources/fxml/LoginDialog.fxml b/src/main/resources/fxml/LoginScene.fxml
similarity index 70%
rename from src/main/resources/fxml/LoginDialog.fxml
rename to src/main/resources/fxml/LoginScene.fxml
index 3da8595..a3a8018 100644
--- a/src/main/resources/fxml/LoginDialog.fxml
+++ b/src/main/resources/fxml/LoginScene.fxml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.DialogPane?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.PasswordField?>
 <?import javafx.scene.control.TextField?>
@@ -11,10 +12,9 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<DialogPane prefHeight="265.0" prefWidth="545.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
-	<content>
-		<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="217.0" prefWidth="545.0">
-			<children>
+
+<VBox prefHeight="206.0" prefWidth="440.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.LoginScene">
+   <children>
 				<Label text="User Login">
 					<font>
 						<Font size="26.0" />
@@ -40,9 +40,13 @@
 					</children>
 				</GridPane>
 				<CheckBox fx:id="registerCheckBox" mnemonicParsing="true" onAction="#registerCheckboxChanged" prefHeight="17.0" prefWidth="181.0" text="_Register" />
-            <Label fx:id="connectionLabel" />
-            <CheckBox fx:id="offlineCheckBox" layoutX="20.0" layoutY="144.0" mnemonicParsing="true" prefHeight="17.0" prefWidth="181.0" text="_Offline mode" />
-			</children>
-		</VBox>
-	</content>
-</DialogPane>
+      <Label fx:id="connectionLabel" />
+      <ButtonBar prefHeight="40.0" prefWidth="200.0">
+        <buttons>
+            <Button mnemonicParsing="false" onAction="#abortLogin" text="Close" />
+            <Button mnemonicParsing="false" onAction="#offlineModeButtonPressed" text="Offline mode" />
+          <Button defaultButton="true" mnemonicParsing="false" onAction="#loginButtonPressed" text="Login" />
+        </buttons>
+      </ButtonBar>
+   </children>
+</VBox>

From cb3913d95dcf60bff2c8249600fb59bc598db57e Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Tue, 9 Jun 2020 11:31:22 +0200
Subject: [PATCH 51/60] Display message date and status

---
 .../java/envoy/client/ui/MessageListCell.java | 35 ++++++++++++++++---
 src/main/java/envoy/client/ui/Startup.java    | 28 +++++++++------
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/src/main/java/envoy/client/ui/MessageListCell.java b/src/main/java/envoy/client/ui/MessageListCell.java
index 21c216d..60a2ada 100644
--- a/src/main/java/envoy/client/ui/MessageListCell.java
+++ b/src/main/java/envoy/client/ui/MessageListCell.java
@@ -1,11 +1,22 @@
 package envoy.client.ui;
 
-import envoy.data.Message;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Map;
+
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
 
+import envoy.data.Message;
+import envoy.data.Message.MessageStatus;
 
 /**
+ * Displays a single message inside the message list.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>MessageListCell.java</strong><br>
  * Created: <strong>28.03.2020</strong><br>
@@ -15,13 +26,29 @@ import javafx.scene.control.ListCell;
  */
 public class MessageListCell extends ListCell<Message> {
 
+	private static final SimpleDateFormat		dateFormat	= new SimpleDateFormat("dd.MM.yyyy HH:mm");
+	private static Map<MessageStatus, Image>	statusImages;
+
+	static {
+		try {
+			statusImages = IconUtil.loadByEnum(MessageStatus.class, 32);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
 	/**
-	 * {@inheritDoc}
+	 * Displays the text, the data of creation and the status of a message.
+	 * 
+	 * @since Envoy v0.1-beta
 	 */
 	@Override
 	protected void updateItem(Message message, boolean empty) {
 		super.updateItem(message, empty);
-		if (!empty && message != null) setGraphic(new Label(message.getText()));
-		else setGraphic(null);
+		setGraphic(!empty && message != null ? new HBox(
+					new VBox(
+					 new Label(dateFormat.format(message.getCreationDate())),
+					 new Label(message.getText())),
+					new Label("", new ImageView(statusImages.get(message.getStatus())))) : null);
 	}
 }
diff --git a/src/main/java/envoy/client/ui/Startup.java b/src/main/java/envoy/client/ui/Startup.java
index ce5afb1..aff8801 100644
--- a/src/main/java/envoy/client/ui/Startup.java
+++ b/src/main/java/envoy/client/ui/Startup.java
@@ -20,6 +20,8 @@ import envoy.exception.EnvoyException;
 import envoy.util.EnvoyLog;
 
 /**
+ * Handles application startup and shutdown.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>Startup.java</strong><br>
  * Created: <strong>26.03.2020</strong><br>
@@ -37,7 +39,10 @@ public final class Startup extends Application {
 	private static final Logger			logger	= EnvoyLog.getLogger(Startup.class);
 
 	/**
-	 * {@inheritDoc}
+	 * Loads the configuration, initializes the client and the local database and
+	 * delegates the rest of the startup process to {@link LoginScene}.
+	 * 
+	 * @since Envoy Client v0.1-beta
 	 */
 	@Override
 	public void start(Stage stage) throws Exception {
@@ -69,13 +74,15 @@ public final class Startup extends Application {
 		if (config.isIgnoreLocalDB()) {
 			localDB = new TransientLocalDB();
 			new Alert(AlertType.WARNING, "Ignoring local database.\nMessages will not be saved!").showAndWait();
-		} else try {
-			localDB = new PersistentLocalDB(new File(config.getHomeDirectory(), config.getLocalDB().getPath()));
-		} catch (final IOException e3) {
-			logger.log(Level.SEVERE, "Could not initialize local database", e3);
-			new Alert(AlertType.ERROR, "Could not initialize local database!\n" + e3).showAndWait();
-			System.exit(1);
-			return;
+		} else {
+			try {
+				localDB = new PersistentLocalDB(new File(config.getHomeDirectory(), config.getLocalDB().getPath()));
+			} catch (final IOException e3) {
+				logger.log(Level.SEVERE, "Could not initialize local database", e3);
+				new Alert(AlertType.ERROR, "Could not initialize local database!\n" + e3).showAndWait();
+				System.exit(1);
+				return;
+			}
 		}
 
 		// Initialize client and unread message cache
@@ -91,12 +98,13 @@ public final class Startup extends Application {
 	}
 
 	/**
-	 * {@inheritDoc}
+	 * Closes the client connection and saves the local database and settings.
+	 * 
+	 * @since Envoy Client v0.1-beta
 	 */
 	@Override
 	public void stop() {
 		try {
-			// Save Settings and PersistentLocalDB on shutdown
 			logger.info("Closing connection...");
 			client.close();
 

From ab626d322633f42a2181628a6bc61700109ed9f8 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Tue, 9 Jun 2020 14:12:27 +0200
Subject: [PATCH 52/60] Fix user list in offline mode

---
 src/main/java/envoy/client/ui/controller/ChatScene.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index e406060..ec00b2c 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -133,8 +133,7 @@ public final class ChatScene {
 		this.client			= client;
 		this.writeProxy		= writeProxy;
 
-		// TODO: handle offline mode
-		userList.setItems(FXCollections.observableList(localDB.getUser().getContacts().stream().collect(Collectors.toList())));
+		userList.setItems(FXCollections.observableList(localDB.getChats().stream().map(Chat::getRecipient).collect(Collectors.toList())));
 	}
 
 	@FXML

From bec49ff9e82cde181967f46dc920966531418e88 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Tue, 9 Jun 2020 14:21:11 +0200
Subject: [PATCH 53/60] Implemented contact removal operation (untested)

---
 src/main/java/envoy/client/ui/controller/ChatScene.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index ec00b2c..7074774 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -109,10 +109,12 @@ public final class ChatScene {
 					case ADD:
 						localDB.getUsers().put(contact.getName(), contact);
 						localDB.getChats().add(new Chat(contact));
-						userList.getItems().add(contact);// TODO might cause contact duplication
+						userList.getItems().add(contact);
 						break;
 					case REMOVE:
-						// TODO add deletion capability
+						localDB.getUsers().remove(contact.getName());
+						localDB.getChats().removeIf(c -> c.getRecipient().getID() == contact.getID());
+						userList.getItems().removeIf(c -> c.getID() == contact.getID());
 						break;
 				}
 			});

From 3d71cda8844af6da928013694a22bf7f2f721c63 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Tue, 9 Jun 2020 15:41:01 +0200
Subject: [PATCH 54/60] Ask user before adding a contact

---
 .../envoy/client/data/PersistentLocalDB.java  |  2 +-
 src/main/java/envoy/client/net/Client.java    |  4 +--
 src/main/java/envoy/client/net/Receiver.java  | 15 +++++++-
 .../envoy/client/ui/controller/ChatScene.java | 29 ++++++++--------
 .../ui/controller/ContactSearchScene.java     | 34 ++++++++++++-------
 5 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/src/main/java/envoy/client/data/PersistentLocalDB.java b/src/main/java/envoy/client/data/PersistentLocalDB.java
index 66bf167..9548516 100644
--- a/src/main/java/envoy/client/data/PersistentLocalDB.java
+++ b/src/main/java/envoy/client/data/PersistentLocalDB.java
@@ -49,7 +49,7 @@ public class PersistentLocalDB extends LocalDB {
 
 		// Initialize local database directory
 		if (localDBDir.exists() && !localDBDir.isDirectory())
-			throw new IOException(String.format("LocalDbDir '%s' is not a directory!", localDBDir.getAbsolutePath()));
+			throw new IOException(String.format("LocalDBDir '%s' is not a directory!", localDBDir.getAbsolutePath()));
 		usersFile		= new File(localDBDir, "users.db");
 		idGeneratorFile	= new File(localDBDir, "id_generator.db");
 	}
diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index ce9b3a6..e36f9ee 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -74,7 +74,7 @@ public class Client implements Closeable {
 		socket = new Socket(config.getServer(), config.getPort());
 		logger.fine("Successfully established TCP connection to server");
 
-		// Create message receiver
+		// Create object receiver
 		receiver = new Receiver(socket.getInputStream());
 
 		// Register user creation processor, contact list processor and message cache
@@ -108,7 +108,7 @@ public class Client implements Closeable {
 
 		online = true;
 
-		// Remove user creation processor
+		// Remove all processors as they are only used during the handshake
 		receiver.removeAllProcessors();
 
 		logger.info("Handshake completed.");
diff --git a/src/main/java/envoy/client/net/Receiver.java b/src/main/java/envoy/client/net/Receiver.java
index b3dd763..5926e1e 100644
--- a/src/main/java/envoy/client/net/Receiver.java
+++ b/src/main/java/envoy/client/net/Receiver.java
@@ -14,6 +14,9 @@ import envoy.util.EnvoyLog;
 import envoy.util.SerializationUtils;
 
 /**
+ * Receives objects from the server and passes them to processor objects based
+ * on their class.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>Receiver.java</strong><br>
  * Created: <strong>30.12.2019</strong><br>
@@ -32,12 +35,19 @@ public class Receiver extends Thread {
 	 * Creates an instance of {@link Receiver}.
 	 *
 	 * @param in the {@link InputStream} to parse objects from
+	 * @since Envoy Client v0.3-alpha
 	 */
 	public Receiver(InputStream in) {
 		super("Receiver");
 		this.in = in;
 	}
 
+	/**
+	 * Starts the receiver loop. When an object is read, it is passed to the
+	 * appropriate processor.
+	 * 
+	 * @since Envoy Client v0.3-alpha
+	 */
 	@Override
 	public void run() {
 
@@ -65,7 +75,7 @@ public class Receiver extends Thread {
 				}
 			}
 		} catch (SocketException e) {
-			logger.info("Connection probably closed by client. Exiting receiver thread...");
+			// Connection probably closed by client.
 		} catch (Exception e) {
 			logger.log(Level.SEVERE, "Error on receiver thread", e);
 			e.printStackTrace();
@@ -78,11 +88,14 @@ public class Receiver extends Thread {
 	 *
 	 * @param processorClass the object class accepted by the processor
 	 * @param processor      the object processor
+	 * @since Envoy Client v0.3-alpha
 	 */
 	public <T> void registerProcessor(Class<T> processorClass, Consumer<T> processor) { processors.put(processorClass, processor); }
 
 	/**
 	 * Removes all object processors registered at this {@link Receiver}.
+	 * 
+	 * @since Envoy Client v0.3-alpha
 	 */
 	public void removeAllProcessors() { processors.clear(); }
 }
diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index 7074774..76c0c3b 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -96,28 +96,27 @@ public final class ChatScene {
 			message.setStatus(e.get());
 
 			// Update UI if in current chat
-			if (currentChat != null && message.getSenderID() == currentChat.getRecipient().getID()) Platform.runLater(() -> messageList.refresh());
+			if (currentChat != null && message.getSenderID() == currentChat.getRecipient().getID()) Platform.runLater(messageList::refresh);
 		});
+
 		// Listen to user status changes
 		eventBus.register(UserStatusChangeEvent.class, e -> Platform.runLater(userList::refresh));
 
 		// Listen to contacts changes
 		eventBus.register(ContactOperationEvent.class, e -> {
 			final var contact = e.get();
-			Platform.runLater(() -> {
-				switch (e.getOperationType()) {
-					case ADD:
-						localDB.getUsers().put(contact.getName(), contact);
-						localDB.getChats().add(new Chat(contact));
-						userList.getItems().add(contact);
-						break;
-					case REMOVE:
-						localDB.getUsers().remove(contact.getName());
-						localDB.getChats().removeIf(c -> c.getRecipient().getID() == contact.getID());
-						userList.getItems().removeIf(c -> c.getID() == contact.getID());
-						break;
-				}
-			});
+			switch (e.getOperationType()) {
+				case ADD:
+					localDB.getUsers().put(contact.getName(), contact);
+					localDB.getChats().add(new Chat(contact));
+					Platform.runLater(() -> userList.getItems().add(contact));
+					break;
+				case REMOVE:
+					localDB.getUsers().remove(contact.getName());
+					localDB.getChats().removeIf(c -> c.getRecipient().getID() == contact.getID());
+					Platform.runLater(() -> userList.getItems().removeIf(c -> c.getID() == contact.getID()));
+					break;
+			}
 		});
 	}
 
diff --git a/src/main/java/envoy/client/ui/controller/ContactSearchScene.java b/src/main/java/envoy/client/ui/controller/ContactSearchScene.java
index d6c34b6..f98b016 100644
--- a/src/main/java/envoy/client/ui/controller/ContactSearchScene.java
+++ b/src/main/java/envoy/client/ui/controller/ContactSearchScene.java
@@ -1,13 +1,12 @@
 package envoy.client.ui.controller;
 
-import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import javafx.application.Platform;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ListView;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
+import javafx.scene.control.Alert.AlertType;
 
 import envoy.client.event.SendEvent;
 import envoy.client.ui.SceneContext;
@@ -59,7 +58,10 @@ public class ContactSearchScene {
 	@FXML
 	private void initialize() {
 		contactList.setCellFactory(e -> new UserListCell());
-		eventBus.register(ContactSearchResult.class, response -> Optional.of(response.get()).ifPresent(list -> contactList.getItems().addAll(list)));
+		eventBus.register(ContactSearchResult.class, response -> Platform.runLater(() -> {
+			contactList.getItems().clear();
+			contactList.getItems().addAll(response.get());
+		}));
 	}
 
 	/**
@@ -104,14 +106,20 @@ public class ContactSearchScene {
 	 */
 	@FXML
 	private void contactListClicked() {
-		Optional.ofNullable(contactList.getSelectionModel().getSelectedItems()).ifPresent(contacts -> contacts.forEach(contact -> {
-			final var event = new ContactOperationEvent(contact, ElementOperation.ADD);
-			// Sends the event to the server
-			eventBus.dispatch(new SendEvent(event));
-			// Updates the UI
-			eventBus.dispatch(event);
-			logger.log(Level.INFO, "Added contact " + contact);
-		}));
+		final var	contact	= contactList.getSelectionModel().getSelectedItem();
+		if (contact != null) {
+			final var alert = new Alert(AlertType.CONFIRMATION);
+			alert.setTitle("Add Contact to Contact List");
+			alert.setHeaderText("Add the user " + contact.getName() + " to your contact list?");
+			alert.showAndWait().filter(btn -> btn == ButtonType.OK).ifPresent(btn -> {
+				final var event = new ContactOperationEvent(contact, ElementOperation.ADD);
+				// Sends the event to the server
+				eventBus.dispatch(new SendEvent(event));
+				// Updates the UI
+				eventBus.dispatch(event);
+				logger.log(Level.INFO, "Added contact " + contact);
+			});
+		}
 	}
 
 	@FXML

From 4835cc68fbf3e3e432b16718aaa7f4eca0e60861 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Tue, 9 Jun 2020 15:49:11 +0200
Subject: [PATCH 55/60] Rename UserListCell to ContactListCell

---
 ...UserListCell.java => ContactListCell.java} | 19 ++++++++++---------
 .../envoy/client/ui/controller/ChatScene.java |  4 ++--
 .../ui/controller/ContactSearchScene.java     |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)
 rename src/main/java/envoy/client/ui/{UserListCell.java => ContactListCell.java} (59%)

diff --git a/src/main/java/envoy/client/ui/UserListCell.java b/src/main/java/envoy/client/ui/ContactListCell.java
similarity index 59%
rename from src/main/java/envoy/client/ui/UserListCell.java
rename to src/main/java/envoy/client/ui/ContactListCell.java
index cfc1fdf..eb6e3c1 100644
--- a/src/main/java/envoy/client/ui/UserListCell.java
+++ b/src/main/java/envoy/client/ui/ContactListCell.java
@@ -1,11 +1,12 @@
 package envoy.client.ui;
 
-import envoy.data.Contact;
-import envoy.data.User;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.layout.VBox;
 
+import envoy.data.Contact;
+import envoy.data.User;
+
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>UserListCell.java</strong><br>
@@ -14,20 +15,20 @@ import javafx.scene.layout.VBox;
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-public class UserListCell extends ListCell<Contact> {
+public class ContactListCell extends ListCell<Contact> {
 
 	/**
-	 * {@inheritDoc}
+	 * Displays the name of a contact. If the contact is a user, their online status
+	 * is displayed as well.
+	 * 
+	 * @since Envoy Client v0.1-beta
 	 */
 	@Override
 	protected void updateItem(Contact contact, boolean empty) {
 		super.updateItem(contact, empty);
 		if (!empty && contact != null) {
-			final Label name = new Label(contact.getName());
-			if (contact instanceof User) {
-				final Label status = new Label(((User) contact).getStatus().toString());
-				setGraphic(new VBox(name, status));
-			} else setGraphic(new VBox(name));
+			final var name = new Label(contact.getName());
+			setGraphic(contact instanceof User ? new VBox(name, new Label(((User) contact).getStatus().toString())) : new VBox(name));
 		}
 	}
 }
diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index 76c0c3b..4c3fe05 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -21,7 +21,7 @@ import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
 import envoy.client.ui.MessageListCell;
 import envoy.client.ui.SceneContext;
-import envoy.client.ui.UserListCell;
+import envoy.client.ui.ContactListCell;
 import envoy.data.Contact;
 import envoy.data.Message;
 import envoy.data.MessageBuilder;
@@ -79,7 +79,7 @@ public final class ChatScene {
 
 		// Initialize message and user rendering
 		messageList.setCellFactory(listView -> new MessageListCell());
-		userList.setCellFactory(listView -> new UserListCell());
+		userList.setCellFactory(listView -> new ContactListCell());
 
 		// Listen to received messages
 		eventBus.register(MessageCreationEvent.class, e -> {
diff --git a/src/main/java/envoy/client/ui/controller/ContactSearchScene.java b/src/main/java/envoy/client/ui/controller/ContactSearchScene.java
index f98b016..9fc495d 100644
--- a/src/main/java/envoy/client/ui/controller/ContactSearchScene.java
+++ b/src/main/java/envoy/client/ui/controller/ContactSearchScene.java
@@ -10,7 +10,7 @@ import javafx.scene.control.Alert.AlertType;
 
 import envoy.client.event.SendEvent;
 import envoy.client.ui.SceneContext;
-import envoy.client.ui.UserListCell;
+import envoy.client.ui.ContactListCell;
 import envoy.data.Contact;
 import envoy.event.ElementOperation;
 import envoy.event.EventBus;
@@ -57,7 +57,7 @@ public class ContactSearchScene {
 
 	@FXML
 	private void initialize() {
-		contactList.setCellFactory(e -> new UserListCell());
+		contactList.setCellFactory(e -> new ContactListCell());
 		eventBus.register(ContactSearchResult.class, response -> Platform.runLater(() -> {
 			contactList.getItems().clear();
 			contactList.getItems().addAll(response.get());

From fc4fb4cdaeb4898f05c80ed23c645ad1e0a1adb2 Mon Sep 17 00:00:00 2001
From: kske <kai@kske.dev>
Date: Tue, 9 Jun 2020 17:06:40 +0200
Subject: [PATCH 56/60] Process ContactOperationEvent

---
 src/main/java/envoy/client/net/Client.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index e36f9ee..fcf9dd0 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -152,8 +152,8 @@ public class Client implements Closeable {
 		// Process contact searches
 		receiver.registerProcessor(ContactSearchResult.class, eventBus::dispatch);
 
-		receiver.registerProcessor(Contact.class,
-				contacts -> eventBus.dispatch(new ContactOperationEvent(contacts.getContacts().iterator().next(), ElementOperation.ADD)));
+		// Process contact operations
+		receiver.registerProcessor(ContactOperationEvent.class, eventBus::dispatch);
 
 		// Process group size changes
 		receiver.registerProcessor(GroupResizeEvent.class, evt -> { localDB.updateGroup(evt); eventBus.dispatch(evt); });

From 9a6214eb82f8ba0217d0654e770dd4b9f3544822 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Tue, 9 Jun 2020 17:11:17 +0200
Subject: [PATCH 57/60] Fixed bug automatically sending a message when ctrl is
 being pressed

---
 .../envoy/client/ui/controller/ChatScene.java | 63 +++++++++++++++----
 src/main/resources/fxml/ChatScene.fxml        |  2 +-
 2 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index 4c3fe05..5b4b1a6 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -19,9 +19,9 @@ import envoy.client.data.Settings;
 import envoy.client.event.MessageCreationEvent;
 import envoy.client.net.Client;
 import envoy.client.net.WriteProxy;
+import envoy.client.ui.ContactListCell;
 import envoy.client.ui.MessageListCell;
 import envoy.client.ui.SceneContext;
-import envoy.client.ui.ContactListCell;
 import envoy.data.Contact;
 import envoy.data.Message;
 import envoy.data.MessageBuilder;
@@ -74,6 +74,11 @@ public final class ChatScene {
 	private static final Logger		logger				= EnvoyLog.getLogger(ChatScene.class);
 	private static final int		MAX_MESSAGE_LENGTH	= 255;
 
+	/**
+	 * Initializes the appearance of certain visual components.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
 	@FXML
 	private void initialize() {
 
@@ -121,6 +126,8 @@ public final class ChatScene {
 	}
 
 	/**
+	 * Initializes all necessary data via dependency injection-
+	 *
 	 * @param sceneContext the scene context used to load other scenes
 	 * @param localDB      the local database form which chats and users are loaded
 	 * @param client       the client used to request ID generators
@@ -137,6 +144,11 @@ public final class ChatScene {
 		userList.setItems(FXCollections.observableList(localDB.getChats().stream().map(Chat::getRecipient).collect(Collectors.toList())));
 	}
 
+	/**
+	 * Actions to perform when the list of contacts has been clicked.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
 	@FXML
 	private void userListClicked() {
 		final Contact user = userList.getSelectionModel().getSelectedItem();
@@ -161,32 +173,43 @@ public final class ChatScene {
 		messageTextArea.setDisable(currentChat == null);
 	}
 
+	/**
+	 * Actions to perform when the Post Button has been clicked.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
 	@FXML
 	private void postButtonClicked() { postMessage(); }
 
+	/**
+	 * Actions to perform when the Settings Button has been clicked.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
 	@FXML
 	private void settingsButtonClicked() {
 		sceneContext.load(SceneContext.SceneInfo.SETTINGS_SCENE);
 		sceneContext.<SettingsScene>getController().initializeData(sceneContext);
 	}
 
+	/**
+	 * Actions to perform when the "Add Contact" - Button has been clicked.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
 	@FXML
 	private void addContactButtonClicked() {
 		sceneContext.load(SceneContext.SceneInfo.CONTACT_SEARCH_SCENE);
 		sceneContext.<ContactSearchScene>getController().initializeData(sceneContext);
 	}
 
+	/**
+	 * Actions to perform when the text was updated in the messageTextArea.
+	 *
+	 * @since Envoy Client v0.1-beta
+	 */
 	@FXML
-	private void messageTextUpdated(KeyEvent e) {
-		// TODO: Letting go of ctrl automatically posts a message. Needs to be fixed
-		// soon.
-
-		// Automatic sending of messages via (ctrl +) enter
-		if (!postButton.isDisabled() && settings.isEnterToSend() && e.getCode() == KeyCode.ENTER
-				|| !settings.isEnterToSend() && e.getCode() == KeyCode.CONTROL)
-			postMessage();
-		else postButton.setDisable(messageTextArea.getText().isBlank() || currentChat == null);
-
+	private void messageTextUpdated() {
 		// Truncating messages that are too long and staying at the same position
 		if (messageTextArea.getText().length() >= MAX_MESSAGE_LENGTH) {
 			messageTextArea.setText(messageTextArea.getText().substring(0, MAX_MESSAGE_LENGTH));
@@ -201,6 +224,24 @@ public final class ChatScene {
 		remainingChars.setTextFill(Color.rgb(currentLength, remainingLength, 0, 1));
 	}
 
+	/**
+	 * Actions to perform when a key has been entered.
+	 *
+	 * @param e the Keys that have been entered
+	 * @since Envoy Client v0.1-beta
+	 */
+	@FXML
+	private void checkKeyCombination(KeyEvent e) {
+		// TODO: Letting go of ctrl automatically posts a message. Needs to be fixed
+		// soon.
+
+		// Automatic sending of messages via (ctrl +) enter
+		if (!postButton.isDisabled() && settings.isEnterToSend() && e.getCode() == KeyCode.ENTER
+				|| !settings.isEnterToSend() && e.getCode() == KeyCode.ENTER && e.isControlDown())
+			postMessage();
+		postButton.setDisable(messageTextArea.getText().isBlank() || currentChat == null);
+	}
+
 	/**
 	 * Sends a new message to the server based on the text entered in the
 	 * messageTextArea.
diff --git a/src/main/resources/fxml/ChatScene.fxml b/src/main/resources/fxml/ChatScene.fxml
index a81cd00..c134894 100644
--- a/src/main/resources/fxml/ChatScene.fxml
+++ b/src/main/resources/fxml/ChatScene.fxml
@@ -27,7 +27,7 @@
 		<Button fx:id="settingsButton" mnemonicParsing="true" onAction="#settingsButtonClicked" text="_Settings" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
 		<ListView fx:id="messageList" prefHeight="257.0" prefWidth="155.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2" />
 		<Button fx:id="postButton" defaultButton="true" disable="true" mnemonicParsing="true" onAction="#postButtonClicked" prefHeight="10.0" prefWidth="65.0" text="_Post" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
-      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyPressed="#messageTextUpdated" onKeyTyped="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyPressed="#checkKeyCombination" onKeyTyped="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <Button mnemonicParsing="true" onAction="#addContactButtonClicked" text="_Add Contacts" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
          <padding>
             <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />

From 77f3db0ba313bd4d4ed26e7c1e10e19b7bddc5cd Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Tue, 9 Jun 2020 20:42:17 +0200
Subject: [PATCH 58/60] Added color display of user statuses

---
 .../java/envoy/client/ui/ContactListCell.java | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/envoy/client/ui/ContactListCell.java b/src/main/java/envoy/client/ui/ContactListCell.java
index eb6e3c1..c3c51d4 100644
--- a/src/main/java/envoy/client/ui/ContactListCell.java
+++ b/src/main/java/envoy/client/ui/ContactListCell.java
@@ -3,8 +3,10 @@ package envoy.client.ui;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
 
 import envoy.data.Contact;
+import envoy.data.Group;
 import envoy.data.User;
 
 /**
@@ -20,15 +22,39 @@ public class ContactListCell extends ListCell<Contact> {
 	/**
 	 * Displays the name of a contact. If the contact is a user, their online status
 	 * is displayed as well.
-	 * 
+	 *
 	 * @since Envoy Client v0.1-beta
 	 */
 	@Override
 	protected void updateItem(Contact contact, boolean empty) {
 		super.updateItem(contact, empty);
 		if (!empty && contact != null) {
-			final var name = new Label(contact.getName());
-			setGraphic(contact instanceof User ? new VBox(name, new Label(((User) contact).getStatus().toString())) : new VBox(name));
+			// the infoLabel displays specific contact info, i.e. status of a user or amount
+			// of members in a group
+			Label infoLabel = null;
+			if (contact instanceof User) {
+				// user specific info
+				infoLabel = new Label(((User) contact).getStatus().toString());
+				Color textColor = null;
+				switch (((User) contact).getStatus()) {
+					case ONLINE:
+						textColor = Color.LIMEGREEN;
+						break;
+					case AWAY:
+						textColor = Color.ORANGERED;
+						break;
+					case BUSY:
+						textColor = Color.RED;
+						break;
+					case OFFLINE:
+						textColor = Color.GRAY;
+						break;
+				}
+				infoLabel.setTextFill(textColor);
+			} else 
+				// group specific infos
+				infoLabel = new Label(String.valueOf(((Group) contact).getContacts().size()) + " members");
+			setGraphic(new VBox(new Label(contact.getName()), infoLabel));
 		}
 	}
 }

From 3e0b73ef12c1f3352c4df4bc30d87bc72132c763 Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Tue, 9 Jun 2020 21:03:19 +0200
Subject: [PATCH 59/60] Added (currently useless) comboBox to change your
 status

---
 .../client/ui/settings/GeneralSettingsPane.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java b/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
index 12cbaf5..e6d5761 100644
--- a/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
+++ b/src/main/java/envoy/client/ui/settings/GeneralSettingsPane.java
@@ -8,13 +8,14 @@ import javafx.scene.layout.VBox;
 import envoy.client.data.Settings;
 import envoy.client.data.SettingsItem;
 import envoy.client.event.ThemeChangeEvent;
+import envoy.data.User.UserStatus;
 import envoy.event.EventBus;
 
 /**
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>GeneralSettingsPane.java</strong><br>
  * Created: <strong>18.04.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
@@ -27,7 +28,7 @@ public class GeneralSettingsPane extends SettingsPane {
 	 */
 	public GeneralSettingsPane() {
 		super("General");
-		var vbox = new VBox();
+		final var vbox = new VBox();
 
 		// TODO: Support other value types
 		List.of("onCloseMode", "enterToSend")
@@ -36,7 +37,7 @@ public class GeneralSettingsPane extends SettingsPane {
 			.map(i -> new SettingsCheckbox((SettingsItem<Boolean>) i))
 			.forEach(vbox.getChildren()::add);
 
-		var combobox = new ComboBox<String>();
+		final var combobox = new ComboBox<String>();
 		combobox.getItems().add("dark");
 		combobox.getItems().add("light");
 		combobox.setValue(settings.getCurrentTheme());
@@ -44,6 +45,13 @@ public class GeneralSettingsPane extends SettingsPane {
 				e -> { settings.setCurrentTheme(combobox.getValue()); EventBus.getInstance().dispatch(new ThemeChangeEvent(combobox.getValue())); });
 		vbox.getChildren().add(combobox);
 
+		final var statusComboBox = new ComboBox<UserStatus>();
+		statusComboBox.getItems().setAll(UserStatus.values());
+		statusComboBox.setValue(UserStatus.ONLINE);
+		// TODO add action when value is changed
+		statusComboBox.setOnAction(e -> {});
+		vbox.getChildren().add(statusComboBox);
+
 		getChildren().add(vbox);
 	}
 }

From d6e12df076bdbe9b4a8f86c76487e79e5add741c Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Tue, 9 Jun 2020 22:24:09 +0200
Subject: [PATCH 60/60] Fixed visual issues as per @delvh 's request

---
 src/main/java/envoy/client/net/Client.java          |  6 +++---
 .../java/envoy/client/ui/controller/ChatScene.java  |  3 ---
 .../java/envoy/client/ui/controller/LoginScene.java | 13 +++++--------
 .../envoy/client/ui/controller/package-info.java    |  4 ++--
 src/main/resources/css/dark.css                     |  2 +-
 src/main/resources/css/light.css                    |  2 +-
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index fcf9dd0..0d09780 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -91,7 +91,7 @@ public class Client implements Closeable {
 		SerializationUtils.writeBytesWithLength(credentials, socket.getOutputStream());
 
 		// Wait for a maximum of five seconds to acquire the sender object
-		long start = System.currentTimeMillis();
+		final long start = System.currentTimeMillis();
 		while (sender == null) {
 
 			// Quit immediately after handshake rejection
@@ -162,7 +162,7 @@ public class Client implements Closeable {
 		eventBus.register(SendEvent.class, evt -> {
 			try {
 				sendEvent(evt.get());
-			} catch (IOException e) {
+			} catch (final IOException e) {
 				e.printStackTrace();
 			}
 		});
@@ -221,7 +221,7 @@ public class Client implements Closeable {
 	 */
 	public Map<String, Contact> getUsers() {
 		checkOnline();
-		Map<String, Contact> users = new HashMap<>();
+		final Map<String, Contact> users = new HashMap<>();
 		contacts.forEach(u -> users.put(u.getName(), u));
 		users.put(sender.getName(), sender);
 		return users;
diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index 5b4b1a6..6fdbd2f 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -232,9 +232,6 @@ public final class ChatScene {
 	 */
 	@FXML
 	private void checkKeyCombination(KeyEvent e) {
-		// TODO: Letting go of ctrl automatically posts a message. Needs to be fixed
-		// soon.
-
 		// Automatic sending of messages via (ctrl +) enter
 		if (!postButton.isDisabled() && settings.isEnterToSend() && e.getCode() == KeyCode.ENTER
 				|| !settings.isEnterToSend() && e.getCode() == KeyCode.ENTER && e.isControlDown())
diff --git a/src/main/java/envoy/client/ui/controller/LoginScene.java b/src/main/java/envoy/client/ui/controller/LoginScene.java
index 4f13149..5f6c5aa 100644
--- a/src/main/java/envoy/client/ui/controller/LoginScene.java
+++ b/src/main/java/envoy/client/ui/controller/LoginScene.java
@@ -28,7 +28,7 @@ import envoy.util.EnvoyLog;
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>LoginDialog.java</strong><br>
  * Created: <strong>03.04.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
@@ -72,7 +72,7 @@ public final class LoginScene {
 
 	/**
 	 * Loads the login dialog using the FXML file {@code LoginDialog.fxml}.
-	 * 
+	 *
 	 * @param client               the client used to perform the handshake
 	 * @param localDB              the local database used for offline login
 	 * @param receivedMessageCache the cache storing messages received during
@@ -104,9 +104,7 @@ public final class LoginScene {
 		if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
 			clearPasswordFields();
 			new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
-		} else {
-			performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected()));
-		}
+		} else performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected()));
 	}
 
 	@FXML
@@ -120,7 +118,6 @@ public final class LoginScene {
 		// Make repeat password field and label visible / invisible
 		repeatPasswordField.setVisible(registerCheckBox.isSelected());
 		repeatPasswordLabel.setVisible(registerCheckBox.isSelected());
-
 		clearPasswordFields();
 	}
 
@@ -148,12 +145,12 @@ public final class LoginScene {
 		try {
 			// Try entering offline mode
 			localDB.loadUsers();
-			User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
+			final User clientUser = (User) localDB.getUsers().get(credentials.getIdentifier());
 			if (clientUser == null) throw new EnvoyException("Could not enter offline mode: user name unknown");
 			client.setSender(clientUser);
 			new Alert(AlertType.WARNING, "A connection to the server could not be established. Starting in offline mode.").showAndWait();
 			loadChatScene();
-		} catch (Exception e) {
+		} catch (final Exception e) {
 			new Alert(AlertType.ERROR, "Client error: " + e).showAndWait();
 			System.exit(1);
 		}
diff --git a/src/main/java/envoy/client/ui/controller/package-info.java b/src/main/java/envoy/client/ui/controller/package-info.java
index 51d18e8..7989b8f 100644
--- a/src/main/java/envoy/client/ui/controller/package-info.java
+++ b/src/main/java/envoy/client/ui/controller/package-info.java
@@ -4,8 +4,8 @@
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>package-info.java</strong><br>
  * Created: <strong>08.06.2020</strong><br>
- * 
+ *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
  */
-package envoy.client.ui.controller;
\ No newline at end of file
+package envoy.client.ui.controller;
diff --git a/src/main/resources/css/dark.css b/src/main/resources/css/dark.css
index 4a899b2..e10a301 100644
--- a/src/main/resources/css/dark.css
+++ b/src/main/resources/css/dark.css
@@ -1,4 +1,4 @@
 .button{
 	-fx-background-color: rgb(105,0,153);
 	-fx-text-fill: white;
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/css/light.css b/src/main/resources/css/light.css
index a529c0f..34a1f74 100644
--- a/src/main/resources/css/light.css
+++ b/src/main/resources/css/light.css
@@ -1,3 +1,3 @@
 .button{
 	-fx-background-color: snow;
-}
\ No newline at end of file
+}