Remove unused preset themes

This commit is contained in:
huangyuhui
2018-07-11 20:55:56 +08:00
parent dfd5a82112
commit 635ae8c11e
7 changed files with 12 additions and 39 deletions

View File

@@ -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);

View File

@@ -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);

View File

@@ -1,5 +0,0 @@
.root {
-fx-base-color: #283593;
-fx-base-check-color: derive(-fx-base-color, 30%);
-fx-base-text-fill: white;
}

View File

@@ -1,5 +0,0 @@
.root {
-fx-base-color: #43A047;
-fx-base-check-color: derive(-fx-base-color, 30%);
-fx-base-text-fill: black;
}

View File

@@ -1,5 +0,0 @@
.root {
-fx-base-color: #E67E22;
-fx-base-check-color: derive(-fx-base-color, 30%);
-fx-base-text-fill: black;
}

View File

@@ -1,5 +0,0 @@
.root {
-fx-base-color: #9C27B0;
-fx-base-check-color: derive(-fx-base-color, 30%);
-fx-base-text-fill: white;
}

View File

@@ -1,5 +0,0 @@
.root {
-fx-base-color: #F44336;
-fx-base-check-color: derive(-fx-base-color, 30%);
-fx-base-text-fill: black;
}