From 10157362834a78d8ed93e61f9f338ef713e22a61 Mon Sep 17 00:00:00 2001
From: law39 <law39@aber.ac.uk>
Date: Wed, 1 Apr 2020 02:41:00 +0100
Subject: [PATCH] Added Programming Project

Added base template project including:
basic javadoc comments.
Maven JavaFX setup.
Placeholder JavaFX controllers and FXML files.
---
 src/Welsh Vocabulary Tutor/.idea/compiler.xml |  13 +++
 .../.idea/encodings.xml                       |   7 ++
 src/Welsh Vocabulary Tutor/.idea/misc.xml     |  14 +++
 .../.idea/workspace.xml                       |  90 ++++++++++++++++++
 .../Welsh Vocabulary Tutor.iml                |   2 +
 src/Welsh Vocabulary Tutor/pom.xml            |  44 +++++++++
 .../src/main/java/module-info.java            |   7 ++
 .../java/uk/ac/aber/cs22120/group20/App.java  |  48 ++++++++++
 .../cs22120/group20/PrimaryController.java    |  14 +++
 .../cs22120/group20/SecondaryController.java  |  14 +++
 .../uk/ac/aber/cs22120/group20/primary.fxml   |  16 ++++
 .../uk/ac/aber/cs22120/group20/secondary.fxml |  16 ++++
 .../target/classes/module-info.class          | Bin 0 -> 270 bytes
 .../uk/ac/aber/cs22120/group20/App.class      | Bin 0 -> 1923 bytes
 .../cs22120/group20/PrimaryController.class   | Bin 0 -> 620 bytes
 .../cs22120/group20/SecondaryController.class | Bin 0 -> 622 bytes
 .../uk/ac/aber/cs22120/group20/primary.fxml   |  16 ++++
 .../uk/ac/aber/cs22120/group20/secondary.fxml |  16 ++++
 18 files changed, 317 insertions(+)
 create mode 100644 src/Welsh Vocabulary Tutor/.idea/compiler.xml
 create mode 100644 src/Welsh Vocabulary Tutor/.idea/encodings.xml
 create mode 100644 src/Welsh Vocabulary Tutor/.idea/misc.xml
 create mode 100644 src/Welsh Vocabulary Tutor/.idea/workspace.xml
 create mode 100644 src/Welsh Vocabulary Tutor/Welsh Vocabulary Tutor.iml
 create mode 100644 src/Welsh Vocabulary Tutor/pom.xml
 create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/module-info.java
 create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/App.java
 create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/PrimaryController.java
 create mode 100644 src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/SecondaryController.java
 create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml
 create mode 100644 src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml
 create mode 100644 src/Welsh Vocabulary Tutor/target/classes/module-info.class
 create mode 100644 src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/App.class
 create mode 100644 src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/PrimaryController.class
 create mode 100644 src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/SecondaryController.class
 create mode 100644 src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml
 create mode 100644 src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml

