From 426199ce4d47f346d3d697070d3e62ac9df79f93 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <mateusz.kowalczyk24@gmail.com>
Date: Fri, 22 Nov 2019 21:43:01 +0100
Subject: [PATCH] Change structure and add welcome page

---
 FFM.iml                                    |   1 +
 out/production/FFM/sample/Controller.class | Bin 269 -> 0 bytes
 out/production/FFM/sample/Main.class       | Bin 1208 -> 0 bytes
 out/production/FFM/sample/sample.fxml      |   8 --------
 resource/welcomePage.fxml                  |  20 ++++++++++++++++++++
 src/{sample => application}/Main.java      |  12 +++++++++---
 src/resource/welcomePage.fxml              |  20 ++++++++++++++++++++
 src/sample/Controller.java                 |   4 ----
 src/sample/sample.fxml                     |   8 --------
 9 files changed, 50 insertions(+), 23 deletions(-)
 delete mode 100644 out/production/FFM/sample/Controller.class
 delete mode 100644 out/production/FFM/sample/Main.class
 delete mode 100644 out/production/FFM/sample/sample.fxml
 create mode 100644 resource/welcomePage.fxml
 rename src/{sample => application}/Main.java (59%)
 create mode 100644 src/resource/welcomePage.fxml
 delete mode 100644 src/sample/Controller.java
 delete mode 100644 src/sample/sample.fxml

diff --git a/FFM.iml b/FFM.iml
index fb8e866..d998771 100644
--- a/FFM.iml
+++ b/FFM.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resource" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/out/production/FFM/sample/Controller.class b/out/production/FFM/sample/Controller.class
deleted file mode 100644
index d9c917c8db078f872487fab60b15b7547a307063..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 269
zcmZXO&5FW65QM8^el$kou20}iJ(!~h#f#u6=wTP{lQ`(en2|C1UVB>b-~;SKi5(I4
zU^f(9ReaEY_v;P77@ZI`v;wpP!~}n;3RTVswf<mDaOY+t32~|lxjY{-X}?9LIr&UY
zF7#ShRry!wmOFJKbkmbK9JNg5rYNn^TG|OA{4!^o%Y~}&_`e$M#YIGL;SoOGKtiYL
z6D^8uvdZ={FVTa;FIPjn46^#{lBWl};V<Zi0|x=C&oLONvqsO`Ljxf@LX*`&^Z=*a
BH?RNz

diff --git a/out/production/FFM/sample/Main.class b/out/production/FFM/sample/Main.class
deleted file mode 100644
index 58c475ed2ea74b37acdf1aa1feac7a9b71e982f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1208
zcmZux?^Dx25Pe5W(}qAxX^Wy_LDWKlps1)If<XP1q65h2_~{5o8zxO^8WhLB$}fe{
z8HdmQQI2~_Y0C^>?)EnO_U*pg%in*${s36Orivj<s+dACj%gJ$m{p-;PQkr6?yH!`
z0|gIbE8ZD}1F@AabAh2Efk*Q5f?OV}NaKlurwSGsVoR1|`O6HE!sISPbj{rt3`xUs
z#O6_LPk1|g&n8dWa7}LSa?g_ImNV*Ctp-EC(crbZE%Y+C9Lm|-@VVzR3>S<;{*@mb
z>*S~ieOs=Jl18h0R*ie#0}n&yvN$Tnb6rZ4ZGSa|BlP#&6OK<b>c+7t>b~VV4FyXS
zUL$&jT;X#7&~5Hih|{y2N<bRrUWKY1y5ut@+jfsUQ<N;(Y(h3ND{I$~K~}*t4a<1W
z&=)p3dvIK{6|87j#R~;%8rHEvna{iJs*}7W&l1jlzQj$DFLU3l3Qs{v!%Ms(T`yp^
zB~o&}*6;>zH5kZhC}W~c9cauj+Jf<V-L_0FMbK9}cB__9g0@TyDG3X`@AeLbN$SQc
z!e6s_Ln>34>{2dplFZ2trWMymkS);&1Y;NvZ~3C!VID{L`iCuplH^+TO5ya<$FgC#
zd|!BUX*L<1B<G0kLc&TZNn5MVG*SHx;qO?!yteFRmC&?}bmp+@W)|1i<tR#gAp3=R
z4dMcKI6950`;8up&5s<jiZOaYL&4LEfTkB&T61*PX=k+ePMv`LB%=qzw8jEw0$0e^
z!T?;w2%Q+N;W|Z0@DIchp?zkmiJo+%iRdYM&k!pY(@GQZ;%_8AO=qBHpq*f#iDa>f
zREH#oUIO<cg#k*JM1ibn3<jk6Fma2NC~yO#M4qDkCh}Ck7-6I28K+;xEliLlOPZ%W
d?B^7N9V(Ropr)e~)ZNo<+#x^1U0Qok_z&y05u5-3

