Icons responsive to Color Change

Author: JSchraff

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;
 

src/main/resources/layouts/ViewLayout.fxml

@@ -51,14 +51,14 @@
                      <center>
                         <HBox alignment="CENTER" prefHeight="36.0">
                            <children>
-                              <Button fx:id="calendarButton" mnemonicParsing="false" prefHeight="11.0" prefWidth="21.0" stylesheets="@../css/application.css">
+                              <Button fx:id="calendarButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="22.0" stylesheets="@../css/application.css">
                                  <graphic>
-                                    <FontAwesomeIconView glyphName="CALENDAR" glyphStyle="fas" size="20" />
+                                    <FontAwesomeIconView fx:id="calendarIcon" glyphName="CALENDAR" glyphStyle="fas" size="20" text="" />
                                  </graphic>
                               </Button>
                               <Button fx:id="settingsButton" mnemonicParsing="false" prefHeight="25.0" prefWidth="22.0" stylesheets="@../css/application.css">
                                  <graphic>
-                                    <FontAwesomeIconView glyphName="COG" glyphStyle="fas" size="20" />
+                                    <FontAwesomeIconView fx:id="settingsIcon" glyphName="COG" glyphStyle="fas" size="20" />
                                  </graphic>
                               </Button>
                            </children>
@@ -90,14 +90,14 @@
                         <Font name="Open Sans Regular" size="12.0" />
                      </font>
                      <graphic>
-                        <FontAwesomeIconView glyphName="WINDOW_MINIMIZE" glyphStyle="fas" size="10" text="" />
+                        <FontAwesomeIconView fx:id="minimizeIcon" glyphName="WINDOW_MINIMIZE" glyphStyle="fas" size="10" text="" />
                      </graphic></Button>
                   <Button fx:id="closeButton" layoutX="287.0" layoutY="7.0" mnemonicParsing="false" stylesheets="@../css/application.css">
                      <font>
                         <Font name="Open Sans Regular" size="12.0" />
                      </font>
                      <graphic>
-                        <FontAwesomeIconView glyphName="TIMES" glyphStyle="fas" size="10" />
+                        <FontAwesomeIconView fx:id="closeIcon" glyphName="TIMES" glyphStyle="fas" size="10" />
                      </graphic>
                   </Button>
                </children>