Skip to content

Commit 9c41e77

Browse files
committed
Added best and worst day visualization to 30 days view
1 parent ce94dee commit 9c41e77

23 files changed

+293
-287
lines changed

.github/workflows/ci.yaml

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ jobs:
77
runs-on: [ windows-latest ]
88
steps:
99
- uses: actions/checkout@v4
10-
- name: Set up JDK 21.0.4
10+
- name: Set up JDK 21
1111
uses: actions/setup-java@v4
1212
with:
13-
java-version: 21.0.4
13+
java-version: 21
1414
distribution: 'zulu'
1515
gpg-private-key: ${{ secrets.GPG_KEY }}
1616
gpg-passphrase: PASSPHRASE
@@ -22,7 +22,7 @@ jobs:
2222
run: .\build_app_windows.bat
2323
- uses: actions/upload-artifact@v4
2424
with:
25-
name: GlucoStatusFX Windows
25+
name: GlucoStatusFX-Windows-x64
2626
path: |
2727
build/installer
2828
build/libs
@@ -31,10 +31,10 @@ jobs:
3131
runs-on: [ macos-latest ]
3232
steps:
3333
- uses: actions/checkout@v4
34-
- name: Set up JDK 21.0.4
34+
- name: Set up JDK 21
3535
uses: actions/setup-java@v4
3636
with:
37-
java-version: 21.0.4
37+
java-version: 21
3838
distribution: 'zulu'
3939
gpg-private-key: ${{ secrets.GPG_KEY }}
4040
gpg-passphrase: PASSPHRASE
@@ -48,7 +48,7 @@ jobs:
4848
run: ./build_app_macos.sh
4949
- uses: actions/upload-artifact@v4
5050
with:
51-
name: GlucoStatusFX Mac
51+
name: GlucoStatusFX-Mac-aarch64
5252
path: |
5353
build/installer
5454
build/libs
@@ -57,10 +57,10 @@ jobs:
5757
runs-on: [ macos-13 ]
5858
steps:
5959
- uses: actions/checkout@v4
60-
- name: Set up JDK 21.0.4
60+
- name: Set up JDK 21
6161
uses: actions/setup-java@v4
6262
with:
63-
java-version: 21.0.4
63+
java-version: 21
6464
distribution: 'zulu'
6565
gpg-private-key: ${{ secrets.GPG_KEY }}
6666
gpg-passphrase: PASSPHRASE
@@ -74,7 +74,7 @@ jobs:
7474
run: ./build_app_macos.sh
7575
- uses: actions/upload-artifact@v4
7676
with:
77-
name: GlucoStatusFX Mac x64
77+
name: GlucoStatusFX-Mac-x64
7878
path: |
7979
build/installer
8080
build/libs
@@ -83,10 +83,10 @@ jobs:
8383
runs-on: [ ubuntu-latest ]
8484
steps:
8585
- uses: actions/checkout@v4
86-
- name: Set up JDK 21.0.4
86+
- name: Set up JDK 21
8787
uses: actions/setup-java@v4
8888
with:
89-
java-version: 21.0.4
89+
java-version: 21
9090
distribution: 'zulu'
9191
gpg-private-key: ${{ secrets.GPG_KEY }}
9292
gpg-passphrase: PASSPHRASE
@@ -100,7 +100,33 @@ jobs:
100100
run: ./build_app_linux.sh
101101
- uses: actions/upload-artifact@v4
102102
with:
103-
name: GlucoStatusFX Linux
103+
name: GlucoStatusFX-Linux-x64
104104
path: |
105105
build/installer
106-
build/libs
106+
build/libs
107+
108+
build-linux-arm64:
109+
runs-on: [ ubuntu-24.04-arm ]
110+
steps:
111+
- uses: actions/checkout@v4
112+
- name: Set up JDK 21
113+
uses: actions/setup-java@v4
114+
with:
115+
java-version: 21
116+
distribution: 'zulu'
117+
gpg-private-key: ${{ secrets.GPG_KEY }}
118+
gpg-passphrase: PASSPHRASE
119+
- name: Build with Gradle
120+
run: ./gradlew build
121+
env:
122+
PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
123+
- name: Grant execute permission for build_app_linux.sh
124+
run: chmod +x ./build_app_linux.sh
125+
- name: Create Distribution
126+
run: ./build_app_linux.sh
127+
- uses: actions/upload-artifact@v4
128+
with:
129+
name: GlucoStatusFX-Linux-arm64
130+
path: |
131+
build/installer
132+
build/libs

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ dependencies {
5757
implementation "org.openjfx:javafx-controls:${javafxVersion}:${platform}"
5858
implementation "org.openjfx:javafx-media:${javafxVersion}:${platform}"
5959
implementation "org.openjfx:javafx-swing:${javafxVersion}:${platform}"
60-
implementation 'eu.hansolo:jdktools:21.0.11'
61-
implementation 'eu.hansolo:toolbox:21.0.15'
60+
implementation 'eu.hansolo:jdktools:21.0.19'
61+
implementation 'eu.hansolo:toolbox:21.0.17'
6262
implementation 'eu.hansolo:toolboxfx:21.0.7'
6363
implementation 'eu.hansolo:applefx:21.0.3'
6464
implementation 'com.google.code.gson:gson:2.10.1'

build_app_linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#
2020

2121
JAVA_VERSION=23
22-
MAIN_JAR="GlucoStatusFX-23.0.0.jar"
23-
APP_VERSION=23.0.0
22+
MAIN_JAR="GlucoStatusFX-23.0.1.jar"
23+
APP_VERSION=23.0.1
2424

2525
echo "java home: $JAVA_HOME"
2626
echo "project version: $PROJECT_VERSION"

build_app_macos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#
2020

2121
JAVA_VERSION=23
22-
MAIN_JAR="GlucoStatusFX-23.0.0.jar"
23-
APP_VERSION=23.0.0
22+
MAIN_JAR="GlucoStatusFX-23.0.1.jar"
23+
APP_VERSION=23.0.1
2424

2525
echo "java home: $JAVA_HOME"
2626
echo "project version: $PROJECT_VERSION"

build_app_windows.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@ECHO OFF
22

33
set JAVA_VERSION=23
4-
set MAIN_JAR=GlucoStatusFX-23.0.0.jar
5-
set APP_VERSION=23.0.0
4+
set MAIN_JAR=GlucoStatusFX-23.0.1.jar
5+
set APP_VERSION=23.0.1
66

77
rem ------ SETUP DIRECTORIES AND FILES ----------------------------------------
88
rem Remove previously generated java runtime and installers. Copy all required

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# limitations under the License.
1717
#
1818

19-
sourceCompatibility = 23
20-
targetCompatibility = 23
19+
sourceCompatibility = 21
20+
targetCompatibility = 21
2121

2222
group = eu.hansolo
23-
version = 23.0.0
23+
version = 23.0.1
2424
javafxVersion = 23

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818

1919
distributionBase=GRADLE_USER_HOME
2020
distributionPath=wrapper/dists
21-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
21+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
2222
zipStoreBase=GRADLE_USER_HOME
2323
zipStorePath=wrapper/dists

releases/GlucoStatusFX-23.0.0.jar

20 MB
Binary file not shown.

releases/GlucoStatusFX-23.0.1.jar

20 MB
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package eu.hansolo.fx.glucostatus;
2+
3+
import eu.hansolo.toolboxfx.geom.Rectangle;
4+
5+
6+
public record ButtonShape(int daysToShow, Rectangle shape) { }

0 commit comments

Comments
 (0)