Removed test that connects to real server, style changes

Author: fredrikmohlen

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

@@ -5,18 +5,16 @@
 import javafx.scene.control.*;
 import javafx.util.Callback;
 
-import java.io.IOException;
 
 /**
  * Controller layer: mediates between the view (FXML) and the model.
  */
 public class HelloController {
 
     private final HelloModel model = new HelloModel(new NtfyConnectionImpl());
-    public ListView<NtfyMessageDto> messageView;
 
     @FXML
-    private TextArea myTextArea;
+    private ListView<NtfyMessageDto> messageView;
 
     @FXML
     private TextArea chatArea;
@@ -32,11 +30,13 @@ private void initialize() {
         if (messageLabel != null) {
             messageLabel.setText(model.getGreeting());
         }
-       messageView.setItems(model.getMessages());
-       messageView.setCellFactory(showOnlyMessages());
-
+        messageView.setItems(model.getMessages());
+        messageView.setCellFactory(showOnlyMessages());
     }
 
+
+
+
     private static Callback<ListView<NtfyMessageDto>, ListCell<NtfyMessageDto>> showOnlyMessages() {
         return List -> new ListCell<>() {
             @Override

src/main/resources/com/example/hello-view.fxml

@@ -3,28 +3,23 @@
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 
-<VBox stylesheets="@../../css/style.css" prefHeight="500.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="com.example.HelloController">
-
-    <Label fx:id="messageLabel" text="Hello, JavaFX!"/>
-    <BorderPane VBox.vgrow="ALWAYS" >
-<center>
-        <ListView  fx:id="messageView" >
-            <padding>
-                <Insets bottom="1.0" left="1.0" right="1.0" top="1.0"/>
-            </padding>
-        </ListView>
-</center>
+<VBox prefHeight="500.0" prefWidth="300.0" stylesheets="@../../css/style.css" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.HelloController">
 
+    <Label fx:id="messageLabel" alignment="CENTER" contentDisplay="CENTER" maxWidth="Infinity" text="Hello, JavaFX!" VBox.vgrow="NEVER" />
+    <BorderPane VBox.vgrow="ALWAYS">
+        <center>
+            <ListView fx:id="messageView">
+                <padding>
+                    <Insets bottom="1.0" left="1.0" right="1.0" top="1.0" />
+                </padding>
+            </ListView>
+        </center>
     </BorderPane>
-    <SplitPane dividerPositions="0.7"  VBox.vgrow="NEVER">
-        <items>
-            <TextArea fx:id="chatArea" wrapText="true" maxHeight="-Infinity" prefHeight="100.0" prefRowCount="3"/>
 
-            <Button fx:id="chatButton" text="send message" onAction="#sendMessage" />
-        </items>
-    </SplitPane>
+    <HBox VBox.vgrow="NEVER" alignment="CENTER_LEFT"> <padding> <Insets bottom="5.0" left="10.0" right="10.0" top="10.0" /></padding>
+        <TextArea fx:id="chatArea" opacity="0.8" prefRowCount="3" wrapText="true" HBox.hgrow="ALWAYS" />
+        <Button fx:id="chatButton" maxWidth="-Infinity" minWidth="-Infinity" onAction="#sendMessage" text="Send Message" />
+    </HBox>
 
 </VBox>

src/main/resources/css/style.css

@@ -3,9 +3,16 @@
 styles.css
  */
 .root {
-    -fx-background-color: #ffffff, linear-gradient(to bottom, #8b0000, #ffd700);
+    -fx-background-color:
+    linear-gradient(to bottom,
+            rgba(0,0,0,0.1) 0%,
+            rgba(0,0,0,0) 10%),
+    linear-gradient(to bottom,
+            #8b0000 30%,
+            #ffd700 100%);
     -fx-background-insets: 0, 4;
     -fx-background-radius: 0, 3;
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.4), 10, 0.5, 0, 0)
 
 }
 .list-view {
@@ -21,41 +28,32 @@ styles.css
     -fx-border-color: transparent;
     -fx-control-inner-background: transparent;
     -fx-font-size: 14;
-}
-/* Remove background and border on hover */
-.list-cell:filled:hover {
-    -fx-background-color: #e0e0e0;
-    -fx-text-fill: #000000;
-}
-
-.list-cell:filled:selected {
-
-    -fx-background-color: #007bff;
-    -fx-text-fill: white;
-
-    -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
-}
-
-.list-cell:filled:selected .text {
     -fx-font-weight: bold;
+    -fx-padding: 5 10 5 10;
 }
 .text-area{
-    -fx-control-inner-background: transparent;
+    -fx-control-inner-background: #FFFFFF;
     -fx-padding: 5px 7px;
     -fx-text-fill: black;
     -fx-font-size: 14;
 
-    -fx-border-radius: 8px;
+    -fx-border-radius: 10;
+    -fx-background-radius: 10;
     -fx-background-color: transparent;
     -fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 5, 0, 0, 0);
 }
+.text-area .content, .viewport {
+    -fx-background-radius: 8;
+    -fx-border-radius: 8;
+}
 .button{
-    -fx-background-color: #007bff;
+    -fx-background-color: #610202;
     -fx-text-fill: white;
-    -fx-font-size: 16px;
-    -fx-padding: 10px 20px;
+    -fx-font-size: 12px;
+    -fx-padding: 10 15 10 15;
     -fx-background-radius: 5px;
+    -fx-border-radius: 8px;
 }
 .button:hover{
-    -fx-background-color: #0056b3;
+    -fx-background-color: #400101;
 }

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

@@ -4,9 +4,6 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
-import javafx.application.Platform;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.awaitility.Awaitility;
@@ -50,29 +47,8 @@ void sendMessageToFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws Interrupt
                 .withRequestBody(matching("Hello World")));
     }
 
-    // Test för att se att vi får meddelanden tillbaka. receiveMessage?
     @Test
-    void checkReceivedMessagesAfterSendingAMessageToServer() throws InterruptedException {
-        //Arrange
-        var conImp = new NtfyConnectionImpl();
-        var model = new HelloModel(conImp);
-        model.setMessageToSend("Hello World");
-        //Act - When
-
-        model.sendMessage().join();
-
-        //Assert
-        Awaitility.await()
-                .atMost(Duration.ofSeconds(5))
-                .pollInterval(Duration.ofMillis(100))
-                .untilAsserted(() -> {
-                    assertThat(model.getMessages()).isNotEmpty();
-                    assertThat(model.getMessages().getLast().message()).contains("Hello World");
-                });
-    }
-
-    @Test
-    void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo wmRunTimeInfo) throws InterruptedException {
+    void checkReceivedMessagesAfterSendingAMessageToAFakeServer(WireMockRuntimeInfo wmRunTimeInfo) {
         // Arrange
         var conImp = new NtfyConnectionImpl("http://localhost:" + wmRunTimeInfo.getHttpPort());