Merge pull request #44 from doubleSlashde/feature/#12_font_awesome_icons

Feature/#12 font awesome icons

Author: Death111

CONTRIBUTING.md

@@ -6,3 +6,11 @@ If you want to contribute please follow this guideline.
 
 For editing fxml files, use the "JavaFX Scene Builder" in version 8.5.0.  
 Layouting is generally done with fxml files.
+
+For fontawesome support add Libraries 
+`de.jensd:fontawsomefx-commons:8.15`
+`de.jensd:fontawsomefx-fontawsome:4.7.0-5`
+to the "JavaFX Scene Builder"
+
+Scene Builder may sometimes delete unicode Charakters when fxml file is changed.
+reset Glyph Name to reset uniocode Charakter.

pom.xml

@@ -93,6 +93,18 @@
       <version>3.1.1</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>

src/main/java/de/doubleslash/keeptime/Main.java

@@ -248,7 +248,6 @@ private void initialiseUI(final Stage primaryStage) throws IOException {
 
       registerMinimizeEventlistener(mainScene, primaryStage);
       registerMaximizeEventlistener(mainScene, primaryStage);
-      // Image(Resources.getResource(RESOURCE.ICON_MAIN).toString())); // TODO use an app icon
 
       primaryStage.setTitle("KeepTime");
       primaryStage.setScene(mainScene);

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

@@ -41,9 +41,6 @@ public enum RESOURCE {
       FXML_MANAGE_PROJECT("/layouts/manage-project.fxml"),
       FXML_MANAGE_WORK("/layouts/manage-work.fxml"),
 
-      // icon
-      ICON_MAIN("/icons/icon.png"),
-
       ;
 
       String resourceLocation;

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

@@ -140,6 +140,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.sort(Comparator.comparing(LicenseTableRow::getName));
 
@@ -154,7 +155,7 @@ private void showLicense(final Licenses license) {
          alert.setContentText(String.format(
                "We could not find the license file at \"%s\". Did you remove it?%nPlease redownload or visit \"%s\".",
                license.getPath(), license.getUrl()));
-         
+
          alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
 
          alert.show();

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

@@ -36,6 +36,7 @@
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.view.time.Interval;
+import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
@@ -61,8 +62,6 @@
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
-import javafx.scene.effect.Light;
-import javafx.scene.effect.Lighting;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.image.WritableImage;
@@ -126,6 +125,18 @@ public class ViewController {
    @FXML
    private Canvas canvas;
 
+   @FXML
+   private FontAwesomeIconView calendarIcon;
+
+   @FXML
+   private FontAwesomeIconView settingsIcon;
+
+   @FXML
+   private FontAwesomeIconView minimizeIcon;
+
+   @FXML
+   private FontAwesomeIconView closeIcon;
+
    private ColorTimeLine mainColorTimeLine;
 
    private class Delta {
@@ -188,19 +199,14 @@ private void initialize() {
 
       addNewProjectButton.textFillProperty().bind(fontColorProperty);
 
-      // Add a light to colorize buttons
-      // TODO is there a nicer way for this? (see #12)
-      final Lighting lighting = new Lighting();
-      lighting.lightProperty().bind(Bindings.createObjectBinding(() -> {
-         final Color color = fontColorProperty.get();
-         return new Light.Distant(45, 45, color);
-      }, fontColorProperty));
-
       settingsButton.setOnAction(ae -> settingsClicked());
-      settingsButton.setEffect(lighting);
 
       calendarButton.setOnAction(ae -> calendarClicked());
-      calendarButton.setEffect(lighting);
+
+      calendarIcon.fillProperty().bind(fontColorProperty);
+      settingsIcon.fillProperty().bind(fontColorProperty);
+      minimizeIcon.fillProperty().bind(fontColorProperty);
+      closeIcon.fillProperty().bind(fontColorProperty);
 
       final Runnable updateMainBackgroundColor = this::runUpdateMainBackgroundColor;