Merge pull request #244 from NightRaven49/add-ui-background

Add new background to ResultDisplay
AY2021S2-CS2103T-T12-4 · Mar 16, 2021 · 94081c6 · 94081c6
2 parents cba5fcd + 24e1cb1
commit 94081c6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/seedu/us/among/ui/ResultDisplay.java b/src/main/java/seedu/us/among/ui/ResultDisplay.java
@@ -30,9 +30,12 @@ public class ResultDisplay extends UiPart<Region> {
     private ImageView loadingSpinnerPlaceholder;
     @FXML
     private ImageView errorPlaceholder;
+    @FXML
+    private ImageView backgroundPlaceholder;
 
     private Timeline errorGifTimeline;
 
+    private final Image background = new Image(this.getClass().getResourceAsStream("/images/background.png"));
     private final Image loadingSpinner = new Image(this.getClass().getResourceAsStream("/images/loading_spinner.gif"));
     private final Image error = new Image(this.getClass().getResourceAsStream("/images/error.gif"));
 
@@ -43,6 +46,7 @@ public ResultDisplay() {
         super(FXML);
         this.loadingSpinnerPlaceholder.setImage(loadingSpinner);
         this.errorPlaceholder.setImage(error);
+        this.backgroundPlaceholder.setImage(background);
         // Set timeline for error message
         this.errorGifTimeline = new Timeline(
             new KeyFrame(Duration.ZERO, x -> this.getErrorPlaceholder().setVisible(true)),

diff --git a/src/main/resources/images/background.png b/src/main/resources/images/background.png
diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
@@ -146,6 +146,10 @@
     -fx-background-color: derive(#1d1d1d, 30%);
 }
 
+.result-background {
+    -fx-opacity: 0.3;
+}
+
 .result-display {
     -fx-background-color: transparent;
     -fx-font-family: "Segoe UI Light";

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.HBox?>
 
 <fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
-         title="imPoster" minWidth="450" minHeight="600" onCloseRequest="#handleExit">
+         title="imPoster" minWidth="825" minHeight="625" onCloseRequest="#handleExit">
   <icons>
     <Image url="@/images/imPoster.png" />
   </icons>

diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml
@@ -13,6 +13,8 @@
   <TextArea fx:id="resultDisplay" editable="false" prefHeight="3840" prefWidth="2160" styleClass="result-display" wrapText="true"/>
   </VBox>
   <children>
+    <ImageView fx:id="backgroundPlaceholder" fitHeight="450" fitWidth="450" pickOnBounds="true" preserveRatio="true" styleClass="result-background">
+    </ImageView>
     <ImageView fx:id="loadingSpinnerPlaceholder" visible="false" fitWidth="320" fitHeight="320" preserveRatio="true" pickOnBounds="true">
     </ImageView>
     <ImageView fx:id="errorPlaceholder" visible="false" fitWidth="320" fitHeight="320" preserveRatio="true" pickOnBounds="true">