diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java index fca8277ed0dbcef26532ae9000066914d7371267..2f26a407c77a9f1e860287652d2a697891608c11 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 28d7660d8296a276d23d204e4a32dc1ca4045fd6..901d6703788b497eec19adb7f95cb490fab3f6a5 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); }