diff --git a/src/main/java/seedu/address/ui/TaskCard.java b/src/main/java/seedu/address/ui/TaskCard.java index 98b24597235f..bebdd1029e7a 100644 --- a/src/main/java/seedu/address/ui/TaskCard.java +++ b/src/main/java/seedu/address/ui/TaskCard.java @@ -41,7 +41,7 @@ public TaskCard(Task task, int displayedIndex) { this.task = task; id.setText(displayedIndex + ". "); name.setText(task.getName().toString()); - endDateTime.setText(task.getEndDateTime().getDate() + ", " + task.getEndDateTime().getTime()); + endDateTime.setText("Due by: " + task.getEndDateTime().getDate() + ", " + task.getEndDateTime().getTime()); task.getTags().forEach(tag -> tags.getChildren().add(new Label(tag.tagName))); } diff --git a/src/main/java/seedu/address/ui/TaskDetailsPane.java b/src/main/java/seedu/address/ui/TaskDetailsPane.java index 71205a82e822..0ec4c6f12613 100644 --- a/src/main/java/seedu/address/ui/TaskDetailsPane.java +++ b/src/main/java/seedu/address/ui/TaskDetailsPane.java @@ -48,8 +48,9 @@ private void handleTaskPanelSelectionChangedEvent(TaskPanelSelectionChangedEvent logger.info(LogsCenter.getEventHandlingLogMessage(event)); Task task = event.getNewSelection(); name.setText(task.getName().toString()); - startDateTime.setText(task.getStartDateTime().getDate() + ", " + task.getStartDateTime().getTime()); - endDateTime.setText(task.getEndDateTime().getDate() + ", " + task.getEndDateTime().getTime()); + startDateTime.setText("Starting from: " + + task.getStartDateTime().getDate() + ", " + task.getStartDateTime().getTime()); + endDateTime.setText("Due by: " + task.getEndDateTime().getDate() + ", " + task.getEndDateTime().getTime()); // Clear existing list of tags before populating with new tags tags.getChildren().clear(); task.getTags().forEach(tag -> tags.getChildren().add(new Label(tag.tagName))); diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css index 039b5ba976f8..f2fb79c621bf 100644 --- a/src/main/resources/view/DarkTheme.css +++ b/src/main/resources/view/DarkTheme.css @@ -120,13 +120,13 @@ .cell_big_label { -fx-font-family: "Segoe UI Semibold"; -fx-font-size: 16px; - -fx-text-fill: #010504; + -fx-text-fill: #FFFFFF; } .cell_small_label { -fx-font-family: "Segoe UI"; -fx-font-size: 13px; - -fx-text-fill: #010504; + -fx-text-fill: #FFFFFF; } .stack-pane { diff --git a/src/main/resources/view/TaskListCard.fxml b/src/main/resources/view/TaskListCard.fxml index a55e15e37528..fe666915b645 100644 --- a/src/main/resources/view/TaskListCard.fxml +++ b/src/main/resources/view/TaskListCard.fxml @@ -7,28 +7,39 @@ + - + - + - + - - - - - + + + + + + + +