Merge branch 'develop' into feature/save_active_work_item_periodically

# Conflicts:
#	src/main/java/de/doubleslash/keeptime/controller/Controller.java

Author: Death111

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

@@ -33,6 +33,7 @@
 import de.doubleslash.keeptime.common.FontProvider;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
+import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Settings;
@@ -41,7 +42,6 @@
 import de.doubleslash.keeptime.viewpopup.GlobalScreenListener;
 import de.doubleslash.keeptime.viewpopup.ViewControllerPopup;
 import javafx.application.Application;
-import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -59,7 +59,6 @@
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import javafx.stage.WindowEvent;
 
 @SpringBootApplication
 public class Main extends Application {
@@ -74,6 +73,8 @@ public class Main extends Application {
 
    private Model model;
 
+   private Controller controller;
+
    private ViewController viewController;
 
    private GlobalScreenListener globalScreenListener;
@@ -87,6 +88,7 @@ public void init() throws Exception {
       springContext = SpringApplication.run(Main.class);
       // TODO test if everywhere is used the same model
       model = springContext.getBean(Model.class);
+      controller = springContext.getBean(Controller.class);
       model.setSpringContext(springContext);
    }
 
@@ -199,7 +201,12 @@ private void readSettings() {
       model.useHotkey.set(settings.isUseHotkey());
       model.displayProjectsRight.set(settings.isDisplayProjectsRight());
       model.hideProjectsOnMouseExit.set(settings.isHideProjectsOnMouseExit());
+      model.screenSettings.proportionalX.set(settings.getWindowXProportion());
+      model.screenSettings.proportionalY.set(settings.getWindowYProportion());
+      model.screenSettings.screenHash.set(settings.getScreenHash());
+      model.screenSettings.saveWindowPosition.set(settings.isSaveWindowPosition());
       model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
+
    }
 
    private void initialisePopupUI(final Stage primaryStage) throws IOException {
@@ -233,13 +240,12 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
 
    private void initialiseUI(final Stage primaryStage) throws IOException {
       LOG.debug("Initialising main UI.");
-      Pane mainPane;
 
       // Load root layout from fxml file.
       final FXMLLoader loader = new FXMLLoader();
       loader.setLocation(Resources.getResource(RESOURCE.FXML_VIEW_LAYOUT));
       loader.setControllerFactory(springContext::getBean);
-      mainPane = loader.load();
+      final Pane mainPane = loader.load();
       primaryStage.initStyle(StageStyle.TRANSPARENT);
       // Show the scene containing the root layout.
       final Scene mainScene = new Scene(mainPane, Color.TRANSPARENT);
@@ -252,12 +258,8 @@ private void initialiseUI(final Stage primaryStage) throws IOException {
       primaryStage.setAlwaysOnTop(true);
       primaryStage.setResizable(false);
 
-      primaryStage.setOnCloseRequest(new EventHandler<WindowEvent>() {
-         @Override
-         public void handle(final WindowEvent event) {
-            LOG.info("On close request");
-         }
-      });
+      primaryStage.setOnCloseRequest(windowEvent -> LOG.info("On close request"));
+
       primaryStage.show();
       viewController = loader.getController();
       // Give the controller access to the main app.

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

@@ -0,0 +1,125 @@
+package de.doubleslash.keeptime.common;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javafx.geometry.Rectangle2D;
+import javafx.stage.Screen;
+
+/**
+ * Helper to handle screen coordinates. Converts between absolute coordinates to screen+proportional coordinates. E.g.
+ * you have two screens, each with 1000px width. Absolute position gives you 1500px and this class will get you hash for
+ * screen #2 and proportional value 0.5. <br>
+ * Reference #38
+ */
+public class ScreenPosHelper {
+
+   private static final Logger LOG = LoggerFactory.getLogger(ScreenPosHelper.class);
+
+   private int screenHash;
+
+   private double absoluteX;
+   private double absoluteY;
+
+   private double proportionalX;
+   private double proportionalY;
+
+   public ScreenPosHelper(final int screenhash, final double proportionalX, final double proportionalY) {
+      this.screenHash = screenhash;
+      this.proportionalX = proportionalX;
+      this.proportionalY = proportionalY;
+      calcAbsolutePosition();
+   }
+
+   public ScreenPosHelper(final double absoluteX, final double absoluteY) {
+      this.absoluteX = absoluteX;
+      this.absoluteY = absoluteY;
+      calcProportionalPosition();
+   }
+
+   public double getAbsoluteX() {
+      return absoluteX;
+   }
+
+   public void setAbsoluteX(final double absolutX) {
+      this.absoluteX = absolutX;
+      calcProportionalPosition();
+   }
+
+   public double getAbsoluteY() {
+      return absoluteY;
+   }
+
+   public void setAbsoluteY(final double absolutY) {
+      this.absoluteY = absolutY;
+      calcProportionalPosition();
+   }
+
+   public int getScreenHash() {
+      return screenHash;
+   }
+
+   public double getProportionalX() {
+      return proportionalX;
+   }
+
+   public double getProportionalY() {
+      return proportionalY;
+   }
+
+   public void resetPositionIfInvalid() {
+      if (!isPositionValid()) {
+         final Screen screen = getScreenWithHashOrPrimary(this.screenHash);
+         final Rectangle2D screenBounds = screen.getBounds();
+         LOG.warn(
+               "Position is not in the range of the screen. Screen (hash '{}') range '{}'. Calculated positions '{}'/'{}'. Setting to '0'/'0'.",
+               screen.hashCode(), screenBounds, absoluteX, absoluteY);
+         proportionalX = 0;
+         proportionalY = 0;
+         absoluteX = 0;
+         absoluteY = 0;
+      }
+   }
+
+   private void calcProportionalPosition() {
+      Screen screen = Screen.getPrimary();
+      for (final Screen s : Screen.getScreens()) {
+         if (s.getBounds().contains(this.absoluteX, this.absoluteY)) {
+            screen = s;
+            break;
+         }
+      }
+      this.screenHash = screen.hashCode();
+      final Rectangle2D bounds = screen.getBounds();
+      final double xInScreen = absoluteX - bounds.getMinX();
+      this.proportionalX = xInScreen / bounds.getWidth();
+      final double yInScreen = absoluteY - bounds.getMinY();
+      this.proportionalY = yInScreen / bounds.getHeight();
+
+   }
+
+   private void calcAbsolutePosition() {
+      final Screen screen = getScreenWithHashOrPrimary(this.screenHash);
+      final Rectangle2D screenBounds = screen.getBounds();
+
+      this.absoluteX = screenBounds.getMinX() + (screenBounds.getWidth() * this.proportionalX);
+      this.absoluteY = screenBounds.getMinY() + (screenBounds.getHeight() * this.proportionalY);
+   }
+
+   private boolean isPositionValid() {
+      final Screen screen = getScreenWithHashOrPrimary(this.screenHash);
+      final Rectangle2D screenBounds = screen.getBounds();
+      return screenBounds.contains(this.absoluteX, this.absoluteY);
+   }
+
+   private Screen getScreenWithHashOrPrimary(final int screenHash) {
+      for (final Screen s : Screen.getScreens()) {
+         if (s.hashCode() == screenHash) {
+            return s;
+         }
+      }
+      LOG.warn("Could not find wanted screen with hash '{}'. Using primary.", screenHash);
+      return Screen.getPrimary();
+   }
+
+}

src/main/java/de/doubleslash/keeptime/controller/Controller.java

@@ -37,7 +37,6 @@
 import de.doubleslash.keeptime.model.Settings;
 import de.doubleslash.keeptime.model.Work;
 import javafx.collections.ObservableList;
-import javafx.scene.paint.Color;
 
 @Service
 public class Controller {
@@ -119,25 +118,24 @@ public void addNewProject(final Project project) {
       model.getProjectRepository().saveAll(changedProjects);
    }
 
-   public void updateSettings(final Color hoverBackgroundColor, final Color hoverFontColor,
-         final Color defaultBackgroundColor, final Color defaultFontColor, final Color taskBarColor,
-         final boolean useHotkey, final boolean displayProjectsRight, final boolean hideProjectsOnMouseExit,
-         final boolean emptyNoteReminder) {
-      // TODO create holder for all the properties (or reuse Settings.class?)
-      final Settings settings = model.getSettingsRepository().findAll().get(0);
-      settings.setTaskBarColor(taskBarColor);
-
-      settings.setDefaultBackgroundColor(defaultBackgroundColor);
-      settings.setDefaultFontColor(defaultFontColor);
-
-      settings.setHoverBackgroundColor(hoverBackgroundColor);
-      settings.setHoverFontColor(hoverFontColor);
-      settings.setUseHotkey(useHotkey);
-      settings.setDisplayProjectsRight(displayProjectsRight);
-      settings.setHideProjectsOnMouseExit(hideProjectsOnMouseExit);
-      settings.setRemindIfNotesAreEmpty(emptyNoteReminder);
-
-      model.getSettingsRepository().save(settings);
+   public void updateSettings(final Settings newValuedSettings) {
+      Settings settings = model.getSettingsRepository().findAll().get(0);
+
+      settings.setTaskBarColor(newValuedSettings.getTaskBarColor());
+      settings.setDefaultBackgroundColor(newValuedSettings.getDefaultBackgroundColor());
+      settings.setDefaultFontColor(newValuedSettings.getDefaultFontColor());
+      settings.setHoverBackgroundColor(newValuedSettings.getHoverBackgroundColor());
+      settings.setHoverFontColor(newValuedSettings.getHoverFontColor());
+      settings.setUseHotkey(newValuedSettings.isUseHotkey());
+      settings.setDisplayProjectsRight(newValuedSettings.isDisplayProjectsRight());
+      settings.setHideProjectsOnMouseExit(newValuedSettings.isHideProjectsOnMouseExit());
+      settings.setSaveWindowPosition(newValuedSettings.isSaveWindowPosition());
+      settings.setWindowXProportion(newValuedSettings.getWindowXProportion());
+      settings.setWindowYProportion(newValuedSettings.getWindowYProportion());
+      settings.setScreenHash(newValuedSettings.getScreenHash());
+      settings.setRemindIfNotesAreEmpty(newValuedSettings.isRemindIfNotesAreEmpty());
+
+      settings = model.getSettingsRepository().save(settings);
 
       model.defaultBackgroundColor.set(settings.getDefaultBackgroundColor());
       model.defaultFontColor.set(settings.getDefaultFontColor());
@@ -147,13 +145,28 @@ public void updateSettings(final Color hoverBackgroundColor, final Color hoverFo
       model.useHotkey.set(settings.isUseHotkey());
       model.displayProjectsRight.set(settings.isDisplayProjectsRight());
       model.hideProjectsOnMouseExit.set(settings.isHideProjectsOnMouseExit());
+      model.screenSettings.saveWindowPosition.set(settings.isSaveWindowPosition());
+      model.screenSettings.proportionalX.set(settings.getWindowXProportion());
+      model.screenSettings.proportionalY.set(settings.getWindowYProportion());
+      model.screenSettings.screenHash.set(settings.getScreenHash());
       model.remindIfNotesAreEmpty.set(settings.isRemindIfNotesAreEmpty());
    }
 
    @PreDestroy
    public void shutdown() {
       LOG.info("Controller shutdown");
-      saveCurrentWork(dateProvider.dateTimeNow());
+
+      LOG.info("Changing project to persist current work on shutdown.");
+      changeProject(model.getIdleProject(), 0);
+
+      LOG.info("Updating settings to persist local changes on shutdown.");
+      final Settings newSettings = new Settings(model.hoverBackgroundColor.get(), model.hoverFontColor.get(),
+            model.defaultBackgroundColor.get(), model.defaultFontColor.get(), model.taskBarColor.get(),
+            model.useHotkey.get(), model.displayProjectsRight.get(), model.hideProjectsOnMouseExit.get(),
+            model.screenSettings.proportionalX.get(), model.screenSettings.proportionalY.get(),
+            model.screenSettings.screenHash.get(), model.screenSettings.saveWindowPosition.get(),
+            model.remindIfNotesAreEmpty.get());
+      updateSettings(newSettings);
    }
 
    public void deleteProject(final Project p) {
@@ -235,13 +248,13 @@ public void deleteWork(final Work workToBeDeleted) {
     * Changes the indexes of the originalList parameter to have a consistent order.
     * 
     * @param originalList
-    *                          list of all projects to adapt the indexes for
+    *           list of all projects to adapt the indexes for
     * @param changedProject
-    *                          the project which has changed which already has the new index
+    *           the project which has changed which already has the new index
     * @param oldIndex
-    *                          the old index of the changed project
+    *           the old index of the changed project
     * @param newIndex
-    *                          the new index of the changed project (which the projects also already has)
+    *           the new index of the changed project (which the projects also already has)
     * @return all projects whose index has been adapted
     */
    List<Project> resortProjectIndexes(final List<Project> originalList, final Project changedProject,
@@ -278,9 +291,9 @@ List<Project> resortProjectIndexes(final List<Project> originalList, final Proje
     * Decreases all indexes by one, after the removed index
     * 
     * @param originalList
-    *                        list of all projects to adapt the indexes for
+    *           list of all projects to adapt the indexes for
     * @param removedIndex
-    *                        the index which has been removed
+    *           the index which has been removed
     * @return all projects whose index has been adapted
     */
    List<Project> adaptProjectIndexesAfterRemoving(final List<Project> originalList, final int removedIndex) {

src/main/java/de/doubleslash/keeptime/model/Model.java

@@ -82,6 +82,8 @@ public Model(final ProjectRepository projectRepository, final WorkRepository wor
 
    public final ObjectProperty<Boolean> remindIfNotesAreEmpty = new SimpleObjectProperty<>(false);
 
+   public final ScreenSettings screenSettings = new ScreenSettings();
+
    private ConfigurableApplicationContext springContext;
 
    public void setWorkRepository(final WorkRepository workRepository) {

src/main/java/de/doubleslash/keeptime/model/ScreenSettings.java

@@ -0,0 +1,11 @@
+package de.doubleslash.keeptime.model;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+
+public class ScreenSettings {
+   public final ObjectProperty<Boolean> saveWindowPosition = new SimpleObjectProperty<>(false);
+   public final ObjectProperty<Double> proportionalX = new SimpleObjectProperty<>(0.5);
+   public final ObjectProperty<Double> proportionalY = new SimpleObjectProperty<>(0.5);
+   public final ObjectProperty<Integer> screenHash = new SimpleObjectProperty<>(0);
+}