Feature/remove font awesome2

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>de.doubleslash</groupId>
@@ -31,24 +31,6 @@
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
- <repositories>
-
-    <!-- Including for fontawesome-->
-    <repository>
-      <id>fontawesomefx-repo</id>
-      <name>FontAwesome Repository</name>
-      <url>https://dl.bintray.com/jerady/maven</url>
-    </repository>
-
-    <!-- needed to resolve against central first-->
-     <repository>
-      <id>central</id>
-      <name>Maven Central</name>
-      <layout>default</layout>
-      <url>https://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories> 
-
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -110,20 +92,7 @@
       <version>3.3.0</version>
       <type>maven-plugin</type>
     </dependency>
-
-    <dependency>
-      <groupId>de.jensd</groupId>
-      <artifactId>fontawesomefx-commons</artifactId>
-      <version>8.15</version>
-    </dependency>
-
-    <dependency>
-      <groupId>de.jensd</groupId>
-      <artifactId>fontawesomefx-fontawesome</artifactId>
-      <version>4.7.0-5</version>
-    </dependency>
   </dependencies>
-
   <build>
     <plugins>
       <plugin>
@@ -214,4 +183,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
+</project>

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

@@ -31,7 +31,9 @@ public enum Licenses {
          "./licenses/GNU Lesser General Public License (LGPL), Version 3.0.txt",
          "GNU Lesser General Public License Version 3.0",
          "https://www.gnu.org/licenses/lgpl-3.0.de.html"),
-   MIT("./licenses/The MIT License.txt", "The MIT License", "https://opensource.org/licenses/MIT");
+   MIT("./licenses/The MIT License.txt", "The MIT License", "https://opensource.org/licenses/MIT"),
+
+   CC_4_0("./licenses/CC BY 4.0 License.txt", "CC BY 4.0 License", "https://creativecommons.org/licenses/by/4.0/");
 
    private final String path;
    private final String name;

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

