Updated changes

chenyixin0 · Feb 26, 2024 · e6718f0 · e6718f0
1 parent d87e04e
commit e6718f0
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 9 deletions.
diff --git a/Ui.png b/Ui.png
diff --git a/src/main/java/duke/main/DialogBox.java b/src/main/java/duke/main/DialogBox.java
@@ -30,6 +30,7 @@ public class DialogBox extends HBox {
     @FXML
     private ImageView displayPicture;
 
+    //public DialogBox() {}
     private DialogBox(String text, Image img) {
         try {
             FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml"));
@@ -43,7 +44,6 @@ private DialogBox(String text, Image img) {
         this.setBackground(new Background(new BackgroundFill(Color.rgb(255, 252, 234), new CornerRadii(10), new Insets(5))));
         dialog.setText(text);
         displayPicture.setImage(img);
-
     }
 
     /**
@@ -65,4 +65,4 @@ public static DialogBox getDukeDialog(String text, Image img) {
         db.flip();
         return db;
     }
-}
+}
diff --git a/src/main/java/duke/main/MainConnector.java b/src/main/java/duke/main/MainConnector.java
@@ -6,9 +6,6 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Background;
-import javafx.scene.layout.BackgroundFill;
-import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 
 /**
@@ -21,7 +18,7 @@ public class MainConnector extends Application {
     @Override
     public void start(Stage stage) {
         try {
-            FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml"));
+            FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/MainWindow.fxml"));
             AnchorPane ap = fxmlLoader.load();
             Scene scene = new Scene(ap);
             stage.setScene(scene);

diff --git a/src/main/production/ip/duke/exception/EmptyTaskException.class b/src/main/production/ip/duke/exception/EmptyTaskException.class
diff --git a/src/main/production/ip/duke/exception/FileNotFoundException.class b/src/main/production/ip/duke/exception/FileNotFoundException.class
diff --git a/src/main/production/ip/duke/exception/UnknownInputException.class b/src/main/production/ip/duke/exception/UnknownInputException.class
diff --git a/src/main/production/ip/duke/main/Parser$1.class b/src/main/production/ip/duke/main/Parser$1.class
diff --git a/src/main/production/ip/duke/main/Parser.class b/src/main/production/ip/duke/main/Parser.class
diff --git a/src/main/production/ip/duke/main/Storage.class b/src/main/production/ip/duke/main/Storage.class
diff --git a/src/main/production/ip/duke/main/TalkingBox.class b/src/main/production/ip/duke/main/TalkingBox.class
diff --git a/src/main/production/ip/duke/main/TaskList.class b/src/main/production/ip/duke/main/TaskList.class
diff --git a/src/main/production/ip/duke/main/UI.class b/src/main/production/ip/duke/main/UI.class
diff --git a/src/main/production/ip/duke/main/save.txt b/src/main/production/ip/duke/main/save.txt
diff --git a/src/main/production/ip/duke/task/Deadline.class b/src/main/production/ip/duke/task/Deadline.class
diff --git a/src/main/production/ip/duke/task/Event.class b/src/main/production/ip/duke/task/Event.class
diff --git a/src/main/production/ip/duke/task/Task.class b/src/main/production/ip/duke/task/Task.class
diff --git a/src/main/production/ip/duke/task/TaskType.class b/src/main/production/ip/duke/task/TaskType.class
diff --git a/src/main/production/ip/duke/task/ToDo.class b/src/main/production/ip/duke/task/ToDo.class
diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml
@@ -5,12 +5,12 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.HBox?>
 
-<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.main.DialogBox">
+<fx:root alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWidth="400.0" type="javafx.scene.layout.HBox" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" >
     <children>
         <Label fx:id="dialog" wrapText="true" />
         <ImageView fx:id="displayPicture" fitHeight="99.0" fitWidth="99.0" pickOnBounds="true" preserveRatio="true" />
     </children>
     <padding>
         <Insets bottom="15.0" left="5.0" right="5.0" top="15.0" />
     </padding>
-</fx:root>
+</fx:root>
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -8,7 +8,7 @@
 
 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.main.MainWindow">
     <children>
-        <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0" AnchorPane.bottomAnchor="1.0" AnchorPane.rightAnchor="76.0" />
+        <TextField fx:id="userInput" layoutY="558.0" onAction="#handleUserInput" prefHeight="41.0" prefWidth="324.0" AnchorPane.bottomAnchor="1.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="76.0" />
         <Button fx:id="sendButton" layoutX="324.0" layoutY="558.0" mnemonicParsing="false" onAction="#handleUserInput" prefHeight="41.0" prefWidth="76.0" text="Send" AnchorPane.bottomAnchor="0.6666666666666643" AnchorPane.rightAnchor="1.0" />
         <ScrollPane fx:id="scrollPane" fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" hvalue="1.0" prefHeight="557.0" prefWidth="400.0" vvalue="1.0" AnchorPane.bottomAnchor="42.66666666666663" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="1.0">
             <content>