client

Bumped javafx to 17-ea+12, Added Java and JavaFX version Label to Settings

Download Browse

+37 −12

Author

Debayan Sutradhar (rnayabed) 2021-06-22 12:26

Committer

Debayan Sutradhar (rnayabed) 2021-06-22 12:26

Hash d3daed4265c6a8d55d55eaf3523f39249e921258

Parent 193c26680daa46cc3f4eecdaac47e9384dcdbd1c

Reference git #client/d3daed4265c6a8d55d55eaf3523f39249e921258

Modified Files

List

Side by side diff

Inline diff

M .github/workflows/build.yml

+8 −8

on:

workflow_run:

workflows: ["Init"]

types:

- completed

jobs:

build-linux-and-android:

runs-on: ubuntu-20.04

steps:

- name: Install packages

run: sudo apt install axel libasound2-dev libavcodec-dev libavformat-dev libavutil-dev libgl-dev libgtk-3-dev libpango1.0-dev libxtst-dev xdg-utils libc6 xdg-utils zlib1g libpng16-16 libasound2 libbsd-dev zip libblkid1 libdbus-1-3 libexpat1 libgpg-error0 liblzma5 libmount1 libpcre3 libselinux1 libsystemd0 libuuid1

- uses: actions/checkout@v2

- name: Setup java

uses: joschi/setup-jdk@v2

with:

java-version: 16

- name: Setup JavaFX

run: |

cd /tmp

axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-jmods.zip

axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-jmods.zip

unzip /tmp/openjfx-17-ea+11_linux-x64_bin-jmods.zip -d /tmp

unzip /tmp/openjfx-17-ea+12_linux-x64_bin-jmods.zip -d /tmp

- name: Download GraalVM 21.1.0

run: |

cd /tmp

axel -n 8 https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.1.0/graalvm-ce-java11-linux-amd64-21.1.0.tar.gz

tar -xvzf *.gz

- name: Install native-image

run: |

cd /tmp/graalvm-ce-java11-21.1.0/bin

./gu install native-image

- name: Download built jars

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: target/lib/

- name: Download REQ_MODULES

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Download VERSION

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Add VERSION to environment

run: |

echo "VERSION=$(<version.txt)" >> $GITHUB_ENV

- name: Add REQ_MODULES to environment

run: |

echo "REQ_MODULES=$(<req_modules.txt)" >> $GITHUB_ENV

- name: Download build-date

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: src/main/resources/com/stream_pi/client/

- name: Create Linux x64 DEB, Linux x64 APP IMAGE, Android aarch64 APK, Linux Arm32 ZIP

run: |

# Create DEB

.github/scripts/jpackage.sh \

--icon assets/linux-icon.png \

--app-version ${{ env.VERSION }} \

--linux-menu-group "Stream-Pi" \

--license-file LICENSE.txt \

--type deb

# Create App Image

.github/scripts/jpackage.sh \

--icon assets/linux-icon.png \

--app-version ${{ env.VERSION }} \

--type app-image

export GRAALVM_HOME=/tmp/graalvm-ce-java11-21.1.0/

mvn -Pandroid gluonfx:build gluonfx:package

