Merge pull request #8 from jadevogt/ui-overhaul

UI overhaul
jadevogt · Sep 13, 2022 · 76fe1e7 · 76fe1e7
2 parents 38c2271 + 1b6b83f
commit 76fe1e7
Show file tree

Hide file tree

Showing 57 changed files with 2,210 additions and 1,617 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 18
-      uses: actions/setup-java@v3
-      with:
-        java-version: '18'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-    - name: Run tests with Maven
-      run: mvn test
+      - uses: actions/checkout@v3
+      - name: Set up JDK 18
+        uses: actions/setup-java@v3
+        with:
+          java-version: '18'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml
+      - name: Run tests with Maven
+        run: mvn test
diff --git a/README.md b/README.md
@@ -1,10 +1,16 @@
 # Tynk Dialog Tool
+
 [![Build](https://github.com/jadevogt/tynk_dialog/actions/workflows/maven.yml/badge.svg)](https://github.com/jadevogt/tynk_dialog/actions/workflows/maven.yml)
+
 ## Overview
-This is an early development version of a tool that can be used to create, edit, and eventually preview dialog boxes for the upcoming game [Tynk! and the Final Phonorecord](https://tynkga.me/). 
+
+This is an early development version of a tool that can be used to create, edit, and eventually
+preview dialog boxes for the upcoming game [Tynk! and the Final Phonorecord](https://tynkga.me/).
 
 ## Roadmap
+
 ### Completed
+
 - Proof of Concept
   * Open dialog files saved in the JSON based file format
   * Edit the content and settings of the dialog files interactively
@@ -19,7 +25,9 @@ This is an early development version of a tool that can be used to create, edit,
   * Behaviors (text effects)
   * Print delay
   * Rich text editing inside the dialog tool interface
+
 ### To-Do
+
 - Game File Integration
   * Automatically pull data from a configured game data path in the filesystem
   * Check user input against the character, blip, textbox style info found in the game files
@@ -28,5 +36,7 @@ This is an early development version of a tool that can be used to create, edit,
   * Preview sound blips
   * Drag and drop capability for rearranging dialog
   * Preview dialog in styled textbox without opening GameMaker
+
 ### Screenshots
+
 ![image](https://user-images.githubusercontent.com/89030899/189528166-79769f65-7576-483f-a1d2-9d916f1ad37c.png)
diff --git a/pom.xml b/pom.xml
@@ -1,74 +1,74 @@
 <?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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>best.tigers</groupId>
-    <artifactId>tynk_dialog</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>javax.json</groupId>
-            <artifactId>javax.json-api</artifactId>
-            <version>1.1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-            <version>1.1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>5.9.0</version>
-            <scope>test</scope>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
-        </dependency>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <artifactId>tynk_dialog</artifactId>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <version>2.22.2</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>17</source>
+          <target>17</target>
+        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <artifactId>javax.json-api</artifactId>
+      <groupId>javax.json</groupId>
+      <version>1.1.4</version>
+    </dependency>
+    <dependency>
+      <artifactId>javax.json</artifactId>
+      <groupId>org.glassfish</groupId>
+      <version>1.1.4</version>
+    </dependency>
+    <dependency>
+      <artifactId>junit-jupiter</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <scope>test</scope>
+      <version>5.9.0</version>
+    </dependency>
+    <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+    <dependency>
+      <artifactId>commons-lang3</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <version>3.12.0</version>
+    </dependency>
 
-        <dependency>
-            <groupId>com.formdev</groupId>
-            <artifactId>flatlaf</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.formdev</groupId>
-            <artifactId>flatlaf-intellij-themes</artifactId>
-            <version>2.4</version>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <artifactId>flatlaf</artifactId>
+      <groupId>com.formdev</groupId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <artifactId>flatlaf-intellij-themes</artifactId>
+      <groupId>com.formdev</groupId>
+      <version>2.4</version>
+    </dependency>
+  </dependencies>
+  <groupId>best.tigers</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <version>1.0-SNAPSHOT</version>
 </project>
diff --git a/src/main/java/best/tigers/tynk_dialog/Main.java b/src/main/java/best/tigers/tynk_dialog/Main.java
@@ -2,21 +2,19 @@
 
 import best.tigers.tynk_dialog.gui.Assets;
 import best.tigers.tynk_dialog.gui.controller.PrimaryListController;
-
-import javax.swing.*;
 import com.formdev.flatlaf.intellijthemes.FlatMaterialDesignDarkIJTheme;
-
-import java.awt.*;
+import java.awt.EventQueue;
+import javax.swing.JEditorPane;
 
 public class Main {
   public static void main(String... args) {
     Assets.runIntegrations();
-    JEditorPane.registerEditorKitForContentType("text/harlowtml", "best.tigers.tynk_dialog.gui.text.HarlowTMLEditorKit");
+    JEditorPane.registerEditorKitForContentType(
+        "text/harlowtml", "best.tigers.tynk_dialog.gui.text.HarlowTMLEditorKit");
     FlatMaterialDesignDarkIJTheme.setup();
     EventQueue.invokeLater(
-            () -> {
-              PrimaryListController.launch();
-            });
+        () -> {
+          PrimaryListController.launch();
+        });
   }
 }
-
diff --git a/src/main/java/best/tigers/tynk_dialog/exceptions/DialogFileIOException.java b/src/main/java/best/tigers/tynk_dialog/exceptions/DialogFileIOException.java
@@ -3,8 +3,7 @@
 import java.io.IOException;
 
 public class DialogFileIOException extends IOException {
-  public DialogFileIOException() {
-  }
+  public DialogFileIOException() {}
 
   public DialogFileIOException(String message) {
     super(message);

diff --git a/src/main/java/best/tigers/tynk_dialog/exceptions/DialogParseException.java b/src/main/java/best/tigers/tynk_dialog/exceptions/DialogParseException.java
@@ -1,8 +1,7 @@
 package best.tigers.tynk_dialog.exceptions;
 
 public class DialogParseException extends Exception {
-  public DialogParseException() {
-  }
+  public DialogParseException() {}
 
   public DialogParseException(String message) {
     super(message);
@@ -16,4 +15,3 @@ public DialogParseException(String message, Throwable cause) {
     super(message, cause);
   }
 }
-