Added theme switcher + dark theme (#60)

* Initial work on the color config

* Save and read config from file.+

* Allow changing the editor colors

* Remove the right margin

* Move config to the user's home dir

* Use Guava instead of Apache commons

* Add runtime theme switching, includes example "dark" theme.

* Rename dark theme as requested

* Small clean up

* Include suggestions from @Thog

9 files changed, 226 insertions, 88 deletions

diff --git a/src/main/java/cuchaz/enigma/Main.java b/src/main/java/cuchaz/enigma/Main.java
index 9f34cd3c..688a55e0 100644
--- a/src/main/java/cuchaz/enigma/Main.java
+++ b/src/main/java/cuchaz/enigma/Main.java
@@ -21,8 +21,7 @@ import java.util.jar.JarFile;
 public class Main {
 
         public static void main(String[] args) throws Exception {
-                Config.loadConfig();
-                if (Config.INSTANCE.useSystemLAF)
+                if (Config.getInstance().useSystemLAF)
                         UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
                 Gui gui = new Gui();
 
diff --git a/src/main/java/cuchaz/enigma/config/Config.java b/src/main/java/cuchaz/enigma/config/Config.java
index 307b221d..87ef3531 100644
--- a/src/main/java/cuchaz/enigma/config/Config.java
+++ b/src/main/java/cuchaz/enigma/config/Config.java
@@ -8,65 +8,109 @@ import java.io.IOException;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 
-/**
- * Created by Mark on 04/06/2017.
- */
 public class Config {
 
-    public static Config INSTANCE = new Config();
-
-    public Integer obfuscatedColor = 0xFFDCDC;
-    public float obfuscatedHiglightAlpha = 1.0F;
-    public Integer obfuscatedColorOutline = 0xA05050;
-    public float obfuscatedOutlineAlpha = 1.0F;
-
-    public Integer deobfuscatedColor = 0xDCFFDC;
-    public float deobfuscatedHiglightAlpha = 1.0F;
-    public Integer deobfuscatedColorOutline = 0x50A050;
-    public float deobfuscatedOutlineAlpha = 1.0F;
-
-    public Integer otherColorOutline = 0xB4B4B4;
-    public float otherOutlineAlpha = 1.0F;
-
-    //Defaults found here: https://github.com/Sciss/SyntaxPane/blob/122da367ff7a5d31627a70c62a48a9f0f4f85a0a/src/main/resources/de/sciss/syntaxpane/defaultsyntaxkit/config.properties#L139
-    public Integer editorBackground = 0xFFFFFF;
-    public Integer highlightColor = 0x3333EE;
-    public Integer stringColor = 0xCC6600;
-    public Integer numberColor = 0x999933;
-    public Integer operatorColor = 0x000000;
-    public Integer delimiterColor = 0x000000;
-    public Integer typeColor = 0x000000;
-    public Integer identifierColor = 0x000000;
-    public Integer defaultTextColor = 0x000000;
-
-    public boolean useSystemLAF = true;
-
-    public static void loadConfig() throws IOException {
-        Gson gson = new GsonBuilder().registerTypeAdapter(Integer.class, new IntSerializer()).registerTypeAdapter(Integer.class, new IntDeserializer()).setPrettyPrinting().create();
-        File dirHome = new File(System.getProperty("user.home"));
-        File engimaDir = new File(dirHome, ".enigma");
-        if(!engimaDir.exists()){
-            engimaDir.mkdirs();
-        }
-        File configFile = new File(engimaDir, "config.json");
-        if (configFile.exists()) {
-            INSTANCE = gson.fromJson(Files.toString(configFile, Charset.defaultCharset()), Config.class);
-        } else {
-            Files.touch(configFile);
-        }
-        Files.write(gson.toJson(INSTANCE), configFile, Charset.defaultCharset());
-    }
-
-    private static class IntSerializer implements JsonSerializer<Integer> {
-        public JsonElement serialize(Integer src, Type typeOfSrc, JsonSerializationContext context) {
-            return new JsonPrimitive("#" + Integer.toHexString(src).toUpperCase());
-        }
-    }
-
-    private static class IntDeserializer implements JsonDeserializer<Integer> {
-        public Integer deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
-            return (int) Long.parseLong(json.getAsString().replace("#", ""), 16);
-        }
-    }
-
-}
+        private static final File DIR_HOME = new File(System.getProperty("user.home"));
+        private static final File ENIGMA_DIR = new File(DIR_HOME, ".enigma");
+        private static final File CONFIG_FILE = new File(ENIGMA_DIR, "config.json");
+        private static final Config INSTANCE = new Config();
+
+        private final transient Gson gson; // transient to exclude it from being exposed
+
+        public Integer obfuscatedColor;
+        public float obfuscatedHiglightAlpha;
+        public Integer obfuscatedColorOutline;
+        public float obfuscatedOutlineAlpha;
+        public Integer deobfuscatedColor;
+        public float deobfuscatedHiglightAlpha;
+        public Integer deobfuscatedColorOutline;
+        public float deobfuscatedOutlineAlpha;
+        public Integer otherColorOutline;
+        public float otherOutlineAlpha;
+
+        //Defaults found here: https://github.com/Sciss/SyntaxPane/blob/122da367ff7a5d31627a70c62a48a9f0f4f85a0a/src/main/resources/de/sciss/syntaxpane/defaultsyntaxkit/config.properties#L139
+        public Integer editorBackground;
+        public Integer highlightColor;
+
+        public Integer stringColor;
+        public Integer numberColor;
+        public Integer operatorColor;
+        public Integer delimiterColor;
+        public Integer typeColor;
+        public Integer identifierColor;
+        public Integer defaultTextColor;
+
+        public boolean useSystemLAF = true;
+
+        private Config() {
+                gson = new GsonBuilder()
+                        .registerTypeAdapter(Integer.class, new IntSerializer())
+                        .registerTypeAdapter(Integer.class, new IntDeserializer())
+                        .registerTypeAdapter(Config.class, (InstanceCreator<Config>) type -> this)
+                        .setPrettyPrinting()
+                        .create();
+                try {
+                        this.loadConfig();
+                } catch (IOException ignored) {
+                        try {
+                                this.reset();
+                        } catch (IOException ignored1) {
+                        }
+                }
+        }
+
+        public void loadConfig() throws IOException {
+                if (!ENIGMA_DIR.exists()) ENIGMA_DIR.mkdirs();
+                File configFile = new File(ENIGMA_DIR, "config.json");
+                if (configFile.exists()) gson.fromJson(Files.toString(configFile, Charset.defaultCharset()), Config.class);
+                else {
+                        this.reset();
+                        Files.touch(configFile);
+                }
+                saveConfig();
+        }
+
+        public void saveConfig() throws IOException {
+                Files.write(gson.toJson(this), CONFIG_FILE, Charset.defaultCharset());
+        }
+
+        public void reset() throws IOException {
+                this.obfuscatedColor = 0xFFDCDC;
+                this.obfuscatedHiglightAlpha = 1.0F;
+                this.obfuscatedColorOutline = 0xA05050;
+                this.obfuscatedOutlineAlpha = 1.0F;
+                this.deobfuscatedColor = 0xDCFFDC;
+                this.deobfuscatedHiglightAlpha = 1.0F;
+                this.deobfuscatedColorOutline = 0x50A050;
+                this.deobfuscatedOutlineAlpha = 1.0F;
+                this.otherColorOutline = 0xB4B4B4;
+                this.otherOutlineAlpha = 1.0F;
+                this.editorBackground = 0xFFFFFF;
+                this.highlightColor = 0x3333EE;
+                this.stringColor = 0xCC6600;
+                this.numberColor = 0x999933;
+                this.operatorColor = 0x000000;
+                this.delimiterColor = 0x000000;
+                this.typeColor = 0x000000;
+                this.identifierColor = 0x000000;
+                this.defaultTextColor = 0x000000;
+                this.useSystemLAF = true;
+                this.saveConfig();
+        }
+
+        private static class IntSerializer implements JsonSerializer<Integer> {
+                public JsonElement serialize(Integer src, Type typeOfSrc, JsonSerializationContext context) {
+                        return new JsonPrimitive("#" + Integer.toHexString(src).toUpperCase());
+                }
+        }
+
+        private static class IntDeserializer implements JsonDeserializer<Integer> {
+                public Integer deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) {
+                        return (int) Long.parseLong(json.getAsString().replace("#", ""), 16);
+                }
+        }
+
+        public static Config getInstance() {
+                return INSTANCE;
+        }
+}
\ No newline at end of file
diff --git a/src/main/java/cuchaz/enigma/config/Themes.java b/src/main/java/cuchaz/enigma/config/Themes.java
new file mode 100644
index 00000000..79c245b4
--- /dev/null
+++ b/src/main/java/cuchaz/enigma/config/Themes.java
@@ -0,0 +1,66 @@
+package cuchaz.enigma.config;
+
+import cuchaz.enigma.gui.Gui;
+import cuchaz.enigma.gui.MinecraftSyntaxKit;
+import cuchaz.enigma.gui.highlight.DeobfuscatedHighlightPainter;
+import cuchaz.enigma.gui.highlight.ObfuscatedHighlightPainter;
+import cuchaz.enigma.gui.highlight.OtherHighlightPainter;
+import de.sciss.syntaxpane.DefaultSyntaxKit;
+
+import java.awt.*;
+import java.io.IOException;
+
+public class Themes {
+
+    public static void setDefault(Gui gui) {
+        //TODO set to default
+            try {
+                    Config.getInstance().reset();
+            } catch (IOException e) {
+                    e.printStackTrace();
+            }
+            updateTheme(gui);
+    }
+
+    public static void setDark(Gui gui) {
+        //Based off colors found here: https://github.com/dracula/dracula-theme/
+        Config.getInstance().obfuscatedColor = 0xFF5555;
+        Config.getInstance().obfuscatedHiglightAlpha = 0.3F;
+        Config.getInstance().obfuscatedColorOutline = 0xFF5555;
+        Config.getInstance().obfuscatedOutlineAlpha = 0.5F;
+        Config.getInstance().deobfuscatedColor = 0x50FA7B;
+        Config.getInstance().deobfuscatedHiglightAlpha = 0.3F;
+        Config.getInstance().deobfuscatedColorOutline = 0x50FA7B;
+        Config.getInstance().deobfuscatedOutlineAlpha = 0.5F;
+        Config.getInstance().otherColorOutline = 0xB4B4B4;
+        Config.getInstance().otherOutlineAlpha = 0.0F;
+        Config.getInstance().editorBackground = 0x282A36;
+        Config.getInstance().highlightColor = 0xFF79C6;
+        Config.getInstance().stringColor = 0xF1FA8C;
+        Config.getInstance().numberColor = 0xBD93F9;
+        Config.getInstance().operatorColor = 0xF8F8F2;
+        Config.getInstance().delimiterColor = 0xF8F8F2;
+        Config.getInstance().typeColor = 0xF8F8F2;
+        Config.getInstance().identifierColor = 0xF8F8F2;
+        Config.getInstance().defaultTextColor = 0xF8F8F2;
+        updateTheme(gui);
+    }
+
+    public static void updateTheme(Gui gui) {
+        try {
+                Config.getInstance().saveConfig();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        MinecraftSyntaxKit.invalidate();
+        DefaultSyntaxKit.initKit();
+        DefaultSyntaxKit.registerContentType("text/minecraft", MinecraftSyntaxKit.class.getName());
+        gui.obfuscatedHighlightPainter = new ObfuscatedHighlightPainter();
+        gui.deobfuscatedHighlightPainter = new DeobfuscatedHighlightPainter();
+        gui.otherHighlightPainter = new OtherHighlightPainter();
+        gui.editor.updateUI();
+        gui.editor.setBackground(new Color(Config.getInstance().editorBackground));
+        gui.getController().refreshCurrentClass();
+    }
+
+}
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index 86c97aa3..4a891cf4 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -68,13 +68,13 @@ public class Gui {
         public JFileChooser exportJarFileChooser;
         private GuiController controller;
         private JFrame frame;
-        private PanelEditor editor;
+        public PanelEditor editor;
         private JPanel classesPanel;
         private JSplitPane splitClasses;
         private PanelIdentifier infoPanel;
-        private ObfuscatedHighlightPainter obfuscatedHighlightPainter;
-        private DeobfuscatedHighlightPainter deobfuscatedHighlightPainter;
-        private OtherHighlightPainter otherHighlightPainter;
+        public ObfuscatedHighlightPainter obfuscatedHighlightPainter;
+        public DeobfuscatedHighlightPainter deobfuscatedHighlightPainter;
+        public OtherHighlightPainter otherHighlightPainter;
         private SelectionHighlightPainter selectionHighlightPainter;
         private JTree inheritanceTree;
         private JTree implementationsTree;
@@ -134,7 +134,7 @@ public class Gui {
                 this.editor = new PanelEditor(this);
                 JScrollPane sourceScroller = new JScrollPane(this.editor);
                 this.editor.setContentType("text/minecraft");
-                this.editor.setBackground(new Color(Config.INSTANCE.editorBackground));
+                this.editor.setBackground(new Color(Config.getInstance().editorBackground));
                 DefaultSyntaxKit kit = (DefaultSyntaxKit) this.editor.getEditorKit();
                 kit.toggleComponent(this.editor, "de.sciss.syntaxpane.components.TokenMarker");
 
diff --git a/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java b/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java
index 41de0350..96327abd 100644
--- a/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java
+++ b/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java
@@ -4,12 +4,8 @@ import cuchaz.enigma.config.Config;
 import de.sciss.syntaxpane.syntaxkits.JavaSyntaxKit;
 import de.sciss.syntaxpane.util.Configuration;
 
-/**
- * Created by Mark on 04/06/2017.
- */
 public class MinecraftSyntaxKit extends JavaSyntaxKit {
-
-    public Configuration configuration = null;
+    private static Configuration configuration = null;
 
     @Override
     public Configuration getConfig() {
@@ -22,17 +18,21 @@ public class MinecraftSyntaxKit extends JavaSyntaxKit {
     public void initConfig(Configuration baseConfig){
         configuration = baseConfig;
         //See de.sciss.syntaxpane.TokenType
-        configuration.put("Style.KEYWORD", Config.INSTANCE.highlightColor + ", 0");
-        configuration.put("Style.KEYWORD2", Config.INSTANCE.highlightColor + ", 3");
-        configuration.put("Style.STRING", Config.INSTANCE.stringColor + ", 0");
-        configuration.put("Style.STRING2", Config.INSTANCE.stringColor + ", 1");
-        configuration.put("Style.NUMBER", Config.INSTANCE.numberColor + ", 1");
-        configuration.put("Style.OPERATOR", Config.INSTANCE.operatorColor + ", 0");
-        configuration.put("Style.DELIMITER", Config.INSTANCE.delimiterColor + ", 1");
-        configuration.put("Style.TYPE", Config.INSTANCE.typeColor + ", 2");
-        configuration.put("Style.TYPE2", Config.INSTANCE.typeColor + ", 1");
-        configuration.put("Style.IDENTIFIER", Config.INSTANCE.identifierColor + ", 0");
-        configuration.put("Style.DEFAULT", Config.INSTANCE.defaultTextColor + ", 0");
+        configuration.put("Style.KEYWORD", Config.getInstance().highlightColor + ", 0");
+        configuration.put("Style.KEYWORD2", Config.getInstance().highlightColor + ", 3");
+        configuration.put("Style.STRING", Config.getInstance().stringColor + ", 0");
+        configuration.put("Style.STRING2", Config.getInstance().stringColor + ", 1");
+        configuration.put("Style.NUMBER", Config.getInstance().numberColor + ", 1");
+        configuration.put("Style.OPERATOR", Config.getInstance().operatorColor + ", 0");
+        configuration.put("Style.DELIMITER", Config.getInstance().delimiterColor + ", 1");
+        configuration.put("Style.TYPE", Config.getInstance().typeColor + ", 2");
+        configuration.put("Style.TYPE2", Config.getInstance().typeColor + ", 1");
+        configuration.put("Style.IDENTIFIER", Config.getInstance().identifierColor + ", 0");
+        configuration.put("Style.DEFAULT", Config.getInstance().defaultTextColor + ", 0");
         configuration.put("RightMarginColumn", "999"); //No need to have a right margin, if someone wants it add a config
     }
+
+    public static void invalidate(){
+        configuration = null;
+    }
 }
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index e446c5a5..c0568bfb 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -1,5 +1,7 @@
 package cuchaz.enigma.gui.elements;
 
+import cuchaz.enigma.config.Config;
+import cuchaz.enigma.config.Themes;
 import cuchaz.enigma.gui.Gui;
 import cuchaz.enigma.gui.dialog.AboutDialog;
 import cuchaz.enigma.throwables.MappingParseException;
@@ -211,6 +213,35 @@ public class MenuBar extends JMenuBar {
                         }
                 }
                 {
+                        JMenu menu = new JMenu("View");
+                        this.add(menu);
+                        {
+                                JMenu themes = new JMenu("Themes");
+                                menu.add(themes);
+                                {
+                                        JMenuItem defaultTheme = new JMenuItem("Default");
+                                        themes.add(defaultTheme);
+                                        defaultTheme.addActionListener(event -> Themes.setDefault(gui));
+                                        JMenuItem dark = new JMenuItem("Dank");
+                                        themes.add(dark);
+                                        dark.addActionListener(event -> Themes.setDark(gui));
+                                        themes.addSeparator();
+                                        JMenuItem refresh = new JMenuItem("Reload From config");
+                                        themes.add(refresh);
+                                        refresh.addActionListener(event -> {
+                                                try {
+                                                        Config.getInstance().reset();
+                                                        Config.getInstance().saveConfig();
+                                                        Themes.updateTheme(gui);
+                                                } catch (IOException e) {
+                                                        e.printStackTrace();
+                                                }
+                                        });
+                                }
+
+                        }
+                }
+                {
                         JMenu menu = new JMenu("Help");
                         this.add(menu);
                         {
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
index ef651e3e..41aa97f8 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
@@ -16,6 +16,6 @@ import cuchaz.enigma.config.Config;
 public class DeobfuscatedHighlightPainter extends BoxHighlightPainter {
 
         public DeobfuscatedHighlightPainter() {
-                super(getColor(Config.INSTANCE.deobfuscatedColor, Config.INSTANCE.deobfuscatedHiglightAlpha), getColor(Config.INSTANCE.deobfuscatedColorOutline, Config.INSTANCE.deobfuscatedOutlineAlpha));
+                super(getColor(Config.getInstance().deobfuscatedColor, Config.getInstance().deobfuscatedHiglightAlpha), getColor(Config.getInstance().deobfuscatedColorOutline, Config.getInstance().deobfuscatedOutlineAlpha));
         }
 }
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
index 78879069..d7358743 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java
@@ -13,11 +13,9 @@ package cuchaz.enigma.gui.highlight;
 
 import cuchaz.enigma.config.Config;
 
-import java.awt.*;
-
 public class ObfuscatedHighlightPainter extends BoxHighlightPainter {
 
         public ObfuscatedHighlightPainter() {
-                super(getColor(Config.INSTANCE.obfuscatedColor, Config.INSTANCE.obfuscatedHiglightAlpha), getColor(Config.INSTANCE.obfuscatedColorOutline, Config.INSTANCE.obfuscatedOutlineAlpha));
+                super(getColor(Config.getInstance().obfuscatedColor, Config.getInstance().obfuscatedHiglightAlpha), getColor(Config.getInstance().obfuscatedColorOutline, Config.getInstance().obfuscatedOutlineAlpha));
         }
 }
diff --git a/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java
index c5154e13..f4ae235a 100644
--- a/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java
+++ b/src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java
@@ -16,6 +16,6 @@ import cuchaz.enigma.config.Config;
 public class OtherHighlightPainter extends BoxHighlightPainter {
 
         public OtherHighlightPainter() {
-                super(null, getColor(Config.INSTANCE.otherColorOutline, Config.INSTANCE.otherOutlineAlpha));
+                super(null, getColor(Config.getInstance().otherColorOutline, Config.getInstance().otherOutlineAlpha));
         }
 }