Merge pull request #112 from xGladiate/update-ui

Update UI
AY2425S1-CS2103T-T12-3 · Oct 25, 2024 · ea24f3c · ea24f3c
2 parents 8fc8dbb + 7df38ea
commit ea24f3c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/src/main/java/seedu/address/MainApp.java b/src/main/java/seedu/address/MainApp.java
@@ -36,7 +36,7 @@
  */
 public class MainApp extends Application {
 
-    public static final Version VERSION = new Version(0, 2, 2, true);
+    public static final Version VERSION = new Version(0, 2, 3, true);
 
     private static final Logger logger = LogsCenter.getLogger(MainApp.class);
 

diff --git a/src/main/java/seedu/address/ui/DeliveryCard.java b/src/main/java/seedu/address/ui/DeliveryCard.java
@@ -48,8 +48,6 @@ public class DeliveryCard extends UiPart<Region> {
     @FXML
     private FlowPane tags;
     @FXML
-    private Label archive;
-    @FXML
     private FlowPane items;
 
     /**
@@ -73,9 +71,6 @@ public DeliveryCard(Delivery delivery, int displayedIndex) {
             .sorted(Comparator.comparing(tag -> tag.tagName))
             .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
 
-        //Can be removed
-        archive.setText(delivery.getArchive().toString());
-
         // Update the card style based on the archive status
         if (delivery.isArchived()) {
             cardPane.getStyleClass().add("archived");

diff --git a/src/main/resources/view/DeliveryListCard.fxml b/src/main/resources/view/DeliveryListCard.fxml
@@ -30,7 +30,7 @@
             <Label fx:id="deliveryId" styleClass="cell_small_label" text="deliveryId" />
             <Label fx:id="address" styleClass="cell_small_label" text="address" />
             <HBox fx:id="itemsContainer" styleClass="cell_small_label">
-                <Label fx:id="itemsLabel" minWidth="40" text="Items: " />
+                <Label fx:id="itemsLabel" styleClass="cell_small_label" text="Items: " />
                 <FlowPane fx:id="items" />
             </HBox>
             <!--<FlowPane fx:id="items" />-->
@@ -40,12 +40,9 @@
             <Label fx:id="eta" styleClass="cell_small_label" text="eta" />
             <Label fx:id="status" styleClass="cell_small_label" text="status" />
             <HBox fx:id="tagsContainer" styleClass="cell_small_label">
-                <Label fx:id="tagsLabel" minWidth="40" text="Tags: "/>
-                <FlowPane fx:id="tags" />
+                <Label fx:id="tagsLabel" styleClass="cell_small_label" text="Tags: "/>
+                <FlowPane fx:id="tags" styleClass="cell_small_label" />
             </HBox>
-
-            <!--Can be removed-->
-            <Label fx:id="archive" styleClass="cell_small_label" text="status" />
         </VBox>
     </GridPane>
 </HBox>
diff --git a/src/main/resources/view/DeliveryListPanel.fxml b/src/main/resources/view/DeliveryListPanel.fxml
@@ -3,6 +3,6 @@
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+<VBox xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" VBox.vgrow="ALWAYS">
     <ListView fx:id="deliveryListView" VBox.vgrow="ALWAYS" />
 </VBox>
diff --git a/src/main/resources/view/InspectWindow.fxml b/src/main/resources/view/InspectWindow.fxml
@@ -46,16 +46,20 @@
                     </padding>
                 </StackPane>
 
-                <SplitPane fx:id="mainSplitPane" VBox.vgrow="ALWAYS" dividerPositions="0.5">
+                <SplitPane fx:id="mainSplitPane" VBox.vgrow="ALWAYS" dividerPositions="0.3">
                     <items>
                         <VBox fx:id="personInfoSection">
                             <StackPane fx:id="personInfoPlaceholder" />
                         </VBox>
-                        <VBox fx:id="deliveryListSection">
-                            <StackPane fx:id="deliveryListPlaceholder" />
+                        <VBox fx:id="deliveryListSection" styleClass="pane-with-border" VBox.vgrow="ALWAYS">
+                            <padding>
+                                <Insets top="10" right="10" bottom="10" left="10" />
+                            </padding>
+                            <StackPane fx:id="deliveryListPlaceholder" VBox.vgrow="ALWAYS" />
                         </VBox>
                     </items>
                 </SplitPane>
+
                 <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
             </VBox>
         </Scene>