Remove unused fxml files and the tournaments and tutorials tabs (#2989)

FAForever · Jun 10, 2023 · 95a6aad · 95a6aad
1 parent bec19fc
commit 95a6aad
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 105 deletions.
diff --git a/src/main/java/com/faforever/client/chat/UrlPreviewResolver.java b/src/main/java/com/faforever/client/chat/UrlPreviewResolver.java
@@ -9,22 +9,5 @@ public interface UrlPreviewResolver {
 
   CompletableFuture<Optional<Preview>> resolvePreview(String urlString);
 
-  class Preview {
-
-    private final Node node;
-    private final String description;
-
-    public Preview(Node node, String description) {
-      this.node = node;
-      this.description = description;
-    }
-
-    public Node getNode() {
-      return node;
-    }
-
-    public String getDescription() {
-      return description;
-    }
-  }
+  record Preview(Node node, String description) {}
 }
diff --git a/src/main/java/com/faforever/client/fx/BrowserCallback.java b/src/main/java/com/faforever/client/fx/BrowserCallback.java
@@ -102,10 +102,10 @@ public void hideUrlPreview() {
   @SuppressWarnings("unused")
   public void previewUrl(String urlString) {
     urlPreviewResolver.resolvePreview(urlString).thenAccept(optionalPreview -> optionalPreview.ifPresent(preview -> {
-      linkPreviewTooltip = new Tooltip(preview.getDescription());
+      linkPreviewTooltip = new Tooltip(preview.description());
       linkPreviewTooltip.setAutoHide(true);
       linkPreviewTooltip.setAnchorLocation(AnchorLocation.CONTENT_BOTTOM_LEFT);
-      linkPreviewTooltip.setGraphic(preview.getNode());
+      linkPreviewTooltip.setGraphic(preview.node());
       linkPreviewTooltip.setContentDisplay(ContentDisplay.TOP);
       fxApplicationThreadExecutor.execute(() -> linkPreviewTooltip.show(StageHolder.getStage(), lastMouseX + 20, lastMouseY));
     }));

diff --git a/src/main/java/com/faforever/client/main/MainController.java b/src/main/java/com/faforever/client/main/MainController.java
@@ -140,11 +140,9 @@ public class MainController implements Controller<Node>, InitializingBean {
   public ToggleButton chatButton;
   public ToggleButton playButton;
   public ToggleButton replayButton;
-  public ToggleButton tutorialsButton;
   public ToggleButton mapButton;
   public ToggleButton modButton;
   public ToggleButton leaderboardsButton;
-  public ToggleButton tournamentsButton;
   public ToggleButton unitsButton;
   public StackPane contentWrapperPane;
   public ToggleGroup mainNavigation;
@@ -194,9 +192,7 @@ public void initialize() {
     mapButton.setUserData(NavigationItem.MAP);
     modButton.setUserData(NavigationItem.MOD);
     leaderboardsButton.setUserData(NavigationItem.LEADERBOARD);
-    tournamentsButton.setUserData(NavigationItem.TOURNAMENTS);
     unitsButton.setUserData(NavigationItem.UNITS);
-    tutorialsButton.setUserData(NavigationItem.TUTORIALS);
     eventBus.register(this);
 
     PersistentNotificationsController persistentNotificationsController = uiService.loadFxml("theme/persistent_notifications.fxml");

diff --git a/src/main/resources/theme/comment_card.fxml b/src/main/resources/theme/comment_card.fxml
diff --git a/src/main/resources/theme/dialog.fxml b/src/main/resources/theme/dialog.fxml
diff --git a/src/main/resources/theme/main.fxml b/src/main/resources/theme/main.fxml
@@ -61,15 +61,9 @@
                       <ToggleButton fx:id="leaderboardsButton" minWidth="-Infinity" mnemonicParsing="false"
                                     onAction="#onNavigateButtonClicked" styleClass="main-navigation-button"
                                     text="%main.leaderboards" toggleGroup="$mainNavigation"/>
-                      <ToggleButton fx:id="tournamentsButton" minWidth="-Infinity" mnemonicParsing="false"
-                                    onAction="#onNavigateButtonClicked" styleClass="main-navigation-button"
-                                    text="%main.tournaments" toggleGroup="$mainNavigation"/>
                       <ToggleButton fx:id="unitsButton" minWidth="-Infinity" mnemonicParsing="false"
                                     onAction="#onNavigateButtonClicked" styleClass="main-navigation-button"
                                     text="%main.units" toggleGroup="$mainNavigation"/>
-                      <ToggleButton fx:id="tutorialsButton" minWidth="-Infinity" mnemonicParsing="false"
-                                    onAction="#onNavigateButtonClicked" styleClass="main-navigation-button"
-                                    text="%main.tutorials" toggleGroup="$mainNavigation"/>
                   </children>
                </HBox>
                <MenuButton fx:id="navigationDropdown" minHeight="-Infinity" minWidth="-Infinity" />

diff --git a/src/main/resources/theme/notification_bar.fxml b/src/main/resources/theme/notification_bar.fxml
diff --git a/src/main/resources/theme/vault/map/map_vault.fxml b/src/main/resources/theme/vault/map/map_vault.fxml