From 3960efaad8aecc7b0cd5e0d36e13d819cf5b479f Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <s.vanderhoeven@student.tudelft.nl>
Date: Wed, 10 Apr 2019 22:07:31 +0200
Subject: [PATCH] ADD::added button to display/hide explaination

EDIT::moved explaination to the center
---
 .../controller/CalculatorController.java      |   1 +
 .../controller/RegisterWindowController.java  |  20 +++++++++++++++
 .../main/resources/fxml/FirstCalculator.fxml  |  24 ++++++++++++++++--
 .../src/main/resources/icons/questionmark.png | Bin 0 -> 4477 bytes
 4 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 src/Client/src/main/resources/icons/questionmark.png

diff --git a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java
index b6434bb..8bc1f13 100644
--- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java
+++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java
@@ -144,6 +144,7 @@ public class CalculatorController {
     @FXML
     private Label servicesLabel;
 
+
     //extra pane
     @FXML
     private AnchorPane extraPane;
diff --git a/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java b/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java
index 7a0b0e8..c0d6712 100644
--- a/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java
+++ b/src/Client/src/main/java/greenify/client/controller/RegisterWindowController.java
@@ -24,6 +24,7 @@ import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Slider;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import javafx.stage.Window;
@@ -47,6 +48,10 @@ public class RegisterWindowController {
     @Autowired
     ExtraActivityController extraActivityController;
 
+    @FXML
+    private Text explainText;
+
+
     //navigation panes
     @FXML
     private AnchorPane getStartedPane;
@@ -160,6 +165,9 @@ public class RegisterWindowController {
     private PasswordField passwordField2;
     @FXML
     private Button signUpButton;
+
+
+
     //@FXML
     //private Line uNamePathLine;
 
@@ -187,6 +195,18 @@ public class RegisterWindowController {
         slideIn.play();
     }
 
+    public void showExplanation(ActionEvent event) throws InterruptedException {
+        System.out.println(explainText.isVisible());
+        if (explainText.isVisible()) {
+            System.out.println("set to false");
+            explainText.setVisible(false);
+        } else {
+            System.out.println("set to true");
+            explainText.setVisible(true);
+        }
+
+    }
+
     /**
      * Signs up the user.
      * @param event the click of the sign up button
diff --git a/src/Client/src/main/resources/fxml/FirstCalculator.fxml b/src/Client/src/main/resources/fxml/FirstCalculator.fxml
index 760ebf5..5ccfc3a 100644
--- a/src/Client/src/main/resources/fxml/FirstCalculator.fxml
+++ b/src/Client/src/main/resources/fxml/FirstCalculator.fxml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.shape.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
@@ -15,7 +22,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="703.0" prefWidth="820.0" xmlns="http://javafx.com/javafx/8.0.172-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="greenify.client.controller.RegisterWindowController">
+<AnchorPane prefHeight="703.0" prefWidth="820.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="greenify.client.controller.RegisterWindowController">
     <children>
         <AnchorPane fx:id="calculatorTabs" prefHeight="92.0" prefWidth="820.0" style="-fx-background-color: #677069;">
             <children>
@@ -159,7 +166,20 @@
                   <Font name="System Bold" size="22.0" />
                </font>
             </Text>
-            <Text layoutX="15.0" layoutY="459.0" strokeType="OUTSIDE" strokeWidth="0.0" text="This application will help you decrease your CO2-footprint. In the next screen, you will be asked to fill in certain things, like your yearly energy costs. These values will help us calculate your CO2-footprint. Warning: If you don't fill anything in, the calculator will use a default value based on averages, so if you want a value to be zero, please fill in zero. After that, you'll be able to see your score and compare your footprint to those of your friends. Let's go green and save the planet!" textAlignment="CENTER" wrappingWidth="714.0" />
+            <Text fx:id="explainText" layoutX="53.0" layoutY="487.0" strokeType="OUTSIDE" strokeWidth="0.0" text="This application will help you decrease your CO2-footprint. In the next screen, you will be asked to fill in certain things, like your yearly energy costs. These values will help us calculate your CO2-footprint. Warning: If you don't fill anything in, the calculator will use a default value based on averages, so if you want a value to be zero, please fill in zero. After that, you'll be able to see your score and compare your footprint to those of your friends. Let's go green and save the planet!" textAlignment="CENTER" visible="false" wrappingWidth="714.0">
+               <font>
+                  <Font size="16.0" />
+               </font>
+            </Text>
+            <Button layoutX="14.0" layoutY="532.0" mnemonicParsing="false" onAction="#showExplanation" style="-fx-background-color: transparent; -fx-padding: 0 0 0 0;">
+               <graphic>
+                  <ImageView fitHeight="73.0" fitWidth="72.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@../icons/questionmark.png" />
+                     </image>
+                  </ImageView>
+               </graphic>
+            </Button>
             </children></AnchorPane>
         <AnchorPane fx:id="travelPane" layoutY="85.0" prefHeight="618.0" prefWidth="820.0" visible="false">
             <children>
diff --git a/src/Client/src/main/resources/icons/questionmark.png b/src/Client/src/main/resources/icons/questionmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..435cd42f11aff091f5fec37555bb7ef788245da7
GIT binary patch
literal 4477
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
P00000NkvXXu0mjfm_4k^

literal 0
HcmV?d00001