Changed main page to have a similar UI design as the edit main page.

ThomasShimUoft · ThomasShimUoft · commit 56ae262d7435 · 2022-12-04T15:38:42.000-05:00
diff --git a/src/main/java/frameworks_and_drivers/components/FlashcardSetDataPanel.java b/src/main/java/frameworks_and_drivers/components/FlashcardSetDataPanel.java
@@ -19,6 +19,7 @@
 
 import javax.swing.*;
 import javax.swing.border.Border;
+import java.awt.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
@@ -48,12 +49,15 @@ public class FlashcardSetDataPanel extends JPanel implements WindowListener {
     public FlashcardSetDataPanel(String title, String description,
                                  int flashcardSetId, DBGateway gateway,
                                  UserLoginResponseModel user, HomeScreen home) {
+        this.home = home;
+
         // Panel Construction
-        Border border = BorderFactory.createTitledBorder(title);
+        Border border = BorderFactory.createTitledBorder("<html>"+title+"<html>");
 
-        JLabel descriptionLabel = new JLabel(description);
-        this.add(descriptionLabel);
-        this.home = home;
+        JLabel descriptionLabel = new JLabel("<html>"+description+"<html>");
+        JPanel descriptionPanel = new JPanel();
+        descriptionLabel.setPreferredSize(new Dimension(300,200));
+        descriptionPanel.add(descriptionLabel);
 
         // Button Construction
         JPanel buttons = new JPanel();
@@ -100,7 +104,7 @@ public void windowClosing(WindowEvent event) {
             DeleteFlashcardSetScreen deleter = new DeleteFlashcardSetScreen(flashcardSetId, controller, user, gateway);
             deleter.addWindowListener(this);
         });
-
+        this.add(descriptionPanel);
         this.add(buttons);
         this.setBorder(border);
         this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
diff --git a/src/main/java/frameworks_and_drivers/components/ListOfFlashcardSetsDataPanel.java b/src/main/java/frameworks_and_drivers/components/ListOfFlashcardSetsDataPanel.java
@@ -28,17 +28,28 @@ public class ListOfFlashcardSetsDataPanel extends JPanel {
     public ListOfFlashcardSetsDataPanel(Map<Integer, String[]> idsToFlashcardSetData,
                                         DBGateway gateway, UserLoginResponseModel user, HomeScreen home) {
         Set<Integer> flashcardSetIds = idsToFlashcardSetData.keySet();
-
+        JPanel flashcardSets = new JPanel();
         for (int flashcardSetId : flashcardSetIds) {
            String[] data = idsToFlashcardSetData.get(flashcardSetId);
            String title = data[0];
            String description = data[1];
 
-           this.add(new FlashcardSetDataPanel(title, description, flashcardSetId, gateway, user, home));
+           flashcardSets.add(new FlashcardSetDataPanel(title, description, flashcardSetId, gateway, user, home));
+        }
+        int size = flashcardSetIds.size();
+        int rows;
+        if (size % 2 == 0){
+            rows = size/2;
+        }
+        else{
+            rows = size/2 + 1;
         }
+        flashcardSets.setLayout(new GridLayout(rows, 2));
+        Dimension flashcardSetPanelSize = flashcardSets.getPreferredSize();
+        flashcardSets.setPreferredSize(new Dimension(flashcardSetPanelSize.width, flashcardSetPanelSize.height + 200));
 
+        this.add(flashcardSets);
         this.setLayout (new FlowLayout());
         this.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
-        this.setPreferredSize(new Dimension(500, 1000));
     }
 }
diff --git a/src/main/java/frameworks_and_drivers/components/ListOfFlashcardsDataPanel.java b/src/main/java/frameworks_and_drivers/components/ListOfFlashcardsDataPanel.java
@@ -77,12 +77,12 @@ public ListOfFlashcardsDataPanel(DBGateway dbGateway, List<FlashcardDsRequestMod
         int size = flashcardData.size();
         int rows;
         if (size % 3 == 0){
-            rows = flashcardData.size()/3;
+            rows = size/3;
         }
         else{
-            rows = flashcardData.size()/3 + 1;
+            rows = size/3 + 1;
         }
-        flashcardPanels.setLayout(new GridLayout( rows, 3));
+        flashcardPanels.setLayout(new GridLayout(rows, 3));
 
         //This panel customization
         this.add(flashcardPanels);
diff --git a/src/main/java/frameworks_and_drivers/screens/HomeScreen.java b/src/main/java/frameworks_and_drivers/screens/HomeScreen.java
@@ -113,7 +113,8 @@ public HomeScreen(UserLoginResponseModel user, DBGateway gateway) throws IOExcep
             this.add(labelPanel);
         }
         else {
-            this.add(new ListOfFlashcardSetsDataPanel(idsToFlashcardSetData, gateway, user, this));
+            ListOfFlashcardSetsDataPanel listOfFCSet = new ListOfFlashcardSetsDataPanel(idsToFlashcardSetData, gateway, user, this);
+            this.add(new JScrollPane(listOfFCSet));
         }
         this.setSize(1000, 800);
         this.setVisible(true);

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@ public HomeScreen(UserLoginResponseModel user, DBGateway gateway) throws IOExcep`
`113`	`113`	`this.add(labelPanel);`
`114`	`114`	`}`
`115`	`115`	`else {`
`116`		`- this.add(new ListOfFlashcardSetsDataPanel(idsToFlashcardSetData, gateway, user, this));`
	`116`	`+ ListOfFlashcardSetsDataPanel listOfFCSet = new ListOfFlashcardSetsDataPanel(idsToFlashcardSetData, gateway, user, this);`
	`117`	`+ this.add(new JScrollPane(listOfFCSet));`
`117`	`118`	`}`
`118`	`119`	`this.setSize(1000, 800);`
`119`	`120`	`this.setVisible(true);`