diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java index 6b1e0f3001ff2973e8b5b972ac5f560a9c7b883b..21b96d9d22b65de8109698a2950e5454e7c7112a 100644 --- a/src/main/java/ch/hepia/config/AppConfig.java +++ b/src/main/java/ch/hepia/config/AppConfig.java @@ -27,6 +27,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", @@ -48,6 +50,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 c4eb4215141b1a8aabb0a5c6bb6fa2bafe9a1946..b731a700a1007dc5010ef072ddd9fb28214b8f3e 100644 --- a/src/main/java/ch/hepia/ui/MainWindowController.java +++ b/src/main/java/ch/hepia/ui/MainWindowController.java @@ -430,6 +430,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