added config file for font

.gitignore

@@ -1,3 +1,4 @@
 .settings/
 target/
 *.class
+config.yaml

README.md

@@ -11,7 +11,7 @@ Student ID:   19023939
 ### *Student 2*
 ```css
 Name:         Jack Sandford;
-Student ID:   ???
+Student ID:   19025303
 ```
 ---
 
@@ -30,4 +30,6 @@ Fletcher:
  ```
 
 Jack:
+```css
+ ```
 ---

dependency-reduced-pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>nz.ac.massey.cs</groupId>
+  <artifactId>nz.ac.massey.cs.flackpad</artifactId>
+  <version>0.3.4-SNAPSHOT</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <configuration>
+          <source>16</source>
+          <target>16</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer>
+                  <mainClass>nz.ac.massey.cs.flackpad.RunApp</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <properties>
+    <maven.compiler.target>16</maven.compiler.target>
+    <javaVersion>16</javaVersion>
+    <maven.compiler.source>16</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+</project>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nz.ac.massey.cs</groupId>
 	<artifactId>nz.ac.massey.cs.flackpad</artifactId>
-	<version>0.3.4-SNAPSHOT</version>
+	<version>0.3.5</version>
 	<properties>
 		<javaVersion>16</javaVersion>
 		<maven.compiler.source>16</maven.compiler.source>
@@ -22,6 +22,11 @@
 			<artifactId>itextpdf</artifactId>
 			<version>5.5.13.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>1.29</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

src/main/java/nz/ac/massey/cs/flackpad/Config.java

@@ -0,0 +1,89 @@
+package nz.ac.massey.cs.flackpad;
+
+import java.awt.Font;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+
+class Config {
+
+	private Window window;
+	private Map<String, Object> defaults = new LinkedHashMap<String, Object>();
+	private Map<String, Object> config = new LinkedHashMap<String, Object>();
+
+	Config(Window window) {
+		this.window = window;
+
+		loadDefaults();
+		loadConfigFile();
+	}
+
+	private void loadDefaults() {
+		defaults.put("fontFamily", "Consolas");
+		defaults.put("fontStyle", Font.PLAIN);
+		defaults.put("fontSize", 12);
+	}
+
+	void loadConfigFile() {
+		// Read config file
+		Yaml yaml = new Yaml();
+
+		try {
+			InputStream inputStream = new FileInputStream("config.yaml");
+			config = yaml.load(inputStream);
+			inputStream.close();
+		} catch (FileNotFoundException e) {
+			Dialogs.error("Configuration file does not exist, using defaults", window);
+		} catch (IOException e) {
+			Dialogs.error("Something wen't wrong when loading configuration file", window);
+		}
+
+		// Set missing values with defaults
+		for (String key:defaults.keySet()) {
+			if (!config.containsKey(key)) config.put(key, defaults.get(key));
+		}
+
+		// Save config
+		saveConfigFile();
+	}
+
+	void saveConfigFile() {
+		DumperOptions options = new DumperOptions();
+		options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+		options.setPrettyFlow(true);
+		Yaml yaml = new Yaml(options);
+
+		try {
+			PrintWriter writer = new PrintWriter("config.yaml");
+			yaml.dump(config, writer);
+			writer.flush();
+			writer.close();
+		} catch (IOException e) {
+			Dialogs.error("Something wen't wrong when saving configuration", window);
+		}
+	}
+
+	Font getFont() {
+		try {
+			return new Font((String) config.get("fontFamily"), (int) config.get("fontStyle"), (int) config.get("fontSize"));
+		} catch (Exception e) {
+			Dialogs.error("Something wen't wrong when loading the configured font, using defaults", window);
+		}
+		setFont(new Font((String) defaults.get("fontFamily"), (int) defaults.get("fontStyle"), (int) defaults.get("fontSize")));
+		return getFont();
+	}
+
+	void setFont(Font font) {
+		config.put("fontFamily", font.getFamily());
+		config.put("fontStyle", font.getStyle());
+		config.put("fontSize", font.getSize());
+	}
+
+}

src/main/java/nz/ac/massey/cs/flackpad/TextArea.java

@@ -39,6 +39,12 @@ void addTimeAndDate() {
 		}
 	}
 
+	void setFontWithZoom(Font font) {
+		fontSize = font.getSize();
+		setFont(font);
+		zoom();
+	}
+
 	//Zoom methods work by changing font size
 	void zoomIn() {
 		if (fontPercentage < 1000) {

src/main/java/nz/ac/massey/cs/flackpad/Window.java

@@ -17,6 +17,7 @@ class Window extends JFrame {
 	private String name = "FlackPad";
 	private JFrame frame;
 	private WindowListener winListener;
+	private Config config;
 
 	private MenuBar menuBar;
 	private TextArea textArea;
@@ -32,14 +33,11 @@ class Window extends JFrame {
 		frame = new JFrame(fileName + " - " + name);
 
 		// Add icon
-//		ImageIcon icon = new ImageIcon("./flackpad.png");
-//		System.out.println(icon.getImageLoadStatus());
-//		frame.setIconImage(icon.getImage());
 		frame.setIconImages(List.of(
-				new ImageIcon("16x16.png").getImage(),
-				new ImageIcon("32x32.png").getImage(),
-				new ImageIcon("64x64.png").getImage(),
-				new ImageIcon("128x128.png").getImage()));
+				new ImageIcon("icons/16x16.png").getImage(),
+				new ImageIcon("icons/32x32.png").getImage(),
+				new ImageIcon("icons/64x64.png").getImage(),
+				new ImageIcon("icons/128x128.png").getImage()));
 
 		// Add window listener
 		winListener = new WinListener(this);
@@ -61,6 +59,12 @@ class Window extends JFrame {
 		frame.setSize(1000, 500);
 		frame.setVisible(true);
 		frame.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+
+		// Get config
+		config = new Config(this);
+
+		// Set configuration
+		textArea.setFontWithZoom(config.getFont());
 	}
 
 	void newDoc() {
@@ -85,6 +89,7 @@ void exit() {
 		if (saveChoice == JOptionPane.YES_OPTION) saved = FileIO.save(this);
 
 		if (saved == FileIO.SAVED) {
+			config.saveConfigFile();
 			frame.dispose();
 		}
 	}
@@ -126,7 +131,6 @@ void setFile(File file) {
 		this.file = file;
 		fileName = file == null ? "Untitled" : file.getName();
 		fileMIME = FileIO.getFileMIME(file);
-//		System.out.println(fileMIME);
 	}
 
 	String getFileName() {

src/main/resources/config.yaml

@@ -0,0 +1,3 @@
+fontFamily: Consolas
+fontStyle: 0
+fontSize: 12