Merge pull request se-edu#83 from jingchen-z/master

Changed UI layout

src/main/java/seedu/address/ui/BrowserPanel.java

@@ -50,10 +50,16 @@ public BrowserPanel(ObservableValue<Task> selectedTask) {
     }
 
     private void loadTaskPage(Task task) {
+        //System.out.println(task.getDescription());
         loadPage(SEARCH_PAGE_URL + task.getName().fullName);
     }
 
+    /**
+     * Load selected page.
+     * @param url
+     */
     public void loadPage(String url) {
+        //System.out.println(url);
         Platform.runLater(() -> browser.getEngine().load(url));
     }
 

src/main/java/seedu/address/ui/DefaultPage.java

@@ -0,0 +1,42 @@
+package seedu.address.ui;
+
+import javafx.collections.ObservableList;
+
+import javafx.fxml.FXML;
+
+import javafx.scene.control.SplitPane;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.Region;
+
+import seedu.address.model.task.Task;
+
+/**
+ * Default page contains calendar, reminder and timeline.
+ */
+public class DefaultPage extends UiPart<Region> {
+
+    private static final String FXML = "DefaultPage.fxml";
+
+    @FXML
+    private SplitPane overallPane;
+
+    @FXML
+    private AnchorPane calendarAnchorPane;
+
+    @FXML
+    private AnchorPane reminderAnchorPane;
+
+    @FXML
+    private AnchorPane timelineAnchorPane;
+
+    @FXML
+    private AnchorPane upperPartAnchorPane;
+
+    public DefaultPage(ObservableList<Task> taskList) {
+        super(FXML);
+        upperPartAnchorPane.maxHeightProperty().bind(overallPane.heightProperty().multiply(0.5));
+        timelineAnchorPane.maxHeightProperty().bind(overallPane.heightProperty().multiply(0.5));
+        calendarAnchorPane.maxWidthProperty().bind(upperPartAnchorPane.widthProperty().multiply(0.5));
+        reminderAnchorPane.maxWidthProperty().bind(upperPartAnchorPane.widthProperty().multiply(0.5));
+    }
+}

src/main/java/seedu/address/ui/MainWindow.java

