Merge branch 'develop' into bugfix/strg_combos_not_working_in_edit_work_dd

Author: Death111

pom.xml

@@ -32,13 +32,22 @@
   </parent>
 
  <repositories>
-    <!-- Including for fontawesome -->
+   
+    <!-- Including for fontawesome-->
     <repository>
       <id>fontawesomefx-repo</id>
       <name>FontAwesome Repository</name>
-      <url>https://bintray.com/jerady/maven/FontAwesomeFX</url>
+      <url>https://dl.bintray.com/jerady/maven</url>
     </repository>
-  </repositories>
+    
+    <!-- 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>

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

@@ -35,6 +35,7 @@
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.collections.transformation.FilteredList;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.ComboBox;
@@ -81,9 +82,12 @@ public class ManageWorkController {
    private boolean comboChange;
    private Project selectedProject;
 
+   private FilteredList<Project> filteredList;
+
    public void setModel(final Model model) {
       this.model = model;
-      projectComboBox.setItems(model.getSortedAvailableProjects());
+      filteredList = new FilteredList<>(model.getSortedAvailableProjects());
+      projectComboBox.setItems(filteredList);
    }
 
    @FXML
@@ -151,8 +155,11 @@ protected void updateItem(final Project project, final boolean empty) {
             if (project == null || empty) {
                setGraphic(null);
             } else {
-               setColor(this, project.getColor());
+               setColor(this, model.hoverBackgroundColor.get());
+
+               setTextFill(project.getColor());
                setText(project.getName());
+
                setUnderline(project.isWork());
             }
          }
@@ -189,16 +196,15 @@ public Project fromString(final String string) {
                comboChange = true;
                // needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
                Platform.runLater(() -> {
-                  projectComboBox.getEditor().selectAll();
-                  setColor(projectComboBox, newValue.getColor());
+                  setTextColor(projectComboBox.getEditor(), newValue.getColor());
                });
             }
 
       );
 
       projectComboBox.getEditor().textProperty().addListener(new ChangeListener<String>() {
 
-         Boolean isValidProject = true;
+         boolean isValidProject = true;
 
          @Override
          public void changed(final ObservableValue<? extends String> observable, final String oldValue,
@@ -215,14 +221,20 @@ public void changed(final ObservableValue<? extends String> observable, final St
             if (isValidProject) {
                isValidProject = false;
                projectComboBox.getSelectionModel().clearSelection();
+               // needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
+               Platform.runLater(() -> {
+                  setTextColor(projectComboBox.getEditor(), model.hoverFontColor.get());
+               });
             }
 
             // needed to avoid exception on empty textfield https://bugs.openjdk.java.net/browse/JDK-8081700
             Platform.runLater(() -> {
                projectComboBox.hide();
-               projectComboBox
-                     .setItems(model.getSortedAvailableProjects().filtered(project -> ProjectsListViewController
-                           .doesProjectMatchSearchFilter(projectComboBox.getEditor().getText(), project)));
+
+               final String searchText = projectComboBox.getEditor().getText();
+               filteredList.setPredicate(
+                     project -> ProjectsListViewController.doesProjectMatchSearchFilter(searchText, project));
+
                if (projectComboBox.getEditor().focusedProperty().get()) {
                   projectComboBox.show();
                }
@@ -284,7 +296,10 @@ public void initializeWith(final Work work) {
 
       projectComboBox.getSelectionModel().select(work.getProject());
 
-      setColor(projectComboBox, work.getProject().getColor());
+      setColor(projectComboBox, model.hoverBackgroundColor.get());
+      setColor(projectComboBox.getEditor(), model.hoverBackgroundColor.get());
+
+      setTextColor(projectComboBox.getEditor(), model.hoverFontColor.get());
 
    }
 
@@ -294,6 +309,12 @@ private void setColor(final Node object, final Color color) {
       object.setStyle(style);
    }
 
+   private void setTextColor(final Node object, final Color color) {
+      final String style = StyleUtils.changeStyleAttribute(object.getStyle(), "fx-text-fill",
+            "rgba(" + ColorHelper.colorToCssRgba(color) + ")");
+      object.setStyle(style);
+   }
+
    public Work getWorkFromUserInput() {
 
       return new Work(startDatePicker.getValue(),