diff --git a/out/production/FFM/sample/sample.fxml b/out/production/FFM/sample/sample.fxml
deleted file mode 100644
index 363237a..0000000
--- a/out/production/FFM/sample/sample.fxml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.layout.GridPane?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<GridPane fx:controller="sample.Controller"
-          xmlns:fx="http://javafx.com/fxml" alignment="center" hgap="10" vgap="10">
-</GridPane>
\ No newline at end of file
diff --git a/resource/welcomePage.fxml b/resource/welcomePage.fxml
new file mode 100644
index 0000000..44ac3e0
--- /dev/null
+++ b/resource/welcomePage.fxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<VBox prefHeight="400.0" prefWidth="640.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+  <children>
+    <AnchorPane maxHeight="-1.0" maxWidth="-1.0" prefHeight="-1.0" prefWidth="-1.0" VBox.vgrow="ALWAYS">
+      <children>
+        <Label alignment="CENTER" layoutX="155.0" layoutY="177.0" style="&#10;" text="Welcome in Friend Face Matcher" textAlignment="CENTER" textFill="#9f9f9f" wrapText="false">
+          <font>
+            <Font size="18.0" />
+          </font>
+        </Label>
+      </children>
+    </AnchorPane>
+  </children>
+</VBox>
diff --git a/src/sample/Main.java b/src/application/Main.java
similarity index 59%
rename from src/sample/Main.java
rename to src/application/Main.java
index 5603e43..3c673fb 100644
--- a/src/sample/Main.java
+++ b/src/application/Main.java
@@ -1,4 +1,4 @@
-package sample;
+package application;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -6,13 +6,19 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
+import java.io.File;
+import java.net.URL;
+
 public class Main extends Application {
 
     @Override
     public void start(Stage primaryStage) throws Exception{
-        Parent root = FXMLLoader.load(getClass().getResource("sample.fxml"));
+        URL welcomePageUrl = ClassLoader.getSystemClassLoader().
+                getResource("welcomePage.fxml");
+
+        Parent welcomePage = FXMLLoader.load(welcomePageUrl);
         primaryStage.setTitle("Friend Face Matcher");
-        primaryStage.setScene(new Scene(root, 300, 275));
+        primaryStage.setScene(new Scene(welcomePage));
         primaryStage.show();
     }
 
diff --git a/src/resource/welcomePage.fxml b/src/resource/welcomePage.fxml
new file mode 100644
index 0000000..44ac3e0
--- /dev/null
+++ b/src/resource/welcomePage.fxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<VBox prefHeight="400.0" prefWidth="640.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+  <children>
+    <AnchorPane maxHeight="-1.0" maxWidth="-1.0" prefHeight="-1.0" prefWidth="-1.0" VBox.vgrow="ALWAYS">
+      <children>
+        <Label alignment="CENTER" layoutX="155.0" layoutY="177.0" style="&#10;" text="Welcome in Friend Face Matcher" textAlignment="CENTER" textFill="#9f9f9f" wrapText="false">
+          <font>
+            <Font size="18.0" />
+          </font>
+        </Label>
+      </children>
+    </AnchorPane>
+  </children>
+</VBox>
diff --git a/src/sample/Controller.java b/src/sample/Controller.java
deleted file mode 100644
index 54e5bd1..0000000
--- a/src/sample/Controller.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package sample;
-
-public class Controller {
-}
diff --git a/src/sample/sample.fxml b/src/sample/sample.fxml
deleted file mode 100644
index 363237a..0000000
--- a/src/sample/sample.fxml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.layout.GridPane?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<GridPane fx:controller="sample.Controller"
-          xmlns:fx="http://javafx.com/fxml" alignment="center" hgap="10" vgap="10">
-</GridPane>
\ No newline at end of file