Merge pull request #206 from conradsoon/v1.4-notes-fix

Fixes for `notes`
AY2324S1-CS2103T-T13-2 · Nov 8, 2023 · abcfadc · abcfadc
2 parents ada8718 + 22cf1e8
commit abcfadc
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/src/main/java/seedu/address/ui/NotesWindow.java b/src/main/java/seedu/address/ui/NotesWindow.java
@@ -1,11 +1,12 @@
 package seedu.address.ui;
 
-import java.util.List;
 import java.util.logging.Logger;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
@@ -23,7 +24,7 @@ public class NotesWindow extends UiPart<Stage> {
     private static final String FXML = "NotesWindow.fxml";
 
     @FXML
-    private ListView<String> notesListView;
+    private ListView<Note> notesListView;
 
     private final Person person;
 
@@ -67,16 +68,29 @@ public void hide() {
         getRoot().hide();
     }
 
-    public void focus() {
-        getRoot().requestFocus();
-    }
-
-    private void populateListView(List<Note> notes) {
-        ObservableList<String> notesObservableList = FXCollections.observableArrayList();
-        for (Note note : notes) {
-            notesObservableList.add(note.toString());
-        }
+    private void populateListView(ObservableList<Note> notes) {
+        ObservableList<Note> notesObservableList = FXCollections.observableArrayList(notes);
         notesListView.setItems(notesObservableList);
+        notesListView.setCellFactory(listView -> new ListCell<Note>() {
+            @Override
+            protected void updateItem(Note note, boolean empty) {
+                super.updateItem(note, empty);
+                if (empty || note == null) {
+                    setText(null);
+                    setGraphic(null);
+                } else {
+                    Label label = new Label((getIndex() + 1) + ". " + note.toString());
+                    label.setWrapText(true);
+                    label.prefWidthProperty().bind(listView.widthProperty().subtract(40));
+                    setGraphic(label);
+                }
+            }
+        });
+
+        // make sure the width is always correct even after resizing the window
+        notesListView.widthProperty().addListener((observable) -> {
+            notesListView.refresh();
+        });
     }
 
     @FXML
@@ -85,7 +99,7 @@ void handleClose() {
         stage.close();
     }
 
-    public ListView<String> getNotesListView() {
+    public ListView<Note> getNotesListView() {
         return notesListView;
     }
 }
diff --git a/src/main/resources/view/NotesWindow.fxml b/src/main/resources/view/NotesWindow.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.Scene?>
-<fx:root resizable="false" title="Notes"
+<fx:root title="Notes"
          type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
     <scene>
         <Scene>
@@ -15,9 +15,7 @@
                     <Insets top="10" right="10" bottom="10" left="10" />
                 </padding>
                 <Label text="Notes" style="-fx-font-weight: bold; -fx-font-size: 18px;" />
-                <ScrollPane fitToWidth="true" prefHeight="300" VBox.vgrow="ALWAYS">
-                    <ListView fx:id="notesListView" />
-                </ScrollPane>
+                <ListView fx:id="notesListView" VBox.vgrow="ALWAYS"/>
                 <Label text="Press ESC to exit" style="-fx-font-size: 12px;" />
                 <Button text="Close" onAction="#handleClose" />
             </VBox>

diff --git a/src/test/java/seedu/address/ui/NotesWindowTest.java b/src/test/java/seedu/address/ui/NotesWindowTest.java
@@ -14,8 +14,10 @@
 import org.testfx.framework.junit5.ApplicationTest;
 
 import javafx.application.Platform;
+import javafx.collections.ObservableList;
 import javafx.scene.input.KeyCode;
 import javafx.stage.Stage;
+import seedu.address.model.person.Note;
 import seedu.address.model.person.Person;
 
 public class NotesWindowTest extends ApplicationTest {
@@ -43,9 +45,14 @@ public void setUp() {
     @Test
     public void displayNotes_correctNumberOfItemsAndContent_displaysExpectedNotes() {
         interact(() -> {
-            List<String> expectedNotes = Arrays.asList("Likes to swim", "Likes to run", "Is a chad");
+            List<Note> expectedNotes = Arrays.asList(
+                new Note("Likes to swim"),
+                new Note("Likes to run"),
+                new Note("Is a chad")
+            );
             verifyThat("#notesListView", hasItems(3));
-            assertTrue(notesWindow.getNotesListView().getItems().containsAll(expectedNotes));
+            ObservableList<Note> actualNotes = notesWindow.getNotesListView().getItems();
+            assertTrue(actualNotes.containsAll(expectedNotes));
         });
     }