From 0e392304e73481aec4b997eaa657b851a0aea567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Pirkl?= <pirkl.theo@gmail.com>
Date: Sun, 3 Feb 2019 19:28:05 +0100
Subject: [PATCH] When two people cross each other, they will know !
---
src/main/java/ch/hepia/config/AppConfig.java | 3 +++
.../java/ch/hepia/ui/MainWindowController.java | 16 ++++++++++++++++
src/main/resources/img/friends.png | Bin 0 -> 1736 bytes
3 files changed, 19 insertions(+)
create mode 100644 src/main/resources/img/friends.png
diff --git a/src/main/java/ch/hepia/config/AppConfig.java b/src/main/java/ch/hepia/config/AppConfig.java
index 136d9c0..c9064e2 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 e2988c5..c82e181 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
GIT binary patch
literal 1736
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
BGMWGY
literal 0
HcmV?d00001
--
GitLab