mv target/gluonfx/aarch64-android/gvm/*.apk ${{ env.INSTALL_DIR }}/stream-pi-client-android-aarch64-${{ env.VERSION }}.apk

cd $INSTALL_DIR

mv *.deb stream-pi-client-linux-x64-${{ env.VERSION }}-debian.deb

mv 'Stream-Pi Client' stream-pi-client-${{ env.VERSION }}

zip -r stream-pi-client-linux-x64-${{ env.VERSION }}-executable.zip stream-pi-client-${{ env.VERSION }}

rm -r stream-pi-client-${{ env.VERSION }}

env:

MAIN_CLASS: com.stream_pi.client.Main

JAVAFX_JMODS: /tmp/javafx-jmods-17/

JPACKAGE_HOME: ${{ env.JAVA_HOME }}

INSTALL_DIR: target/install

- name: Saving Linux x64 DEB

uses: actions/upload-artifact@v2

with:

path: target/install/stream-pi-client-linux-x64-${{ env.VERSION }}-debian.deb

- name: Saving Linux x64 ZIP

uses: actions/upload-artifact@v2

with:

path: target/install/stream-pi-client-linux-x64-${{ env.VERSION }}-executable.zip

- name: Saving Android aarch64 APK

uses: actions/upload-artifact@v2

with:

path: target/install/*.apk

build-macos:

runs-on: macos-10.15

steps:

- uses: actions/checkout@v2

- name: Setup java

uses: joschi/setup-jdk@v2

with:

java-version: 16

- name: Setup JavaFX

run: |

wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-jmods.zip

wget -P /tmp https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-jmods.zip

unzip /tmp/openjfx-17-ea+11_linux-x64_bin-jmods.zip -d /tmp

unzip /tmp/openjfx-17-ea+12_linux-x64_bin-jmods.zip -d /tmp

- name: Download built jars

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: target/lib/

- name: Download REQ_MODULES

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Download VERSION

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Add VERSION to environment

run: |

echo "VERSION=$(<version.txt)" >> $GITHUB_ENV

- name: Add REQ_MODULES to environment

run: |

echo "REQ_MODULES=$(<req_modules.txt)" >> $GITHUB_ENV

- name: Create DMG

run: |

# Create DMG

.github/scripts/jpackage.sh \

--icon assets/macos-icon.icns \

--license-file LICENSE.txt \

--type dmg

cd $INSTALL_DIR

mv *.dmg stream-pi-client-macos-x64-${{ env.VERSION }}.dmg

env:

MAIN_CLASS: com.stream_pi.client.Main

JAVAFX_JMODS: /tmp/javafx-jmods-17/

JPACKAGE_HOME: ${{ env.JAVA_HOME }}

INSTALL_DIR: target/install

- name: Saving MacOS x64 DMG

uses: actions/upload-artifact@v2

with:

path: target/install/stream-pi-client-macos-x64-${{ env.VERSION }}.dmg

build-windows:

runs-on: windows-2019

steps:

- uses: actions/checkout@v2

- name: Setup java

uses: joschi/setup-jdk@v2

with:

java-version: 16

- name: Download REQ_MODULES

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Download VERSION

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Setup JavaFX

run: |

bitsadmin /Transfer DownloadJavaFX https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_windows-x64_bin-jmods.zip D:\openjfx-17-ea+11_windows-x64_bin-jmods.zip

bitsadmin /Transfer DownloadJavaFX https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_windows-x64_bin-jmods.zip D:\openjfx-17-ea+12_windows-x64_bin-jmods.zip

Expand-Archive -Force D:\openjfx-17-ea+11_windows-x64_bin-jmods.zip D:\

Expand-Archive -Force D:\openjfx-17-ea+12_windows-x64_bin-jmods.zip D:\

- name: Download built jars

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: target/lib/

- name: Create Bundle using JPackage

id: project

shell: cmd

run: |

call .github\scripts\jpackage.bat

env:

MAIN_CLASS: com.stream_pi.client.Main

JAVAFX_JMODS: D:\javafx-jmods-17\

JPACKAGE_HOME: ${{ env.JAVA_HOME }}

INSTALL_DIR: target/install

- name: Saving Windows x64 EXE

uses: actions/upload-artifact@v2

with:

path: target/install/*.msi

armv32_job:

runs-on: ubuntu-18.04

steps:

- uses: actions/checkout@v2.1.0

- name: Download VERSION

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

- name: Add VERSION to environment

run: |

echo "VERSION=$(<version.txt)" >> $GITHUB_ENV

- name: Download built jars

uses: dawidd6/action-download-artifact@v2

with:

workflow: init.yml

path: target/lib/

- uses: uraimo/run-on-arch-action@v2.0.5

with:

arch: armv6

distro: buster

run: |

sudo apt update

sudo apt install axel unzip zip

VERSION=$(<version.txt)

INSTALL_DIR=target/install

mkdir -p $INSTALL_DIR

mv target/lib/* $INSTALL_DIR

axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-arm32_bin-sdk.zip

axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-arm32_bin-sdk.zip

unzip openjfx-17-ea+11_linux-arm32_bin-sdk.zip -d javafx-sdk-arm32

unzip openjfx-17-ea+12_linux-arm32_bin-sdk.zip -d javafx-sdk-arm32

mv javafx-sdk-arm32/javafx-sdk-17/legal javafx-sdk-arm32/javafx-sdk-17/javafx-legal

mv javafx-sdk-arm32/javafx-sdk-17/lib/libgluon_drm* javafx-sdk-arm32/javafx-sdk-17/lib/libgluon_drm.so

mv javafx-sdk-arm32/javafx-sdk-17/lib/* $INSTALL_DIR/

cp assets/arm32-launchers/run_console $INSTALL_DIR/run_console

cp assets/arm32-launchers/run_desktop $INSTALL_DIR/run_desktop

chmod +x $INSTALL_DIR/run_desktop

chmod +x $INSTALL_DIR/run_console

#Download jdk

axel -n 8 https://cdn.azul.com/zulu-embedded/bin/zulu11.48.21-ca-jdk11.0.11-linux_aarch32hf.tar.gz

tar -xvzf zulu11.48.21-ca-jdk11.0.11-linux_aarch32hf.tar.gz

#Run jpackage

zulu11.48.21-ca-jdk11.0.11-linux_aarch32hf/bin/jlink --no-header-files --no-man-pages --add-modules java.base,java.logging,java.net.http,java.scripting,jdk.jsobject,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom,java.xml,java.management,jdk.localedata,java.sql,jdk.crypto.ec --output $INSTALL_DIR/jre

cd $INSTALL_DIR

zip -r stream-pi-client-linux-arm32-$VERSION-executable.zip *

- name: Saving Linux ARM32 ZIP

uses: actions/upload-artifact@v2

with:

path: target/install/stream-pi-client-linux-arm32-${{ env.VERSION }}-executable.zip

M .github/workflows/init.yml

+2 −2

on: [push]

jobs:

init:

runs-on: ubuntu-20.04

steps:

- name: Install packages

run: sudo apt install unzip axel

- uses: actions/checkout@v2

- name: Setup java

uses: joschi/setup-jdk@v2

with:

java-version: 16

- name: Setup JavaFX

run: |

cd /tmp

axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+11_linux-x64_bin-sdk.zip

axel -n 8 https://download2.gluonhq.com/openjfx/17/openjfx-17-ea+12_linux-x64_bin-sdk.zip

unzip /tmp/openjfx-17-ea+11_linux-x64_bin-sdk.zip -d /tmp

unzip /tmp/openjfx-17-ea+12_linux-x64_bin-sdk.zip -d /tmp

- name: Set Timezone

uses: szenius/set-timezone@v1.0

with:

timezoneLinux: "Asia/Kolkata"

- name: Build Jars

run: |

echo $(date +'%d-%m-%Y %H:%M:%S %Z') > src/main/resources/com/stream_pi/client/build-date

echo Build Date/Time: cat src/main/resources/com/stream_pi/client/build-date

mvn -X package

- name: Save built jars

uses: actions/upload-artifact@v2

with:

path: target/lib/*

- name: Set Version

run: |

echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV

- name: Calculate required modules

run: |

JDEPS_MODULES=$(jdeps --module-path $JAVAFX_SDK/:target/lib/ --print-module-deps --ignore-missing-deps target/lib/client-$VERSION.jar)

JAVAFX_MODULES=javafx.fxml,javafx.media,javafx.swing,javafx.web

EXTRA_MODULES=java.base,java.logging,java.net.http,java.scripting,jdk.jsobject,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom,java.xml,java.management,jdk.localedata,java.sql,jdk.crypto.ec

echo "REQ_MODULES=$EXTRA_MODULES,$JDEPS_MODULES,$JAVAFX_MODULES" >> $GITHUB_ENV

env:

JAVAFX_SDK: /tmp/javafx-sdk-17/lib/

- name: Saving REQ_MODULES

run: |

echo $REQ_MODULES > req_modules.txt

- name: Uploading REQ_MODULES

uses: actions/upload-artifact@v2

with:

path: req_modules.txt

- name: Saving VERSION

run: |

echo $VERSION > version.txt

- name: Uploading VERSION

uses: actions/upload-artifact@v2

with:

path: version.txt

- name: Uploading build-date

uses: actions/upload-artifact@v2

with:

path: src/main/resources/com/stream_pi/client/build-date

M pom.xml

+1 −1

<?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-EA+3-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>17-ea+11</javafx.version>

<javafx.version>17-ea+12</javafx.version>

<gluonfx.plugin.version>1.0.0</gluonfx.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>

<controlsfx.version>11.1.0</controlsfx.version>

<attach.version>4.0.11</attach.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>

<javafx.maven.plugin.version>0.0.6</javafx.maven.plugin.version>

<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>

<jar.plugin>2.3.1</jar.plugin>

</properties>

<groupId>org.openjfx</groupId>

<artifactId>javafx-controls</artifactId>

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

<!--scope>${javafx.scope}</scope>

<systemPath>${javafx.systemPath}/javafx.controls.jar</systemPath-->

</dependency>

<groupId>org.openjfx</groupId>

<artifactId>javafx-base</artifactId>

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

<!--scope>${javafx.scope}</scope>

<systemPath>${javafx.systemPath}/javafx.base.jar</systemPath-->

</dependency>

<groupId>org.openjfx</groupId>

<artifactId>javafx-graphics</artifactId>

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

<!--scope>${javafx.scope}</scope>

<systemPath>${javafx.systemPath}/javafx.graphics.jar</systemPath-->

</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>

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

</dependency>

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

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

</dependency>

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

<artifactId>orientation</artifactId>

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

</dependency>

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

<artifactId>storage</artifactId>

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

</dependency>

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

<artifactId>browser</artifactId>

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

</dependency>

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

<artifactId>vibration</artifactId>

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

</dependency>

<groupId>org.controlsfx</groupId>

<artifactId>controlsfx</artifactId>

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

</dependency>

</dependencies>

<id>gluon-releases</id>

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

</repository>

<id>sonatype-snapshot</id>

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

</repository>

</repositories>

<build>

<artifactId>maven-dependency-plugin</artifactId>

<phase>package</phase>

<goals>

<goal>copy-dependencies</goal>

</goals>

<outputDirectory>target/lib</outputDirectory>

<excludeGroupIds>org.openjfx</excludeGroupIds>

</configuration>

</execution>

</executions>

</plugin>

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

<artifactId>maven-jar-plugin</artifactId>

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

<outputDirectory>target/lib/</outputDirectory>

</configuration>

</plugin>

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

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

</plugin>

<groupId>org.openjfx</groupId>

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

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

<commandlineArgs>-DStream-Pi.defaultFullScreenMode=false -DStream-Pi.enableScreenSaverFeature=false</commandlineArgs>

<option>-Dprism.verbose=true</option>

<option>-Djavafx.verbose=true</option>

<option>-Dprism.forceGPU=true</option>

</options>

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

</configuration>

</plugin>

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

</configuration>

</plugin>

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

<artifactId>maven-surefire-plugin</artifactId>

<version>${maven-surefire-plugin.version}</version>

</plugin>

</plugins>

</build>

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

<id>Sonatype</id>

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

</pluginRepository>

</pluginRepositories>

<id>android</id>

<build>

<groupId>com.gluonhq</groupId>

<artifactId>gluonfx-maven-plugin</artifactId>

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

<target>android</target>

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

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

<list>browser</list>

<list>vibration</list>

<list>orientation</list>

</attachList>

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

<list>com.stream_pi.client.window.settings.About.Contributor</list>

<list>javafx.scene.control.TableColumnBase</list>

</reflectionList>

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

</configuration>

</plugin>

</plugins>

</build>

</profile>

<build>

<groupId>com.gluonhq</groupId>

<artifactId>gluonfx-maven-plugin</artifactId>

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

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

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

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

</nativeImageArgs>

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

</bundlesList>

<list>lifecycle</list>

<list>storage</list>

<list>browser</list>

<list>vibration</list>

<list>orientation</list>

</attachList>

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

<list>com.stream_pi.client.window.settings.About.Contributor</list>

<list>javafx.scene.control.TableColumnBase</list>

</reflectionList>

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

</configuration>

</plugin>

</plugins>

</build>

</profile>

<id>linux-aarch64</id>

<build>

<groupId>com.gluonhq</groupId>

<artifactId>gluonfx-maven-plugin</artifactId>

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

<target>linux-aarch64</target>

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

<remoteHostName>pi@pi-4b.local</remoteHostName>

<remoteDir>/home/rnayabed/native/</remoteDir>

<arg>-Dmonocle.platform=EGL</arg>

<arg>-Dembedded=monocle</arg>

<arg>-Dglass.platform=Monocle</arg>

<arg>-Degl.displayid=/dev/dri/card1</arg>

</runtimeArgs>

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

</nativeImageArgs>

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

</bundlesList>

<list>lifecycle</list>

<list>storage</list>

<list>browser</list>

<list>vibration</list>

<list>orientation</list>

</attachList>

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

<list>com.stream_pi.client.window.settings.About.Contributor</list>

<list>javafx.scene.control.TableColumnBase</list>

</reflectionList>

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

</configuration>

</plugin>

</plugins>

</build>

</profile>

<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/window/settings/About/AboutTab.java

+21 −1

package com.stream_pi.client.window.settings.About;

import com.stream_pi.action_api.ActionAPI;

import com.stream_pi.client.Main;

import com.stream_pi.client.controller.ClientListener;

import com.stream_pi.client.info.ClientInfo;

import javafx.application.HostServices;

import javafx.event.Event;

import javafx.event.EventHandler;

import javafx.geometry.Insets;

import javafx.geometry.Pos;

import javafx.scene.CacheHint;

import javafx.scene.control.*;

import javafx.scene.image.Image;

import javafx.scene.image.ImageView;

import javafx.scene.input.SwipeEvent;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.scene.layout.VBox;

import java.net.URL;

import java.nio.file.Files;

import java.nio.file.Paths;

import java.util.Objects;

import java.util.logging.Logger;

public class AboutTab extends ScrollPane

{

private ClientListener clientListener;

private ContributorsTab contributorsTab;

private VBox mainVBox;

public AboutTab(ClientListener clientListener)

{

this.clientListener = clientListener;

getStyleClass().add("about_parent");

setPadding(new Insets(5));

mainVBox = new VBox();

mainVBox.getStyleClass().add("about");

mainVBox.setSpacing(5.0);

mainVBox.setAlignment(Pos.TOP_CENTER);

Image appIcon = new Image(Objects.requireNonNull(Main.class.getResourceAsStream("app_icon.png")));

ImageView appIconImageView = new ImageView(appIcon);

appIconImageView.setFitHeight(146);

appIconImageView.setFitWidth(132);

Tab contributorsT = new Tab("Contributors");

contributorsTab = new ContributorsTab();

contributorsT.setContent(contributorsTab);

TabPane tabPane = new TabPane();

tabPane.addEventFilter(SwipeEvent.ANY, Event::consume);

tabPane.getStyleClass().add("settings_about_tab_internal");

tabPane.setTabClosingPolicy(TabPane.TabClosingPolicy.UNAVAILABLE);

tabPane.setMaxWidth(600);

VBox.setVgrow(tabPane, Priority.ALWAYS);

Tab licenseTab = new Tab("License");

licenseTab.setContent(new LicenseTab());

Tab contactTab = new Tab("Contact");

contactTab.setContent(new ContactTab(clientListener));

tabPane.getTabs().addAll(licenseTab, contributorsT, contactTab);

Hyperlink donateButton = new Hyperlink("DONATE");

donateButton.setOnAction(event -> openWebpage("https://www.patreon.com/streampi"));

donateButton.getStyleClass().add("about_donate_hyperlink");

ClientInfo clientInfo = ClientInfo.getInstance();

Label versionText = new Label(clientInfo.getVersion().getText() + " - "+ clientInfo.getPlatform().getUIName() + " - "+ clientInfo.getReleaseStatus().getUIName());

versionText.getStyleClass().add("about_version_label");

Label commStandardLabel = new Label("Comm Standard "+clientInfo.getCommStandardVersion().getText());

commStandardLabel.getStyleClass().add("about_comm_standard_label");

Label minThemeAPILabel = new Label("Min ThemeAPI "+clientInfo.getMinThemeSupportVersion().getText());

minThemeAPILabel.getStyleClass().add("about_min_theme_api_label");

Label minActionAPILabel = new Label("Min ActionAPI "+clientInfo.getMinPluginSupportVersion().getText());

minActionAPILabel.getStyleClass().add("about_min_action_api_label");

Label currentActionAPILabel = new Label("ActionAPI "+ ActionAPI.API_VERSION.getText());

currentActionAPILabel.getStyleClass().add("about_current_action_api_label");

HBox hBox1 = new HBox(versionText);

hBox1.setAlignment(Pos.CENTER);

hBox1.setSpacing(10);

Label javaVersionLabel = new Label("Java "+System.getProperty("java.version"));

javaVersionLabel.getStyleClass().add("about_java_version");

Label javafxVersionLabel = new Label("JavaFX "+System.getProperty("javafx.version"));

javafxVersionLabel.getStyleClass().add("about_javafx_version");

HBox hBox2 = new HBox(javaVersionLabel, getSep(),

javafxVersionLabel);

hBox2.setAlignment(Pos.CENTER);

hBox2.setSpacing(10);

Label disclaimerLabel = new Label("This contributor list shows only those who have contributed " +

"to the Client Source code.\nTo know about the contributors of Action API, Theme API, Util, " +

"visit the respective repositories. If you want to know about the Core Team instead, please visit the website.");

disclaimerLabel.getStyleClass().add("about_license_contributors_disclaimer_label");

disclaimerLabel.setWrapText(true);

Label buildDateLabel = new Label();

buildDateLabel.getStyleClass().add("build-date-label");

mainVBox.getChildren().addAll(appIconImageView, tabPane, disclaimerLabel,

donateButton, hBox1, buildDateLabel);

donateButton, hBox1, hBox2, buildDateLabel);

mainVBox.prefWidthProperty().bind(widthProperty().subtract(25));

setContent(mainVBox);

try

{

buildDateLabel.setText("Build date/time: " + new String(Objects.requireNonNull(Main.class.getResourceAsStream("build-date")).readAllBytes()));

}

catch (Exception e)

{

e.printStackTrace();

}

setCache(true);

setCacheHint(CacheHint.SPEED);

}

private Label getSep()

{

Label label = new Label("|");

label.getStyleClass().add("separator_ui_label");

return label;

}

public void openWebpage(String url)

{

clientListener.openURL(url);

}

M src/main/resources/com/stream_pi/client/style.css

+5 −0

.root {

-fx-font-family : 'Roboto';

}

.action_box

{

-fx-border-width: 1px;

-fx-border-color : grey;

}

.action_box_icon_present

{

}

.action_box_icon_not_present

{

}

.action_box_onclick

{

}

.settings_heading_label

{

-fx-font-size: 20;

}

.alert_header

{

-fx-padding: 5;

}

.alert_pane

{

-fx-border-width : 5;

-fx-border-radius : 5;

-fx-background-radius : 5;

-fx-max-width : 400;

-fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 5, 0.0 , 0.0 , 0 );

}

.alert_header_icon

{

-fx-icon-size : 30;

}

.alert_content_pane

{

-fx-padding: 5;

}

.alert_pane_parent, .combobox_pane_parent

{

-fx-background-color : rgba(0,0,0,0.5);

}

.alert_pane_header_text

{

-fx-font-size: 18;

}

.alert_button_bar

{

-fx-alignment: CENTER_RIGHT;

-fx-spacing: 5;

-fx-padding: 5;

}

.alert_scroll_pane {

-fx-max-height : 300;

/*-fx-focus-color: #FFFFFF;

-fx-faint-focus-color:#FFFFFF;*/

}