@@ -25,20 +25,30 @@ public class MainWindow extends UiPart<Stage> {
 
     private static final String FXML = "MainWindow.fxml";
 
+    private static final String DEFAULT_PAGE = "defaultPage";
+    private static final String PROJECT_DETAILS = "projectDetails";
+
     private final Logger logger = LogsCenter.getLogger(getClass());
 
     private Stage primaryStage;
     private Logic logic;
 
     // Independent Ui parts residing in this Ui container
     private BrowserPanel browserPanel;
+    private DefaultPage defaultPage;
     private TaskListPanel taskListPanel;
     private ResultDisplay resultDisplay;
     private HelpWindow helpWindow;
 
+    //To check which scene to show
+    private String optionPage = DEFAULT_PAGE;
+
     @FXML
     private StackPane browserPlaceholder;
 
+    @FXML
+    private StackPane defaultBrowserPlaceholder;
+
     @FXML
     private StackPane commandBoxPlaceholder;
 
@@ -54,6 +64,7 @@ public class MainWindow extends UiPart<Stage> {
     @FXML
     private StackPane statusbarPlaceholder;
 
+
     public MainWindow(Stage primaryStage, Logic logic) {
         super(FXML, primaryStage);
 
@@ -111,8 +122,23 @@ private void setAccelerator(MenuItem menuItem, KeyCombination keyCombination) {
      * Fills up all the placeholders of this window.
      */
     void fillInnerParts() {
-        browserPanel = new BrowserPanel(logic.selectedTaskProperty());
-        browserPlaceholder.getChildren().add(browserPanel.getRoot());
+        switch (optionPage) {
+        case DEFAULT_PAGE:
+            defaultPage = new DefaultPage(logic.getFilteredTaskList());
+            defaultBrowserPlaceholder.getChildren().add(defaultPage.getRoot());
+            break;
+
+        case PROJECT_DETAILS:
+            browserPanel = new BrowserPanel(logic.selectedTaskProperty());
+            browserPlaceholder.getChildren().add(browserPanel.getRoot());
+            break;
+
+        default:
+            defaultPage = new DefaultPage(logic.getFilteredTaskList());
+            defaultBrowserPlaceholder.getChildren().add(defaultPage.getRoot());
+            break;
+        }
+
 
         taskListPanel = new TaskListPanel(logic.getFilteredTaskList(), logic.selectedTaskProperty(),
                 logic::setSelectedTask);
@@ -172,6 +198,21 @@ public TaskListPanel getTaskListPanel() {
         return taskListPanel;
     }
 
+    /**
+     * Choose which page to show.
+     */
+    public void setScene(String value) {
+        optionPage = value;
+    }
+
+    /**
+     * Get current page.
+     * @return
+     */
+    public String getPage() {
+        return this.optionPage;
+    }
+
     /**
      * Executes the command and returns the result.
      *

src/main/java/seedu/address/ui/calendar/Calendar.java

@@ -0,0 +1,9 @@
+package seedu.address.ui.calendar;
+
+/**
+ * The real implementation will be here.
+ */
+public class Calendar {
+    //TBC
+    //In development.
+}

src/main/java/seedu/address/ui/calendar/CalendarController.java

@@ -0,0 +1,9 @@
+package seedu.address.ui.calendar;
+
+/**
+ * Link between calendar and PaneNodes.
+ */
+public class CalendarController {
+    // Get the pane to put the calendar on
+    //@FXML Pane calendarAnchorPane;
+}

src/main/java/seedu/address/ui/calendar/PaneNode.java

@@ -0,0 +1,34 @@
+package seedu.address.ui.calendar;
+
+import java.time.LocalDate;
+
+import javafx.scene.Node;
+import javafx.scene.layout.AnchorPane;
+
+
+/**
+ * This is each single date grid.
+ */
+public class PaneNode extends AnchorPane {
+
+    private LocalDate day;
+
+    /**
+     * Initialize.
+     * @param children
+     */
+    public PaneNode(Node... children) {
+        super(children);
+    }
+
+    /**
+     * Get today.
+     * @return
+     */
+    public LocalDate getDay() {
+        return day;
+    }
+
+    public void setDay(LocalDate newDay) { this.day = newDay; }
+
+}

src/main/resources/view/BrowserPanel.fxml

@@ -4,5 +4,5 @@
 <?import javafx.scene.web.WebView?>
 
 <StackPane xmlns:fx="http://javafx.com/fxml/1">
-  <WebView fx:id="browser"/>
+    <WebView fx:id="browser"/>
 </StackPane>

src/main/resources/view/DefaultPage.fxml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<SplitPane fx:id="overallPane" dividerPositions="0.5" orientation="VERTICAL" prefHeight="424.0" prefWidth="860.0" xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1">
+  <items>
+    <AnchorPane fx:id="upperPartAnchorPane" minHeight="0.0" minWidth="0.0" prefHeight="100.0" prefWidth="160.0">
+         <children>
+            <SplitPane dividerPositions="0.5"  prefHeight="224.0" prefWidth="682.0">
+              <items>
+                <AnchorPane fx:id="calendarAnchorPane" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" />
+                <AnchorPane fx:id="reminderAnchorPane" minHeight="0.0" minWidth="0.0" prefHeight="189.0" prefWidth="292.0" />
+              </items>
+            </SplitPane>
+         </children></AnchorPane>
+    <AnchorPane fx:id="timelineAnchorPane" minHeight="0.0" minWidth="0.0" prefHeight="100.0" prefWidth="160.0" />
+  </items>
+</SplitPane>

src/main/resources/view/MainWindow.fxml

@@ -53,8 +53,14 @@
             </padding>
             <StackPane fx:id="taskListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
           </VBox>
-
-          <StackPane fx:id="browserPlaceholder" prefWidth="340" >
+          <!--
+           <StackPane fx:id="browserPlaceholder" prefWidth="340" >
+            <padding>
+              <Insets top="10" right="10" bottom="10" left="10" />
+            </padding>
+          </StackPane>
+          -->
+          <StackPane fx:id="defaultBrowserPlaceholder" prefWidth="340" >
             <padding>
               <Insets top="10" right="10" bottom="10" left="10" />
             </padding>