Mac Compatible

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: maven:3-amazoncorretto-11
+image: maven:3-amazoncorretto-17
 
 stages:
   - staticTest
@@ -7,11 +7,12 @@ stages:
 variables:
   VERSION: 0.0.${CI_PIPELINE_ID}
 
+
 # Jobs
 build:
   stage: build
   script:
-    - mvn clean package -Dproject.version=${VERSION}
+    - mvn clean package -Dproject.version=${VERSION} -Dmaven.compiler.source=17 -Dmaven.compiler.target=17
   artifacts:
     name: "busylight_client.jar"
     reports:

pom.xml

@@ -10,6 +10,9 @@
     <project.version>0.0.1-SNAPSHOT</project.version>
     <junit.version>5.10.0</junit.version>
     <mockito.version>5.4.0</mockito.version>
+    <java.version>17</java.version>
+    <javafx.version>21.0.1</javafx.version>
+
   </properties>
   <dependencies>
     <dependency>
@@ -39,25 +42,32 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>11.0.2</version>
+      <version>${javafx.version}</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-fxml</artifactId>
-      <version>11.0.2</version>
+      <version>${javafx.version}</version>
+
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-graphics -->
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-graphics</artifactId>
-      <version>11.0.2</version>
+      <version>${javafx.version}</version>
       <classifier>win</classifier>
     </dependency>
+    <dependency>
+    <groupId>org.openjfx</groupId>
+    <artifactId>javafx-graphics</artifactId>
+      <version>${javafx.version}</version>
+      <classifier>mac-aarch64</classifier>
+  </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-graphics</artifactId>
-      <version>11.0.2</version>
+      <version>${javafx.version}</version>
       <classifier>linux</classifier>
     </dependency>
     <dependency>
@@ -132,8 +142,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.11.0</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>17</source>
+          <target>17</target>
         </configuration>
       </plugin>
 

src/main/java/de/doubleslash/usb_led_matrix/App.java

@@ -57,6 +57,7 @@ public void start(final Stage primaryStage) throws Exception {
       final UsbDeviceView usbDeviceView = new UsbDeviceView(model, usbAdapter);
       usbDeviceView.initialize();
       final Scene scene = new Scene(root);
+      scene.getStylesheets().add("/CSS/Style_Mode.css");
       final ConfigurationView configurationView = fxmlLoader.getController();
       configurationView.setModel(model);
       configurationView.setScene(scene);

src/main/java/de/doubleslash/usb_led_matrix/Settings.java

@@ -42,6 +42,8 @@ public class Settings {
    private static double brightness = defaultBrightness;
    private static String colorMode = defaultColorMode;
    private static String cssFile = "/CSS/light_Mode.css";
+
+   private static String styleMode = "/CSS/Style_Mode.css";
    private static int timeoutInMinutes = defaultTimeoutInMinutes;
    private static int numberOfLeds = defaultNumberOfLeds;
 
@@ -265,11 +267,14 @@ public static void Dark(final Scene scene) {
       setColorMode("dark");
       if (scene.getStylesheets().contains(cssFile)) {
          scene.getStylesheets().remove(cssFile);
+         scene.getStylesheets().add(styleMode);
       }
    }
 
    public static void Light(final Scene scene) {
       scene.getStylesheets().add(cssFile);
+      scene.getStylesheets().add(styleMode);
+
       setColorMode("light");
    }
 

src/main/java/de/doubleslash/usb_led_matrix/view/ConfigurationView.java

@@ -203,6 +203,8 @@ private void initialize() {
          if (!model.isLoggedIntoTeams()) {
             LOG.info("Start Device Code Flow.");
             final Alert alert = new Alert(AlertType.CONFIRMATION);
+            scene.getStylesheets().add("/CSS/Style_Mode.css");
+
             alert.setContentText("You need to log in.");
             final Optional<ButtonType> optionalButtonType = alert.showAndWait();
 
@@ -216,6 +218,8 @@ private void initialize() {
                      final Parent root = fxmlLoader.load();
                      final AuthenticationView authFlow = fxmlLoader.getController();
                      final Scene scene = new Scene(root);
+                     scene.getStylesheets().add("/CSS/Style_Mode.css");
+
                      authFlow.setScene(scene);
                      authFlow.customInitialize();
                      model.deviceCodeProperty().bind(authFlow.getDeviceCodeProperty());
@@ -412,6 +416,7 @@ void informationImageButton(final MouseEvent event) throws SerialPortException {
          final Parent root = fxmlLoader.load();
          final VersionView versionView = fxmlLoader.getController();
          final Scene scene = new Scene(root);
+         scene.getStylesheets().add("/CSS/Style_Mode.css");
          versionView.setScene(scene);
          versionView.instantiate(usbAdapter.versionProperty());
 

src/main/resources/CSS/Style_Mode.css

@@ -0,0 +1,3 @@
+*{
+-fx-font-family:"Arial";
+}