client

Added window size persistence for non phone platforms while on non full screen

Download Browse

+8 −4

Author

Debayan Sutradhar (rnayabed) 2021-04-29 13:23

Committer

Debayan Sutradhar (rnayabed) 2021-04-29 13:23

Hash 8f814639474a7f2d7784c13647a7c8efaec9b065

Parent caafb55ab42d271ee386a2b9080dd7ddd4f2e112

Reference git #client/8f814639474a7f2d7784c13647a7c8efaec9b065

Modified Files

List

Side by side diff

Inline diff

M src/main/java/com/stream_pi/client/controller/Controller.java

+6 −2

package com.stream_pi.client.controller;

import com.gluonhq.attach.vibration.VibrationService;

import com.stream_pi.action_api.action.Action;

import com.stream_pi.client.connection.Client;

import com.stream_pi.client.io.Config;

import com.stream_pi.client.info.ClientInfo;

import com.stream_pi.client.profile.ClientProfile;

import com.stream_pi.client.profile.ClientProfiles;

import com.stream_pi.client.window.Base;

import com.stream_pi.client.window.dashboard.actiongridpane.ActionBox;

import com.stream_pi.client.window.dashboard.actiongridpane.ActionGridPaneListener;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.alert.StreamPiAlertListener;

import com.stream_pi.util.alert.StreamPiAlertType;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.gluonhq.attach.lifecycle.LifecycleService;

import com.gluonhq.attach.util.Services;

import javafx.animation.Interpolator;

import javafx.animation.KeyFrame;

import javafx.animation.KeyValue;

import javafx.animation.Timeline;

import javafx.application.Platform;

import javafx.beans.value.ChangeListener;

import javafx.scene.Node;

import javafx.scene.input.KeyCombination;

import javafx.util.Duration;

import java.io.*;

import java.util.logging.Level;

public class Controller extends Base

