From cfd39c377a2ac5833a5c4f27e300f9ceda299bbc Mon Sep 17 00:00:00 2001
From: Alexis Durgnat <alexis.durgnat@etu.hesge.ch>
Date: Sun, 3 Feb 2019 18:38:43 +0100
Subject: [PATCH] Weather icon in chat
---
src/main/java/ch/hepia/config/AppConfig.java | 2 ++
src/main/java/ch/hepia/ui/MainWindowController.java | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java
index fca8277..2f26a40 100644
--- a/src/main/java/ch/hepia/config/AppConfig.java
+++ b/src/main/java/ch/hepia/config/AppConfig.java
@@ -34,6 +34,8 @@ public final class AppConfig {
/**
* Resources
*/
+ public static final String CHAT_TRAIN_ICON = "/img/train.png";
+ public static final String CHAT_TRAIN_ICON_SELF = "/img/train_self.png";
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";
diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java
index 28d7660..901d670 100644
--- a/src/main/java/ch/hepia/ui/MainWindowController.java
+++ b/src/main/java/ch/hepia/ui/MainWindowController.java
@@ -404,9 +404,9 @@ public class MainWindowController implements Initializable {
User sender = joinedJourney.getUser();
String message = sender.getName() + " voyage !";
if (sender.equals(app.getUser().get())) {
- drawMessage(message, AppConfig.CHAT_MESSAGE_ICON_SELF, AppConfig.COLOR_BLUE_10_OPACITY);
+ drawMessage(message, AppConfig.CHAT_TRAIN_ICON_SELF, AppConfig.COLOR_BLUE_10_OPACITY);
} else {
- drawMessage(message, AppConfig.CHAT_MESSAGE_ICON, AppConfig.COLOR_BLUE_10_OPACITY);
+ drawMessage(message, joinedJourney.getWeatherToDestination(), AppConfig.COLOR_BLUE_10_OPACITY);
}
}), userFilter::test);
@@ -415,9 +415,9 @@ public class MainWindowController implements Initializable {
User sender = leftJourney.getUser();
String message = sender.getName() + " a terminé son voyage !";
if (sender.equals(app.getUser().get())) {
- drawMessage(message, AppConfig.CHAT_MESSAGE_ICON_SELF, AppConfig.COLOR_BLUE_10_OPACITY);
+ drawMessage(message, AppConfig.CHAT_TRAIN_ICON, AppConfig.COLOR_BLUE_10_OPACITY);
} else {
- drawMessage(message, AppConfig.CHAT_MESSAGE_ICON, AppConfig.COLOR_BLUE_10_OPACITY);
+ drawMessage(message, leftJourney.getWeatherToDestination(), AppConfig.COLOR_BLUE_10_OPACITY);
}
}), userFilter::test);
}
--
GitLab