From 7442ddd3e4de4a6422c314438a515fed5507054e Mon Sep 17 00:00:00 2001 From: 0xboobface <0xboobface@gmail.com> Date: Sat, 27 Oct 2018 18:50:29 +0200 Subject: [PATCH] Show thumb, if offline_picture is not available Tweak the insets --- .../ctbrec/sites/camsoda/CamsodaShowsTab.java | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/ctbrec/sites/camsoda/CamsodaShowsTab.java b/src/main/java/ctbrec/sites/camsoda/CamsodaShowsTab.java index c85033bf..53972c87 100644 --- a/src/main/java/ctbrec/sites/camsoda/CamsodaShowsTab.java +++ b/src/main/java/ctbrec/sites/camsoda/CamsodaShowsTab.java @@ -61,7 +61,7 @@ public class CamsodaShowsTab extends Tab implements TabSelectionListener { } private void createGui() { - showList = new VBox(10); + showList = new VBox(); progressIndicator = new ProgressIndicator(); progressIndicator.setPrefSize(100, 100); setContent(progressIndicator); @@ -120,7 +120,7 @@ public class CamsodaShowsTab extends Tab implements TabSelectionListener { showList.getChildren().clear(); for (ShowBox showBox : boxes) { showList.getChildren().add(showBox); - VBox.setMargin(showBox, new Insets(20)); + VBox.setMargin(showBox, new Insets(20, 20, 0, 20)); } } catch (Exception e) { LOG.error("Couldn't load upcoming camsoda shows", e); @@ -147,8 +147,10 @@ public class CamsodaShowsTab extends Tab implements TabSelectionListener { } private class ShowBox extends TitledPane { + BorderPane root = new BorderPane(); int thumbSize = 200; + public ShowBox(Model model, ZonedDateTime startTime, ZonedDateTime endTime) { setText(model.getName()); setPrefHeight(268); @@ -203,22 +205,25 @@ public class CamsodaShowsTab extends Tab implements TabSelectionListener { JSONObject user = json.getJSONObject("user"); if(user.has("settings")) { JSONObject settings = user.getJSONObject("settings"); + String imageUrl; if(settings.has("offline_picture")) { - Platform.runLater(() -> { - String imageUrl = settings.getString("offline_picture"); - Image img = new Image(imageUrl, 1000, thumbSize, true, true, true); - img.progressProperty().addListener(new ChangeListener() { - @Override - public void changed(ObservableValue observable, Number oldValue, Number newValue) { - if(newValue.doubleValue() == 1.0) { - thumb.setImage(img); - root.setLeft(thumb); - } - } - }); - - }); + imageUrl = settings.getString("offline_picture"); + } else { + imageUrl = "https:" + user.getString("thumb"); } + Platform.runLater(() -> { + Image img = new Image(imageUrl, 1000, thumbSize, true, true, true); + img.progressProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, Number oldValue, Number newValue) { + if(newValue.doubleValue() == 1.0) { + thumb.setImage(img); + root.setLeft(thumb); + } + } + }); + + }); } } }