From: Debayan Sutradhar Date: Sat, 12 Jun 2021 16:57:59 +0530 Subject: Refactor, Cleanup --- Refactor, Cleanup --- --- 'a/src/main/java/com/stream_pi/client/window/Base.java' +++ b/src/main/java/com/stream_pi/client/window/Base.java @@ -65,10 +65,6 @@ public abstract class Base extends Stack private FirstTimeUse firstTimeUse; - public FirstTimeUse getFirstTimeUse() { - return firstTimeUse; - } - private StackPane alertStackPane; @@ -164,7 +160,6 @@ public abstract class Base extends Stack StreamPiAlert.setParent(alertStackPane); StreamPiComboBox.setParent(alertStackPane); - firstTimeUse = new FirstTimeUse(this, this); getChildren().clear(); @@ -188,11 +183,12 @@ public abstract class Base extends Stack config = Config.getInstance(); + initThemes(); + if(config.isFirstTimeUse()) { - clearStylesheets(); - applyDefaultStylesheet(); - applyDefaultIconsStylesheet(); + + firstTimeUse = new FirstTimeUse(this, this); getChildren().add(firstTimeUse); @@ -210,8 +206,6 @@ public abstract class Base extends Stack { dashboardBase.toFront(); } - - initThemes(); } private void resizeAccordingToResolution() --- 'a/src/main/java/com/stream_pi/client/window/firsttimeuse/FinalConfigPane.java' +++ b/src/main/java/com/stream_pi/client/window/firsttimeuse/FinalConfigPane.java @@ -49,17 +49,7 @@ public class FinalConfigPane extends VBo HBoxInputBox serverIPHostNameInputBox = new HBoxInputBox("Server IP", serverIPHostNameTextField); HBoxInputBox serverIPPortInputBox = new HBoxInputBox("Server Port", serverPortTextField); - Platform platform = ClientInfo.getInstance().getPlatform(); - - - VBox v = new VBox(clientNickNameInputBox, serverIPHostNameInputBox, serverIPPortInputBox); - v.setSpacing(10.0); - - ScrollPane scrollPane = new ScrollPane(v); - scrollPane.getStyleClass().add("first_time_use_final_config_pane_scroll_pane"); - v.prefWidthProperty().bind(scrollPane.widthProperty().subtract(25)); - - getChildren().addAll(label, scrollPane); + getChildren().addAll(label, clientNickNameInputBox, serverIPHostNameInputBox, serverIPPortInputBox); setSpacing(10.0); Binary files 'a/src/main/resources/com/stream_pi/client/Default.zip' and b/src/main/resources/com/stream_pi/client/Default.zip differ --- 'a/src/main/resources/com/stream_pi/client/style.css' +++ b/src/main/resources/com/stream_pi/client/style.css @@ -119,11 +119,6 @@ -fx-font-size: 20; } -.first_time_use_final_config_pane_scroll_pane -{ - -fx-background-color:transparent; -} - .first_time_use_pane_stackpane {