diff --git a/voting-station-gui/src/ExternalClasses/LoadingIndicator.java b/voting-station-gui/src/ExternalClasses/LoadingIndicator.java
new file mode 100644
index 0000000..575c671
--- /dev/null
+++ b/voting-station-gui/src/ExternalClasses/LoadingIndicator.java
@@ -0,0 +1,68 @@
+package ExternalClasses;
+
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.scene.Parent;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Text;
+import javafx.util.Duration;
+
+public class LoadingIndicator extends Parent{
+
+ private Timeline timeline = new Timeline();
+
+ private DoubleProperty stroke = new SimpleDoubleProperty(100.0);
+
+ public LoadingIndicator(){
+ super();
+
+ timeline.setCycleCount(Timeline.INDEFINITE);
+
+ final KeyValue kv = new KeyValue(stroke, 0);
+ final KeyFrame kf = new KeyFrame(Duration.millis(1500), kv);
+
+ timeline.getKeyFrames().add(kf);
+ timeline.play();
+
+ VBox root = new VBox(3);
+
+ StackPane progressIndicator = new StackPane();
+
+ Rectangle bar = new Rectangle(350,13);
+ bar.setFill(Color.TRANSPARENT);
+ bar.setStroke(Color.WHITE);
+ bar.setArcHeight(15);
+ bar.setArcWidth(15);
+ bar.setStrokeWidth(2);
+
+ Rectangle progress = new Rectangle(342,6);
+ progress.setFill(Color.WHITE);
+ progress.setStroke(Color.WHITE);
+ progress.setArcHeight(8);
+ progress.setArcWidth(8);
+ progress.setStrokeWidth(1.5);
+ progress.getStrokeDashArray().addAll(3.0,7.0,3.0,7.0);
+ progress.strokeDashOffsetProperty().bind(stroke);
+
+
+ progressIndicator.getChildren().add(progress);
+ progressIndicator.getChildren().add(bar);
+
+ root.getChildren().add(progressIndicator);
+
+ Text label = new Text("Loading...");
+ label.setFill(Color.WHITE);
+
+ root.getChildren().add(label);
+
+ getChildren().add(root);
+
+ }
+
+}
\ No newline at end of file
diff --git a/voting-station-gui/src/fxmls/set_up_complete.fxml b/voting-station-gui/src/fxmls/set_up_complete.fxml
new file mode 100644
index 0000000..44217a6
--- /dev/null
+++ b/voting-station-gui/src/fxmls/set_up_complete.fxml
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/voting-station-gui/src/splash_screen_on_boot/fxmls/spalsh_screen_on_boot.fxml b/voting-station-gui/src/fxmls/spalsh_screen_on_boot.fxml
similarity index 76%
rename from voting-station-gui/src/splash_screen_on_boot/fxmls/spalsh_screen_on_boot.fxml
rename to voting-station-gui/src/fxmls/spalsh_screen_on_boot.fxml
index a0a5e58..1808651 100644
--- a/voting-station-gui/src/splash_screen_on_boot/fxmls/spalsh_screen_on_boot.fxml
+++ b/voting-station-gui/src/fxmls/spalsh_screen_on_boot.fxml
@@ -10,8 +10,7 @@
-
-
+
@@ -42,11 +41,6 @@
-
@@ -59,18 +53,28 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/voting-station-gui/src/fxmls/uploading_to_bulletin_board.fxml b/voting-station-gui/src/fxmls/uploading_to_bulletin_board.fxml
new file mode 100644
index 0000000..f9cc007
--- /dev/null
+++ b/voting-station-gui/src/fxmls/uploading_to_bulletin_board.fxml
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/voting-station-gui/src/gifs/VerticalLoading.gif b/voting-station-gui/src/gifs/VerticalLoading.gif
new file mode 100644
index 0000000..942255f
Binary files /dev/null and b/voting-station-gui/src/gifs/VerticalLoading.gif differ
diff --git a/voting-station-gui/src/splash_screen_on_boot/Main.java b/voting-station-gui/src/splash_screen_on_boot/Main.java
index 08c7ba4..50a8388 100644
--- a/voting-station-gui/src/splash_screen_on_boot/Main.java
+++ b/voting-station-gui/src/splash_screen_on_boot/Main.java
@@ -15,7 +15,8 @@ import java.util.concurrent.ThreadFactory;
public class Main extends Application {
- private static final String SPALSH_SCREEN_ON_BOOT_FXML_PATH = "fxmls/spalsh_screen_on_boot.fxml";
+ private static final String SPALSH_SCREEN_ON_BOOT_FXML_PATH = "../fxmls/spalsh_screen_on_boot.fxml";
+ private static final String FXMLS_DIRECTORY_PATH = "../fxmls/";
private List listFilesForFolder(File folder) {
List filesNames = new ArrayList<>();
@@ -28,7 +29,7 @@ public class Main extends Application {
}
private List getNamesOfAllFxmls() throws IOException {
- String fxmlsFolderPath = getClass().getResource("fxmls/").getPath().replace("%20", " ");
+ String fxmlsFolderPath = getClass().getResource(FXMLS_DIRECTORY_PATH).getPath().replace("%20", " ");
List filesNames = listFilesForFolder(new File(fxmlsFolderPath));
return filesNames;
}
@@ -38,7 +39,7 @@ public class Main extends Application {
private void loadAllFxmls() throws IOException, InterruptedException {
Boards = new ArrayList<>();
for (String filename : getNamesOfAllFxmls()) {
- Boards.add(FXMLLoader.load(getClass().getResource("fxmls/" + filename)));
+ Boards.add(FXMLLoader.load(getClass().getResource(FXMLS_DIRECTORY_PATH + filename)));
}
}
@@ -58,8 +59,9 @@ public class Main extends Application {
@Override
public void start(Stage primaryStage) throws Exception{
Parent root = loadStartingPanel(primaryStage);
+ System.out.println(0);
loadAllFxmls();
- removeLoadingGif(root);
+ //removeLoadingGif(root);
}
public static void main(String[] args) throws InterruptedException {