Merge remote-tracking branch 'origin/milestone-02' into implement-dao-tests

# Conflicts:
#	src/main/java/cz/muni/fi/pv168/project/ui/main/MainWindow.java

src/main/java/cz/muni/fi/pv168/project/color/AppColors.java

@@ -8,9 +8,7 @@ public final class AppColors {
     }
 
     public static final Color RED = new Color(0xE84049);
-    public static final Color YELLOW = new Color(0xEDD62F);
     public static final Color GREEN = new Color(0x33CC33);
-    public static final Color BLUE = new Color(0x1D90AF);
 
     /**
      * Returns a hex string value of a given color.

src/main/java/cz/muni/fi/pv168/project/data/task/Task.java

@@ -16,10 +16,10 @@ public class Task implements ITask, Identifiable {
 
     private Long id;
 
-    private String title;
-    private LocalDate dueDate;
+    private final String title;
+    private final LocalDate dueDate;
 
-    private Duration estimatedTime;
+    private final Duration estimatedTime;
     private String description;
     private TaskStatus taskStatus;
 

src/main/java/cz/muni/fi/pv168/project/ui/resources/Icons.java

@@ -2,7 +2,8 @@ package cz.muni.fi.pv168.project.ui.resources;
 
 import cz.muni.fi.pv168.project.data.task.TaskStatus;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import java.awt.Window;
 import java.net.URL;
 import java.util.logging.Level;
@@ -11,23 +12,12 @@ import java.util.logging.Logger;
 
 public final class Icons {
 
-    public static final Icon REMOVE_BIN_ICON = createIcon("remove_icon_simple_32x32.png");
     public static final Icon REMOVE_CATEGORY_BIN_ICON = createIcon("remove_category_32x32.png");
     public static final Icon REMOVE_TASK_BIN_ICON = createIcon("remove_task_32x32.png");
 
-    public static final Icon REMOVE_SQUARE_ICON = createIcon("remove_square_icon_24x24.png");
-    public static final Icon CANCEL_CIRCLE_ICON = createIcon("cancel_circle_32x32.png");
-    public static final Icon CANCEL_SQUARE_ICON = createIcon("cancel_square_32x32.png");
-
-    public static final Icon EDIT_ICON = createIcon("edit_icon_32x32.png");
     public static final Icon EDIT_CATEGORY_ICON = createIcon("edit_category_32x32.png");
     public static final Icon EDIT_TASK_ICON = createIcon("edit_task_32x32.png");
 
-    public static final Icon TINY_ADD_CIRCLE_ICON = createIcon("tiny_add_icon_16x16.png");
-    public static final Icon TINY_CANCEL_CIRCLE_ICON = createIcon("tiny_cancel_icon_16x16.png");
-
-    public static final Icon ADD_CIRCLE_ICON = createIcon("add_circle_32x32.png");
-    public static final Icon ADD_SQUARE_ICON = createIcon("add_square_icon_24x24.png");
     public static final Icon ADD_TASK_ICON = createIcon("add_task_32x32.png");
     public static final Icon ADD_CATEGORY_ICON = createIcon("add_category_32x32.png");
 
@@ -56,23 +46,6 @@ public final class Icons {
         return new ImageIcon(url);
     }
 
-    public static JButton createIconButton(Icon icon, String textAndTooltip) {
-        return createIconButton(icon, textAndTooltip, textAndTooltip);
-    }
-
-    public static JButton createIconButton(Icon icon, String backupText, String toolTip) {
-        JButton button;
-
-        if (icon == null) {
-            button = new JButton(backupText);
-        } else {
-            button = new JButton(icon);
-        }
-        button.setToolTipText(toolTip);
-
-        return button;
-    }
-
     public static void addTodoIconToWindow(Window window) {
         if (Icons.LOGO_ICON != null) {
             window.setIconImage(((ImageIcon) Icons.LOGO_ICON).getImage());