4130 provide dark theme

CHANGELOG.md

@@ -34,7 +34,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We add auto url formatting when user paste link to URL field in entry editor. [#254](https://github.com/koppor/jabref/issues/254)
 - We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279)
 - We added a new keyboard shortcut so that the entry editor could be closed by <kbd>Ctrl<kbd> + <kbd>E<kbd>. [#4222] (https://github.com/JabRef/jabref/issues/4222)
-
+- Change theme to dark or light via settings
 
 
 

src/main/java/org/jabref/gui/preferences/AppearancePrefsTab.java

@@ -4,7 +4,9 @@
 import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
@@ -16,12 +18,16 @@
 
 class AppearancePrefsTab extends Pane implements PrefsTab {
 
+    public static final String BASE_CSS = "Base.css";
+    public static final String DARK_CSS = "Dark.css";
     private final JabRefPreferences prefs;
     private final CheckBox fontTweaksLAF;
     private final TextField fontSize;
     private final CheckBox overrideFonts;
     private final VBox container = new VBox();
     private final DialogService dialogService;
+    private final RadioButton lightTheme;
+    private final RadioButton darkTheme;
 
     /**
      * Customization of appearance parameters.
@@ -41,7 +47,18 @@ public AppearancePrefsTab(DialogService dialogService, JabRefPreferences prefs)
         fontSizeContainer.disableProperty().bind(overrideFonts.selectedProperty().not());
         fontTweaksLAF = new CheckBox(Localization.lang("Tweak font rendering for entry editor on Linux"));
 
-        container.getChildren().addAll(overrideFonts, fontSizeContainer, fontTweaksLAF);
+        ToggleGroup themeGroup = new ToggleGroup();
+        lightTheme = new RadioButton("Light theme");
+        lightTheme.setToggleGroup(themeGroup);
+        darkTheme = new RadioButton("Dark theme");
+        darkTheme.setToggleGroup(themeGroup);
+
+        if (prefs.get(JabRefPreferences.FX_THEME).equals(BASE_CSS))
+            lightTheme.setSelected(true);
+        else if (prefs.get(JabRefPreferences.FX_THEME).equals(DARK_CSS))
+            darkTheme.setSelected(true);
+
+        container.getChildren().addAll(overrideFonts, fontSizeContainer, fontTweaksLAF, lightTheme, darkTheme);
 
     }
 
@@ -68,10 +85,21 @@ public void storeSettings() {
         int newFontSize = Integer.parseInt(fontSize.getText());
         prefs.putInt(JabRefPreferences.MAIN_FONT_SIZE, newFontSize);
 
+        boolean isThemeChanged = false;
+
+        if (lightTheme.isSelected() && !prefs.get(JabRefPreferences.FX_THEME).equals(BASE_CSS)) {
+            prefs.put(JabRefPreferences.FX_THEME, BASE_CSS);
+            isThemeChanged = true;
+        } else if (darkTheme.isSelected() && !prefs.get(JabRefPreferences.FX_THEME).equals(DARK_CSS)) {
+            prefs.put(JabRefPreferences.FX_THEME, DARK_CSS);
+            isThemeChanged = true;
+        }
+
         boolean isRestartRequired =
-                oldFxTweakValue != fontTweaksLAF.isSelected()
-                        || oldOverrideDefaultFontSize != overrideFonts.isSelected()
-                        || oldFontSize != newFontSize;
+                (oldFxTweakValue != fontTweaksLAF.isSelected())
+                        || (oldOverrideDefaultFontSize != overrideFonts.isSelected())
+                        || (oldFontSize != newFontSize)
+                        || isThemeChanged;
         if (isRestartRequired) {
             dialogService.showWarningDialogAndWait(Localization.lang("Settings"),
                     Localization.lang("Some appearance settings you changed require to restart JabRef to come into effect."));

src/main/java/org/jabref/gui/util/ThemeLoader.java

@@ -1,5 +1,6 @@
 package org.jabref.gui.util;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -37,12 +38,19 @@
 public class ThemeLoader {
 
     private static final String DEFAULT_PATH_MAIN_CSS = JabRefFrame.class.getResource("Base.css").toExternalForm();
-    private static final String CSS_SYSTEM_PROPERTY = System.getProperty("jabref.theme.css");
     private static final Logger LOGGER = LoggerFactory.getLogger(ThemeLoader.class);
+    private final String CSS_SYSTEM_PROPERTY;
     private final FileUpdateMonitor fileUpdateMonitor;
 
     public ThemeLoader(FileUpdateMonitor fileUpdateMonitor) {
         this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
+
+        String cssFileName = JabRefPreferences.getInstance().get(JabRefPreferences.FX_THEME);
+        if (cssFileName != null) {
+            String themeName = JabRefFrame.class.getResource(cssFileName).getPath();
+            CSS_SYSTEM_PROPERTY = new File(themeName).getAbsolutePath();
+        } else
+            CSS_SYSTEM_PROPERTY = null;
     }
 
     /**

src/main/java/org/jabref/preferences/JabRefPreferences.java

@@ -119,6 +119,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String EXTERNAL_FILE_TYPES = "externalFileTypes";
     public static final String FONT_FAMILY = "fontFamily";
     public static final String FX_FONT_RENDERING_TWEAK = "fxFontRenderingTweak";
+    public static final String FX_THEME = "fxTheme";
     public static final String LANGUAGE = "language";
     public static final String NAMES_LAST_ONLY = "namesLastOnly";
     public static final String ABBR_AUTHOR_NAMES = "abbrAuthorNames";
@@ -472,6 +473,7 @@ private JabRefPreferences() {
         }
 
         defaults.put(FX_FONT_RENDERING_TWEAK, OS.LINUX); //we turn this on per default on Linux
+        defaults.put(FX_THEME, "Base.css");
         defaults.put(EMACS_ADDITIONAL_PARAMETERS, "-n -e");
 
         defaults.put(PUSH_TO_APPLICATION, "TeXstudio");