{

private Client client;

public Controller()

{

client = null;

}

private boolean firstRun = true;

@Override

public void init()

{

try

{

if(firstRun)

initBase();

if(getClientInfo().getPlatform() != com.stream_pi.util.platform.Platform.ANDROID)

{

getStage().setWidth(getConfig().getStartupWindowWidth());

if(!getConfig().getIsFullScreenMode())

getStage().setHeight(getConfig().getStartupWindowHeight());

{

getStage().setWidth(getConfig().getStartupWindowWidth());

getStage().setHeight(getConfig().getStartupWindowHeight());

}

getStage().centerOnScreen();

setupFlags();

}

applyDefaultTheme();

setupDashWindow();

getStage().show();

requestFocus();

if(Config.getInstance().isFirstTimeUse())

return;

setupSettingsWindowsAnimations();

getDashboardPane().getSettingsButton().setOnAction(event -> {

openSettingsTimeLine.play();

});

getSettingsPane().getCloseButton().setOnAction(event -> {

closeSettingsTimeLine.play();

});

setClientProfiles(new ClientProfiles(new File(getConfig().getProfilesPath()), getConfig().getStartupProfileID()));

if(getClientProfiles().getLoadingErrors().size() > 0)

{

StringBuilder errors = new StringBuilder("Please rectify the following errors and try again");

for(MinorException exception : getClientProfiles().getLoadingErrors())

{

errors.append("\n * ")

.append(exception.getMessage());

}

throw new MinorException("Profiles", errors.toString());

}

renderRootDefaultProfile();

loadSettings();

if(firstRun)

{

if(getConfig().isConnectOnStartup())

{

setupClientConnection();

}

firstRun = false;

}

ChangeListener<Number> windowResizeListener = (observableValue, number, t1) -> {

if(isConnected())

{

try {

client.sendClientScreenDetails();

} catch (SevereException e) {

e.printStackTrace();

}

};

getStage().widthProperty().addListener(windowResizeListener);

getStage().heightProperty().addListener(windowResizeListener);

}

catch (SevereException e)

{

handleSevereException(e);

}

catch (MinorException e)

{

handleMinorException(e);

}

@Override

public void setupClientConnection()

{

Platform.runLater(()->getSettingsPane().setDisableStatus(true));

client = new Client(getConfig().getSavedServerHostNameOrIP(), getConfig().getSavedServerPort(), this, this);

}

@Override

public void updateSettingsConnectDisconnectButton() {

getSettingsPane().setConnectDisconnectButtonStatus();

}

@Override

public void disconnect(String message) throws SevereException {

client.disconnect(message);

}

public void setupDashWindow()

{

getStage().setTitle("Stream-Pi Client");

getStage().setOnCloseRequest(e->onCloseRequest());

}

@Override

public void onCloseRequest()

{

try

{

if(isConnected())

client.exit();

getConfig().setStartupWindowSize(getStageWidth(), getStageHeight());

getConfig().save();

}

catch (SevereException e)

{

handleSevereException(e);

}

finally

{

getLogger().info("Shut down");

closeLogger();

if (ClientInfo.getInstance().getPlatform() == com.stream_pi.util.platform.Platform.ANDROID)

Services.get(LifecycleService.class).ifPresent(LifecycleService::shutdown);

}

@Override

public void loadSettings() {

try {

getSettingsPane().loadData();

} catch (SevereException e) {

e.printStackTrace();

handleSevereException(e);

}

@Override

public Client getClient() {

return client;

}

@Override

public void onDisconnect() {

Platform.runLater(()->getDashboardPane().getActionGridPane().toggleOffAllToggleActions());

}

@Override

public boolean getToggleStatus(String profileID, String actionID)

{

return getClientProfiles().getProfileFromID(profileID).getActionFromID(actionID).getCurrentToggleStatus();

}

private Timeline openSettingsTimeLine;

private Timeline closeSettingsTimeLine;

private void setupSettingsWindowsAnimations()

{

Node settingsNode = getSettingsPane();

Node dashboardNode = getDashboardPane();

openSettingsTimeLine = new Timeline();

openSettingsTimeLine.setCycleCount(1);

openSettingsTimeLine.getKeyFrames().addAll(

new KeyFrame(Duration.millis(0.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.EASE_IN)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR))

);

openSettingsTimeLine.setOnFinished(event1 -> settingsNode.toFront());

closeSettingsTimeLine = new Timeline();

closeSettingsTimeLine.setCycleCount(1);

closeSettingsTimeLine.getKeyFrames().addAll(

new KeyFrame(Duration.millis(0.0D),

new KeyValue(settingsNode.opacityProperty(),

1.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(settingsNode.opacityProperty(),

0.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(0.0D),

new KeyValue(dashboardNode.opacityProperty(),

0.0D, Interpolator.LINEAR)),

new KeyFrame(Duration.millis(90.0D),

new KeyValue(dashboardNode.opacityProperty(),

1.0D, Interpolator.LINEAR))

);

closeSettingsTimeLine.setOnFinished(event1 -> {

dashboardNode.toFront();

Platform.runLater(()-> {

try {

getSettingsPane().loadData();

} catch (SevereException e) {

e.printStackTrace();

handleSevereException(e);

}

});

}

@Override

public void handleMinorException(MinorException e)

{

getLogger().log(Level.SEVERE, e.getMessage(), e);

e.printStackTrace();

Platform.runLater(()-> genNewAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.WARNING).show());

}

@Override

public void handleSevereException(SevereException e)

{

getLogger().log(Level.SEVERE, e.getMessage(), e);

e.printStackTrace();

Platform.runLater(()->

{

StreamPiAlert alert = genNewAlert(e.getTitle(), e.getShortMessage(), StreamPiAlertType.ERROR);

alert.setOnClicked(new StreamPiAlertListener()

{

@Override

public void onClick(String txt)

{

onCloseRequest();

Platform.exit();

}

});

alert.show();

});

}

@Override

public void onAlert(String title, String body, StreamPiAlertType alertType) {

Platform.runLater(()-> genNewAlert(title, body, alertType).show());

}

public StreamPiAlert genNewAlert(String title, String message, StreamPiAlertType alertType)

{

StreamPiAlert alert = new StreamPiAlert(title, message, alertType);

return alert;

}

private boolean isConnected = false;

@Override

public void onActionFailed(String profileID, String actionID) {

Platform.runLater(()-> getDashboardPane().getActionGridPane().actionFailed(profileID, actionID));

}

@Override

public void onActionClicked(String profileID, String actionID, boolean toggleState)

{

try {

vibratePhone();

client.onActionClicked(profileID, actionID, toggleState);

} catch (SevereException e) {

e.printStackTrace();

handleSevereException(e);

}

public void vibratePhone()

{

if(getConfig().isVibrateOnActionClicked())

{

VibrationService.create().ifPresent(VibrationService::vibrate);

}

@Override

public void setConnected(boolean isConnected) {

this.isConnected = isConnected;

}

@Override

public ActionBox getActionBox(int col, int row)

{

return getDashboardPane().getActionGridPane().getActionBox(col, row);

}

@Override

public boolean isConnected()

{

return isConnected;

}

@Override

public void renderProfile(ClientProfile clientProfile, boolean freshRender)

{

getDashboardPane().renderProfile(clientProfile, freshRender);

}

@Override

public void clearActionBox(int col, int row)

{

Platform.runLater(()->getDashboardPane().getActionGridPane().clearActionBox(col, row));

}

@Override

public void addBlankActionBox(int col, int row)

{

Platform.runLater(()->getDashboardPane().getActionGridPane().addBlankActionBox(col, row));

}

@Override

public void renderAction(String currentProfileID, Action action)

{

Platform.runLater(()->{

try {

if(getDashboardPane().getActionGridPane().getCurrentParent().equals(action.getParent()) &&

getCurrentProfile().getID().equals(currentProfileID))

{

getDashboardPane().getActionGridPane().renderAction(action);

}

catch (Exception e)

{

e.printStackTrace();

}

});

}

@Override

public void refreshGridIfCurrentProfile(String profileID) {

if(getCurrentProfile().getID().equals(profileID))

{

Platform.runLater(()-> getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(profileID), true));

}

@Override

public ClientProfile getCurrentProfile() {

return getDashboardPane().getActionGridPane().getClientProfile();

}

@Override

public String getCurrentParent()

{

return getDashboardPane().getActionGridPane().getCurrentParent();

}

@Override

public ActionBox getActionBoxByProfileAndID(String profileID, String actionID)

{

Action action = getClientProfiles().getProfileFromID(profileID).getActionFromID(actionID);

if(!getCurrentProfile().getID().equals(profileID) && !getCurrentParent().equals(action.getParent()))

return null;

return getDashboardPane().getActionGridPane().getActionBoxByLocation(action.getLocation());

}

M src/main/java/com/stream_pi/client/io/Config.java

+1 −1

Config.java

Contributor(s) : Debayan Sutradhar (@rnayabed)

handler for config.xml

package com.stream_pi.client.io;

import java.io.File;

import java.util.Objects;

import javax.xml.parsers.DocumentBuilder;

import javax.xml.parsers.DocumentBuilderFactory;

import javax.xml.transform.Result;

import javax.xml.transform.Source;

import javax.xml.transform.Transformer;

import javax.xml.transform.TransformerFactory;

import javax.xml.transform.dom.DOMSource;

import javax.xml.transform.stream.StreamResult;

import com.stream_pi.client.Main;

import com.stream_pi.client.info.ClientInfo;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.iohelper.IOHelper;

import com.stream_pi.util.platform.Platform;

import com.stream_pi.util.xmlconfighelper.XMLConfigHelper;

import org.w3c.dom.Document;

import org.w3c.dom.Element;

public class Config

{

private static Config instance = null;

private final File configFile;

private Document document;

private Config() throws SevereException

{

try

{

configFile = new File(ClientInfo.getInstance().getPrePath()+"config.xml");

DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();

DocumentBuilder docBuilder = docFactory.newDocumentBuilder();

document = docBuilder.parse(configFile);

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException("Config", "unable to read config.xml");

}

public static synchronized Config getInstance() throws SevereException

{

if(instance == null)

instance = new Config();

return instance;

}

public void unzipToDefaultPrePath() throws Exception

public static void unzipToDefaultPrePath() throws Exception

{

IOHelper.unzip(Objects.requireNonNull(Main.class.getResourceAsStream("Default.zip")), ClientInfo.getInstance().getPrePath());

Config.getInstance().setThemesPath(ClientInfo.getInstance().getPrePath()+"Themes/");

Config.getInstance().setIconsPath(ClientInfo.getInstance().getPrePath()+"Icons/");

Config.getInstance().setProfilesPath(ClientInfo.getInstance().getPrePath()+"Profiles/");

Config.getInstance().save();

}

public void save() throws SevereException

{

try

{

Transformer transformer = TransformerFactory.newInstance().newTransformer();

Result output = new StreamResult(configFile);

Source input = new DOMSource(document);

transformer.transform(input, output);

}

catch (Exception e)

{

throw new SevereException("Config", "unable to save config.xml");

}

//Client Element

public Element getClientElement()

{

return (Element) document.getElementsByTagName("client").item(0);

}

//Default Values

public String getDefaultClientNickName()

{

return "Stream-Pi Client";

}

public String getDefaultStartupProfileID()

{

return "default";

}

public String getDefaultCurrentThemeFullName()

{

return "com.stream_pi.defaultlight";

}

public String getDefaultThemesPath()

{

return ClientInfo.getInstance().getPrePath()+"Themes/";

}

public String getDefaultProfilesPath()

{

return ClientInfo.getInstance().getPrePath()+"Profiles/";

}

public String getDefaultIconsPath()

{

return ClientInfo.getInstance().getPrePath()+"Icons/";

}

//Getters

public String getClientNickName()

{

return XMLConfigHelper.getStringProperty(getClientElement(), "nickname", getDefaultClientNickName(), false, true, document, configFile);

}

public String getStartupProfileID()

{

return XMLConfigHelper.getStringProperty(getClientElement(), "startup-profile", getDefaultStartupProfileID(), false, true, document, configFile);

}

public String getCurrentThemeFullName()

{

return XMLConfigHelper.getStringProperty(getClientElement(), "current-theme-full-name", getDefaultCurrentThemeFullName(), false, true, document, configFile);

}

public String getThemesPath()

{

Platform platform = ClientInfo.getInstance().getPlatform();

if(platform != Platform.ANDROID &&

platform != Platform.IOS)

return ClientInfo.getInstance().getPrePath() + "Themes/";

return XMLConfigHelper.getStringProperty(getClientElement(), "themes-path", getDefaultThemesPath(), false, true, document, configFile);

}

public String getProfilesPath()

{

Platform platform = ClientInfo.getInstance().getPlatform();

if(platform != Platform.ANDROID &&

platform != Platform.IOS)

return ClientInfo.getInstance().getPrePath() + "Profiles/";

return XMLConfigHelper.getStringProperty(getClientElement(), "profiles-path", getDefaultProfilesPath(), false, true, document, configFile);

}

public String getIconsPath()

{

Platform platform = ClientInfo.getInstance().getPlatform();

if(platform != Platform.ANDROID &&

platform != Platform.IOS)

return ClientInfo.getInstance().getPrePath() + "Icons/";

return XMLConfigHelper.getStringProperty(getClientElement(), "icons-path", getDefaultIconsPath(), false, true, document, configFile);

}

//Setters

public void setNickName(String nickName)

{

getClientElement().getElementsByTagName("nickname").item(0).setTextContent(nickName);

}

public void setStartupProfileID(String id)

{

getClientElement().getElementsByTagName("startup-profile").item(0).setTextContent(id);

}

public void setCurrentThemeFullName(String name)

{

getClientElement().getElementsByTagName("current-theme-full-name").item(0).setTextContent(name);

}

public void setProfilesPath(String profilesPath)

{

getClientElement().getElementsByTagName("profiles-path").item(0).setTextContent(profilesPath);

}

public void setIconsPath(String iconsPath)

{

getClientElement().getElementsByTagName("icons-path").item(0).setTextContent(iconsPath);

}

public void setThemesPath(String themesPath)

{

getClientElement().getElementsByTagName("themes-path").item(0).setTextContent(themesPath);

}

//comms-server

public Element getCommsServerElement()

{

return (Element) document.getElementsByTagName("comms-server").item(0);

}

public String getDefaultSavedServerHostNameOrIP()

{

return "127.0.0.1";

}

public int getDefaultSavedServerPort()

{

return -1;

}

public int getDefaultAutoReconnectTimeInterval()

{

return 300;

}

public String getSavedServerHostNameOrIP()

{

return XMLConfigHelper.getStringProperty(getCommsServerElement(), "hostname-ip", getDefaultSavedServerHostNameOrIP(), false, true, document, configFile);

}

public int getSavedServerPort()

{

return XMLConfigHelper.getIntProperty(getCommsServerElement(), "port", getDefaultSavedServerPort(), false, true, document, configFile);

}

public int getAutoReconnectTimeInterval()

{

return XMLConfigHelper.getIntProperty(getCommsServerElement(), "auto-reconnect-interval", getDefaultSavedServerPort(), false, true, document, configFile);

}

public void setServerHostNameOrIP(String hostNameOrIP)

{

getCommsServerElement().getElementsByTagName("hostname-ip").item(0).setTextContent(hostNameOrIP);

}

public void setServerPort(int port)

{

getCommsServerElement().getElementsByTagName("port").item(0).setTextContent(port+"");

}

//others

public Element getOthersElement()

{

return (Element) document.getElementsByTagName("others").item(0);

}

//others-default

public boolean getDefaultStartOnBoot()

{

return false;

}

public boolean getDefaultIsShowCursor()

{

return true;

}

public boolean getDefaultFirstTimeUse()

{

return true;

}

public boolean isShowCursor()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "show-cursor", getDefaultIsShowCursor(), false, true, document, configFile);

}

public boolean isStartOnBoot()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "start-on-boot", getDefaultStartOnBoot(), false, true, document, configFile);

}

public boolean isFirstTimeUse()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "first-time-use", true, false, true, document, configFile);

}

public boolean isVibrateOnActionClicked()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "vibrate-on-action-clicked", false, false, true, document, configFile);

}

public boolean isConnectOnStartup()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "connect-on-startup", false, false, true, document, configFile);

}

public boolean getIsFullScreenMode()

{

return XMLConfigHelper.getBooleanProperty(getOthersElement(), "full-screen-mode", false, false, true, document, configFile);

}

public void setStartOnBoot(boolean value)

{

getOthersElement().getElementsByTagName("start-on-boot").item(0).setTextContent(value+"");

}

public void setShowCursor(boolean value)

{

getOthersElement().getElementsByTagName("show-cursor").item(0).setTextContent(value+"");

}

public void setFullscreen(boolean value)

{

getOthersElement().getElementsByTagName("fullscreen").item(0).setTextContent(value+"");

}

public void setFirstTimeUse(boolean value)

{

getOthersElement().getElementsByTagName("first-time-use").item(0).setTextContent(value+"");

}

public void setVibrateOnActionClicked(boolean value)

{

getOthersElement().getElementsByTagName("vibrate-on-action-clicked").item(0).setTextContent(value+"");

}

public void setConnectOnStartup(boolean value)

{

getOthersElement().getElementsByTagName("connect-on-startup").item(0).setTextContent(value+"");

}

public void setIsFullScreenMode(boolean value)

{

getOthersElement().getElementsByTagName("full-screen-mode").item(0).setTextContent(value+"");

}

private Element getStartupWindowSizeElement()

{

return (Element) getClientElement().getElementsByTagName("startup-window-size").item(0);

}

public double getStartupWindowWidth()

{

return XMLConfigHelper.getDoubleProperty(getStartupWindowSizeElement(), "width",

getDefaultStartupWindowWidth(), false, true, document, configFile);

}

public double getStartupWindowHeight()

{

return XMLConfigHelper.getDoubleProperty(getStartupWindowSizeElement(), "height",

getDefaultStartupWindowHeight(), false, true, document, configFile);

}

public int getDefaultStartupWindowWidth()

{

return 800;

}

public int getDefaultStartupWindowHeight()

{

return 400;

}

public void setStartupWindowSize(double width, double height)

{

setStartupWindowWidth(width);

setStartupWindowHeight(height);

}

public void setStartupWindowWidth(double width)

{

getStartupWindowSizeElement().getElementsByTagName("width").item(0).setTextContent(width+"");

}

public void setStartupWindowHeight(double height)

{

getStartupWindowSizeElement().getElementsByTagName("height").item(0).setTextContent(height+"");

}

M src/main/java/com/stream_pi/client/window/Base.java

+1 −1

package com.stream_pi.client.window;

import com.stream_pi.client.connection.ClientListener;

import com.stream_pi.client.io.Config;

import com.stream_pi.client.info.ClientInfo;

import java.io.File;

import java.util.Objects;

import java.util.logging.Logger;

import com.stream_pi.client.Main;

import com.stream_pi.client.profile.ClientProfiles;

import com.stream_pi.client.window.dashboard.DashboardBase;

import com.stream_pi.client.window.firsttimeuse.FirstTimeUse;

import com.stream_pi.client.window.settings.SettingsBase;

import com.stream_pi.theme_api.Theme;

import com.stream_pi.theme_api.Themes;

import com.stream_pi.util.alert.StreamPiAlert;

import com.stream_pi.util.combobox.StreamPiComboBox;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.exception.SevereException;

import com.stream_pi.util.iohelper.IOHelper;

import com.stream_pi.util.loggerhelper.StreamPiLogFallbackHandler;

import com.stream_pi.util.loggerhelper.StreamPiLogFileHandler;

import com.stream_pi.util.platform.Platform;

import javafx.application.HostServices;

import javafx.geometry.Insets;

import javafx.scene.CacheHint;

import javafx.scene.Cursor;

import javafx.scene.image.Image;

import javafx.scene.input.KeyCombination;

import javafx.scene.layout.StackPane;

import javafx.scene.text.Font;

import javafx.stage.Screen;

import javafx.stage.Stage;

public abstract class Base extends StackPane implements ExceptionAndAlertHandler, ClientListener {

private Config config;

private ClientProfiles clientProfiles;

private ClientInfo clientInfo;

private Stage stage;

public Stage getStage()

{

return stage;

}

public Logger getLogger()

{

return logger;

}

private DashboardBase dashboardBase;

private SettingsBase settingsBase;

private FirstTimeUse firstTimeUse;

public FirstTimeUse getFirstTimeUse() {

return firstTimeUse;

}

private StackPane alertStackPane;

@Override

public ClientProfiles getClientProfiles() {

return clientProfiles;

}

public void setClientProfiles(ClientProfiles clientProfiles) {

this.clientProfiles = clientProfiles;

}

private Logger logger = null;

private StreamPiLogFileHandler logFileHandler = null;

private StreamPiLogFallbackHandler logFallbackHandler = null;

@Override

public void initLogger()

{

try

{

if(logFileHandler != null)

return;

closeLogger();

logger = Logger.getLogger("");

if(new File(ClientInfo.getInstance().getPrePath()).getAbsoluteFile().getParentFile().canWrite())

{

String path = ClientInfo.getInstance().getPrePath()+"../stream-pi-client.log";

Platform platform = getClientInfo().getPlatform();

if(platform == Platform.ANDROID ||

platform == Platform.IOS)

path = ClientInfo.getInstance().getPrePath()+"stream-pi-client.log";

logFileHandler = new StreamPiLogFileHandler(path);

logger.addHandler(logFileHandler);

}

else

{

logFallbackHandler = new StreamPiLogFallbackHandler();

logger.addHandler(logFallbackHandler);

}

catch(Exception e)

{

e.printStackTrace();

logFallbackHandler = new StreamPiLogFallbackHandler();

logger.addHandler(logFallbackHandler);

}

public void closeLogger()

{

if(logFileHandler != null)

logFileHandler.close();

else if(logFallbackHandler != null)

logFallbackHandler.close();

}

private HostServices hostServices;

public void setHostServices(HostServices hostServices)

{

this.hostServices = hostServices;

}

public HostServices getHostServices()

{

return hostServices;

}

public void initBase() throws SevereException

{

stage = (Stage) getScene().getWindow();

getStage().getIcons().add(new Image(Main.class.getResourceAsStream("app_icon.png")));

clientInfo = ClientInfo.getInstance();

dashboardBase = new DashboardBase(this, this);

dashboardBase.prefWidthProperty().bind(widthProperty());

dashboardBase.prefHeightProperty().bind(heightProperty());

settingsBase = new SettingsBase(this, this, getHostServices());

alertStackPane = new StackPane();

alertStackPane.setPadding(new Insets(10));

alertStackPane.setVisible(false);

StreamPiAlert.setParent(alertStackPane);

StreamPiComboBox.setParent(alertStackPane);

firstTimeUse = new FirstTimeUse(this, this);

getChildren().clear();

getChildren().addAll(alertStackPane);

if(getClientInfo().isPhone())

{

dashboardBase.setPadding(new Insets(10));

settingsBase.setPadding(new Insets(10));

}

initLogger();

checkPrePathDirectory();

getChildren().addAll(settingsBase, dashboardBase);

setStyle(null);

config = Config.getInstance();

if(config.isFirstTimeUse())

{

clearStylesheets();

applyDefaultStylesheet();

applyDefaultIconsStylesheet();

getChildren().add(firstTimeUse);

firstTimeUse.toFront();

//resolution check

resizeAccordingToResolution();

}

else

{

dashboardBase.toFront();

}

initThemes();

}

private void resizeAccordingToResolution()

{

if(getClientInfo().isPhone())

{

double height = getScreenHeight();

double width = getScreenWidth();

logger.info("HEIGHT: "+height+", WIDTH: "+width);

if(height < 500)

setPrefHeight(320);

if(width < 500)

setPrefWidth(240);

}

@Override

public double getStageWidth()

{

if(getClientInfo().isPhone())

{

return getScreenWidth();

}

else

{

return getStage().getWidth();

}

public double getScreenWidth()

{

return Screen.getPrimary().getBounds().getWidth();

}

@Override

public double getStageHeight()

{

if(ClientInfo.getInstance().getPlatform() == Platform.ANDROID)

{

return getScreenHeight();

}

else

{

return getStage().getHeight();

}

public double getScreenHeight()

{

return Screen.getPrimary().getBounds().getHeight();

}

private void checkPrePathDirectory() throws SevereException

{

try

{

String path = getClientInfo().getPrePath();

System.out.println("PAAAAAAAAAAAATH : '"+path+"'");

if(path == null)

{

throwStoragePermErrorAlert("Unable to access file system!");

return;

}

File file = new File(path);

if(!file.exists())

{

boolean result = file.mkdirs();

if(result)

{

Config.getInstance().unzipToDefaultPrePath();

Config.unzipToDefaultPrePath();

initLogger();

}

else

{

throwStoragePermErrorAlert("No storage permission. Give it!");

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

private void throwStoragePermErrorAlert(String msg) throws SevereException

{

resizeAccordingToResolution();

clearStylesheets();

applyDefaultStylesheet();

applyDefaultIconsStylesheet();

getStage().show();

throw new SevereException(msg);

}

public void setupFlags()

{

//Full Screen

if(getConfig().getIsFullScreenMode())

{

getStage().setFullScreenExitKeyCombination(KeyCombination.NO_MATCH);

getStage().setFullScreen(true);

}

else

{

getStage().setFullScreenExitKeyCombination(KeyCombination.keyCombination("ESC"));

getStage().setFullScreen(false);

}

//Cursor

if(getConfig().isShowCursor())

{

setCursor(Cursor.DEFAULT);

}

else

{

setCursor(Cursor.NONE);

}

public SettingsBase getSettingsPane() {

return settingsBase;

}

public DashboardBase getDashboardPane() {

return dashboardBase;

}

public void renderRootDefaultProfile()

{

getDashboardPane().renderProfile(getClientProfiles().getProfileFromID(

getConfig().getStartupProfileID()

), true);

}

public void clearStylesheets()

{

getStylesheets().clear();

}

public void applyDefaultStylesheet()

{

Font.loadFont(Main.class.getResourceAsStream("Roboto.ttf"), 13);

getStylesheets().add(Main.class.getResource("style.css").toExternalForm());

}

public void applyDefaultIconsStylesheet()

{

Font.loadFont(Main.class.getResourceAsStream("Roboto.ttf"), 13);

getStylesheets().add(Main.class.getResource("default_icons.css").toExternalForm());

}

public Config getConfig()

{

return config;

}

public ClientInfo getClientInfo()

{

return clientInfo;

}

private Theme currentTheme;

@Override

public Theme getCurrentTheme()

{

return currentTheme;

}

public void applyTheme(Theme t)

{

logger.info("Applying theme '"+t.getFullName()+"' ...");

if(t.getFonts() != null)

{

for(String fontFile : t.getFonts())

{

Font.loadFont(fontFile.replace("%20",""), 13);

}

currentTheme = t;

clearStylesheets();

applyDefaultStylesheet();

getStylesheets().addAll(t.getStylesheets());

applyDefaultIconsStylesheet();

logger.info("... Done!");

}

Themes themes;

public void initThemes() throws SevereException

{

logger.info("Loading themes ...");

themes = new Themes(getConfig().getThemesPath(), getConfig().getCurrentThemeFullName(), clientInfo.getMinThemeSupportVersion());

if(themes.getErrors().size()>0)

{

StringBuilder themeErrors = new StringBuilder();

for(MinorException eachException : themes.getErrors())

{

themeErrors.append("\n * ").append(eachException.getShortMessage());

}

if(themes.getIsBadThemeTheCurrentOne())

{

themeErrors.append("\n\nReverted to default theme! (").append(getConfig().getDefaultCurrentThemeFullName()).append(")");

getConfig().setCurrentThemeFullName(getConfig().getDefaultCurrentThemeFullName());

getConfig().save();

}

handleMinorException(new MinorException("Theme Loading issues", themeErrors.toString()));

}

logger.info("... Done!");

}

@Override

public Themes getThemes() {

return themes;

}

public void applyDefaultTheme()

{

logger.info("Applying default theme ...");

boolean foundTheme = false;

for(Theme t: themes.getThemeList())

{

if(t.getFullName().equals(config.getCurrentThemeFullName()))

{

foundTheme = true;

applyTheme(t);

break;

}

if(foundTheme)

{

logger.info("... Done!");

}

else

{

logger.info("Theme not found. reverting to light theme ...");

try {

Config.getInstance().setCurrentThemeFullName("com.StreamPi.DefaultLight");

Config.getInstance().save();

applyDefaultTheme();

}

catch (SevereException e)

{

handleSevereException(e);

}

@Override

public String getDefaultThemeFullName()

{

return config.getCurrentThemeFullName();

}

M src/main/resources/com/stream_pi/client/Default.zip

+- −-

PK��Q Icons/UT a�_�H`�H`ux��PK'cJR Profiles/UT R�#`�H`�H`ux��PK'cJR1 Profiles/6fe15d84-8ac7-4b72-88f6-e497335fea7e.xmlUT R�#`�{8`�H`ux��U�� E�J�Ğ�l�,U�� $bG!}�__BQ�N�=>õl�c`O��'T�9՜Z�=:�﷮:s�� 8o�� -��]��L��C�hF��#,��I�i1fzE�H�ga�Bfyf�jU�@7u-��;�LIٌ5�nb_��Q��/PKL�V&�PKF�PR Themes/UT ],`�H`�H`ux��PK��DR! Themes/com.stream_pi.defaultdark/UT >,`�H`�H`ux��PK��DR% Themes/com.stream_pi.defaultdark/res/UT �)`�H`�H`ux��PK��DRo. Themes/com.stream_pi.defaultdark/res/style.cssUT �)`�{8`�H`ux��T�n�0�G�?X�*(�*U�X��`a�� Ŀ��"v�)��x�Wt

d� �&$h��ǜ,�孒�2MM�lk2��u��K6�5�sS�X�D@3��.JPPM�� ֘p��P�J�o@u�T�iH��W�R�̲E\𸵣W��LC�XM��5�<��e��@�q׏��bKk��*ɴ`I��K7F��H.S�'��K@�>��DwcV:��>uA5HY�@N2��0ă]��*��s38��r t'}$ ht�?��B"��P�sed�ې�$צ��7�s�\�s�ަ�ػ�x�.9f�&F�w��xh=7�Qz*�6�㚇��{gz��7��d��(��*��aUc&�C�Iy�{-}�#w��(��PK��ѱoPK��DR�* Themes/com.stream_pi.defaultdark/theme.xmlUT >,`�{8`�H`ux��uP�� M��Ni�� ]�89��>��/VZ��ݽ˽c�K�� F�p��nL;��)�ÑU|�c��r�&+|��a��1

/�U$��a��a��Dd�]o�'Z(�5H1��M�D.&pn�� ZF#�H6��)M�O�2�y�x��[ptY��9F&��^��O�t]�PK}��PKͺDR) Themes/com.stream_pi.defaulthighcontrast/UT Z4`�H`�H`ux��PK�DR- Themes/com.stream_pi.defaulthighcontrast/res/UT x,`�H`�H`ux��PK�DRk6 Themes/com.stream_pi.defaulthighcontrast/res/style.cssUT x,`�{8`�H`ux��T;o�0�#�?x�Zu cE'ԡb��J�0�"�)T��^��&��|��OD��D$��ս��2m��7�O&��,*4

SWf�hƵLPPm�w��_� 6�p ��K9\@��B�[ȀV�m(��R�̪� ��IgŠC��J��9�r�P{PR�ZW�A�Iߏv��rGk��*͵`i��#T^�W��/�ӠXc�g�J4�Y�L��%� eM9�<��ҐLN�(tC�~9Xv�s�frG�D/�͠;�3A��w�b�+3��E^��\�ڢ��F.=x�Fc��cܧ�1�}�p{��z^ڣ��]��9O�)��:X��v��n�_�Apxv��-�}�=YX�o%��o�՘��)��*��>t��v��D.�PK*$�kPKͺDR�2 Themes/com.stream_pi.defaulthighcontrast/theme.xmlUT Z4`�{8`�H`ux��uP1�0ܑ�C� �40 ��x�)n�&(q��R�|w>�O��]�n輶��,chJ{֦.��Ŋ�3�V�,��t�;� #��x4S�+�I��Fm*��Pm��%��u�6֐Ol�w�J��s�)��x� �RD �|��" �>9�H�}�H>��(�Ћ��K�0��:�ҟPKGzK��PK�DR" Themes/com.stream_pi.defaultlight/UT `�H`�H`ux��PKK�DR& Themes/com.stream_pi.defaultlight/res/UT )`�H`�H`ux��PKK�DR�/ Themes/com.stream_pi.defaultlight/res/style.cssUT )`�{8`�H`ux��S�n�0�G�?X�j=�b�=�"�,�7rJ��'q�pNxggg��;��r��u�@�A�}��{T*�v�m� 5+ζ��P�h�o�6�/�`�0=[��t_��5��P��,�΁W�q

`Q�P��;��v7 (i��ء6�i��^Ԃ&y��t[y�� 9i��hC��H^6Dw�

k��wy�p]v�:J�eyK4Y��pJ��-3��d8mi�<�2�0M��P9$/��Q�0��ե%�{ٺ�m�\Y��X�f��z�Fk�&(�F�.��=��c�S¹F_�(;�K�Iz<��u��~G

�{3eM�,j{*-��?�<��PKB˜u�PK�DR�+ Themes/com.stream_pi.defaultlight/theme.xmlUT `�{8`�H`ux��uPA�0��{)L0)��ă/��@hM��{(��3��k��SF�I�f ]�F�Lη+-�Ñ� ��~�k�[�MV��{��1Hl�i0�+�8��~o��ҭ Ȳ��X�Z� N��i@rQ]��EL��z\X-gy��D�M�u΢�W�P8�zt��ǖ5��,b"+��-�PK�|��PK�mR`�A��\

config.xmluS�n�0��?�+JҴ��=�[�u�A��X�,��+a��(|��H��m��0��j]W�.��_��D:��c�}�~�S�u�|�*e��@�Ds�94��ދ�G��D��or��=ywH�/jX�e�$&MC�k��K%?pf�K�s2�3�)�u��T�R�٫��r�?��'W�,�+�f&ґ�I�d��݉V�F��V��}��[� (y[U�+�.a�D��n&Z܅��ͶY��Q��1R�]�wJ.Gv��, �1]�#0�"uV��e��D�\��t�̼Yt�W��0�x��؜��3\��Q,m��yA�s�V(a2 �{�� g��xPK��Q �AIcons/UT a�_�H`�H`ux��PK'cJR �ADProfiles/UT R�#`�H`�H`ux��PK'cJRL�V&�1 ��Profiles/6fe15d84-8ac7-4b72-88f6-e497335fea7e.xmlUT R�#`�{8`�H`ux��PKF�PR �A�Themes/UT ],`�H`�H`ux��PK��DR! �A�Themes/com.stream_pi.defaultdark/UT >,`�H`�H`ux��PK��DR% �AKThemes/com.stream_pi.defaultdark/res/UT �)`�H`�H`ux��PK��DR��ѱo. ��Themes/com.stream_pi.defaultdark/res/style.cssUT �)`�{8`�H`ux��PK��DR}��* ��Themes/com.stream_pi.defaultdark/theme.xmlUT >,`�{8`�H`ux��PKͺDR) �AThemes/com.stream_pi.defaulthighcontrast/UT Z4`�H`�H`ux��PK�DR- �A{Themes/com.stream_pi.defaulthighcontrast/res/UT x,`�H`�H`ux��PK�DR*$�k6 ��Themes/com.stream_pi.defaulthighcontrast/res/style.cssUT x,`�{8`�H`ux��PKͺDRGzK��2 �� Themes/com.stream_pi.defaulthighcontrast/theme.xmlUT Z4`�{8`�H`ux��PK�DR" �A[

Themes/com.stream_pi.defaultlight/UT `�H`�H`ux��PKK�DR& �A�

Themes/com.stream_pi.defaultlight/res/UT )`�H`�H`ux��PKK�DRB˜u�/ ��Themes/com.stream_pi.defaultlight/res/style.cssUT )`�{8`�H`ux��PK�DR�|��+ �� Themes/com.stream_pi.defaultlight/theme.xmlUT `�{8`�H`ux��PK?�mR`�A��\

$ ��Mconfig.xml

2��2��2��PK��

Public

client

Clone or download

Added window size persistence for non phone platforms while on non full screen

Modified Files