Merge remote-tracking branch 'origin/develop' into develop

src/main/resources/css/SplashScreenView.css

@@ -1,10 +1,50 @@
-#background {
-    -fx-background-color: #E7F1F8;
+.root {
+    -fx-effect: -fx-pp-dropshadow-dark;
+    -fx-background-radius: 5;
+    -fx-padding: 10;
+}
+
+#rootPane {
+    -fx-background-image: url("/images/waves.png");
+
 }
 
 #headText {
-    -fx-background-color: transparent;
     -fx-font-size: 52px;
-    -fx-text-fill: -fx-pp-light-text-color;
-    -fx-effect: -fx-pp-dropshadow-headers;
+    -fx-text-fill: rgb(30, 30, 30);
+    -fx-effect: -fx-pp-dropshadow-dark;
+}
+
+#subHeadLabel {
+    -fx-text-fill: rgb(30, 30, 30);
+    -fx-effect: -fx-pp-dropshadow-dark;
+    -fx-font-size: 12px;
+}
+
+.materialDesign-purple .arc {
+    -fx-stroke: #ab47bc;
+}
+
+.materialDesign-blue .arc {
+    -fx-stroke: #2962ff;
+}
+
+.materialDesign-cyan .arc {
+    -fx-stroke: #00b8d4;
+}
+
+.materialDesign-green .arc {
+    -fx-stroke: #00c853;
+}
+
+.materialDesign-yellow .arc {
+    -fx-stroke: #ffd600;
+}
+
+.materialDesign-orange .arc {
+    -fx-stroke: #ff6d00;
+}
+
+.materialDesign-red .arc {
+    -fx-stroke: #d50000;
 }

src/main/resources/views/SplashScreen.fxml

@@ -1,30 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import com.jfoenix.controls.JFXSpinner?>
 <?import java.net.URL?>
-<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-<StackPane id="background" fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.SplashScreenController">
+<StackPane fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+  minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8"
+  xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="seng302.visualiser.controllers.SplashScreenController">
    <children>
-      <ImageView fitHeight="296.0" fitWidth="295.0" pickOnBounds="true" preserveRatio="true" StackPane.alignment="TOP_CENTER">
+      <AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
+         <children>
+            <Label fx:id="subHeadLabel" layoutX="225.0" layoutY="370.0"
+              text="MADE BY :PARTYPARROT:"/>
+            <StackPane layoutX="150.0" layoutY="10.0" prefHeight="150.0" prefWidth="200.0">
+               <children>
+                  <ImageView fitHeight="190.0" fitWidth="190.0" pickOnBounds="true"
+                    preserveRatio="true">
                      <image>
-            <Image url="@../PP.png" />
+                        <Image url="@../PP.png"/>
                      </image>
-         <StackPane.margin>
-            <Insets top="20.0" />
-         </StackPane.margin>
                   </ImageView>
-      <Text fx:id="headText" strokeType="OUTSIDE" strokeWidth="0.0" text="Party Parrots at Sea" StackPane.alignment="BOTTOM_CENTER">
-         <font>
-            <Font name="System Bold" size="42.0" />
-         </font>
-         <StackPane.margin>
-            <Insets bottom="20.0" />
-         </StackPane.margin>
-      </Text>
+                  <JFXSpinner fx:id="materialDesignRed" radius="150.0" startingAngle="0.0"
+                    styleClass="materialDesign-red"/>
+                  <JFXSpinner radius="140.0" startingAngle="20.0"
+                    styleClass="materialDesign-orange"/>
+                  <JFXSpinner radius="130.0" startingAngle="40.0"
+                    styleClass="materialDesign-yellow"/>
+                  <JFXSpinner radius="120.0" startingAngle="60.0"
+                    styleClass="materialDesign-green"/>
+                  <JFXSpinner radius="110.0" startingAngle="80.0" styleClass="materialDesign-cyan"/>
+                  <JFXSpinner radius="100.0" startingAngle="100.0"
+                    styleClass="materialDesign-blue"/>
+                  <JFXSpinner radius="90.0" startingAngle="120.0"
+                    styleClass="materialDesign-purple"/>
+               </children>
+            </StackPane>
+            <Label fx:id="headText" layoutX="36.0" layoutY="295.0" text="PARTY PARROT AT SEA"/>
+         </children>
+      </AnchorPane>
    </children>
     <stylesheets>
        <URL value="@../css/Master.css"/>