Fix formatting in GUI

yisiox · Feb 18, 2024 · 64f4b9f · 64f4b9f
1 parent 6adb358
commit 64f4b9f
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 18 deletions.
diff --git a/src/main/java/earl/gui/MainWindow.java b/src/main/java/earl/gui/MainWindow.java
@@ -76,7 +76,7 @@ public void handleExit() {
      */
     private void displayDialog(String input, String response) {
         dialogContainer.getChildren().addAll(
-                DialogBox.getUserDialog(input + " ".repeat(4), userImage),
+                DialogBox.getUserDialog(input, userImage),
                 DialogBox.getEarlDialog(response, earlImage));
         userInput.clear();
     }

diff --git a/src/main/java/earl/logic/DeleteHandler.java b/src/main/java/earl/logic/DeleteHandler.java
@@ -32,9 +32,9 @@ public void handle(TaskList tasks, Ui ui) throws EarlException {
 
             ui.makeResponse(getDisplayEntriesReversed());
         } catch (ParserException e) {
-            throw new EarlException(
-                    "The indices' format is fraught with invalidity."
-                            + " Example format: 1 4-7 9-10");
+            throw new EarlException(ui.appendNewline(
+                    "The indices' format is fraught with invalidity.")
+                    + ui.leftPad("Example format: 1 4-7 9-10"));
         } catch (Exception e) {
             throw new EarlException("Command hath faltered: "
                     + "obscure employment of delete.");

diff --git a/src/main/java/earl/logic/MarkHandler.java b/src/main/java/earl/logic/MarkHandler.java
@@ -39,9 +39,9 @@ public void handle(TaskList tasks, Ui ui) throws EarlException {
 
             ui.makeResponse(getDisplayEntriesReversed());
         } catch (ParserException e) {
-            throw new EarlException(
-                    "The indices' format is fraught with invalidity."
-                            + " Example format: 1 4-7 9-10");
+            throw new EarlException(ui.appendNewline(
+                    "The indices' format is fraught with invalidity.")
+                    + ui.leftPad("Example format: 1 4-7 9-10"));
         } catch (Exception e) {
             throw new EarlException("Command hath faltered: "
                     + "obscure employment of mark.");

diff --git a/src/main/java/earl/logic/UnmarkHandler.java b/src/main/java/earl/logic/UnmarkHandler.java
@@ -37,12 +37,12 @@ public void handle(TaskList tasks, Ui ui) throws EarlException {
 
             ui.makeResponse(getDisplayEntriesReversed());
         } catch (ParserException e) {
-            throw new EarlException(
-                    "The indices' format is fraught with invalidity."
-                            + " Example format: 1 4-7 9-10");
+            throw new EarlException(ui.appendNewline(
+                    "The indices' format is fraught with invalidity.")
+                    + ui.leftPad("Example format: 1 4-7 9-10"));
         } catch (Exception e) {
             throw new EarlException("Command hath faltered: "
-                            + "obscure employment of unmark.");
+                    + "obscure employment of unmark.");
         }
     }
 }
diff --git a/src/main/java/earl/util/Ui.java b/src/main/java/earl/util/Ui.java
@@ -91,9 +91,9 @@ public String getResponse() {
         assert n > 0;
         StringBuilder res = new StringBuilder();
         for (int i = 0; i < n - 1; ++i) {
-            res.append(PADDING).append(response[i]).append(NEWLINE);
+            res.append(response[i]).append(NEWLINE);
         }
-        res.append(PADDING).append(response[n - 1]); // last line has no newline
+        res.append(response[n - 1]); // last line has no newline
         return res.toString();
     }
 }
diff --git a/src/main/resources/stylesheets/style.css b/src/main/resources/stylesheets/style.css
@@ -9,6 +9,7 @@
 .label {
     -fx-font-family: 'Fira Code Bold';
     -fx-font-size: 12;
+    -fx-padding: 0px 16px 0px 16px;
 }
 
 .user-dialog-box {
@@ -26,4 +27,5 @@
 .earl-dialog-box .label {
     -fx-font-family: 'Victor Mono Bold Oblique';
     -fx-font-size: 12;
+    -fx-padding: 0px 10px 0px 10px;
 }
diff --git a/src/test/java/earl/logic/DeleteHandlerTest.java b/src/test/java/earl/logic/DeleteHandlerTest.java
@@ -16,9 +16,10 @@
 class DeleteHandlerTest {
 
     private static final PrintStream originalOut = System.out;
-
     private static final ByteArrayOutputStream testingOut =
             new ByteArrayOutputStream();
+    private static final String NEWLINE = System.lineSeparator();
+    private static final String PADDING = " ".repeat(4);
 
     @BeforeEach
     void setUp() {
@@ -42,7 +43,8 @@ void handle_nonIntegerInput_exceptionThrown() {
             fail();
         } catch (Exception e) {
             assertEquals("The indices' format is fraught with invalidity."
-                    + " Example format: 1 4-7 9-10", e.getMessage());
+                    + NEWLINE
+                    + PADDING + "Example format: 1 4-7 9-10", e.getMessage());
         }
     }
 

diff --git a/src/test/java/earl/logic/MarkHandlerTest.java b/src/test/java/earl/logic/MarkHandlerTest.java
@@ -18,6 +18,8 @@ class MarkHandlerTest {
     private static final PrintStream originalOut = System.out;
     private static final ByteArrayOutputStream testingOut =
             new ByteArrayOutputStream();
+    private static final String NEWLINE = System.lineSeparator();
+    private static final String PADDING = " ".repeat(4);
 
     @BeforeEach
     void setUp() {
@@ -42,7 +44,8 @@ void handle_nonIntegerInput_exceptionThrown() {
             fail();
         } catch (Exception e) {
             assertEquals("The indices' format is fraught with invalidity."
-                    + " Example format: 1 4-7 9-10", e.getMessage());
+                    + NEWLINE
+                    + PADDING + "Example format: 1 4-7 9-10", e.getMessage());
         }
     }
 

diff --git a/src/test/java/earl/util/UiTest.java b/src/test/java/earl/util/UiTest.java
@@ -29,8 +29,7 @@ void setUp() {
     void getResponse_singleLine_success() {
         Ui ui = new Ui();
         ui.makeResponse("A");
-        String expected = PADDING + "A";
-        assertEquals(expected, ui.getResponse());
+        assertEquals("A", ui.getResponse());
     }
 
     @Test