Skicka, samt ladda ner/visa fil fungerar

Author: Linus Westling

src/main/java/com/example/AttachmentDto.java

@@ -0,0 +1,7 @@
+package com.example;
+
+public record AttachmentDto(
+        String name,
+        String url,
+        String type,
+        long size) {}

src/main/java/com/example/HelloController.java

@@ -3,13 +3,24 @@
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListView;
+import javafx.scene.control.*;
 import javafx.stage.FileChooser;
 
+import javafx.scene.layout.VBox;
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+
+import java.awt.*;
+import java.net.URI;
+import java.time.Instant;
+import java.time.ZoneId;
+
+
 import java.io.File;
 import java.nio.file.Path;
 
+import static com.example.HelloModel.runOnFx;
+
 /**
  * Controller layer: mediates between the view (FXML) and the model.
  */
@@ -25,10 +36,56 @@ public class HelloController {
     @FXML
     private void initialize() {
         System.out.println("Controller init: kopplar ListView");
+
         if (messageLabel != null) {
             messageLabel.setText(model.getGreeting());
         }
+
         messageView.setItems(model.getMessages());
+
+        messageView.setCellFactory(listView -> new ListCell<>() {
+            @Override
+            protected void updateItem(NtfyMessageDto item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || item == null) {
+                    setText(null);
+                    setGraphic(null);
+                } else {
+                    VBox container = new VBox();
+                    container.setSpacing(4);
+
+                    Label topicLabel = new Label(item.topic());
+                    topicLabel.setStyle("-fx-font-weight: bold; -fx-text-fill: #2a9df4;");
+
+                    Label messageLabel = new Label(item.message());
+                    messageLabel.setWrapText(true);
+                    messageLabel.setStyle("-fx-text-fill: #333333;");
+
+                    Label timeLabel = new Label("⏰ " + Instant.ofEpochMilli(item.time()).atZone(ZoneId.systemDefault()).toLocalDateTime());
+                    timeLabel.setStyle("-fx-font-size: 10px; -fx-text-fill: #888888;");
+
+                    container.getChildren().addAll(topicLabel, messageLabel, timeLabel);
+
+                    // Lägg till nedladdningslänk om fil finns
+                    if (item.attachmentUrl() != null && !item.attachmentUrl().isEmpty()) {
+                        Hyperlink downloadLink = new Hyperlink("📎 Ladda ner fil");
+                        downloadLink.setOnAction(e -> {
+                            try {
+                                Desktop.getDesktop().browse(new URI(item.attachmentUrl()));
+                            } catch (Exception ex) {
+                                ex.printStackTrace();
+                            }
+                        });
+                        container.getChildren().add(downloadLink);
+                    }
+
+                    container.setPadding(new Insets(8));
+                    container.setStyle("-fx-background-color: #f4f4f4; -fx-background-radius: 6;");
+
+                    setGraphic(container);
+                }
+            }
+        });
     }
 
     @FXML
@@ -50,7 +107,7 @@ private void sendFile(ActionEvent event) {
         if (selectedFile != null) {
             Path filePath = selectedFile.toPath();
             model.sendFile(filePath).thenAccept(success -> {
-                Platform.runLater(() -> {
+                runOnFx(() -> {
                     if (success) {
                         System.out.println("Fil skickad: " + filePath.getFileName());
                     } else {

src/main/java/com/example/HelloFX.java

@@ -13,6 +13,7 @@ public void start(Stage stage) throws Exception {
         FXMLLoader fxmlLoader = new FXMLLoader(HelloFX.class.getResource("hello-view.fxml"));
         Parent root = fxmlLoader.load();
         Scene scene = new Scene(root, 640, 480);
+        scene.getStylesheets().add(getClass().getResource("/com/example/style.css").toExternalForm());
         stage.setTitle("Hello MVC");
         stage.setScene(scene);
         stage.show();

src/main/java/com/example/HelloModel.java

@@ -59,11 +59,21 @@ public CompletableFuture<Boolean> sendFile(Path filePath) {
     }
 
     public void receiveMessage() {
-        connection.receive(m -> Platform.runLater(() -> messages.add(m)));
+        connection.receive(m -> runOnFx(() -> messages.add(m)));
     }
 
     public void testAddMessage() {
-        NtfyMessageDto test = new NtfyMessageDto("id123", System.currentTimeMillis(), "message", "mytopic", "Testmeddelande");
-        Platform.runLater(() -> messages.add(test));
+        NtfyMessageDto test = new NtfyMessageDto("id123", System.currentTimeMillis(), "message", "mytopic", "Testmeddelande", null);
+        runOnFx(() -> messages.add(test));
     }
+
+    static void runOnFx(Runnable task) {
+        try {
+            if (Platform.isFxApplicationThread()) task.run();
+            else Platform.runLater(task);
+        } catch (IllegalStateException notInitialized) {
+            task.run();
+        }
+    }
+
 }

src/main/java/com/example/NtfyMessageDto.java

@@ -3,5 +3,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-public record NtfyMessageDto(String id, long time, String event, String topic, String message) {
-}
+public record NtfyMessageDto(
+        String id,
+        long time,
+        String event,
+        String topic,
+        String message,
+        AttachmentDto attachment
+) {
+    public String attachmentUrl() {
+        return attachment != null ? attachment.url() : null;
+    }
+}

src/main/resources/com/example/style.css

@@ -27,9 +27,9 @@
 }
 
 .message-list {
-    -fx-background-color: #2e2e3e;
+    -fx-background-color: white;
+    -fx-border-color: #cccccc;
     -fx-border-radius: 5;
-    -fx-background-radius: 5;
-    -fx-pref-height: 200;
-    -fx-cell-size: 40;
+    -fx-padding: 10;
 }
+

src/test/java/com/example/HelloModelTest.java

@@ -54,7 +54,8 @@ void receiveShouldTriggerHandler() {
                 System.currentTimeMillis(),
                 "message",
                 "mytopic",
-                "Hej från testet!"
+                "Hej från testet!",
+                null
         );
 
         // Act
@@ -76,7 +77,8 @@ void receiveShouldAddMessageToModel() {
                 System.currentTimeMillis(),
                 "message",
                 "mytopic",
-                "Hej från testet!"
+                "Hej från testet!",
+                null
         );
 
         // Act