Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add search bar for coop leaderboard #3053

Merged
merged 6 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/main/java/com/faforever/client/coop/CoopController.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
import com.faforever.client.util.TimeService;
import com.faforever.commons.lobby.GameStatus;
import com.faforever.commons.lobby.GameType;
import com.github.benmanes.caffeine.cache.CacheLoader;
import com.google.common.base.Strings;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.collections.transformation.FilteredList;
import javafx.geometry.Pos;
import javafx.scene.Node;
Expand Down Expand Up @@ -89,13 +92,16 @@ public class CoopController extends AbstractViewController<Node> {
private final WebViewConfigurer webViewConfigurer;
private final ModService modService;
private final FxApplicationThreadExecutor fxApplicationThreadExecutor;
private final ObservableList<CoopResultBean> leaderboardUnFilteredList = FXCollections.observableArrayList();
private final FilteredList<CoopResultBean> leaderboardFilteredList = new FilteredList<>(leaderboardUnFilteredList);

public GridPane coopRoot;
public ComboBox<CoopMissionBean> missionComboBox;
public WebView descriptionWebView;
public Pane gameViewContainer;
public TextField titleTextField;
public Button playButton;
public TextField leaderboardSearchTextField;
public PasswordField passwordTextField;
public ImageView mapPreviewImageView;
public Region leaderboardInfoIcon;
Expand Down Expand Up @@ -125,6 +131,19 @@ public void initialize() {
numberOfPlayersComboBox.getSelectionModel().select(0);
numberOfPlayersComboBox.getSelectionModel().selectedItemProperty().addListener(observable -> loadLeaderboard());

leaderboardFilteredList.predicateProperty().bind(leaderboardSearchTextField.textProperty().map(newValue -> coopResultBean -> {
if (newValue.isEmpty()) {
return true;
}
return coopResultBean.getReplay()
.getTeams()
.values()
.stream()
.flatMap(Collection::stream)
.anyMatch(name -> name.toLowerCase().contains(newValue.toLowerCase()));
}));
leaderboardTable.setItems(leaderboardFilteredList);

rankColumn.setCellValueFactory(param -> param.getValue().rankingProperty().asObject());
rankColumn.setCellFactory(param -> new StringCell<>(String::valueOf));

Expand Down Expand Up @@ -243,7 +262,7 @@ private void loadLeaderboard() {
.thenAccept(coopLeaderboardEntries -> {
AtomicInteger ranking = new AtomicInteger();
coopLeaderboardEntries.forEach(coopResult -> coopResult.setRanking(ranking.incrementAndGet()));
fxApplicationThreadExecutor.execute(() -> leaderboardTable.setItems(observableList(coopLeaderboardEntries)));
fxApplicationThreadExecutor.execute(() -> leaderboardUnFilteredList.setAll(coopLeaderboardEntries));
})
.exceptionally(throwable -> {
log.warn("Could not load coop leaderboard", throwable);
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/theme/play/coop/coop.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@
<Region fx:id="leaderboardInfoIcon" styleClass="icon, icon16x16, info-icon"/>
</graphic>
</Label>
<TextField fx:id="leaderboardSearchTextField" promptText="%leaderboard.searchPrompt">
<HBox.margin>
<Insets right="10.0"/>
</HBox.margin>
</TextField>
<ComboBox fx:id="numberOfPlayersComboBox" HBox.hgrow="NEVER">
<items>
<FXCollections fx:factory="observableArrayList">
Expand Down