add FontProvider, replace literals and unneeded references

Author: mplieske

src/main/java/de/doubleslash/keeptime/common/FontProvider.java

@@ -0,0 +1,20 @@
+package de.doubleslash.keeptime.common;
+
+import javafx.scene.text.Font;
+
+public class FontProvider {
+	private static final Font defaultFont = Font.font("Open Sans Regular");
+	private static final Font boldFont = Font.font("Open Sans Bold");
+	
+	private FontProvider() {
+		// no instances allowed
+	}
+	
+	public static Font getDefaultFont() {
+		return defaultFont;
+	}
+	
+	public static Font getBoldFont() {
+		return boldFont;
+	}
+}

src/main/java/de/doubleslash/keeptime/common/Resources.java

@@ -20,10 +20,10 @@ public enum RESOURCE {
       FXML_PROJECT_LAYOUT("/layouts/ProjectDetailLayout.fxml"),
       FXML_SETTINGS("/layouts/settings.fxml"),
       FXML_VIEW_POPUP_LAYOUT("/layouts/ViewLayoutPopup.fxml"),
+      FXML_REPORT("/layouts/report.fxml"),
 
       // icon
       ICON_MAIN("/icons/icon.png"),
-      FXML_REPORT("/layouts/report.fxml"),
 
       ;
       String resourceLocation;

src/main/java/de/doubleslash/keeptime/view/ReportController.java

@@ -13,6 +13,7 @@
 import com.sun.javafx.scene.control.skin.DatePickerSkin;
 
 import de.doubleslash.keeptime.common.DateFormatter;
+import de.doubleslash.keeptime.common.FontProvider;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Work;
@@ -86,12 +87,10 @@ private void updateReport(final LocalDate newvalue) {
       int rowIndex = 0;
       long currentWorkSeconds = 0;
       long currentSeconds = 0;
-      final Font labelFontBold = Font.font("Open Sans", FontWeight.BOLD, 15);
-      final Font labelFontNormal = Font.font("Open Sans", FontWeight.NORMAL, 15);
 
       for (final Project project : workedProjectsSet) {
          final Label projectName = new Label(project.getName());
-         projectName.setFont(labelFontBold);
+         projectName.setFont(FontProvider.getBoldFont());
          this.gridPane.add(projectName, 0, rowIndex);
 
          final List<Work> onlyCurrentProjectWork = currentWorkItems.stream().filter(w -> w.getProject() == project)
@@ -106,7 +105,7 @@ private void updateReport(final LocalDate newvalue) {
          }
 
          final Label workedTimeLabel = new Label(DateFormatter.secondsToHHMMSS(todaysWorkSeconds));
-         workedTimeLabel.setFont(labelFontBold);
+         workedTimeLabel.setFont(FontProvider.getBoldFont());
          this.gridPane.add(workedTimeLabel, 2, rowIndex);
 
          // text will be set later
@@ -124,18 +123,18 @@ private void updateReport(final LocalDate newvalue) {
             final String currentWorkNote = work.getNotes();
             pr.appendToWorkNotes(currentWorkNote);
             final Label commentLabel = new Label(currentWorkNote);
-            commentLabel.setFont(labelFontNormal);
+            commentLabel.setFont(FontProvider.getDefaultFont());
             commentLabel.setWrapText(true);
             this.gridPane.add(commentLabel, 0, rowIndex);
 
             final Label fromTillLabel = new Label(DateFormatter.toTimeString(work.getStartTime()) + " - "
                   + DateFormatter.toTimeString(work.getEndTime()));
-            fromTillLabel.setFont(labelFontNormal);
+            fromTillLabel.setFont(FontProvider.getDefaultFont());
             fromTillLabel.setWrapText(true);
             this.gridPane.add(fromTillLabel, 1, rowIndex);
 
             final Label workedHoursLabel = new Label(workedHours);
-            workedHoursLabel.setFont(labelFontNormal);
+            workedHoursLabel.setFont(FontProvider.getDefaultFont());
             this.gridPane.add(workedHoursLabel, 2, rowIndex);
 
             rowIndex++;

src/main/java/de/doubleslash/keeptime/view/ViewController.java

@@ -17,6 +17,7 @@
 
 import de.doubleslash.keeptime.common.ColorHelper;
 import de.doubleslash.keeptime.common.DateFormatter;
+import de.doubleslash.keeptime.common.FontProvider;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
 import de.doubleslash.keeptime.controller.Controller;
@@ -726,31 +727,31 @@ private GridPane setUpGridPane(final String projectName, final Color projectColo
       grid.setPadding(new Insets(20, 150, 10, 10));
 
       Label nameLabel = new Label("Name:");
-      nameLabel.setFont(Font.font("Open Sans Regular"));
+      nameLabel.setFont(FontProvider.getDefaultFont());
       grid.add(nameLabel, 0, 0);
 
       final TextField projectNameTextField = new TextField(projectName);
-      projectNameTextField.setFont(Font.font("Open Sans Regular"));
+      projectNameTextField.setFont(FontProvider.getDefaultFont());
       grid.add(projectNameTextField, 1, 0);
 
       Label colorLabel = new Label("Color:");
-      colorLabel.setFont(Font.font("Open Sans Regular"));
+      colorLabel.setFont(FontProvider.getDefaultFont());
       grid.add(colorLabel, 0, 1);
 
       final ColorPicker colorPicker = new ColorPicker(projectColor);
       grid.add(colorPicker, 1, 1);
 
       Label isWorkLabel = new Label("IsWork:");
-      isWorkLabel.setFont(Font.font("Open Sans Regular"));
+      isWorkLabel.setFont(FontProvider.getDefaultFont());
       grid.add(isWorkLabel, 0, 2);
 
       final CheckBox isWorkCheckBox = new CheckBox();
       isWorkCheckBox.setSelected(isWork);
-      isWorkCheckBox.setFont(Font.font("Open Sans Regular"));
+      isWorkCheckBox.setFont(FontProvider.getDefaultFont());
       grid.add(isWorkCheckBox, 1, 2);
 
       Label sortIndex = new Label("SortIndex:");
-      sortIndex.setFont(Font.font("Open Sans Regular"));
+      sortIndex.setFont(FontProvider.getDefaultFont());
       grid.add(new Label("SortIndex:"), 0, 3);
 
       return grid;