Merge branch 'feature/searchbarForProjectsInMainView' of https://github.com/doubleSlashde/KeepTime into feature/searchbarForProjectsInMainView

Author: Martin Plieske

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

@@ -7,7 +7,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
-import java.util.function.Consumer;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,6 +36,7 @@
 import javafx.scene.control.ListView;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.MultipleSelectionModel;
+import javafx.scene.control.SelectionMode;
 import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory.IntegerSpinnerValueFactory;
 import javafx.scene.control.TextField;
@@ -80,14 +80,6 @@ public ProjectsListViewController(final Model model, final Controller controller
          addProjectToProjectSelectionNodeMap(project);
       }
 
-      // TODO why is there no nice way for listview height?
-      // https://stackoverflow.com/questions/17429508/how-do-you-get-javafx-listview-to-be-the-height-of-its-items
-      final Consumer<Double> updateSize = height -> {
-         LOG.debug(String.format("%s%f", "update size ", height));
-         availableProjectsListView.setPrefHeight(height);
-         mainStage.sizeToScene(); // also update scene size
-      };
-
       searchTextField.textProperty().addListener((a, b, newValue) -> {
          LOG.info("New filter value: " + newValue);
          // TODO do i always have to create a new predicate?
@@ -100,38 +92,40 @@ public ProjectsListViewController(final Model model, final Controller controller
             final String lowerCaseFilter = newValue.toLowerCase();
 
             if (project.getName().toLowerCase().contains(lowerCaseFilter)) {
-               return true; // Filter matches first name.
+               return true;
             }
 
-            return false; // Does not match.
+            return false;
          });
          LOG.debug("Amount of projects to show '{}'.", filteredData.size());
+         availableProjectsListView.getSelectionModel().selectFirst();
+         availableProjectsListView.scrollTo(0);
       });
 
       searchTextField.setOnKeyPressed(eh -> {
          final MultipleSelectionModel<Project> selectionModel = availableProjectsListView.getSelectionModel();
-         final int selectedIndex = selectionModel.getSelectedIndex();
          switch (eh.getCode()) {
          case UP:
             LOG.debug("Arrow up pressed.");
-            selectionModel.select(selectedIndex - 1);
+            selectionModel.selectPrevious();
             eh.consume();
             break;
          case DOWN:
             LOG.debug("Arrow down pressed.");
-            selectionModel.select(selectedIndex + 1);
+            selectionModel.selectNext();
             eh.consume();
             break;
          case ESCAPE:
+            LOG.debug("Esc pressed.");
             if (hideable) {
-               searchTextField.getScene().getWindow().hide();
+               mainStage.hide();
             }
+            eh.consume();
             break;
          default:
             break;
          }
          availableProjectsListView.scrollTo(selectionModel.getSelectedIndex());
-         LOG.debug("Selected list item index '{}'.", selectionModel.getSelectedIndex());
       });
 
       // enter pressed in textfield
@@ -143,9 +137,8 @@ public ProjectsListViewController(final Model model, final Controller controller
          }
       });
 
+      availableProjectsListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
       availableProjectsListView.getSelectionModel().selectFirst();
-
-      searchTextField.setPromptText("Search");
    }
 
    private void addProjectToProjectSelectionNodeMap(final Project project) {
@@ -321,8 +314,9 @@ private Pane addProjectToProjectList(final Project p) {
             projectNameLabel.setTextFill(new Color(p.getColor().getRed() * dimFactor,
                   p.getColor().getGreen() * dimFactor, p.getColor().getBlue() * dimFactor, 1));
             projectNameLabel.setUnderline(p.isWork());
+            projectNameLabel.getTooltip().setText(p.getName());
 
-            // updateProjectView(); // TODO how to update currentProjectLabel when project was edited?
+            // TODO how to update currentProjectLabel when active project was edited?
             realignProjectList();
          });
       });

src/main/resources/css/application.css

@@ -67,6 +67,7 @@
 
 .list-cell {
     -fx-background-color: transparent;
+    -fx-padding: 0px;
 }
 
 .list-cell:selected {

src/main/resources/layouts/ViewLayout.fxml

@@ -108,12 +108,12 @@
          <left>
             <VBox fx:id="projectsVBox" BorderPane.alignment="CENTER">
                <children>
-                  <TextField fx:id="searchTextField" maxHeight="15.0" minHeight="0.0" prefHeight="15.0" prefWidth="148.0" stylesheets="@../css/application.css">
+                  <TextField fx:id="searchTextField" maxHeight="15.0" minHeight="0.0" prefHeight="15.0" prefWidth="140.0" promptText="Search" stylesheets="@../css/application.css">
                      <font>
                         <Font name="Open Sans Regular" size="12.0" />
                      </font>
                   </TextField>
-                        <ListView fx:id="availableProjectsListView" prefHeight="130.0" prefWidth="148.0" stylesheets="@../css/application.css" />
+                        <ListView fx:id="availableProjectsListView" prefHeight="130.0" prefWidth="140.0" stylesheets="@../css/application.css" />
                   <Button fx:id="addNewProjectButton" minHeight="-Infinity" mnemonicParsing="false" onAction="#addNewProject" prefHeight="23.0" prefWidth="120.0" stylesheets="@../css/application.css" text="+ Add new project">
                      <font>
                         <Font name="Open Sans Regular" size="12.0" />

src/main/resources/layouts/ViewLayoutPopup.fxml

@@ -21,13 +21,13 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<VBox fx:id="root" prefHeight="425.0" prefWidth="145.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.viewpopup.ViewControllerPopup">
+<VBox fx:id="root" prefHeight="350.0" prefWidth="145.0" style="-fx-background-radius: 10 10 10 10; -fx-border-radius: 10 10 10 10; -fx-border-color: rgba(54,143,179,.0.01);" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.doubleslash.keeptime.viewpopup.ViewControllerPopup">
    <children>
       <TextField fx:id="searchTextField" maxHeight="15.0" minHeight="0.0" prefHeight="15.0" promptText="Search" stylesheets="@../css/application.css">
          <font>
             <Font name="Open Sans Regular" size="12.0" />
          </font>
       </TextField>
-      <ListView fx:id="projectListView" prefHeight="400.0" prefWidth="312.0" stylesheets="@../css/application.css" />
+      <ListView fx:id="projectListView" prefHeight="335.0" prefWidth="145.0" stylesheets="@../css/application.css" />
    </children>
 </VBox>