.combo_box

{

-fx-alignment:CENTER_LEFT;

-fx-pref-width:200;

-fx-padding: 5;

-fx-border-width : 1;

-fx-border-color : grey;

-fx-border-radius : 3;

}

.combo_box_popup

{

-fx-border-width : 5;

-fx-border-radius : 5;

-fx-background-radius : 5;

-fx-max-height : 300;

-fx-max-width : 410;

-fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 5, 0.0 , 0.0 , 0 );

}

.combo_box_popup_vbox

{

-fx-padding: 5 5 0 5;

-fx-spacing:5;

}

.combo_box_drop_down_icon

{

-fx-icon-code: fas-caret-down;

-fx-icon-size: 14;

}

.action_grid_pane_parent

{

-fx-background-color:transparent;

}

.first_time_use_pane_heading_label

{

-fx-font-size: 20;

}

.first_time_use_pane_stackpane

{

}

.first_time_use_pane_welcome

{

}

.first_time_use_pane_license

{

-fx-spacing : 10;

}

.first_time_use_pane_final_config

{

}

.first_time_use_pane_final_config_label

{

}

.first_time_use_welcome_pane_welcome_label

{

-fx-font-size: 30;

}

.first_time_use_welcome_pane_next_to_continue_label

{

-fx-font-size: 15;

}

.scroll-pane

{

-fx-focus-color:transparent;

-fx-faint-focus-color:transparent;

}

/*Alert Classes added to default stylesheet to show init error, if occurs */

.action_box_display_text_label

{

-fx-font-size : 16;

-fx-background-color : transparent;

}

.alert_pane

{

-fx-background-color : white;

-fx-border-color : white;

}

.alert_content_pane

{

-fx-background-color: white;

-fx-padding: 5;

}

.alert_scroll_pane

{

-fx-background: white;

-fx-border-color:white;

}

.alert_button_bar

{

-fx-background-color:white;

}

.about_donate_hyperlink

{

-fx-padding : 10 0 0 0;

-fx-font-size : 25;

}

.screensaver

{

-fx-background-color: black;

}

.separator_ui_label

{

-fx-text-fill: grey;

}

Public

client

Clone or download

Bumped javafx to 17-ea+12, Added Java and JavaFX version Label to Settings

Modified Files