From c406a5d226ae3bf773f6dce175b78d143c719b1e Mon Sep 17 00:00:00 2001
From: DieGurke <55625494+DieGurke@users.noreply.github.com>
Date: Wed, 15 Jul 2020 14:05:47 +0200
Subject: [PATCH 01/33] Replaced custom clearableTextField with normal
TextField
---
.../java/envoy/client/ui/controller/LoginScene.java | 11 +++++------
client/src/main/resources/fxml/LoginScene.fxml | 6 +++---
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/client/src/main/java/envoy/client/ui/controller/LoginScene.java b/client/src/main/java/envoy/client/ui/controller/LoginScene.java
index 3f0df5b..fe05578 100644
--- a/client/src/main/java/envoy/client/ui/controller/LoginScene.java
+++ b/client/src/main/java/envoy/client/ui/controller/LoginScene.java
@@ -14,7 +14,6 @@ import javafx.scene.control.Alert.AlertType;
import envoy.client.data.*;
import envoy.client.net.Client;
import envoy.client.net.WriteProxy;
-import envoy.client.ui.ClearableTextField;
import envoy.client.ui.SceneContext;
import envoy.client.ui.Startup;
import envoy.data.LoginCredentials;
@@ -38,7 +37,7 @@ import envoy.util.EnvoyLog;
public final class LoginScene {
@FXML
- private ClearableTextField userTextField;
+ private TextField userTextField;
@FXML
private PasswordField passwordField;
@@ -104,16 +103,16 @@ public final class LoginScene {
if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
repeatPasswordField.clear();
- } else if (!Bounds.isValidContactName(userTextField.getTextField().getText())) {
+ } else if (!Bounds.isValidContactName(userTextField.getText())) {
new Alert(AlertType.ERROR, "The entered user name is not valid (" + Bounds.CONTACT_NAME_PATTERN + ")").showAndWait();
- userTextField.getTextField().clear();
- } else performHandshake(new LoginCredentials(userTextField.getTextField().getText(), passwordField.getText(), registerCheckBox.isSelected(),
+ userTextField.clear();
+ } else performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText(), registerCheckBox.isSelected(),
Startup.VERSION));
}
@FXML
private void offlineModeButtonPressed() {
- attemptOfflineMode(new LoginCredentials(userTextField.getTextField().getText(), passwordField.getText(), false, Startup.VERSION));
+ attemptOfflineMode(new LoginCredentials(userTextField.getText(), passwordField.getText(), false, Startup.VERSION));
}
@FXML
diff --git a/client/src/main/resources/fxml/LoginScene.fxml b/client/src/main/resources/fxml/LoginScene.fxml
index 1e915a2..04c144a 100644
--- a/client/src/main/resources/fxml/LoginScene.fxml
+++ b/client/src/main/resources/fxml/LoginScene.fxml
@@ -1,11 +1,11 @@
-
+
@@ -70,12 +70,12 @@
-
-
+
From 88afb77a2c3453dda5f16997d7310eeea99f0d5e Mon Sep 17 00:00:00 2001
From: DieGurke <55625494+DieGurke@users.noreply.github.com>
Date: Wed, 15 Jul 2020 18:45:55 +0200
Subject: [PATCH 02/33] Implemented completely new UI for the login scene
---
.../client/ui/controller/LoginScene.java | 40 ++++-
client/src/main/resources/css/base.css | 18 +-
client/src/main/resources/css/dark.css | 8 +
client/src/main/resources/css/light.css | 4 +
.../src/main/resources/fxml/LoginScene.fxml | 156 +++++++-----------
5 files changed, 121 insertions(+), 105 deletions(-)
diff --git a/client/src/main/java/envoy/client/ui/controller/LoginScene.java b/client/src/main/java/envoy/client/ui/controller/LoginScene.java
index fe05578..4a18200 100644
--- a/client/src/main/java/envoy/client/ui/controller/LoginScene.java
+++ b/client/src/main/java/envoy/client/ui/controller/LoginScene.java
@@ -8,6 +8,7 @@ import java.util.logging.Logger;
import javafx.application.Platform;
import javafx.fxml.FXML;
+import javafx.geometry.Insets;
import javafx.scene.control.*;
import javafx.scene.control.Alert.AlertType;
@@ -46,19 +47,27 @@ public final class LoginScene {
private PasswordField repeatPasswordField;
@FXML
- private Label repeatPasswordLabel;
-
- @FXML
- private CheckBox registerCheckBox;
+ private Button registerSwitch;
@FXML
private Label connectionLabel;
+ @FXML
+ private Button loginButton;
+
+ @FXML
+ private Button offlineModeButton;
+
+ @FXML
+ private Label registerTextLabel;
+
private Client client;
private LocalDB localDB;
private CacheMap cacheMap;
private SceneContext sceneContext;
+ private boolean registration = false;
+
private static final Logger logger = EnvoyLog.getLogger(LoginScene.class);
private static final EventBus eventBus = EventBus.getInstance();
private static final ClientConfig config = ClientConfig.getInstance();
@@ -100,13 +109,13 @@ public final class LoginScene {
private void loginButtonPressed() {
// Prevent registration with unequal passwords
- if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) {
+ if (registration && !passwordField.getText().equals(repeatPasswordField.getText())) {
new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait();
repeatPasswordField.clear();
} else if (!Bounds.isValidContactName(userTextField.getText())) {
new Alert(AlertType.ERROR, "The entered user name is not valid (" + Bounds.CONTACT_NAME_PATTERN + ")").showAndWait();
userTextField.clear();
- } else performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText(), registerCheckBox.isSelected(),
+ } else performHandshake(new LoginCredentials(userTextField.getText(), passwordField.getText(), registration,
Startup.VERSION));
}
@@ -116,11 +125,24 @@ public final class LoginScene {
}
@FXML
- private void registerCheckboxChanged() {
+ private void registerSwitchPressed() {
+ registration = !registration;
// Make repeat password field and label visible / invisible
- repeatPasswordField.setVisible(registerCheckBox.isSelected());
- repeatPasswordLabel.setVisible(registerCheckBox.isSelected());
+ repeatPasswordField.setVisible(registration);
+ if (loginButton.getText().equals("Login")) {
+ loginButton.setText("Register");
+ loginButton.setPadding(new Insets(2, 116, 2, 116));
+ registerTextLabel.setText("Already an account?");
+ registerSwitch.setText("Login");
+ offlineModeButton.setDisable(true);
+ } else {
+ loginButton.setText("Login");
+ loginButton.setPadding(new Insets(2, 125, 2, 125));
+ registerTextLabel.setText("No account yet?");
+ registerSwitch.setText("Register");
+ offlineModeButton.setDisable(false);
+ }
}
@FXML
diff --git a/client/src/main/resources/css/base.css b/client/src/main/resources/css/base.css
index 78fff9e..013ef59 100644
--- a/client/src/main/resources/css/base.css
+++ b/client/src/main/resources/css/base.css
@@ -1,5 +1,5 @@
.button, .list-cell, .progress-bar * {
- -fx-background-radius: 5.0em;
+ -fx-background-radius: 0.3em;
}
.context-menu, .context-menu > * {
@@ -65,6 +65,22 @@
-fx-text-alignment: center;
}
+#loginButton {
+ -fx-background-radius: 1em;
+}
+
+#registerSwitch {
+ -fx-background-color: transparent;
+ -fx-text-fill: orange;
+}
+
+#loginInputField {
+ -fx-background-color: transparent;
+ -fx-border: solid;
+ -fx-border-width: 0 0 1 0;
+
+}
+
#remainingCharsLabel {
-fx-text-fill: #00FF00;
-fx-background-color: transparent;
diff --git a/client/src/main/resources/css/dark.css b/client/src/main/resources/css/dark.css
index eaad3a9..d97369e 100644
--- a/client/src/main/resources/css/dark.css
+++ b/client/src/main/resources/css/dark.css
@@ -37,3 +37,11 @@
.alert.information.dialog-pane, .alert.warning.dialog-pane, .alert.error.dialog-pane {
-fx-background-color: black;
}
+
+#loginInputField {
+ -fx-border-color: white;
+}
+
+#loginBackground {
+ -fx-background-color: rgb(25, 25, 25);
+}
diff --git a/client/src/main/resources/css/light.css b/client/src/main/resources/css/light.css
index 066de55..8486dcb 100644
--- a/client/src/main/resources/css/light.css
+++ b/client/src/main/resources/css/light.css
@@ -14,3 +14,7 @@
.own-message {
-fx-background-color: lightgreen;
}
+
+#loginInputField {
+ -fx-border-color: black;
+}
diff --git a/client/src/main/resources/fxml/LoginScene.fxml b/client/src/main/resources/fxml/LoginScene.fxml
index 04c144a..5f0b872 100644
--- a/client/src/main/resources/fxml/LoginScene.fxml
+++ b/client/src/main/resources/fxml/LoginScene.fxml
@@ -2,93 +2,73 @@
-
-
+
+
+
-
+
-
From c963b9bdccf88e32da0420843c1047b2f93e4def Mon Sep 17 00:00:00 2001
From: delvh
Date: Wed, 15 Jul 2020 21:44:57 +0200
Subject: [PATCH 03/33] Fixed bug not scrolling to the correct message
---
.../src/main/java/envoy/client/ui/controller/ChatScene.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/src/main/java/envoy/client/ui/controller/ChatScene.java b/client/src/main/java/envoy/client/ui/controller/ChatScene.java
index 920d93f..e5c1931 100644
--- a/client/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/client/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -184,7 +184,7 @@ public final class ChatScene implements Restorable {
switch (e.getOperationType()) {
case ADD:
localDB.getUsers().put(contact.getName(), contact);
- Chat chat = contact instanceof User ? new Chat(contact) : new GroupChat(client.getSender(), contact);
+ final Chat chat = contact instanceof User ? new Chat(contact) : new GroupChat(client.getSender(), contact);
Platform.runLater(() -> chatList.getItems().add(chat));
break;
case REMOVE:
@@ -240,7 +240,7 @@ public final class ChatScene implements Restorable {
currentChat = localDB.getChat(user.getID()).get();
messageList.setItems(FXCollections.observableList(currentChat.getMessages()));
- final var scrollIndex = messageList.getItems().size() - currentChat.getUnreadAmount() - 1;
+ final var scrollIndex = messageList.getItems().size() - currentChat.getUnreadAmount();
messageList.scrollTo(scrollIndex);
logger.log(Level.FINEST, "Loading chat with " + user + " at index " + scrollIndex);
deleteContactMenuItem.setText("Delete " + user.getName());
From c0676984e6d872e2e0884b240b7eb8eac300ecef Mon Sep 17 00:00:00 2001
From: delvh
Date: Wed, 15 Jul 2020 21:48:06 +0200
Subject: [PATCH 04/33] Persisted really important statement forever in comment
---
common/src/main/java/envoy/util/Bounds.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common/src/main/java/envoy/util/Bounds.java b/common/src/main/java/envoy/util/Bounds.java
index 315e047..7540b88 100644
--- a/common/src/main/java/envoy/util/Bounds.java
+++ b/common/src/main/java/envoy/util/Bounds.java
@@ -23,6 +23,8 @@ public class Bounds {
*/
public static final Pattern CONTACT_NAME_PATTERN = Pattern.compile("^\\w[a-zA-Z0-9-]{2,15}$");
+ // KAI: Trust of Chain - das berühmte Konzept aus der Kryptographie
+
/**
* @param contactName the contact name to validate
* @return {@code true} if the given contact name is valid
From bb6d6b19f768a8073bd7117fee1ca98292a09d4c Mon Sep 17 00:00:00 2001
From: DieGurke <55625494+DieGurke@users.noreply.github.com>
Date: Thu, 16 Jul 2020 16:02:03 +0200
Subject: [PATCH 05/33] Login Scene is not resizable, logo gets loaded
correctly
---
client/src/main/java/envoy/client/ui/SceneContext.java | 2 ++
.../main/java/envoy/client/ui/controller/LoginScene.java | 7 +++++++
client/src/main/resources/fxml/LoginScene.fxml | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/client/src/main/java/envoy/client/ui/SceneContext.java b/client/src/main/java/envoy/client/ui/SceneContext.java
index a027395..dff69be 100644
--- a/client/src/main/java/envoy/client/ui/SceneContext.java
+++ b/client/src/main/java/envoy/client/ui/SceneContext.java
@@ -125,6 +125,8 @@ public final class SceneContext {
sceneStack.push(scene);
stage.setScene(scene);
+ if (sceneInfo == SceneInfo.LOGIN_SCENE) stage.setResizable(false);
+ else stage.setResizable(true);
applyCSS();
stage.sizeToScene();
stage.show();
diff --git a/client/src/main/java/envoy/client/ui/controller/LoginScene.java b/client/src/main/java/envoy/client/ui/controller/LoginScene.java
index 4a18200..808212d 100644
--- a/client/src/main/java/envoy/client/ui/controller/LoginScene.java
+++ b/client/src/main/java/envoy/client/ui/controller/LoginScene.java
@@ -11,10 +11,12 @@ import javafx.fxml.FXML;
import javafx.geometry.Insets;
import javafx.scene.control.*;
import javafx.scene.control.Alert.AlertType;
+import javafx.scene.image.ImageView;
import envoy.client.data.*;
import envoy.client.net.Client;
import envoy.client.net.WriteProxy;
+import envoy.client.ui.IconUtil;
import envoy.client.ui.SceneContext;
import envoy.client.ui.Startup;
import envoy.data.LoginCredentials;
@@ -61,6 +63,9 @@ public final class LoginScene {
@FXML
private Label registerTextLabel;
+ @FXML
+ private ImageView logo;
+
private Client client;
private LocalDB localDB;
private CacheMap cacheMap;
@@ -78,6 +83,8 @@ public final class LoginScene {
// Show an alert after an unsuccessful handshake
eventBus.register(HandshakeRejection.class, e -> Platform.runLater(() -> { new Alert(AlertType.ERROR, e.get()).showAndWait(); }));
+
+ logo.setImage(IconUtil.loadIcon("envoy_logo"));
}
/**
diff --git a/client/src/main/resources/fxml/LoginScene.fxml b/client/src/main/resources/fxml/LoginScene.fxml
index 5f0b872..b4f475f 100644
--- a/client/src/main/resources/fxml/LoginScene.fxml
+++ b/client/src/main/resources/fxml/LoginScene.fxml
@@ -16,7 +16,7 @@
-
+
From 057f4688135359757eaf00c9ce94ad5914a8d791 Mon Sep 17 00:00:00 2001
From: DieGurke <55625494+DieGurke@users.noreply.github.com>
Date: Thu, 16 Jul 2020 17:28:00 +0200
Subject: [PATCH 06/33] Relocated existing Components of chatScene and adjusted
them a bit
---
client/src/main/resources/fxml/ChatScene.fxml | 187 +++++++-----------
1 file changed, 66 insertions(+), 121 deletions(-)
diff --git a/client/src/main/resources/fxml/ChatScene.fxml b/client/src/main/resources/fxml/ChatScene.fxml
index 11c4c3e..86e2518 100644
--- a/client/src/main/resources/fxml/ChatScene.fxml
+++ b/client/src/main/resources/fxml/ChatScene.fxml
@@ -13,43 +13,24 @@
+
-
+
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
-
+
-
+
@@ -57,14 +38,12 @@
-
+
-
-