@@ -41,6 +41,22 @@ public enum RESOURCE {
       FXML_MANAGE_PROJECT("/layouts/manage-project.fxml"),
       FXML_MANAGE_WORK("/layouts/manage-work.fxml"),
 
+      SVG_CALENDAR_DAYS_ICON("/svgs/calendar-days.svg"),
+
+      SVG_CLOSE_ICON("/svgs/xmark.svg"),
+
+      SVG_SETTINGS_ICON("/svgs/gear.svg"),
+
+      SVG_MINUS_ICON("/svgs/minus.svg"),
+
+      SVG_TRASH_ICON("/svgs/trash-can.svg"),
+
+      SVG_PENCIL_ICON("/svgs/pencil.svg"),
+
+      SVG_CLIPBOARD("/svgs/clipboard.svg"),
+
+      SVG_BUG_ICON("/svgs/bug.svg"),
+
       ;
 
       String resourceLocation;

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

@@ -0,0 +1,52 @@
+package de.doubleslash.keeptime.common;
+
+import javafx.scene.Node;
+import javafx.scene.shape.SVGPath;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Class loads SvgPath from a SvgFile because Java can not load the original svg file as it is.
+ * <p>
+ * To load the svg the class extracts the path as string and creates a new SvgPath and returns it.
+ */
+
+public class SvgNodeProvider {
+
+   public static String getSvgPathWithXMl(Resources.RESOURCE resource) {
+      String svgPath;
+      Document document;
+      DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+      DocumentBuilder db;
+
+      try {
+         db = dbf.newDocumentBuilder();
+      } catch (ParserConfigurationException e) {
+         throw new RuntimeException("Tried to build new document", e);
+      }
+
+      try (InputStream inputStream = Resources.getResource(resource).openStream()) {
+         document = db.parse(inputStream);
+         NodeList nodeList = document.getElementsByTagName("path");
+         svgPath = nodeList.item(0).getAttributes().getNamedItem("d").getNodeValue();
+      } catch (IOException | SAXException e) {
+         throw new RuntimeException("Could not extract SvgPath from resource " + resource, e);
+      }
+      return svgPath;
+   }
+
+   public static Node getSvgNodeWithScale(Resources.RESOURCE resource, Double scaleX, Double scaleY) {
+      SVGPath iconSvg = new SVGPath();
+      iconSvg.setContent(getSvgPathWithXMl(resource));
+      iconSvg.setScaleX(scaleX);
+      iconSvg.setScaleY(scaleY);
+      return iconSvg;
+   }
+}

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

@@ -18,15 +18,13 @@
 
 import java.util.Comparator;
 
+import de.doubleslash.keeptime.common.*;
+import javafx.scene.shape.SVGPath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import de.doubleslash.keeptime.ApplicationProperties;
-import de.doubleslash.keeptime.Main;
-import de.doubleslash.keeptime.common.BrowserHelper;
-import de.doubleslash.keeptime.common.FileOpenHelper;
-import de.doubleslash.keeptime.common.Licenses;
 import de.doubleslash.keeptime.view.license.LicenseTableRow;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -57,6 +55,8 @@ public class AboutController {
    @FXML
    private Button reportBugButton;
 
+   @FXML
+   private SVGPath bugIcon;
    @FXML
    private Label versionNumberLabel;
 
@@ -70,10 +70,10 @@ public class AboutController {
 
    private final ApplicationProperties applicationProperties;
 
-   public AboutController (ApplicationProperties applicationProperties) {
-	   this.applicationProperties = applicationProperties;
+   public AboutController(ApplicationProperties applicationProperties) {
+      this.applicationProperties = applicationProperties;
    }
-   
+
    @FXML
    public void initialize() {
       LOG.debug("set version label");
@@ -90,6 +90,9 @@ public void initialize() {
 
       nameColumn.setCellValueFactory(new PropertyValueFactory<>("name"));
 
+      //set SvgPath content
+      bugIcon.setContent(SvgNodeProvider.getSvgPathWithXMl(Resources.RESOURCE.SVG_BUG_ICON));
+
       // licenseColumn
       final TableColumn<LicenseTableRow, String> licenseColumn = new TableColumn<>("License");
       licenseColumn.setMinWidth(260);
@@ -149,7 +152,7 @@ public ObservableList<LicenseTableRow> loadLicenseRows() {
       licenseRows.add(new LicenseTableRow("spring-boot-starter-data-jpa", Licenses.APACHEV2));
       licenseRows.add(new LicenseTableRow("mockito-core", Licenses.MIT));
       licenseRows.add(new LicenseTableRow("h2", Licenses.EPLV1));
-      licenseRows.add(new LicenseTableRow("fontawesomefx", Licenses.APACHEV2));
+      licenseRows.add(new LicenseTableRow("Font Awesome Icons", Licenses.CC_4_0));
 
       licenseRows.sort(Comparator.comparing(LicenseTableRow::getName));
 

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

@@ -35,6 +35,7 @@
 import de.doubleslash.keeptime.common.DateFormatter;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
+import de.doubleslash.keeptime.common.SvgNodeProvider;
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.exceptions.FXMLLoaderException;
 import de.doubleslash.keeptime.model.Model;
@@ -43,8 +44,6 @@
 import de.doubleslash.keeptime.view.worktable.ProjectTableRow;
 import de.doubleslash.keeptime.view.worktable.TableRow;
 import de.doubleslash.keeptime.view.worktable.WorkTableRow;
-import de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon;
-import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -56,6 +55,7 @@
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
+import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.DateCell;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.Dialog;
@@ -200,19 +200,22 @@ private void updateReport(final LocalDate dateToShow) {
 
       this.currentDayLabel.setText(DateFormatter.toDayDateString(this.currentReportDate));
       final List<Work> currentWorkItems = model.getWorkRepository()
-            .findByStartDateOrderByStartTimeAsc(this.currentReportDate);
+                                               .findByStartDateOrderByStartTimeAsc(this.currentReportDate);
 
       colorTimeLine.update(currentWorkItems, controller.calcSeconds(currentWorkItems));
 
-      final SortedSet<Project> workedProjectsSet = currentWorkItems.stream().map(Work::getProject)
-            .collect(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Project::getIndex))));
+      final SortedSet<Project> workedProjectsSet = currentWorkItems.stream()
+                                                                   .map(Work::getProject)
+                                                                   .collect(Collectors.toCollection(() -> new TreeSet<>(
+                                                                         Comparator.comparing(Project::getIndex))));
 
       long currentWorkSeconds = 0;
       long currentSeconds = 0;
 
       for (final Project project : workedProjectsSet) {
-         final List<Work> onlyCurrentProjectWork = currentWorkItems.stream().filter(w -> w.getProject() == project)
-               .collect(Collectors.toList());
+         final List<Work> onlyCurrentProjectWork = currentWorkItems.stream()
+                                                                   .filter(w -> w.getProject() == project)
+                                                                   .collect(Collectors.toList());
 
          final long projectWorkSeconds = controller.calcSeconds(onlyCurrentProjectWork);
 
@@ -282,7 +285,12 @@ public void updateItem(final LocalDate item, final boolean empty) {
    }
 
    private Button createDeleteWorkButton(final Work w) {
-      final Button deleteButton = new Button("", new FontAwesomeIconView(FontAwesomeIcon.TRASH));
+      final Button deleteButton = new Button("",
+            SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_TRASH_ICON, 0.03, 0.03));
+      deleteButton.setMaxSize(20, 18);
+      deleteButton.setMinSize(20, 18);
+      deleteButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
       deleteButton.setOnAction(e -> {
          LOG.info("Delete work clicked.");
          final Alert alert = new Alert(AlertType.CONFIRMATION);
@@ -304,7 +312,12 @@ private Button createDeleteWorkButton(final Work w) {
    }
 
    private Button createEditWorkButton(final Work work) {
-      final Button editButton = new Button("", new FontAwesomeIconView(FontAwesomeIcon.PENCIL));
+      final Button editButton = new Button("",
+            SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_PENCIL_ICON, 0.03, 0.03));
+      editButton.setMaxSize(20, 18);
+      editButton.setMinSize(20, 18);
+      editButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
       editButton.setOnAction(e -> {
          LOG.info("Edit work clicked.");
          final Dialog<Work> dialog = setupEditWorkDialog(work);
@@ -361,7 +374,11 @@ private GridPane setUpEditWorkGridPane(final Work work, final Dialog<Work> dialo
    }
 
    private Button createCopyProjectButton(final List<Work> projectWork) {
-      final Button copyButton = new Button("", new FontAwesomeIconView(FontAwesomeIcon.CLIPBOARD));
+      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD, 0.03, 0.03));
+      copyButton.setMaxSize(20, 18);
+      copyButton.setMinSize(20, 18);
+      copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
       final EventHandler<ActionEvent> eventListener = actionEvent -> {
          LOG.debug("Copy to Clipboard clicked.");
          final ProjectReport pr = new ProjectReport(projectWork.size());
@@ -381,7 +398,11 @@ private Button createCopyProjectButton(final List<Work> projectWork) {
    }
 
    private Node createCopyWorkButton(final Work w) {
-      final Button copyButton = new Button("", new FontAwesomeIconView(FontAwesomeIcon.CLIPBOARD));
+      final Button copyButton = new Button("", SvgNodeProvider.getSvgNodeWithScale(RESOURCE.SVG_CLIPBOARD, 0.03, 0.03));
+      copyButton.setMaxSize(20, 18);
+      copyButton.setMinSize(20, 18);
+      copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+
       final EventHandler<ActionEvent> eventListener = actionEvent -> {
          LOG.debug("Copy to Clipboard clicked.");
          final Clipboard clipboard = Clipboard.getSystemClipboard();