client

Somewhat storage support for iOS

Download Browse

+31 −3

Author

Debayan Sutradhar (rnayabed) 2021-03-06 11:00

Committer

Debayan Sutradhar (rnayabed) 2021-03-06 11:00

Hash 9e252b0f51f3c5b9ea3223b92ebf3b548cc84709

Parent d5f0058a90bc60d9a430954325f0b6c91e257618

Reference git #client/9e252b0f51f3c5b9ea3223b92ebf3b548cc84709

Modified Files

List

Side by side diff

Inline diff

M pom.xml

+6 −0

<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<groupId>com.stream-pi</groupId>

<artifactId>client</artifactId>

<version>1.0.0-SNAPSHOT</version>

<url>https://stream-pi.com/</url>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.release>11</maven.compiler.release>

<javafx.version>16-ea+7</javafx.version>

<client.plugin.version>0.1.36</client.plugin.version>

<ikonli.version>11.5.0</ikonli.version>

<action.api.version>1.0.0-SNAPSHOT</action.api.version>

<util.version>1.0.0-SNAPSHOT</util.version>

<theme.api.version>1.0.0-SNAPSHOT</theme.api.version>

<main.class.name>com.stream_pi.client.Main</main.class.name>

<source.plugin.version>2.2.1</source.plugin.version>

<javadoc.plugin.version>3.1.0</javadoc.plugin.version>

<gpg.plugin.version>1.6</gpg.plugin.version>

</properties>

<groupId>org.openjfx</groupId>

<artifactId>javafx-controls</artifactId>

<version>${javafx.version}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-fontawesome5-pack</artifactId>

<version>${ikonli.version}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-javafx</artifactId>

<version>${ikonli.version}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>action-api</artifactId>

<version>${action.api.version}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<artifactId>theme-api</artifactId>

<version>${theme.api.version}</version>

</dependency>

<groupId>com.stream-pi</groupId>

<version>${util.version}</version>

</dependency>

<groupId>com.gluonhq.attach</groupId>

<artifactId>lifecycle</artifactId>

</dependency>

<groupId>com.gluonhq.attach</groupId>

</dependency>

<groupId>com.gluonhq.attach</groupId>

<artifactId>storage</artifactId>

</dependency>

</dependencies>

<id>gluon-releases</id>

<url>http://nexus.gluonhq.com/nexus/content/repositories/releases/</url>

</repository>

</repositories>

<build>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-compiler-plugin</artifactId>

</plugin>

<groupId>org.openjfx</groupId>

<artifactId>javafx-maven-plugin</artifactId>

<mainClass>${main.class.name}</mainClass>

</configuration>

</plugin>

<groupId>com.gluonhq</groupId>

<artifactId>client-maven-plugin</artifactId>

<version>${client.plugin.version}</version>

<target>android</target>

<list>--initialize-at-build-time=com.sun.org.apache.xml.internal.serializer.ToXMLStream</list>

<list>-Dsvm.targetName=android</list>

</nativeImageArgs>

<list>com.sun.org.apache.xerces.internal.impl.msg.XMLMessages</list>

</bundlesList>

<list>lifecycle</list>

<list>storage</list>

</attachList>

<list>java.util.logging.FileHandler</list>

</reflectionList>

<mainClass>${main.class.name}</mainClass>

</configuration>

</plugin>

<artifactId>maven-resources-plugin</artifactId>

</configuration>

</plugin>

</plugins>

</build>

<!--profiles>

<id>android</id>

<clientTarget>android</clientTarget>

<additionalArgs>-Dsvm.targetName=android</additionalArgs>

</properties>

</profile>

<clientTarget>linux-aarch64</clientTarget>

<additionalArgs>-Dsvm.targetName=linux_raspberrypi</additionalArgs>

</properties>

</profile>

</profiles-->

<id>gluon-releases</id>

<url>http://nexus.gluonhq.com/nexus/content/repositories/releases/</url>

</pluginRepository>

<id>gluon-snapshots</id>

<url>https://nexus.gluonhq.com/nexus/content/repositories/public-snapshots</url>

</pluginRepository>

</pluginRepositories>

<id>release</id>

<build>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-source-plugin</artifactId>

<id>attach-sources</id>

<goals>

</goals>

</execution>

</executions>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-javadoc-plugin</artifactId>

<version>${javadoc.plugin.version}</version>

<id>attach-javadocs</id>

<goals>

</goals>

</execution>

</executions>

</configuration>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-gpg-plugin</artifactId>

<version>${gpg.plugin.version}</version>

<id>sign-artifacts</id>

<phase>verify</phase>

<goals>

</goals>

<arg>--pinentry-mode</arg>

<arg>loopback</arg>

</gpgArguments>

</configuration>

</execution>

</executions>

</plugin>

</plugins>

</build>

</profile>

</profiles>

<name>Stream Pi</name>

<url>https://www.stream-pi.com</url>

</organization>

<system>GitHub</system>

<url>https://github.com/Stream-Pi/client/issues</url>

</issueManagement>

<name>GPL-3.0 License</name>

<url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>

</license>

</licenses>

<name>Debayan Sutradhar</name>

<email>debayansutradhar3@gmail.com</email>

<organization>Stream-Pi</organization>

<organizationUrl>https://www.stream-pi.com</organizationUrl>

</developer>

<name>Abhinay Agarwal</name>

<email>abhinay_agarwal@live.com</email>

<organization>Stream-Pi</organization>

<organizationUrl>https://www.stream-pi.com</organizationUrl>

</developer>

</developers>

<scm>

<url>https://github.com/stream-pi/client</url>

<connection>scm:git:git://github.com/stream-pi/client.git</connection>

<developerConnection>scm:git:ssh://git@github.com:stream-pi/client.git</developerConnection>

