Skip to content
Snippets Groups Projects
Commit b9ce0af8 authored by Simon Jensen's avatar Simon Jensen
Browse files

Merge branch 'link_open_albums' into 'dev' 

Added option to view albums

See merge request !56
parents a8867a96 61ea5a3f
No related branches found
No related tags found
2 merge requests!104Weekly merge to Master,!56Added option to view albums
Pipeline #76451 passed
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
+ 15
− 0
View file @ b9ce0af8
......@@ -56,6 +56,11 @@ public class ExploreAlbums {
public Text album_desc5;
public Text album_tags5;
public Button tbar_albums;
public Button open_album4;
public Button open_album3;
public Button open_album2;
public Button open_album1;
public Button open_album;
/**
* Method that changes stage to Main page
......@@ -141,4 +146,14 @@ public class ExploreAlbums {
public void switchToNext(ActionEvent actionEvent) throws IOException {
//TODO: Make method that updates content
}
/**
* Method to open specific albums using the "Open Album" button
* @param actionEvent
* @throws IOException
*/
public void switchToViewAlbum(ActionEvent actionEvent) throws IOException {
//TODO: write method to open the specific album chosen
App.setRoot("view_album");
}
}
src/main/resources/NTNU/IDATT1002/explore_albums.fxml
+ 26
− 1
View file @ b9ce0af8
......@@ -18,7 +18,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<AnchorPane maxHeight="2148.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.ExploreAlbums">
<AnchorPane maxHeight="2148.0" maxWidth="1920.0" 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>
<HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<children>
......@@ -142,6 +142,11 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
<Button fx:id="open_album" layoutX="551.0" layoutY="250.0" mnemonicParsing="false" onAction="#switchToViewAlbum" text="Open Album">
<font>
<Font size="18.0" />
</font>
</Button>
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
......@@ -191,6 +196,11 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
<Button fx:id="open_album1" layoutX="551.0" layoutY="250.0" mnemonicParsing="false" onAction="#switchToViewAlbum" text="Open Album">
<font>
<Font size="18.0" />
</font>
</Button>
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2">
......@@ -240,6 +250,11 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
<Button fx:id="open_album2" layoutX="551.0" layoutY="250.0" mnemonicParsing="false" onAction="#switchToViewAlbum" text="Open Album">
<font>
<Font size="18.0" />
</font>
</Button>
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="3">
......@@ -289,6 +304,11 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
<Button fx:id="open_album3" layoutX="551.0" layoutY="250.0" mnemonicParsing="false" onAction="#switchToViewAlbum" text="Open Album">
<font>
<Font size="18.0" />
</font>
</Button>
</children>
</Pane>
<Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="4">
......@@ -338,6 +358,11 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
<Button fx:id="open_album4" layoutX="551.0" layoutY="250.0" mnemonicParsing="false" onAction="#switchToViewAlbum" text="Open Album">
<font>
<Font size="18.0" />
</font>
</Button>
</children>
</Pane>
</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