From 1e0ab2b94391cea3005748c7e3c473a11e2297c9 Mon Sep 17 00:00:00 2001 From: Jannik Date: Wed, 9 May 2018 22:55:32 +0200 Subject: [PATCH] code cleanup --- .../application/MainWindowController.java | 31 +++++++------------ .../HomeFlix/controller/DBController.java | 2 +- .../controller/OMDbAPIController.java | 1 - 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index 5e6b035..583aabe 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -215,7 +215,7 @@ public class MainWindowController { private boolean autoplay = false; private final String version = "0.7.0"; - private final String buildNumber = "155"; + private final String buildNumber = "157"; private final String versionName = "toothless dragon"; private String btnStyle; private String color; @@ -236,12 +236,6 @@ public class MainWindowController { private ObservableList filterData = FXCollections.observableArrayList(); private ObservableList filmsList = FXCollections.observableArrayList(); private ObservableList sourcesList = FXCollections.observableArrayList(); - private ImageView skip_previous_white = new ImageView(new Image("icons/ic_skip_previous_white_18dp_1x.png")); - private ImageView skip_previous_black = new ImageView(new Image("icons/ic_skip_previous_black_18dp_1x.png")); - private ImageView skip_next_white = new ImageView(new Image("icons/ic_skip_next_white_18dp_1x.png")); - private ImageView skip_next_black = new ImageView(new Image("icons/ic_skip_next_black_18dp_1x.png")); - private ImageView play_arrow_white = new ImageView(new Image("icons/ic_play_arrow_white_18dp_1x.png")); - private ImageView play_arrow_black = new ImageView(new Image("icons/ic_play_arrow_black_18dp_1x.png")); private MenuItem like = new MenuItem("like"); private MenuItem dislike = new MenuItem("dislike"); // TODO one option (like or dislike) private ContextMenu menu = new ContextMenu(like, dislike); @@ -408,7 +402,6 @@ public class MainWindowController { if (!getCurrentTitle().isEmpty()) { dbController.readCache(getCurrentStreamUrl()); } - // ta1.setFont(Font.font("System", size)); saveSettings(); } }); @@ -459,7 +452,7 @@ public class MainWindowController { } } - addDataUI(filterData); + addFilmsToTable(filterData); } }); @@ -646,7 +639,7 @@ public class MainWindowController { /** * add data from films-list to films-table */ - public void addDataUI(ObservableList elementsList) { + public void addFilmsToTable(ObservableList elementsList) { for (FilmTabelDataType element : elementsList) { @@ -713,28 +706,26 @@ public class MainWindowController { */ private void applyColor() { String menuBtnStyle; - String btnStyleBlack = "-fx-button-type: RAISED; -fx-background-color: #" + getColor() + "; -fx-text-fill: BLACK;"; - String btnStyleWhite = "-fx-button-type: RAISED; -fx-background-color: #" + getColor() + "; -fx-text-fill: WHITE;"; BigInteger usedColor = new BigInteger(getColor(), 16); BigInteger checkColor = new BigInteger("78909cff", 16); if (usedColor.compareTo(checkColor) == -1) { - btnStyle = btnStyleWhite; + btnStyle = "-fx-button-type: RAISED; -fx-background-color: #" + getColor() + "; -fx-text-fill: WHITE;"; menuBtnStyle = "-fx-text-fill: WHITE;"; - playbtn.setGraphic(play_arrow_white); - returnBtn.setGraphic(skip_previous_white); - forwardBtn.setGraphic(skip_next_white); + playbtn.setGraphic(new ImageView(new Image("icons/ic_play_arrow_white_18dp_1x.png"))); + returnBtn.setGraphic(new ImageView(new Image("icons/ic_skip_previous_white_18dp_1x.png"))); + forwardBtn.setGraphic(new ImageView(new Image("icons/ic_skip_next_white_18dp_1x.png"))); menuHam.getStyleClass().clear(); menuHam.getStyleClass().add("jfx-hamburgerW"); } else { - btnStyle = btnStyleBlack; + btnStyle = "-fx-button-type: RAISED; -fx-background-color: #" + getColor() + "; -fx-text-fill: BLACK;"; menuBtnStyle = "-fx-text-fill: BLACK;"; - playbtn.setGraphic(play_arrow_black); - returnBtn.setGraphic(skip_previous_black); - forwardBtn.setGraphic(skip_next_black); + playbtn.setGraphic(new ImageView(new Image("icons/ic_play_arrow_black_18dp_1x.png"))); + returnBtn.setGraphic(new ImageView(new Image("icons/ic_skip_previous_black_18dp_1x.png"))); + forwardBtn.setGraphic(new ImageView(new Image("icons/ic_skip_next_black_18dp_1x.png"))); menuHam.getStyleClass().clear(); menuHam.getStyleClass().add("jfx-hamburgerB"); diff --git a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java index 7cc5df2..be39a93 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/DBController.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/DBController.java @@ -235,7 +235,7 @@ public class DBController { } LOGGER.info("loading data to the GUI ..."); - mainWindowController.addDataUI(mainWindowController.getFilmsList()); + mainWindowController.addFilmsToTable(mainWindowController.getFilmsList()); } /** diff --git a/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java b/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java index 0fc48a9..de203c7 100644 --- a/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java +++ b/src/main/java/kellerkinder/HomeFlix/controller/OMDbAPIController.java @@ -152,7 +152,6 @@ public class OMDbAPIController implements Runnable { BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream())); output = ina.readLine(); ina.close(); - System.out.println(apiUrl.toString()); LOGGER.info("response from '" + URL + "&t=" + title + "' was:" + output); } catch (IOException e) { LOGGER.error("error while making api request or reading response");