jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use TextArea and Okhttp to show the chnagelog 

Instead of using a WebView use TextArea and Okhttp, so that we can get
rid of javafx-web
This commit is contained in:
0xboobface 2019-01-05 16:38:48 +01:00
parent 3ab4ef785b
commit 77753bd377
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
client/src/main/java/ctbrec/ui/UpdateTab.java
View File

@ -3,23 +3,25 @@ package ctbrec.ui;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import ctbrec.Config; import ctbrec.io.HttpException;
import ctbrec.ui.CamrecApplication.Release; import ctbrec.ui.CamrecApplication.Release;
import ctbrec.ui.controls.Dialogs;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.control.Button; import javafx.scene.control.Button;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.Tab; import javafx.scene.control.Tab;
import javafx.scene.control.TextArea;
import javafx.scene.layout.Priority; import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.scene.web.WebEngine; import okhttp3.Request;
import javafx.scene.web.WebView; import okhttp3.Response;
public class UpdateTab extends Tab { public class UpdateTab extends Tab {
private static final transient Logger LOG = LoggerFactory.getLogger(UpdateTab.class); private static final transient Logger LOG = LoggerFactory.getLogger(UpdateTab.class);
private WebView browser; private TextArea changelog;
public UpdateTab(Release latest) { public UpdateTab(Release latest) {
setText("Update Available"); setText("Update Available");
@ -32,18 +34,24 @@ public class UpdateTab extends Tab {
vbox.getChildren().add(button); vbox.getChildren().add(button);
VBox.setMargin(button, new Insets(0, 0, 10, 0)); VBox.setMargin(button, new Insets(0, 0, 10, 0));
vbox.setAlignment(Pos.CENTER); vbox.setAlignment(Pos.CENTER);
changelog = new TextArea();
browser = new WebView(); changelog.setEditable(false);
try { vbox.getChildren().add(changelog);
WebEngine webEngine = browser.getEngine(); VBox.setVgrow(changelog, Priority.ALWAYS);
webEngine.load("https://raw.githubusercontent.com/0xboobface/ctbrec/master/CHANGELOG.md");
webEngine.setUserDataDirectory(Config.getInstance().getConfigDir());
vbox.getChildren().add(browser);
VBox.setVgrow(browser, Priority.ALWAYS);
} catch (Exception e) {
LOG.error("Couldn't load changelog", e);
}
setContent(vbox); setContent(vbox);
new Thread(() -> {
Request req = new Request.Builder().url("https://raw.githubusercontent.com/0xboobface/ctbrec/master/CHANGELOG.md").build();
try(Response resp = CamrecApplication.httpClient.execute(req)) {
if(resp.isSuccessful()) {
changelog.setText(resp.body().string());
} else {
throw new HttpException(resp.code(), resp.message());
}
} catch (Exception e1) {
LOG.error("Couldn't download the changelog", e1);
Dialogs.showError("Communication error", "Couldn't download the changelog", e1);
}
}).start();
} }
} }