Show maps and mods differently if they are installed

Added a label containing an icon to show the installed maps and mods as such Fixes #702
FAForever · Mar 22, 2018 · d432039 · d432039
1 parent adf7132
commit d432039
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/src/main/java/com/faforever/client/map/MapBean.java b/src/main/java/com/faforever/client/map/MapBean.java
@@ -216,6 +216,11 @@ public int compareTo(@NotNull MapBean o) {
     return getDisplayName().compareTo(o.getDisplayName());
   }
 
+  @Override
+  public boolean equals(@NotNull Object o) {
+    return o instanceof MapBean && ((MapBean) o).compareTo(this) == 0;
+  }
+
   public String getDisplayName() {
     return displayName.get();
   }

diff --git a/src/main/java/com/faforever/client/map/MapCardController.java b/src/main/java/com/faforever/client/map/MapCardController.java
@@ -40,6 +40,7 @@ public class MapCardController implements Controller<Node> {
   public Label numberOfPlaysLabel;
   public Label sizeLabel;
   public Label maxPlayersLabel;
+  public Label installedLabel;
 
   private MapBean map;
   private Consumer<MapBean> onOpenDetailListener;
@@ -57,13 +58,13 @@ public void initialize() {
     installedMapsChangeListener = change -> {
       while (change.next()) {
         for (MapBean mapBean : change.getAddedSubList()) {
-          if (map.getId().equals(mapBean.getId())) {
+          if (map.getFolderName().equals(mapBean.getFolderName())) {
             setInstalled(true);
             return;
           }
         }
         for (MapBean mapBean : change.getRemoved()) {
-          if (map.getId().equals(mapBean.getId())) {
+          if (map.getFolderName().equals(mapBean.getFolderName())) {
             setInstalled(false);
             return;
           }
@@ -92,6 +93,7 @@ public void setMap(MapBean map) {
     ObservableList<MapBean> installedMaps = mapService.getInstalledMaps();
     synchronized (installedMaps) {
       installedMaps.addListener(new WeakListChangeListener<>(installedMapsChangeListener));
+      setInstalled(installedMaps.contains(map));
     }
 
     ObservableList<Review> reviews = map.getReviews();
@@ -109,6 +111,7 @@ private void populateReviews() {
 
   private void setInstalled(boolean installed) {
     // FIXME implement
+    installedLabel.setVisible(installed);
   }
 
   public Node getRoot() {

diff --git a/src/main/java/com/faforever/client/mod/ModCardController.java b/src/main/java/com/faforever/client/mod/ModCardController.java
@@ -35,6 +35,7 @@ public class ModCardController implements Controller<Node> {
   public Label createdLabel;
   public Label numberOfReviewsLabel;
   public Label typeLabel;
+  public Label installedLabel;
   private ModVersion modVersion;
   private Consumer<ModVersion> onOpenDetailListener;
   private ListChangeListener<ModVersion> installStatusChangeListener;
@@ -78,7 +79,7 @@ public void initialize() {
   }
 
   private void setInstalled(boolean installed) {
-    //TODO:IMPLEMENT ISSUE #670
+    installedLabel.setVisible(installed);
   }
 
   public void setModVersion(ModVersion modVersion) {
@@ -91,6 +92,7 @@ public void setModVersion(ModVersion modVersion) {
 
     ObservableList<ModVersion> installedModVersions = modService.getInstalledModVersions();
     synchronized (installedModVersions) {
+      setInstalled(installedModVersions.contains(modVersion));
       installedModVersions.addListener(new WeakListChangeListener<>(installStatusChangeListener));
     }
     ObservableList<Review> reviews = modVersion.getReviews();

diff --git a/src/main/resources/theme/vault/map/map_card.fxml b/src/main/resources/theme/vault/map/map_card.fxml
@@ -28,6 +28,10 @@
       <Label fx:id="nameLabel" alignment="TOP_LEFT" maxWidth="1.7976931348623157E308"
              text="Long text to test whether it's being wrapped" wrapText="true" GridPane.columnSpan="2147483647"
              GridPane.rowIndex="1" GridPane.valignment="TOP"/>
+      <Label fx:id="installedLabel" alignment="TOP_RIGHT" contentDisplay="RIGHT" styleClass="icon" text=""
+             wrapText="true"
+             GridPane.columnIndex="3" GridPane.columnSpan="2147483647" GridPane.rowIndex="2"
+             GridPane.valignment="TOP"/>
       <Label fx:id="authorLabel" maxWidth="1.7976931348623157E308" minWidth="0.0" styleClass="secondary" text="Label"
              wrapText="true" GridPane.columnSpan="2147483647" GridPane.rowIndex="2" GridPane.valignment="TOP"/>
       <Label fx:id="numberOfPlaysLabel" text="Label" GridPane.columnSpan="2" GridPane.rowIndex="3">

diff --git a/src/main/resources/theme/vault/mod/mod_card.fxml b/src/main/resources/theme/vault/mod/mod_card.fxml
@@ -26,6 +26,10 @@
       <Label fx:id="nameLabel" alignment="TOP_LEFT" maxWidth="1.7976931348623157E308"
              text="Long text to test whether it's being wrapped" wrapText="true" GridPane.columnSpan="2147483647"
              GridPane.rowIndex="1" GridPane.valignment="TOP"/>
+      <Label fx:id="installedLabel" alignment="TOP_RIGHT" contentDisplay="RIGHT" styleClass="icon" text=""
+             wrapText="true"
+             GridPane.columnIndex="3" GridPane.columnSpan="2147483647" GridPane.rowIndex="2"
+             GridPane.valignment="TOP"/>
       <Label fx:id="authorLabel" maxWidth="1.7976931348623157E308" minWidth="0.0" styleClass="secondary" text="Label"
              wrapText="true" GridPane.columnSpan="2147483647" GridPane.rowIndex="2" GridPane.valignment="TOP"/>
       <Label fx:id="numberOfReviewsLabel" text="12345" GridPane.columnIndex="1" GridPane.columnSpan="2147483647"