From ba8cdb1b426ab09f8d1e3201de3954d26a9e4ae2 Mon Sep 17 00:00:00 2001
From: yushijinhun <yushijinhun@gmail.com>
Date: Sat, 16 Jun 2018 19:21:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4AuthlibInjectorServersPage?=
 =?UTF-8?q?=E7=9A=84spinner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmcl/ui/AuthlibInjectorServersPage.java   | 26 +++++--------------
 .../assets/fxml/authlib-injector-servers.fxml |  1 -
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
index efd058f27..959429291 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/AuthlibInjectorServersPage.java
@@ -36,7 +36,6 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
     @FXML private JFXDialogLayout confirmServerPane;
     @FXML private JFXDialog dialog;
     @FXML private StackPane contentPane;
-    @FXML private JFXSpinner spinner;
     @FXML private JFXProgressBar progressBar;
     @FXML private JFXButton btnAddNext;
 
@@ -55,33 +54,22 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
         txtServerIp.textProperty().addListener((a, b, newValue) ->
                 btnAddNext.setDisable(!txtServerIp.validate()));
 
-        loading();
+        reload();
     }
 
     private void removeServer(AuthlibInjectorServerItem item) {
         Settings.INSTANCE.SETTINGS.authlibInjectorServers.remove(item.getInfo());
-        loading();
+        reload();
     }
 
-    private void loading() {
-        getChildren().remove(contentPane);
-        spinner.setVisible(true);
-
+    private void reload() {
         listPane.getChildren().setAll(
-        Settings.INSTANCE.SETTINGS.authlibInjectorServers.stream()
+                Settings.INSTANCE.SETTINGS.authlibInjectorServers.stream()
                         .map(server -> new AuthlibInjectorServerItem(server, this::removeServer))
                         .collect(toList()));
-
-        // TODO: remove spinner
-        loadingCompleted();
-    }
-
-    private void loadingCompleted() {
-        getChildren().add(contentPane);
-        spinner.setVisible(false);
-
-        if (Settings.INSTANCE.SETTINGS.authlibInjectorServers.isEmpty())
+        if (Settings.INSTANCE.SETTINGS.authlibInjectorServers.isEmpty()) {
             onAdd();
+        }
     }
 
     @FXML
@@ -135,7 +123,7 @@ public class AuthlibInjectorServersPage extends StackPane implements DecoratorPa
         if (!Settings.INSTANCE.SETTINGS.authlibInjectorServers.contains(serverBeingAdded)) {
             Settings.INSTANCE.SETTINGS.authlibInjectorServers.add(serverBeingAdded);
         }
-        loading();
+        reload();
         dialog.close();
     }
 
diff --git a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
index e37c03188..cac3bee5d 100644
--- a/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
+++ b/HMCL/src/main/resources/assets/fxml/authlib-injector-servers.fxml
@@ -8,7 +8,6 @@
 <fx:root xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          type="StackPane">
-    <JFXSpinner fx:id="spinner" style="-fx-radius:16" styleClass="materialDesign-purple, first-spinner" />
     <StackPane fx:id="contentPane">
         <ScrollPane fx:id="scrollPane" fitToWidth="true" fitToHeight="true">
             <VBox fx:id="listPane" spacing="10" style="-fx-padding: 20 20 70 20;">