Move chat message show details logic up

FAForever · May 11, 2024 · c7ee7a8 · c7ee7a8
1 parent 35ab746
commit c7ee7a8
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 56 deletions.
diff --git a/src/main/java/com/faforever/client/chat/ChatMessage.java b/src/main/java/com/faforever/client/chat/ChatMessage.java
@@ -30,7 +30,7 @@ public class ChatMessage {
   private final Type type;
   private final ChatMessage targetMessage;
 
-  private final BooleanProperty open = new SimpleBooleanProperty();
+  private final BooleanProperty seen = new SimpleBooleanProperty();
   private final ObservableMap<Emoticon, ObservableMap<String, String>> reactions = FXCollections.synchronizedObservableMap(
       FXCollections.observableHashMap());
   private final ObservableMap<Emoticon, ObservableMap<String, String>> unmodifiableReactions = FXCollections.unmodifiableObservableMap(
@@ -59,16 +59,16 @@ public void removeReaction(Reaction reaction) {
     }
   }
 
-  public boolean isOpen() {
+  public boolean isSeen() {
-    return open.get();
+    return seen.get();
   }
 
-  public BooleanProperty openProperty() {
+  public BooleanProperty seenProperty() {
-    return open;
+    return seen;
   }
 
-  public void setOpen(boolean open) {
+  public void setSeen(boolean seen) {
-    this.open.set(open);
+    this.seen.set(seen);
   }
 
   public enum Type {

diff --git a/src/main/java/com/faforever/client/chat/ChatMessageCell.java b/src/main/java/com/faforever/client/chat/ChatMessageCell.java
@@ -2,21 +2,21 @@
 
 import com.faforever.client.fx.FxApplicationThreadExecutor;
 import com.faforever.client.theme.UiService;
-import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.ReadOnlyIntegerProperty;
+import javafx.beans.property.ReadOnlyIntegerWrapper;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableList;
 import javafx.scene.Node;
 import javafx.scene.layout.VBox;
 import org.fxmisc.flowless.Cell;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import java.util.Objects;
 import java.util.function.Consumer;
 
 @Component
@@ -28,19 +28,15 @@ public class ChatMessageCell implements Cell<ChatMessage, Node> {
 
   private final ObjectProperty<Consumer<ChatMessage>> onReplyButtonClicked = new SimpleObjectProperty<>();
   private final ObjectProperty<Consumer<ChatMessage>> onReplyClicked = new SimpleObjectProperty<>();
-  private final ObjectProperty<ObservableList<ChatMessage>> items = new SimpleObjectProperty<>();
+  private final ReadOnlyIntegerWrapper index = new ReadOnlyIntegerWrapper();
-  private final IntegerProperty index = new SimpleIntegerProperty();
+  private final BooleanProperty showDetails = new SimpleBooleanProperty();
+  private final ReadOnlyObjectWrapper<ChatMessage> item = new ReadOnlyObjectWrapper<>();
 
   public ChatMessageCell(UiService uiService, FxApplicationThreadExecutor fxApplicationThreadExecutor) {
     this.fxApplicationThreadExecutor = fxApplicationThreadExecutor;
     chatMessageController = uiService.loadFxml("theme/chat/chat_message.fxml");
-    ObservableValue<ChatMessage> previousMessageProperty = items.flatMap(
+    chatMessageController.chatMessageProperty().bind(item);
-        items -> Bindings.valueAt(items, index.subtract(1)));
+    chatMessageController.showDetailsProperty().bind(showDetails);
-    chatMessageController.showDetailsProperty()
-                         .bind(Bindings.createBooleanBinding(() -> showDetails(previousMessageProperty.getValue(),
-                                                                               chatMessageController.getChatMessage()),
-                                                             previousMessageProperty,
-                                                             chatMessageController.chatMessageProperty()));
     chatMessageController.onReplyButtonClickedProperty().bind(onReplyButtonClicked);
     chatMessageController.onReplyClickedProperty().bind(onReplyClicked);
   }
@@ -57,7 +53,7 @@ public boolean isReusable() {
 
   @Override
   public void updateItem(ChatMessage item) {
-    fxApplicationThreadExecutor.execute(() -> chatMessageController.setChatMessage(item));
+    fxApplicationThreadExecutor.execute(() -> this.item.set(item));
   }
 
   @Override
@@ -67,19 +63,7 @@ public void updateIndex(int index) {
 
   @Override
   public void reset() {
-    fxApplicationThreadExecutor.execute(() -> chatMessageController.setChatMessage(null));
+    fxApplicationThreadExecutor.execute(() -> this.item.set(null));
-  }
-
-  private boolean showDetails(ChatMessage previousMessage, ChatMessage currentMessage) {
-    if (currentMessage == null) {
-      return false;
-    }
-
-    if (previousMessage == null) {
-      return true;
-    }
-
-    return !Objects.equals(previousMessage.getSender(), currentMessage.getSender());
   }
 
   public Consumer<ChatMessage> getOnReplyButtonClicked() {
@@ -106,15 +90,31 @@ public void setOnReplyClicked(Consumer<ChatMessage> onReplyClicked) {
     this.onReplyClicked.set(onReplyClicked);
   }
 
-  public ObservableList<ChatMessage> getItems() {
+  public boolean isShowDetails() {
-    return items.get();
+    return showDetails.get();
+  }
+
+  public BooleanProperty showDetailsProperty() {
+    return showDetails;
+  }
+
+  public void setShowDetails(boolean showDetails) {
+    this.showDetails.set(showDetails);
+  }
+
+  public int getIndex() {
+    return index.get();
+  }
+
+  public ReadOnlyIntegerProperty indexProperty() {
+    return index.getReadOnlyProperty();
   }
 
-  public ObjectProperty<ObservableList<ChatMessage>> itemsProperty() {
+  public ReadOnlyObjectProperty<ChatMessage> itemProperty() {
-    return items;
+    return item.getReadOnlyProperty();
   }
 
-  public void setItems(ObservableList<ChatMessage> items) {
+  public ChatMessage getItem() {
-    this.items.set(items);
+    return item.get();
   }
 }
diff --git a/src/main/java/com/faforever/client/chat/ChatMessageController.java b/src/main/java/com/faforever/client/chat/ChatMessageController.java
@@ -162,8 +162,6 @@ protected void onInitialize() {
     chatMessage.when(attached).subscribe((oldValue, newValue) -> {
       if (oldValue != null) {
         oldValue.getReactions().removeListener(reactionChangeListener);
-        oldValue.openProperty().unbind();
-        oldValue.setOpen(false);
       }
 
       reactionNodeMap.clear();
@@ -172,7 +170,7 @@ protected void onInitialize() {
       if (newValue != null) {
         newValue.getReactions().forEach(this::addReaction);
         newValue.getReactions().addListener(reactionChangeListener);
-        newValue.openProperty().bind(showing);
+        newValue.setSeen(true);
       }
     });
 
@@ -195,15 +193,6 @@ protected void onInitialize() {
                                        .when(showing));
   }
 
-  @Override
-  protected void onDetached() {
-    ChatMessage chatMessage = getChatMessage();
-    if (chatMessage != null) {
-      chatMessage.openProperty().unbind();
-      chatMessage.setOpen(false);
-    }
-  }
-
   private void onReactionChange(
       MapChangeListener.Change<? extends Emoticon, ? extends ObservableMap<String, String>> change) {
     Emoticon reaction = change.getKey();

diff --git a/src/main/java/com/faforever/client/chat/ChatMessageViewController.java b/src/main/java/com/faforever/client/chat/ChatMessageViewController.java
@@ -11,6 +11,7 @@
 import com.faforever.client.util.ConcurrentUtil;
 import com.faforever.client.util.PopupUtil;
 import javafx.beans.Observable;
+import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
@@ -50,6 +51,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
@@ -132,7 +134,7 @@ protected void onInitialize() {
 
       if (newValue != null) {
         newValue.getMessages().addListener(chatMessageListener);
-        newValue.getMessages().forEach(message -> fxApplicationThreadExecutor.execute(() -> rawMessages.add(message)));
+        fxApplicationThreadExecutor.execute(() -> rawMessages.addAll(newValue.getMessages()));
         ObservableList<ChatChannelUser> typingUsers = newValue.getTypingUsers();
         setTypingLabel(typingUsers);
         typingUsers.addListener(typingUsersChangeListener);
@@ -161,7 +163,13 @@ protected void onInitialize() {
 
     messageListView = VirtualFlow.createVertical(filteredMessages, item -> {
       ChatMessageCell cell = chatMessageCellFactory.getObject();
-      cell.setItems(filteredMessages);
+      cell.showDetailsProperty()
+          .bind(Bindings.valueAt(filteredMessages, cell.indexProperty().subtract(1))
+                        .flatMap(previousMessage -> cell.itemProperty()
+                                                        .map(currentMessage -> showDetails(previousMessage,
+                                                                                           currentMessage)))
+                        .orElse(true)
+                        .when(showing));
       cell.updateItem(item);
       cell.setOnReplyButtonClicked(message -> {
         targetMessage.set(message);
@@ -185,6 +193,18 @@ protected void onInitialize() {
     });
   }
 
+  private boolean showDetails(ChatMessage previousMessage, ChatMessage currentMessage) {
+    if (currentMessage == null) {
+      return false;
+    }
+
+    if (previousMessage == null) {
+      return true;
+    }
+
+    return !Objects.equals(previousMessage.getSender(), currentMessage.getSender());
+  }
+
   private void scrollToEnd() {
     fxApplicationThreadExecutor.execute(() -> messageListView.showAsLast(filteredMessages.size() - 1));
   }
@@ -325,6 +345,7 @@ private void sendMessage() {
       messageTextField.setDisable(false);
       messageTextField.requestFocus();
       removeReply();
+      scrollToEnd();
     }, fxApplicationThreadExecutor);
   }