Skip to content
Snippets Groups Projects
Commit 3544a0a8 authored by Stian Fjæran Mogen's avatar Stian Fjæran Mogen
Browse files

Merge branch 'ExploreAlbums_redesign' into 'dev' 

Updated design for explore albums page

See merge request !135
parents f9485c40 5bdfa139
No related branches found
No related tags found
2 merge requests!165Weekly merge to Master,!135Updated design for explore albums page
Pipeline #79282 passed
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
src/main/resources/NTNU/IDATT1002/explore_albums.fxml
+ 44
− 25
View file @ 3544a0a8
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.ChoiceBox?> <?import javafx.scene.control.ChoiceBox?>
<?import javafx.scene.control.ProgressBar?>
<?import javafx.scene.control.ScrollPane?> <?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.TextField?> <?import javafx.scene.control.TextField?>
<?import javafx.scene.image.Image?> <?import javafx.scene.image.Image?>
...@@ -16,46 +17,64 @@ ...@@ -16,46 +17,64 @@
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?import javafx.scene.text.Text?>
<?import javafx.scene.control.ProgressBar?>
<VBox fx:id="pageRootContainer" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ExploreAlbums"> <VBox fx:id="pageRootContainer" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ExploreAlbums">
<children> <children>
<HBox fx:id="progressBarContainer" alignment="CENTER" minHeight="15.0" prefHeight="15.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #6d6d6d;"> <HBox fx:id="progressBarContainer" alignment="CENTER" minHeight="15.0" prefHeight="15.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #6d6d6d;">
<children> <children>
<ProgressBar fx:id="progressBar" prefHeight="15.0" prefWidth="1920.0" minWidth="1920.0"/> <ProgressBar fx:id="progressBar" minWidth="1920.0" prefHeight="15.0" prefWidth="1920.0" />
</children> </children>
</HBox> </HBox>
<HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;"> <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" styleClass="tbarbg" stylesheets="@style.css">
<children> <children>
<ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true"> <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0">
<image> <children>
<Image url="@../../Images/PlaceholderLogo.png" /> <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="250.0">
</image> <children>
</ImageView> <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
<Pane prefHeight="100.0" prefWidth="343.0" /> <image>
<TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." /> <Image url="@../../Images/PlaceholderLogo.png" />
<Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" /> </image>
<Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" /> <HBox.margin>
<Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" /> <Insets />
<Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" /> </HBox.margin>
<Pane prefHeight="100.0" prefWidth="174.0" /> </ImageView>
<Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" /> </children>
<opaqueInsets>
<Insets />
</opaqueInsets>
</HBox>
<TextField fx:id="tbar_search" focusTraversable="false" minWidth="200.0" prefHeight="35.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc...">
<HBox.margin>
<Insets />
</HBox.margin>
</TextField>
<Button fx:id="tbar_searchBtn" minWidth="70" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" textFill="white" />
<Button fx:id="tbar_explore" minWidth="70" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" textFill="white" />
<Button fx:id="tbar_albums" minWidth="70" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" textFill="white" />
<Button fx:id="tbar_map" minWidth="50" mnemonicParsing="false" onAction="#switchToMap" text="MAP" textFill="white" />
<HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="250.0">
<children>
<Button fx:id="tbar_upload" minWidth="70" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" textFill="white" />
</children>
</HBox>
</children>
</HBox>
</children> </children>
</HBox> </HBox>
<HBox alignment="CENTER" prefHeight="990.0" prefWidth="1920.0" VBox.vgrow="ALWAYS"> <HBox alignment="CENTER" prefHeight="990.0" prefWidth="1920.0" VBox.vgrow="ALWAYS">
<children> <children>
<ScrollPane fx:id="scrollpane" fitToWidth="true" hbarPolicy="NEVER" prefWidth="1920.0" HBox.hgrow="ALWAYS"> <ScrollPane fx:id="scrollpane" fitToWidth="true" hbarPolicy="NEVER" prefWidth="1920.0" styleClass="scroll-bar" stylesheets="@style.css" HBox.hgrow="ALWAYS">
<content> <content>
<BorderPane AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <BorderPane styleClass="bodybg" stylesheets="@style.css" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<left> <left>
<Pane minHeight="300.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" /> <Pane minHeight="300.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
</left> </left>
<right> <right>
<Pane minHeight="300.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" /> <Pane minHeight="300.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
</right> </right>
<bottom> <bottom>
<Pane prefHeight="250.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER"> <Pane prefHeight="250.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0" /> <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0" />
</children> </children>
...@@ -63,9 +82,9 @@ ...@@ -63,9 +82,9 @@
</bottom> </bottom>
<center> <center>
<VBox fx:id="rootAlbumsContainer" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" spacing="10.0" style="-fx-background-color: #555555;" BorderPane.alignment="CENTER"> <VBox fx:id="rootAlbumsContainer" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" spacing="10.0" styleClass="exploreGrid" stylesheets="@style.css" BorderPane.alignment="CENTER">
<children> <children>
<Text fx:id="albumsPlaceholder" textAlignment="CENTER" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Loading albums..."> <Text fx:id="albumsPlaceholder" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Loading albums..." textAlignment="CENTER">
<font> <font>
<Font size="36.0" /> <Font size="36.0" />
</font> </font>
...@@ -74,7 +93,7 @@ ...@@ -74,7 +93,7 @@
</VBox> </VBox>
</center> </center>
<top> <top>
<VBox prefHeight="250.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER"> <VBox prefHeight="250.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox alignment="CENTER" prefHeight="107.0" prefWidth="1905.0"> <HBox alignment="CENTER" prefHeight="107.0" prefWidth="1905.0">
<children> <children>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment