CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-30 00:56:56 +13:00
Code Issues Projects Releases Packages Wiki Activity

Improve custom themes

Browse source
This commit is contained in:
crschnick 2023-09-28 05:06:18 +00:00
parent 8ae8adbf8c
commit 631b6edc30
2 changed files with 50 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
app/src/main/java/io/xpipe/app/core/AppTheme.java
View file

@ -25,6 +25,7 @@ import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
import java.nio.file.Files;
import java.util.List;
import java.util.stream.Collectors;
public class AppTheme {
@ -132,44 +133,58 @@ public class AppTheme {
});
}
public static class DerivedTheme extends Theme {
private final String name;
public DerivedTheme(String id, String name, atlantafx.base.theme.Theme theme) {
super(id, theme);
this.name = name;
}
@Override
@SneakyThrows
public void apply() {
var builder = new StringBuilder();
AppResources.with(AppResources.XPIPE_MODULE, "theme/" + id + ".css", path->{
var content = Files.readString(path);
builder.append(content);
});
AppResources.with("atlantafx.base", theme.getUserAgentStylesheet(), path->{
var baseStyleContent = Files.readString(path);
builder.append("\n").append(baseStyleContent.lines().skip(builder.toString().lines().count()).collect(Collectors.joining("\n")));
});
var out = Files.createTempFile(id, ".css");
Files.writeString(out, builder.toString());
Application.setUserAgentStylesheet(out.toUri().toString());
}
@Override
public String toTranslatedString() {
return name;
}
};
@AllArgsConstructor
public enum Theme implements PrefsChoiceValue {
public static class Theme implements PrefsChoiceValue {
CUSTOM("custom", new PrimerDark()) {
@Override
@SneakyThrows
public void apply() {
var builder = new StringBuilder();
AppResources.with(AppResources.XPIPE_MODULE, "theme/custom.css", path->{
var content = Files.readString(path);
builder.append(content);
});
public static final Theme PRIMER_LIGHT = new Theme("light", new PrimerLight());
public static final Theme PRIMER_DARK = new Theme("dark", new PrimerDark());
public static final Theme NORD_LIGHT = new Theme("nordLight", new NordLight());
public static final Theme NORD_DARK = new Theme("nordDark", new NordDark());
public static final Theme CUPERTINO_LIGHT = new Theme("cupertinoLight", new CupertinoLight());
public static final Theme CUPERTINO_DARK = new Theme("cupertinoDark", new CupertinoDark());
public static final Theme DRACULA = new Theme("dracula", new Dracula());
AppResources.with("atlantafx.base", theme.getUserAgentStylesheet(), path->{
var baseStyleContent = Files.readString(path);
builder.append("\n").append(baseStyleContent.lines().skip(builder.toString().lines().count()).collect(Collectors.joining("\n")));
});
// Adjust this to create your own theme
public static final Theme CUSTOM = new DerivedTheme("custom", "Custom", new PrimerDark());
var out = Files.createTempFile(id, ".css");
Files.writeString(out, builder.toString());
Application.setUserAgentStylesheet(out.toUri().toString());
}
@Override
public String toTranslatedString() {
return "Custom";
}
},
PRIMER_LIGHT("light", new PrimerLight()),
PRIMER_DARK("dark", new PrimerDark()),
NORD_LIGHT("nordLight", new NordLight()),
NORD_DARK("nordDark", new NordDark()),
CUPERTINO_LIGHT("cupertinoLight", new CupertinoLight()),
CUPERTINO_DARK("cupertinoDark", new CupertinoDark()),
DRACULA("dracula", new Dracula());
// Also include your custom theme here
public static final List<Theme> ALL = List.of(PRIMER_LIGHT, PRIMER_DARK, NORD_LIGHT, NORD_DARK, CUPERTINO_LIGHT, CUPERTINO_DARK);
static Theme getDefaultLightTheme() {
return switch (OsType.getLocal()) {

2
app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
View file

@ -71,7 +71,7 @@ public class AppPrefs {
private final SimpleListProperty<SupportedLocale> languageList =
new SimpleListProperty<>(FXCollections.observableArrayList(Arrays.asList(SupportedLocale.values())));
private final SimpleListProperty<AppTheme.Theme> themeList =
new SimpleListProperty<>(FXCollections.observableArrayList(Arrays.asList(AppTheme.Theme.values())));
new SimpleListProperty<>(FXCollections.observableArrayList(AppTheme.Theme.ALL));
private final SimpleListProperty<CloseBehaviour> closeBehaviourList = new SimpleListProperty<>(
FXCollections.observableArrayList(PrefsChoiceValue.getSupported(CloseBehaviour.class)));
private final SimpleListProperty<ExternalEditorType> externalEditorList = new SimpleListProperty<>(