Merge pull request AY2324S2-CS2103T-W13-4#62 from nobodyishappy/branc…

…h-UI Update to UI
nobodyishappy · Apr 4, 2024 · 2e52b13 · 2e52b13
2 parents d0f6434 + 43c091f
commit 2e52b13
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/src/main/java/seedu/address/ui/TaskCard.java b/src/main/java/seedu/address/ui/TaskCard.java
@@ -51,5 +51,21 @@ public TaskCard(Task task, int displayedIndex) {
         status.setText(task.getStatus().toString());
         description.setText(task.getDescription().taskDescription);
         deadline.setText(task.getDeadline().toString());
+
+        String settings = "-fx-padding: 1 3 1 3; -fx-border-radius: 2; -fx-background-radius: 2; -fx-font-size: 12;";
+
+        if (task.getPriority().toString().equalsIgnoreCase("low")) {
+            priority.setStyle("-fx-background-color: #00ff00;" + settings);
+        } else if (task.getPriority().toString().equalsIgnoreCase("medium")) {
+            priority.setStyle("-fx-background-color: #ffae00;" + settings);
+        } else if (task.getPriority().toString().equalsIgnoreCase("high")) {
+            priority.setStyle("-fx-background-color: #ff0000;" + settings);
+        }
+
+        if (task.getStatus().toString().equalsIgnoreCase("Done")) {
+            status.setStyle("-fx-background-color: #00ff00;" + settings);
+        } else if (task.getStatus().toString().equalsIgnoreCase("Not Done")) {
+            status.setStyle("-fx-background-color: #ff0000;" + settings);
+        }
     }
 }
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -120,6 +120,12 @@
     -fx-text-fill: white;
 }
 
+.cell_head_label {
+    -fx-font-family: "Segoe UI Semibold";
+    -fx-font-size: 20px;
+    -fx-text-fill: white;
+}
+
 .cell_big_label {
     -fx-font-family: "Segoe UI Semibold";
     -fx-font-size: 16px;
@@ -350,3 +356,4 @@
     -fx-background-radius: 2;
     -fx-font-size: 11;
 }
+
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -12,7 +12,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.stage.Stage?>
 
-<fx:root minHeight="600" minWidth="780.0" onCloseRequest="#handleExit" title="Address App" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
+<fx:root minHeight="600" minWidth="780.0" onCloseRequest="#handleExit" title="TeamTracker" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
   <icons>
     <Image url="@/images/address_book_32.png" />
   </icons>

diff --git a/src/main/resources/view/PersonListPanel.fxml b/src/main/resources/view/PersonListPanel.fxml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.VBox?>
 
 <VBox xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+  <Label fx:id="listname" text="List of Person" styleClass="cell_head_label" />
   <ListView fx:id="personListView" VBox.vgrow="ALWAYS" />
 </VBox>
diff --git a/src/main/resources/view/TaskListPanel.fxml b/src/main/resources/view/TaskListPanel.fxml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.VBox?>
 
 <VBox xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+    <Label fx:id="listname" text="List of Task" styleClass="cell_head_label" />
     <ListView fx:id="taskListView" VBox.vgrow="ALWAYS" />
 </VBox>