From c4591e46e7c52974ac21c8114a49f22364cd3a76 Mon Sep 17 00:00:00 2001
From: Alexis Durgnat <alexis.durgnat@etu.hesge.ch>
Date: Sun, 3 Feb 2019 12:25:19 +0100
Subject: [PATCH] Differentiate other and self chatmessages

---
 src/main/java/ch/hepia/config/AppConfig.java    |   1 +
 .../java/ch/hepia/ui/MainWindowController.java  |   9 +++++++--
 src/main/resources/img/bubble_self.png          | Bin 0 -> 16091 bytes
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/img/bubble_self.png

diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java
index d904501..47571bf 100644
--- a/src/main/java/ch/hepia/config/AppConfig.java
+++ b/src/main/java/ch/hepia/config/AppConfig.java
@@ -34,6 +34,7 @@ public final class AppConfig {
 	 * Resources
 	 */
 	public static final String CHAT_MESSAGE_ICON = "/img/bubble.png";
+	public static final String CHAT_MESSAGE_ICON_SELF = "/img/bubble_self.png";
 	public static final String HELP_MESSAGE_ICON = "/img/help.png";
 	/**
 	 * Style
diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java
index a315c69..3ac3b3f 100644
--- a/src/main/java/ch/hepia/ui/MainWindowController.java
+++ b/src/main/java/ch/hepia/ui/MainWindowController.java
@@ -311,8 +311,13 @@ public class MainWindowController implements Initializable {
         app.getMessageManager().conditionalSubscribeChatMessage(
             chatMessage -> {
                 Platform.runLater(() -> {
-                    String message = chatMessage.getUser().toString() + ": " + chatMessage.getMessage();
-                    drawMessage(chatMessage.getUser(), message, AppConfig.CHAT_MESSAGE_ICON, AppConfig.COLOR_BLUE_10_OPACITY);
+                    User sender = chatMessage.getUser();
+                    String message = sender.getName() + ": " + chatMessage.getMessage();
+                    if (sender.equals(app.getUser().get())) {
+                        drawMessage(sender, message, AppConfig.CHAT_MESSAGE_ICON_SELF, AppConfig.COLOR_BLUE_10_OPACITY);
+                    } else {
+                        drawMessage(sender, message, AppConfig.CHAT_MESSAGE_ICON, AppConfig.COLOR_BLUE_10_OPACITY);
+                    }
                 });
             },
             chatMessage -> !(app.getUser().get().getIgnoredUserList().contains(chatMessage.getUser()))
diff --git a/src/main/resources/img/bubble_self.png b/src/main/resources/img/bubble_self.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f82566859fd2d56154b276532a5745d7c19ceb5
GIT binary patch
literal 16091
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

literal 0
HcmV?d00001

-- 
GitLab