diff --git a/src/main/java/com/rohitawate/everest/controllers/DashboardController.java b/src/main/java/com/rohitawate/everest/controllers/DashboardController.java index 946caaf..c7055fc 100644 --- a/src/main/java/com/rohitawate/everest/controllers/DashboardController.java +++ b/src/main/java/com/rohitawate/everest/controllers/DashboardController.java @@ -17,6 +17,7 @@ package com.rohitawate.everest.controllers; import com.fasterxml.jackson.databind.JsonNode; import com.jfoenix.controls.JFXButton; +import com.jfoenix.controls.JFXProgressBar; import com.jfoenix.controls.JFXSnackbar; import com.rohitawate.everest.exceptions.RedirectException; import com.rohitawate.everest.exceptions.UnreliableResponseException; @@ -83,6 +84,8 @@ public class DashboardController implements Initializable { Tab paramsTab, authTab, headersTab, bodyTab; @FXML private Tab visualizerTab, responseHeadersTab; + @FXML + private JFXProgressBar progressBar; private JFXSnackbar snackbar; private final String[] httpMethods = {"GET", "POST", "PUT", "DELETE", "PATCH"}; @@ -279,6 +282,7 @@ public class DashboardController implements Initializable { } private void configureRequestManager() { + progressBar.progressProperty().bind(requestManager.progressProperty()); requestManager.setOnRunning(e -> whileRunning()); requestManager.setOnSucceeded(e -> onSucceeded()); requestManager.setOnCancelled(e -> onCancelled()); diff --git a/src/main/resources/assets/LoadingCircle_WhiteOnOrange.gif b/src/main/resources/assets/LoadingCircle_WhiteOnOrange.gif deleted file mode 100644 index af7cf6e..0000000 Binary files a/src/main/resources/assets/LoadingCircle_WhiteOnOrange.gif and /dev/null differ diff --git a/src/main/resources/fxml/homewindow/Dashboard.fxml b/src/main/resources/fxml/homewindow/Dashboard.fxml index febed9f..6fbcdd6 100644 --- a/src/main/resources/fxml/homewindow/Dashboard.fxml +++ b/src/main/resources/fxml/homewindow/Dashboard.fxml @@ -16,36 +16,47 @@ ~ limitations under the License. --> - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -58,7 +69,7 @@ - + @@ -70,16 +81,14 @@ - + - + @@ -139,8 +148,7 @@ - + @@ -161,31 +169,30 @@ - + - + @@ -213,31 +220,22 @@ -