</scm>

<id>ossrh</id>

<url>https://oss.sonatype.org/content/repositories/snapshots</url>

</snapshotRepository>

<id>ossrh</id>

<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>

</repository>

</distributionManagement>

</project>

M src/main/java/com/stream_pi/client/info/ClientInfo.java

+23 −1

ServerInfo.java

Stores basic information about the server - name, platform type

Contributors: Debayan Sutradhar (@dubbadhar)

package com.stream_pi.client.info;

import com.gluonhq.attach.storage.StorageService;

import com.stream_pi.util.exception.MinorException;

import com.stream_pi.util.platform.Platform;

import com.stream_pi.util.platform.ReleaseStatus;

import com.stream_pi.util.version.Version;

import java.io.File;

import java.io.FileNotFoundException;

import java.util.Optional;

import java.util.function.Function;

public class ClientInfo {

private Version version;

private final ReleaseStatus releaseStatus;

private Platform platformType;

private String prePath;

private Version minThemeSupportVersion;

private Version minPluginSupportVersion;

private Version commStandardVersion;

private String runnerFileName;

private static ClientInfo instance = null;

private ClientInfo()

{

version = new Version(1,0,0);

minThemeSupportVersion = new Version(1,0,0);

minPluginSupportVersion = new Version(1,0,0);

commStandardVersion = new Version(1,0,0);

releaseStatus = ReleaseStatus.EA;

String osName = System.getProperty("os.name").toLowerCase();

prePath = System.getProperty("user.home")+"/Stream-Pi/Client/";

if(osName.contains("windows"))

{

platformType = Platform.WINDOWS;

}

else if (osName.contains("linux"))

{

platformType = Platform.LINUX;

}

else if(osName.contains("android")) // SPECIFY -Dsvm.targetName=android WHILE BUILDING ANDROID NATIVE IMAGE

{

prePath = "/sdcard/Android/data/com.stream_pi.client/";

StorageService.create().ifPresent(s->{

s.getPublicStorage("Documents").ifPresentOrElse(sp->{

prePath = sp.getAbsolutePath()+"/Stream-Pi/Client/";

}, ()->

{

prePath = null;

});

platformType = Platform.ANDROID;

}

else if(osName.contains("ios")) // SPECIFY -Dsvm.targetName=ios WHILE BUILDING ANDROID NATIVE IMAGE

{

StorageService.create().ifPresent(s->{

s.getPrivateStorage().ifPresentOrElse(sp->{

prePath = sp.getAbsolutePath()+"/Stream-Pi/Client/";

}, ()->

{

prePath = null;

});

platformType = Platform.IOS;

}

else if (osName.contains("mac"))

{

platformType = Platform.MAC;

}

else

{

platformType = Platform.UNKNOWN;

}

public void setRunnerFileName(String runnerFileName)

{

this.runnerFileName = runnerFileName;

}

public String getRunnerFileName()

{

return runnerFileName;

}

public static synchronized ClientInfo getInstance(){

if(instance == null)

{

instance = new ClientInfo();

}

return instance;

}

private boolean isShowShutDownButton = false;

public void setShowShutDownButton(boolean showShutDownButton) {

isShowShutDownButton = showShutDownButton;

}

private boolean isXMode = false;

public void setXMode(boolean isXMode)

{

this.isXMode = isXMode;

}

public boolean isXMode() {

return isXMode;

}

public boolean isShowShutDownButton() {

return isShowShutDownButton;

}

public String getPrePath()

{

return prePath;

}

public Platform getPlatformType()

{

return platformType;

}

public Version getVersion() {

return version;

}

public ReleaseStatus getReleaseStatus()

{

return releaseStatus;

}

public Version getMinThemeSupportVersion()

{

return minThemeSupportVersion;

}

public Version getMinPluginSupportVersion()

{

return minPluginSupportVersion;

}

public Version getCommStandardVersion()

{

return commStandardVersion;

}

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

+1 −2

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.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";

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

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);

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(ClientInfo.getInstance().getPlatformType() != Platform.ANDROID)

{

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(ClientInfo.getInstance().getPlatformType() == Platform.ANDROID)

{

return getScreenWidth();

}

else

{

return getStage().getWidth();

}

public double getScreenWidth()

{

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

}

@Override

public double getStageHeight()

{

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

{

return getScreenHeight();

}

else

{

return getStage().getHeight();

}

public double getScreenHeight()

{

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

}

private void checkPrePathDirectory() throws SevereException

{

try

{

File filex = new File(ClientInfo.getInstance().getPrePath());

File filex = new File(getClientInfo().getPrePath());

if(!filex.exists())

{

boolean result = filex.mkdirs();

if(result)

{

IOHelper.unzip(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();

initLogger();

}

else

{

resizeAccordingToResolution();

clearStylesheets();

applyDefaultStylesheet();

applyDefaultIconsStylesheet();

getStage().show();

throw new SevereException("No storage permission. Give it!");

}

catch (Exception e)

{

e.printStackTrace();

throw new SevereException(e.getMessage());

}

public void setupFlags()

{

//Full Screen

if(getConfig().isFullscreen())

{

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/java/module-info.java

+1 −0

module com.stream_pi.client {

requires javafx.base;

requires javafx.graphics;

requires javafx.controls;

requires org.kordamp.iconli.core;

requires org.kordamp.ikonli.javafx;

requires com.gluonhq.attach.lifecycle;

requires com.gluonhq.attach.util;

requires com.gluonhq.attach.storage;

requires java.xml;

requires com.stream_pi.util;

requires com.stream_pi.theme_api;

requires com.stream_pi.action_api;

requires org.kordamp.ikonli.fontawesome5;

exports com.stream_pi.client;

}

Public

client

Clone or download

Somewhat storage support for iOS

Modified Files