Slight change to UI

CFSY · Oct 22, 2022 · 31125c3 · 31125c3
1 parent 0d706af
commit 31125c3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/seedu/waddle/ui/ItemGroupCard.java b/src/main/java/seedu/waddle/ui/ItemGroupCard.java
@@ -29,7 +29,6 @@ public class ItemGroupCard extends UiPart<Region> {
     @FXML
     private StackPane itemListPanelPlaceholder;
 
-
     /**
      * Creates a {@code ItineraryCode} with the given {@code Itinerary} and index to display.
      */
@@ -41,8 +40,8 @@ public ItemGroupCard(ObservableList<Item> itemGroup, int displayedIndex) {
         } else {
             this.id.setText("Day " + displayedIndex);
         }
-        System.out.println("SET ITEM GROUP ID");
         this.itemListPanelPlaceholder.getChildren().add(new ItemListPanel(itemGroup).getRoot());
+        this.itemListPanelPlaceholder.setMinHeight(UiSizes.ITEM_LIST_MIN_HEIGHT);
     }
 
     @Override

diff --git a/src/main/java/seedu/waddle/ui/ItemGroupListPanel.java b/src/main/java/seedu/waddle/ui/ItemGroupListPanel.java
@@ -26,7 +26,6 @@ public ItemGroupListPanel(ObservableList<ObservableList<Item>> itemGroups) {
         super(FXML);
         itemGroupListView.setItems(itemGroups);
         itemGroupListView.setCellFactory(listView -> new ItemGroupListPanel.ItemGroupListViewCell());
-        System.out.println("DONE CREATING GROUP LIST PANEL");
     }
 
     /**

diff --git a/src/main/java/seedu/waddle/ui/ItemListPanel.java b/src/main/java/seedu/waddle/ui/ItemListPanel.java
@@ -2,6 +2,7 @@
 
 import java.util.logging.Logger;
 
+import javafx.beans.binding.Bindings;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListCell;
@@ -26,6 +27,7 @@ public ItemListPanel(ObservableList<Item> itemList) {
         super(FXML);
         itemListView.setItems(itemList);
         itemListView.setCellFactory(listView -> new ItemListPanel.ItemListViewCell());
+        itemListView.prefHeightProperty().bind(Bindings.size(itemList).multiply(UiSizes.ITEM_CARD_HEIGHT));
     }
 
     /**

diff --git a/src/main/java/seedu/waddle/ui/MainWindow.java b/src/main/java/seedu/waddle/ui/MainWindow.java
@@ -209,7 +209,6 @@ private CommandResult executeCommand(String commandText) throws CommandException
                 case WISH:
                     ObservableList<ObservableList<Item>> itemGroups = StageManager.getInstance()
                             .getSelectedItinerary().getUnmodifiableItemGroups();
-                    System.out.println("GOT UNMODIFIABLE ITEM GROUPS");
                     setListPanel(new ItemGroupListPanel(itemGroups));
                     break;
                 case SCHEDULE:

diff --git a/src/main/java/seedu/waddle/ui/UiSizes.java b/src/main/java/seedu/waddle/ui/UiSizes.java
@@ -0,0 +1,6 @@
+package seedu.waddle.ui;
+
+public class UiSizes {
+    public static final double ITEM_CARD_HEIGHT = 120;
+    public static final double ITEM_LIST_MIN_HEIGHT = 20;
+}
diff --git a/src/main/resources/view/ItemGroupListCard.fxml b/src/main/resources/view/ItemGroupListCard.fxml
@@ -7,6 +7,6 @@
 <VBox VBox.vgrow="ALWAYS" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Label fx:id="id" prefHeight="60.0" text="Label" />
-      <StackPane fx:id="itemListPanelPlaceholder" prefHeight="100" VBox.vgrow="ALWAYS" />
+      <StackPane fx:id="itemListPanelPlaceholder"/>
    </children>
 </VBox>
diff --git a/src/main/resources/view/ItemListCard.fxml b/src/main/resources/view/ItemListCard.fxml
@@ -14,7 +14,7 @@
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="150" />
         </columnConstraints>
-        <VBox alignment="CENTER_LEFT" minHeight="105" GridPane.columnIndex="0">
+        <VBox alignment="CENTER_LEFT" minHeight="120" GridPane.columnIndex="0">
             <padding>
                 <Insets top="5" right="5" bottom="5" left="15" />
             </padding>