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

# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml

racevisionGame/src/main/java/visualiser/Controllers/MainController.java

@@ -73,6 +73,11 @@ public class MainController extends Controller {
      */
     public void hostGame(){ hostController.hostGame(); }
 
+    /**
+     * Sets up the css for the start of the program
+     */
+    public void startCss(){titleController.setDayMode();}
+
     /**
      * Main Controller for the applications will house the menu and the displayed pane.
      *

racevisionGame/src/main/java/visualiser/Controllers/TitleController.java

@@ -5,6 +5,7 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.RadioButton;
 import javafx.scene.image.Image;
 import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
@@ -24,6 +25,10 @@ public class TitleController extends Controller {
     Button btnJoin;
     @FXML
     AnchorPane titleWrapper;
+    @FXML
+    RadioButton dayModeRD;
+    @FXML
+    RadioButton nightModeRD;
 
     /**
      * Method called when the 'host a game' button is pressed.
@@ -50,6 +55,18 @@ public class TitleController extends Controller {
         parent.enterLobby();
     }
 
+    public void setDayMode(){
+        dayModeRD.getScene().getStylesheets().clear();
+        dayModeRD.getScene().getStylesheets().add("/css/dayMode.css");
+        nightModeRD.setSelected(false);
+    }
+
+    public void setNightMode(){
+        nightModeRD.getScene().getStylesheets().clear();
+        nightModeRD.getScene().getStylesheets().add("/css/nightMode.css");
+        dayModeRD.setSelected(false);
+    }
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
 

racevisionGame/src/main/java/visualiser/app/App.java

@@ -37,7 +37,7 @@ public class App extends Application {
         });
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/visualiser/scenes/main.fxml"));
         Parent root = loader.load();
-        stage.setResizable(false);
+//        stage.setResizable(false);
         MainController mc = (MainController) loader.getController();
         mc.enterTitle();
         Scene scene = new Scene(root);
@@ -45,6 +45,7 @@ public class App extends Application {
         stage.setScene(scene);
         stage.setTitle("RaceVision - Team 7");
         stage.getIcons().add(new Image(getClass().getClassLoader().getResourceAsStream("images/SailIcon.png")));
+        mc.startCss();
         stage.show();
     }
 }

racevisionGame/src/main/resources/css/dayMode.css

@@ -11,9 +11,9 @@
     -fx-control-inner-background-alt: derive(-fx-control-inner-background, 10%);
 
     /* text colors depending on background's brightness */
-    -fx-light-text-color: rgb(220, 220, 220);
-    -fx-mid-text-color: rgb(100, 100, 100);
-    -fx-dark-text-color: rgb(20, 20, 20);
+    -fx-light-text-color: rgb(80, 80, 80);
+    -fx-mid-text-color: rgb(20, 20, 20);
+    -fx-dark-text-color: rgb(0, 0, 0);
 
     /*highlighting/accenting objects.  */
     -fx-accent: rgb(128, 128, 128);
@@ -27,8 +27,8 @@
 
 /* Fix derived prompt color for text fields */
 .text-input {
-    -fx-prompt-text-fill: derive(-fx-control-inner-background, +50%);
-
+    -fx-prompt-text-fill: derive(-fx-control-inner-background, +0%);
+    -fx-background-color: #a9a9a9 , black , black;
 }
 
 /* Keep prompt invisible when focused (above color fix overrides it) */

racevisionGame/src/main/resources/css/nightMode.css

@@ -27,7 +27,8 @@
 
 /* Fix derived prompt color for text fields */
 .text-input {
-    -fx-prompt-text-fill: derive(-fx-control-inner-background, +50%);
+    -fx-prompt-text-fill: derive(-fx-control-inner-background, +0%);
+    -fx-background-color: #a9a9a9 , white , white;
 
 }
 

racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml

@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.HostController">
+<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.HostController">
    <children>
       <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>
@@ -21,8 +21,8 @@
           <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-            <TextField fx:id="gameAddressFld" promptText="Enter Address" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.valignment="TOP" />
-            <TextField fx:id="gamePortFld" promptText="Enter Port" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.valignment="BOTTOM" />
+            <TextField fx:id="gameNameField" disable="true" promptText="Enter game name" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.valignment="TOP" />
+            <TextField fx:id="hostNameField" disable="true" promptText="Enter host name" GridPane.columnIndex="1" GridPane.rowIndex="1" GridPane.valignment="BOTTOM" />
             <Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Host Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
                <font>
                   <Font size="20.0" />

racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml

@@ -15,7 +15,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane fx:id="titleWrapper" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.TitleController">
+<AnchorPane fx:id="titleWrapper" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.TitleController">
    <children>
       <GridPane layoutY="39.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>
@@ -45,6 +45,8 @@
                         <Font name="Comic Sans MS" size="12.0" />
                      </font>
                   </Text>
+                  <RadioButton fx:id="nightModeRD" layoutX="681.0" layoutY="168.0" mnemonicParsing="false" onAction="#setNightMode" text="Night Mode" />
+                  <RadioButton fx:id="dayModeRD" layoutX="574.0" layoutY="168.0" mnemonicParsing="false" onAction="#setDayMode" selected="true" text="Day Mode" />
                </children>
             </Pane>
             <Pane prefHeight="20.0" prefWidth="20.0" style="-fx-background-color: #6be6ff;" GridPane.columnSpan="4" GridPane.rowSpan="4">
@@ -59,7 +61,7 @@
                         <Image url="@../images/cloud.png" />
                      </image>
                   </ImageView>
-                  <ImageView fx:id="imgWhale" fitHeight="113.0" fitWidth="98.0" layoutX="68.0" layoutY="257.0" pickOnBounds="true" preserveRatio="true">
+                  <ImageView fx:id="imgWhale" fitHeight="113.0" fitWidth="98.0" layoutX="69.0" layoutY="302.0" pickOnBounds="true" preserveRatio="true">
                      <image>
                         <Image url="@../images/whale.png" />
                      </image>