diff --git a/src/main/java/NTNU/IDATT1002/controllers/SearchResults.java b/src/main/java/NTNU/IDATT1002/controllers/SearchResults.java
index 24052b873fd275e40275e299b483a315a4017a3c..63f64c768e91d9ef06d2a749e0ffb5566f52a238 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/SearchResults.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/SearchResults.java
@@ -1,4 +1,6 @@
package NTNU.IDATT1002.controllers;
+
public class SearchResults {
+
}
diff --git a/src/main/resources/Images/AppBG.png b/src/main/resources/Images/AppBG.png
new file mode 100644
index 0000000000000000000000000000000000000000..b785788a4f74f1c22b2904ce0cd8395a6de3f12b
Binary files /dev/null and b/src/main/resources/Images/AppBG.png differ
diff --git a/src/main/resources/NTNU/IDATT1002/search_results.fxml b/src/main/resources/NTNU/IDATT1002/search_results.fxml
index c5ef4dba81a2b913504ff747042414d7a686a93f..41d3b66acca1e24cb239fc131856b024892b556f 100644
--- a/src/main/resources/NTNU/IDATT1002/search_results.fxml
+++ b/src/main/resources/NTNU/IDATT1002/search_results.fxml
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import java.lang.String?>
-<?import javafx.collections.FXCollections?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
@@ -63,10 +59,10 @@
<HBox alignment="CENTER" prefHeight="986.0" prefWidth="1920.0" style="-fx-background-color: #555555;" VBox.vgrow="ALWAYS">
<children>
<ScrollPane fx:id="scrollpane" fitToWidth="true" hbarPolicy="NEVER" maxWidth="1.7976931348623157E308" minHeight="960.0" prefWidth="1920.0" style="-fx-background-color: #555555; -fx-fit-to-width: true;" HBox.hgrow="ALWAYS">
- <content>
- <BorderPane prefHeight="200.0" prefWidth="200.0" styleClass="bodybg" stylesheets="@style.css">
- <top>
- <HBox alignment="CENTER" maxWidth="Infinity" prefHeight="201.0" prefWidth="1920.0" spacing="10.0" stylesheets="@style.css" BorderPane.alignment="CENTER">
+ <content>
+ <VBox alignment="CENTER" styleClass="bodybg" stylesheets="@style.css">
+ <children>
+ <HBox alignment="CENTER" maxWidth="Infinity" prefHeight="200.0" prefWidth="1920.0" spacing="10.0" stylesheets="@style.css">
<children>
<Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
<font>
@@ -83,42 +79,23 @@
<Font size="36.0" />
</font>
</Text>
- <Text fx:id="search_result" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text=""result"">
+ <Text fx:id="imageSearchString" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text=""result"">
<font>
<Font name="System Italic" size="36.0" />
</font>
</Text>
- <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text=", sorted by:" wrappingWidth="184.341796875">
- <font>
- <Font size="36.0" />
- </font>
- </Text>
- <ChoiceBox fx:id="sorted_by_choicebox" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
- <items>
- <FXCollections fx:factory="observableArrayList">
- <String fx:value="Most Popular" />
- <String fx:value="Newest First" />
- <String fx:value="Oldest First" />
- </FXCollections>
- </items>
- </ChoiceBox>
</children>
+ <opaqueInsets>
+ <Insets />
+ </opaqueInsets>
</HBox>
- </top>
- <center>
- <VBox fx:id="vBox" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" prefWidth="1920.0" spacing="10.0" styleClass="transparentbg" stylesheets="@style.css" BorderPane.alignment="CENTER" />
- </center>
- <left>
- <VBox prefHeight="200.0" prefWidth="100.0" BorderPane.alignment="CENTER" />
- </left>
- <right>
- <VBox prefHeight="200.0" prefWidth="100.0" stylesheets="@style.css" BorderPane.alignment="CENTER" />
- </right>
- <bottom>
- <VBox prefHeight="200.0" prefWidth="100.0" BorderPane.alignment="CENTER" />
- </bottom>
- </BorderPane>
- </content>
+ <VBox fx:id="vBox" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" prefWidth="1920.0" spacing="10.0" styleClass="transparentbg" stylesheets="@style.css" />
+ </children>
+ <padding>
+ <Insets left="80.0" right="80.0" />
+ </padding>
+ </VBox>
+ </content>
</ScrollPane>
</children>
</HBox>
@@ -130,9 +107,9 @@
<children>
<ScrollPane fx:id="scrollpane" fitToWidth="true" hbarPolicy="NEVER" prefWidth="1920.0" styleClass="scroll-bar" stylesheets="@style.css" HBox.hgrow="ALWAYS">
<content>
- <VBox prefHeight="1500.0" styleClass="bodybg" stylesheets="@style.css">
+ <VBox alignment="CENTER" styleClass="bodybg" stylesheets="@style.css">
<children>
- <HBox alignment="CENTER" prefHeight="80.0" prefWidth="1905.0" spacing="10.0">
+ <HBox alignment="CENTER" prefHeight="200.0" prefWidth="1905.0" spacing="10.0">
<children>
<Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
<font>
@@ -144,23 +121,19 @@
<Font name="System Bold Italic" size="36.0" />
</font>
</Text>
- <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="albums, sorted by:">
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="albums for your search">
<font>
<Font size="36.0" />
</font>
</Text>
- <ChoiceBox fx:id="sortedByChoicebox" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
- <items>
- <FXCollections fx:factory="observableArrayList">
- <String fx:value="Most Popular" />
- <String fx:value="Newest First" />
- <String fx:value="Oldest First" />
- </FXCollections>
- </items>
- </ChoiceBox>
+ <Text fx:id="albumSearchString" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text=""result"">
+ <font>
+ <Font name="System Italic" size="36.0" />
+ </font>
+ </Text>
</children>
</HBox>
- <VBox fx:id="rootAlbumsContainer" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" spacing="10.0" styleClass="exploreGrid" stylesheets="@style.css" VBox.vgrow="ALWAYS">
+ <VBox fx:id="rootAlbumsContainer" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" spacing="10.0" styleClass="transparentbg" stylesheets="@style.css" VBox.vgrow="ALWAYS">
<children>
<Text fx:id="albumsPlaceholder" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Loading albums..." textAlignment="CENTER">
<font>
@@ -174,7 +147,7 @@
<Insets />
</opaqueInsets>
<padding>
- <Insets left="80.0" right="80.0" top="20.0" />
+ <Insets left="80.0" right="80.0" />
</padding>
</VBox>
</content>
diff --git a/src/main/resources/NTNU/IDATT1002/style.css b/src/main/resources/NTNU/IDATT1002/style.css
index 640c83f6d5e9c3b3429981371e8d2eaa0cca5372..ccabfdfadd6827e4b6b8d8d8de3c9d59101a479c 100644
--- a/src/main/resources/NTNU/IDATT1002/style.css
+++ b/src/main/resources/NTNU/IDATT1002/style.css
@@ -1,7 +1,7 @@
/*GENERAL STYLING*/
.bodybg{
- -fx-background-image: url("../../Images/vector1.jpg");
+ -fx-background-image: url("../../Images/AppBG.png");
-fx-background-size: cover;
}