diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java index 136d9c010c8f6001437162bf6431ad5b8a04f159..c9064e273c024f9975608e7129b94a1e8e0bf668 100644 --- a/src/main/java/ch/hepia/config/AppConfig.java +++ b/src/main/java/ch/hepia/config/AppConfig.java @@ -25,6 +25,8 @@ public final class AppConfig { public static final String ERROR_API_MQ = "Une erreur s'est produite lors de la publication de cet évènement."; public static final String DEFAULT_JOURNEY_TEXT = "Vous n'avez prévu aucun voyage pour le moment."; + public static final String COMMON_ITINERARY_TEXT = "Vous allez croiser %s à %s ! Pensez à vous saluer !"; + public static List<String> CHAT_COMMANDS = List.of( "help", "block", @@ -46,6 +48,7 @@ public final class AppConfig { public static final String WEATHER_ICON_SNOWY = "/img/snowy.png"; public static final String WEATHER_ICON_STORMY = "/img/stormy.png"; public static final String WEATHER_ICON_SUNNY = "/img/sunny.png"; + public static final String JOURNEY_ICON_COMMON_ITINERARY = "/img/friends.png"; /** * Style diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java index e2988c5cde18397b6db0ea3f060704a05e3a0d33..c82e181d646b17d09aad288294e90b010dde0a24 100644 --- a/src/main/java/ch/hepia/ui/MainWindowController.java +++ b/src/main/java/ch/hepia/ui/MainWindowController.java @@ -410,6 +410,22 @@ public class MainWindowController implements Initializable { drawMessage(message, AppConfig.CHAT_TRAIN_ICON_SELF, AppConfig.COLOR_BLUE_10_OPACITY); } else { drawMessage(message, joinedJourney.getWeatherToDestination(), AppConfig.COLOR_BLUE_10_OPACITY); + try { + Section commonSection = joinedJourney.getConnection().getInCommonSection(currentJourney); + if (!(commonSection.equals(Section.empty()))){ + drawMessage( + String.format( + AppConfig.COMMON_ITINERARY_TEXT, + sender.getName(), + commonSection.getDeparture().getLocation().getName() + ), + AppConfig.JOURNEY_ICON_COMMON_ITINERARY, + AppConfig.COLOR_BLUE_50_OPACITY + ); + } + } catch (ParseException e) { + e.printStackTrace(); + } } }), userFilter::test); diff --git a/src/main/resources/img/friends.png b/src/main/resources/img/friends.png new file mode 100644 index 0000000000000000000000000000000000000000..306c38c7aa49ca2d8e416c4bc4fa1914b978f8f0 Binary files /dev/null and b/src/main/resources/img/friends.png differ