diff --git a/src/main/java/kellerkinder/HomeFlix/application/FilmDetailView.java b/src/main/java/kellerkinder/HomeFlix/application/FilmDetailView.java index c5da73e..9db14e6 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/FilmDetailView.java +++ b/src/main/java/kellerkinder/HomeFlix/application/FilmDetailView.java @@ -1,18 +1,44 @@ package kellerkinder.HomeFlix.application; +import com.jfoenix.controls.JFXButton; + import javafx.fxml.FXML; import javafx.scene.control.Label; +import javafx.scene.image.Image; +import javafx.scene.image.ImageView; +import javafx.scene.layout.AnchorPane; +import javafx.scene.text.Text; public class FilmDetailView { - @FXML private Label lblFilm; + @FXML private AnchorPane filmDVPane; + @FXML private Label lblTitle; + @FXML private Label lblYear; + @FXML private Label lblScore; + + @FXML private JFXButton btnWhishlist; + @FXML private JFXButton btnFavourite; + + @FXML private Text textPlot; public void initialize() { System.out.println("init nested controller"); + filmDVPane.setStyle("-fx-background-color: rgba(89,89,89,0.9);"); + btnWhishlist.setGraphic(new ImageView(new Image("icons/ic_play_arrow_black_18dp_1x.png"))); } public void foo() { System.out.println("test"); } + + @FXML + private void btnWhishlistAction() { + + } + + @FXML + private void btnFavouriteAction() { + + } } diff --git a/src/main/java/kellerkinder/HomeFlix/application/Main.java b/src/main/java/kellerkinder/HomeFlix/application/Main.java index 26e78b5..2d580c6 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/Main.java +++ b/src/main/java/kellerkinder/HomeFlix/application/Main.java @@ -34,7 +34,6 @@ import javafx.application.Application; import javafx.event.ActionEvent; import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; -import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.image.Image; import javafx.scene.layout.AnchorPane; diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index 9481d9c..e8febb7 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -72,6 +72,7 @@ import javafx.scene.control.TreeItem; import javafx.scene.control.TreeTableColumn; import javafx.scene.control.TreeTableColumn.SortType; import javafx.scene.control.TreeTableView; +import javafx.scene.effect.BoxBlur; import javafx.scene.control.ScrollPane.ScrollBarPolicy; import javafx.scene.image.Image; import javafx.scene.image.ImageView; @@ -225,7 +226,7 @@ public class MainWindowController { // load sources list in gui addSourceToTable(); -// posterModeStartup(); // TODO testing DO NOT USE THIS!! + posterModeStartup(); // TODO testing DO NOT USE THIS!! } // Initialize general UI elements @@ -252,6 +253,12 @@ public class MainWindowController { setLocalUI(); applyColor(); + + BoxBlur boxBlur = new BoxBlur(); + boxBlur.setWidth(9); + boxBlur.setHeight(7); + boxBlur.setIterations(3); + posterModeFlowPane.setEffect(boxBlur); } /** @@ -501,7 +508,7 @@ public class MainWindowController { @FXML private void returnBtnclicked() { filmsTreeTable.getSelectionModel().select(last); - filmDetailViewController.foo(); + filmDetailViewController.foo(); // TODO } @FXML @@ -843,15 +850,15 @@ public class MainWindowController { getTextFlow().setStyle("-fx-font-size : " + ((int) Math.round(XMLController.getFontSize()) + 1) + "px;"); // add the image - if (new File(cacheData[20]).isFile()) { - try { + try { + if (new File(cacheData[20]).isFile()) { posterImageView.setImage(new Image(new File(cacheData[20]).toURI().toString())); - } catch (Exception e) { - posterImageView.setImage(new Image("icons/Homeflix_Poster.png")); - LOGGER.error("No Poster found, useing default."); + } else { + posterImageView.setImage(new Image(cacheData[20])); } - } else { - posterImageView.setImage(new Image(cacheData[20])); + } catch (Exception e) { + posterImageView.setImage(new Image("icons/Homeflix_Poster.png")); + LOGGER.error("No Poster found, useing default."); } } diff --git a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java index e00d869..3ecd905 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java @@ -219,13 +219,9 @@ public class DBController { while (rs.next()) { String[] cacheData = readCache(rs.getString("streamUrl")); // get from the cache table - System.out.println(rs.getString("streamUrl")); - System.out.println(":" + cacheData[20] + ":"); - if(cacheData[20] != null && cacheData[20].length() > 0) { posterElementsList.add(new PosterModeElement(rs.getString("streamUrl"), cacheData[0], new Image(new File(cacheData[20]).toURI().toString()))); } else { - System.out.println("adding default"); posterElementsList.add(new PosterModeElement(rs.getString("streamUrl"), cacheData[0], new Image("icons/Homeflix_Poster.png"))); } } diff --git a/src/main/resources/fxml/FilmDetailView.fxml b/src/main/resources/fxml/FilmDetailView.fxml index 94bc190..3faf40e 100644 --- a/src/main/resources/fxml/FilmDetailView.fxml +++ b/src/main/resources/fxml/FilmDetailView.fxml @@ -1,10 +1,61 @@ + + + + + + + + - + - diff --git a/src/main/resources/fxml/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml index 865bb27..308ca49 100644 --- a/src/main/resources/fxml/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -74,9 +74,7 @@ - - - + diff --git a/src/main/resources/icons/spider-man.jpg b/src/main/resources/icons/spider-man.jpg new file mode 100644 index 0000000..8f11ab6 Binary files /dev/null and b/src/main/resources/icons/spider-man.jpg differ