diff --git a/src/Welsh Vocabulary Tutor/.idea/compiler.xml b/src/Welsh Vocabulary Tutor/.idea/compiler.xml
new file mode 100644
index 0000000..0c465ee
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/.idea/compiler.xml	
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="Welsh Vocabulary Tutor" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/.idea/encodings.xml b/src/Welsh Vocabulary Tutor/.idea/encodings.xml
new file mode 100644
index 0000000..aa00ffa
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/.idea/encodings.xml	
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/.idea/misc.xml b/src/Welsh Vocabulary Tutor/.idea/misc.xml
new file mode 100644
index 0000000..d24ea8e
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/.idea/misc.xml	
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/.idea/workspace.xml b/src/Welsh Vocabulary Tutor/.idea/workspace.xml
new file mode 100644
index 0000000..abf7dc2
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/.idea/workspace.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="b436be74-9b31-4913-bf6e-41784cacd483" name="Default Changelist" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="MavenImportPreferences">
+    <option name="importingSettings">
+      <MavenImportingSettings>
+        <option name="importAutomatically" value="true" />
+      </MavenImportingSettings>
+    </option>
+  </component>
+  <component name="ProjectId" id="1ZuzdvhY95vKxjmCaMLe5YQbnXd" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="project.structure.last.edited" value="Libraries" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.2" />
+  </component>
+  <component name="RunManager">
+    <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="uk.ac.aber.cs22120.group20.App" />
+      <module name="Welsh Vocabulary Tutor" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="uk.ac.aber.cs22120.group20.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.App" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="b436be74-9b31-4913-bf6e-41784cacd483" name="Default Changelist" comment="" />
+      <created>1585703857421</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1585703857421</updated>
+      <workItem from="1585703861677" duration="881000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state width="1878" height="282" key="GridCell.Tab.0.bottom" timestamp="1585703985278">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1878" height="282" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1585703985278" />
+    <state width="1878" height="282" key="GridCell.Tab.0.center" timestamp="1585703985278">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1878" height="282" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1585703985278" />
+    <state width="1878" height="282" key="GridCell.Tab.0.left" timestamp="1585703985278">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1878" height="282" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1585703985278" />
+    <state width="1878" height="282" key="GridCell.Tab.0.right" timestamp="1585703985278">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1878" height="282" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1585703985278" />
+    <state x="441" y="95" key="SettingsEditor" timestamp="1585703966325">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="441" y="95" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1585703966325" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/Welsh Vocabulary Tutor.iml b/src/Welsh Vocabulary Tutor/Welsh Vocabulary Tutor.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/Welsh Vocabulary Tutor.iml	
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/pom.xml b/src/Welsh Vocabulary Tutor/pom.xml
new file mode 100644
index 0000000..d2e762f
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/pom.xml	
@@ -0,0 +1,44 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>uk.ac.aber.cs22120.group20</groupId>
+    <artifactId>Welsh Vocabulary Tutor</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-controls</artifactId>
+            <version>11</version>
+        </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>11</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <release>11</release>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.1</version>
+                <configuration>
+                    <mainClass>uk.ac.aber.cs22120.group20.App</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/module-info.java b/src/Welsh Vocabulary Tutor/src/main/java/module-info.java
new file mode 100644
index 0000000..5d44bb3
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/src/main/java/module-info.java	
@@ -0,0 +1,7 @@
+module uk.ac.aber.cs22120.group20 {
+    requires javafx.controls;
+    requires javafx.fxml;
+
+    opens uk.ac.aber.cs22120.group20 to javafx.fxml;
+    exports uk.ac.aber.cs22120.group20;
+}
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/App.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/App.java
new file mode 100644
index 0000000..8b5c64d
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/App.java	
@@ -0,0 +1,48 @@
+package uk.ac.aber.cs22120.group20;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+/**
+ * Launch class of the Welsh Vocabulary tutor Application
+ *
+ * @author Brad Corbett [brc9]
+ * @author Henry Dugmore [hjd3]
+ * @author Kain Bryan-Jones [kab74]
+ * @author Luke Wybar [law39]
+ * @author Marcin Jakob [maj83]
+ * @author Oscar Pocock [osp1]
+ * @author Tom Perry [top1]
+ * @author Waylen Watts [ncw]
+ *
+ * @version 0.1
+ */
+public class App extends Application {
+    private static Scene scene;
+
+    @Override
+    public void start(Stage stage) throws IOException {
+        scene = new Scene(loadFXML("primary"));
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    static void setRoot(String fxml) throws IOException {
+        scene.setRoot(loadFXML(fxml));
+    }
+
+    private static Parent loadFXML(String fxml) throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(App.class.getResource(fxml + ".fxml"));
+        return fxmlLoader.load();
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+
+}
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/PrimaryController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/PrimaryController.java
new file mode 100644
index 0000000..b1929a6
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/PrimaryController.java	
@@ -0,0 +1,14 @@
+package uk.ac.aber.cs22120.group20;
+
+import java.io.IOException;
+import javafx.fxml.FXML;
+/**
+ * Placeholder Controller
+ */
+public class PrimaryController {
+
+    @FXML
+    private void switchToSecondary() throws IOException {
+        App.setRoot("secondary");
+    }
+}
diff --git a/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/SecondaryController.java b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/SecondaryController.java
new file mode 100644
index 0000000..94eb1ac
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/src/main/java/uk/ac/aber/cs22120/group20/SecondaryController.java	
@@ -0,0 +1,14 @@
+package uk.ac.aber.cs22120.group20;
+
+import java.io.IOException;
+import javafx.fxml.FXML;
+/**
+ * Placeholder Controller
+ */
+public class SecondaryController {
+
+    @FXML
+    private void switchToPrimary() throws IOException {
+        App.setRoot("primary");
+    }
+}
\ No newline at end of file
diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml
new file mode 100644
index 0000000..e2ba159
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/primary.fxml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.geometry.Insets?>
+
+<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs22120.group20.PrimaryController">
+   <children>
+      <Label text="Primary View" />
+      <Button fx:id="primaryButton" text="Switch to Secondary View" onAction="#switchToSecondary"/>
+   </children>
+   <padding>
+      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+   </padding>
+</VBox>
diff --git a/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml
new file mode 100644
index 0000000..3e1a950
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/src/main/resources/uk/ac/aber/cs22120/group20/secondary.fxml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.geometry.Insets?>
+
+<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs22120.group20.SecondaryController">
+    <children>
+        <Label text="Secondary View" />
+        <Button fx:id="secondaryButton" text="Switch to Primary View" onAction="#switchToPrimary" />
+    </children>
+    <padding>
+        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+    </padding>
+</VBox>
diff --git a/src/Welsh Vocabulary Tutor/target/classes/module-info.class b/src/Welsh Vocabulary Tutor/target/classes/module-info.class
new file mode 100644
index 0000000000000000000000000000000000000000..c1c0eee2464f6c8645e5f37624c28a85df251404
GIT binary patch
literal 270
zcmYk1O%j4I42568Kl}p+SKh%;Sm+Jhx$*?Hf`g)Uia0JkmkSTzp&UzPVHQc=o5`2t
z{dv9sEHUX~z|h~QO3QSW7b!z<QoE{1=lMBPbPzYe&{<n6#4yCj$T%iWixA@w{uBYj
z;BSUuRvk%565CXhER!ToIPJBnE(vGwY9wt%X;%4lpWR8S^Hr;&G@!=G?x(_nA|az1
q6g8lz0X+a_KKO+L$21OHv`pn_TiZqF0d&!`%Cp)0`d7_0wfX{}w>J6!

literal 0
HcmV?d00001

diff --git a/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/App.class b/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/App.class
new file mode 100644
index 0000000000000000000000000000000000000000..c5694b637800b71a3c517874bbbab859586fbf38
GIT binary patch
literal 1923
zcmaJ?`%@EF6#gy=*|6Cf4G30Se4!0sS*5M5#cDN`iVb23qLjWan>ATkb~C#h3;#*~
zj6P<-vC~d}?jP0ZcXt=E5$rJB$GPWx=R2>>KmWe^3&6){>KMi~4YNgjpreEjbqwI6
zA)c=5eEvi&H<avC4Rac9R%rFPjyt%kLq|<5Uud|eVP08(so}oBU})K%Eih7lE?>xJ
z+h%+>8%jDSP`K%MPIOBkSDjoH$k+TPmCJR<vmbW1Htb+UZn%_G>b@o2RT((yo(l6(
z+X)5E)w`Rfv`k5L(+X#2ugzXHTY=y0aKF>((9K{N$siIKs~*sZWXm=iYMoP_l}4+N
zXGTFlzqf7KoyhUMP{V?N7TVFW?-TN50%^L^YY{JSyjBdDf405lD&i{czE^>w>&xc+
z)5W^L<Wc4aBvqEoM>4Rzh*9VYvQASw5ID83q=cpdOJ1m#-;$0eFj`$d>^#o03|h?F
z@Da~+((t>1WzRb*?M0?<Mg?GC6l09$a1oh{PT*|GV8_6Fs4B$=21amF!&e6CSTyhu
zV+Jnb0V$>SuW=R_|NjyS9KXwKhfyFqi+0rZn_;<tr6L{~_!`R^8U|MISUF!c@B~j8
zT_4pXhlEkmY&8t5;R^ky+OpGe9ZRZ0tJc{+r*Nj@n+r<^t-vDm`YBr~mE?m|_4<hU
zWZT58-`9$<X)+OUdBV2;la6n&&iN2CNgs`E$xXZFd*t@SiP}7|VZDfDy!^%v%ErmI
zDEDHoxiX|_sl_g~!?@rA7v2oy*^&8pxlWK1snWhACal_-BVL`%^xM+LbK6o~TX1F9
zv)UTIRkiw2V4}yv@m~0wY7EubB+<=FEAoRK4I4DA`~GIPBVa6eo*l%jZSwv(%QVGE
z+Ty<SnywvAB!+VtKIv#?Bz=Y}J01H7_3VhG5oLo+A!^cf8%|{Nqi6|SIuzeg+|r&)
zYSc$1jREKR5gq0ymNTj5iKjuHIfq<N@n&)tN;<U%@hcAlc$;e>79PWCo{dBSXYdYh
z0`Fp+TFQ7GIi7$se_&v(l6#5#9tM9$Vfr@|cA-u0qS%A1AWzj1l*wY0f2YYo!H*^o
zDLlb&7U$^ZJm2!%FQCY|pGaNa;I8<V=wgZvcQMp+p?+3CP@Nz><|SOhWy*Viy86hZ
zfDJlHW6;+srKwkp7rS_C569{Zp!_$E|3c#=Es2A1X7p?y_r$?4nNDJ=kNXg&afK3<
zuIt<t_hRl(oOp@K>%=cYW1KzWMZAw0>gQM`#o#J_;I0$nJ4k%bLVc#tc)!K}+y4Py
C(Z==w

literal 0
HcmV?d00001

diff --git a/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/PrimaryController.class b/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/PrimaryController.class
new file mode 100644
index 0000000000000000000000000000000000000000..e909f1795568b201391116c2a2964c4c47d1d239
GIT binary patch
literal 620
zcmb7B$w~u35Ph9xM#s4CD|k~8TZ7<15kwS(xL_oB?M&L(I_VBQJsLmDlj6Y-@T0_<
zG3r4O>_aWD>b>fs-riqc0c>F*KoMg-7!NRkNgq=_rWw2)rIp)d$S*C|7z+EQAsGfM
zO3Ra^RhRZc)FVPhDkc<BO<0xYU9jM;Rm`wfNp86axuA9)#^v%xd7U?{N!sMktZE7S
zuy3@pCW@rpW*Cm|l?$&gOjU+PH>k`I9CSk2cFO43#|*>td7_<a$(o84P2AJkIFXgp
z&)kSRan<2homRvTFOMrE8dObULwTsu?@s(0yOvT)@ZdA_#$R)N%$6{Rd4|>h?7%RT
z%JE3(CO@s;$j~v2W{@)c==6IRhJ`<L_u6d+KbG#?7!nv?%J%wHtvai8b9=dlMHJ|A
z>C1r*2A^yXWt==CUtD<td(6tcWW5aZ5KvtDY(O7HDZQV_`HZ~TC3_>eXXJm_0d;}6
dMdJJ@cwL17suhSih#`v7NyFsnAY^kG{Qz@;ix&U@

literal 0
HcmV?d00001

diff --git a/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/SecondaryController.class b/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/SecondaryController.class
new file mode 100644
index 0000000000000000000000000000000000000000..d1e4339c0618e766099ac5def014d2496ce0789c
GIT binary patch
literal 622
zcmb7B$w~u35Ph9xM#s4CD|k~6wg$n2B8VsmaluIN+8Nu}I_VyIdNh8PC&hyw;75ry
zlb{z7>_b&`RlWDBsE^OLcL3X13Q)#GA0`7#VcN%xk68w9S83(;7>X;a4TjQzxt0vW
zHKpZg+HOjFDVh;w#%d-MQA1dj{d>uhyHyFpMlHSPBIJVFd6-nIo7D~8vL=nm*JWt*
zwXjbIMmuYwNZK6|NFJ37Z!gWcRc$IV1c#ka#!eZX_?Tmuy-2lFZP`$XBE@~JjT3n}
z8|F?th?@?->9iw$bahfA%Ajsi8_FY<jXU#;?0N>Oz=O}=$6Z|?^A#*$kzxIRJ1~r7
zbUYHe#m|~|GIR{%c}f|6eD=K!!_ptj`*BReB+^|NLj;p6`DR_#y0c2Rc2*l$Mu~2h
zy#nZD@X7YkkCSKQ%WE%S&w06@td}P}1Qb`g4H%#(gAWq8n1i=^U~jDOisBDCpe_)$
cOqd@Aug5S%wGttRF+x$MG)kUMLbibMFB^=D-2eap

literal 0
HcmV?d00001

diff --git a/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml b/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml
new file mode 100644
index 0000000..e2ba159
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/primary.fxml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.geometry.Insets?>
+
+<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs22120.group20.PrimaryController">
+   <children>
+      <Label text="Primary View" />
+      <Button fx:id="primaryButton" text="Switch to Secondary View" onAction="#switchToSecondary"/>
+   </children>
+   <padding>
+      <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+   </padding>
+</VBox>
diff --git a/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml b/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml
new file mode 100644
index 0000000..3e1a950
--- /dev/null
+++ b/src/Welsh Vocabulary Tutor/target/classes/uk/ac/aber/cs22120/group20/secondary.fxml	
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.geometry.Insets?>
+
+<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="uk.ac.aber.cs22120.group20.SecondaryController">
+    <children>
+        <Label text="Secondary View" />
+        <Button fx:id="secondaryButton" text="Switch to Primary View" onAction="#switchToPrimary" />
+    </children>
+    <padding>
+        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+    </padding>
+</VBox>