From ba5ffc258f6d58bf9d01226baea016db10cfd811 Mon Sep 17 00:00:00 2001
From: Modmuss50
Date: Wed, 7 Jun 2017 08:29:37 +0100
Subject: 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
---
 .../cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java     | 2 +-
 .../java/cuchaz/enigma/gui/highlight/ObfuscatedHighlightPainter.java  | 4 +---
 src/main/java/cuchaz/enigma/gui/highlight/OtherHighlightPainter.java  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/gui/highlight')

diff --git a/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java b/src/main/java/cuchaz/enigma/gui/highlight/DeobfuscatedHighlightPainter.java
index ef651e3..41aa97f 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 7887906..d735874 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 c5154e1..f4ae235 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));
 	}
 }
-- 
cgit v1.2.3