From 635ae8c11ed92f2abc0fb6b1fde7a366a9f6d697 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Wed, 11 Jul 2018 20:55:56 +0800 Subject: [PATCH] Remove unused preset themes --- .../org/jackhuang/hmcl/setting/Theme.java | 24 +++++++++---------- .../org/jackhuang/hmcl/ui/SettingsPage.java | 2 +- .../main/resources/assets/css/dark_blue.css | 5 ---- HMCL/src/main/resources/assets/css/green.css | 5 ---- HMCL/src/main/resources/assets/css/orange.css | 5 ---- HMCL/src/main/resources/assets/css/purple.css | 5 ---- HMCL/src/main/resources/assets/css/red.css | 5 ---- 7 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 HMCL/src/main/resources/assets/css/dark_blue.css delete mode 100644 HMCL/src/main/resources/assets/css/green.css delete mode 100644 HMCL/src/main/resources/assets/css/orange.css delete mode 100644 HMCL/src/main/resources/assets/css/purple.css delete mode 100644 HMCL/src/main/resources/assets/css/red.css diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java index a5dd4a8aa..0ec6d8b0d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/Theme.java @@ -31,13 +31,15 @@ import java.util.logging.Level; public class Theme { public static final Theme BLUE = new Theme("blue", "#5C6BC0"); - public static final Theme DARK_BLUE = new Theme("dark_blue", "#283593"); - public static final Theme GREEN = new Theme("green", "#43A047"); - public static final Theme ORANGE = new Theme("orange", "#E67E22"); - public static final Theme PURPLE = new Theme("purple", "#9C27B0"); - public static final Theme RED = new Theme("red", "#F44336"); - public static final Theme[] VALUES = new Theme[]{BLUE, DARK_BLUE, GREEN, ORANGE, PURPLE, RED}; + public static final Color[] SUGGESTED_COLORS = new Color[]{ + Color.web("#5C6BC0"), // blue + Color.web("#283593"), // dark blue + Color.web("#43A047"), // green + Color.web("#E67E22"), // orange + Color.web("#9C27B0"), // purple + Color.web("#F44336") // red + }; private final String color; private final String name; @@ -68,8 +70,7 @@ public class Theme { } public String[] getStylesheets() { - String name = isCustom() ? BLUE.getName() : this.name; - String css = Theme.class.getResource("/assets/css/" + name + ".css").toExternalForm(); + String css; try { File temp = File.createTempFile("hmcl", ".css"); FileUtils.writeText(temp, IOUtils.readFullyAsString(Theme.class.getResourceAsStream("/assets/css/custom.css")) @@ -77,7 +78,8 @@ public class Theme { .replace("%font-color%", getColorDisplayName(getForegroundColor()))); css = temp.toURI().toString(); } catch (IOException e) { - Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet", e); + Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e); + css = Theme.class.getResource("/assets/css/blue.css").toExternalForm(); } return new String[]{ @@ -98,10 +100,6 @@ public class Theme { if (name == null) return Optional.empty(); - for (Theme theme : VALUES) - if (theme.name.equalsIgnoreCase(name)) - return Optional.of(theme); - if (name.startsWith("#")) try { Color.web(name); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java index 5619747a0..5be45bbe2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java @@ -204,7 +204,7 @@ public final class SettingsPage extends StackPane implements DecoratorPage { JFXColorPicker picker = new JFXColorPicker(Color.web(Settings.INSTANCE.getTheme().getColor()), null); picker.setCustomColorText(i18n("color.custom")); picker.setRecentColorsText(i18n("color.recent")); - picker.getCustomColors().setAll(Arrays.stream(Theme.VALUES).map(Theme::getColor).map(Color::web).collect(Collectors.toList())); + picker.getCustomColors().setAll(Theme.SUGGESTED_COLORS); picker.setOnAction(e -> { Theme theme = Theme.custom(Theme.getColorDisplayName(picker.getValue())); Settings.INSTANCE.setTheme(theme); diff --git a/HMCL/src/main/resources/assets/css/dark_blue.css b/HMCL/src/main/resources/assets/css/dark_blue.css deleted file mode 100644 index 0e5d6cbbb..000000000 --- a/HMCL/src/main/resources/assets/css/dark_blue.css +++ /dev/null @@ -1,5 +0,0 @@ -.root { - -fx-base-color: #283593; - -fx-base-check-color: derive(-fx-base-color, 30%); - -fx-base-text-fill: white; -} \ No newline at end of file diff --git a/HMCL/src/main/resources/assets/css/green.css b/HMCL/src/main/resources/assets/css/green.css deleted file mode 100644 index c7a8acbc5..000000000 --- a/HMCL/src/main/resources/assets/css/green.css +++ /dev/null @@ -1,5 +0,0 @@ -.root { - -fx-base-color: #43A047; - -fx-base-check-color: derive(-fx-base-color, 30%); - -fx-base-text-fill: black; -} \ No newline at end of file diff --git a/HMCL/src/main/resources/assets/css/orange.css b/HMCL/src/main/resources/assets/css/orange.css deleted file mode 100644 index c01de02c4..000000000 --- a/HMCL/src/main/resources/assets/css/orange.css +++ /dev/null @@ -1,5 +0,0 @@ -.root { - -fx-base-color: #E67E22; - -fx-base-check-color: derive(-fx-base-color, 30%); - -fx-base-text-fill: black; -} \ No newline at end of file diff --git a/HMCL/src/main/resources/assets/css/purple.css b/HMCL/src/main/resources/assets/css/purple.css deleted file mode 100644 index 360a3e6eb..000000000 --- a/HMCL/src/main/resources/assets/css/purple.css +++ /dev/null @@ -1,5 +0,0 @@ -.root { - -fx-base-color: #9C27B0; - -fx-base-check-color: derive(-fx-base-color, 30%); - -fx-base-text-fill: white; -} \ No newline at end of file diff --git a/HMCL/src/main/resources/assets/css/red.css b/HMCL/src/main/resources/assets/css/red.css deleted file mode 100644 index fff023d48..000000000 --- a/HMCL/src/main/resources/assets/css/red.css +++ /dev/null @@ -1,5 +0,0 @@ -.root { - -fx-base-color: #F44336; - -fx-base-check-color: derive(-fx-base-color, 30%); - -fx-base-text-fill: black; -} \ No newline at end of file