Merge branch 'simple' into 'main'

Simple

See merge request !2

src/main/java/view/Grid.java

+package view;
+
+import javafx.util.Pair;
+import util.Position;
+
+import java.util.List;
+
+/**
+ * This interface represents a generic grid structure for displaying two-dimensional data.
+ *
+ * @param <E> The type of elements stored in the grid.
+ */
+public interface Grid<E> {
+
+  /**
+   * Repaint the grid with a list of elements, each associated with their respective positions.
+   *
+   * @param elements A list of pairs, each containing a position and the element to be displayed at that position.
+   */
+  void repaint(List<Pair<Position, E>> elements);
+
+  /**
+   * Repaint the grid with a two-dimensional array of elements. The array's dimensions should match
+   * the row and column count of the grid.
+   *
+   * @param elements A two-dimensional array of elements to be displayed on the grid.
+   */
+  void repaint(E[][] elements);
+
+  /**
+   * Set the dimensions of the grid to the specified number of columns, number of rows, square width,
+   * and square height.
+   *
+   * @param columnCount The new number of columns in the grid.
+   * @param rowCount The new number of rows in the grid.
+   * @param squareWidth The width of each square within the grid.
+   * @param squareHeight The height of each square within the grid.
+   */
+  void setDimensions(int columnCount, int rowCount, int squareWidth, int squareHeight);
+
+  /**
+   * Get the number of columns in the grid.
+   *
+   * @return The number of columns in the grid.
+   */
+  int columnCount();
+
+  /**
+   * Get the number of rows in the grid.
+   *
+   * @return The number of rows in the grid.
+   */
+  int rowCount();
+}
+

src/main/java/view/ViewElement.java

+package view;
+
+import javafx.scene.paint.Color;
+
+public enum ViewElement {
+  FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE);
+  final Color color;
+  ViewElement(Color color) {
+    this.color = color;
+  }
+}

src/main/resources/view/DarkTheme.css

+.background {
+    -fx-background-color: #1d1d1d;
+}
+
+.label {
+    -fx-font-size: 11pt;
+    -fx-font-family: "Segoe UI Semibold";
+    -fx-text-fill: white;
+    -fx-opacity: 0.6;
+}
+
+.label-bright {
+    -fx-font-size: 11pt;
+    -fx-font-family: "Segoe UI Semibold";
+    -fx-text-fill: white;
+    -fx-opacity: 1;
+}
+
+.label-header {
+    -fx-font-size: 32pt;
+    -fx-font-family: "Segoe UI Light";
+    -fx-text-fill: white;
+    -fx-opacity: 1;
+}
+
+.table-view {
+    -fx-base: #1d1d1d;
+    -fx-control-inner-background: #1d1d1d;
+    -fx-background-color: #1d1d1d;
+    -fx-table-cell-border-color: transparent;
+    -fx-table-header-border-color: transparent;
+    -fx-padding: 5;
+}
+
+.table-view .column-header-background {
+    -fx-background-color: transparent;
+}
+
+.table-view .column-header, .table-view .filler {
+    -fx-border-width: 0 0 1 0;
+    -fx-background-color: transparent;
+    -fx-border-color: 
+        transparent
+        transparent
+        derive(-fx-base, 80%) 
+        transparent;
+    -fx-border-insets: 0 10 1 0;
+}
+
+.table-view .column-header .label {
+    -fx-font-size: 20pt;
+    -fx-font-family: "Segoe UI Light";
+    -fx-text-fill: white;
+    -fx-alignment: center-left;
+    -fx-opacity: 1;
+}
+
+.table-view:focused .table-row-cell:filled:focused:selected {
+    -fx-background-color: -fx-focus-color;
+}
+
+.split-pane:horizontal > .split-pane-divider {
+    -fx-border-color: transparent #1d1d1d transparent #1d1d1d;
+    -fx-background-color: transparent, derive(#1d1d1d,20%);
+}
+
+.split-pane {
+    -fx-padding: 1 0 0 0;
+}
+
+.menu-bar {
+    -fx-background-color: derive(#1d1d1d,20%);
+}
+
+.context-menu {
+    -fx-background-color: derive(#1d1d1d,50%);
+}
+
+.menu-bar .label {
+    -fx-font-size: 14pt;
+    -fx-font-family: "Segoe UI Light";
+    -fx-text-fill: white;
+    -fx-opacity: 0.9;
+}
+
+.menu .left-container {
+    -fx-background-color: black;
+}
+
+.text-field {
+    -fx-font-size: 12pt;
+    -fx-font-family: "Segoe UI Semibold";
+}
+
+/* 
+ * Metro style Push Button
+ * Author: Pedro Duque Vieira
+ * http://pixelduke.wordpress.com/2012/10/23/jmetro-windows-8-controls-on-java/
+ */
+.button {
+    -fx-padding: 5 22 5 22;   
+    -fx-border-color: #e2e2e2;
+    -fx-border-width: 2;
+    -fx-background-radius: 0;
+    -fx-background-color: #1d1d1d;
+    -fx-font-family: "Segoe UI", Helvetica, Arial, sans-serif;
+    -fx-font-size: 11pt;
+    -fx-text-fill: #d8d8d8;
+    -fx-background-insets: 0 0 0 0, 0, 1, 2;
+}
+
+.button:hover {
+    -fx-background-color: #3a3a3a;
+}
+
+.button:pressed, .button:default:hover:pressed {
+  -fx-background-color: white;
+  -fx-text-fill: #1d1d1d;
+}
+
+.button:focused {
+    -fx-border-color: white, white;
+    -fx-border-width: 1, 1;
+    -fx-border-style: solid;
+    -fx-border-radius: 0, 0;
+    -fx-border-insets: 1 1 1 1, 0;
+}
+
+.button:disabled, .button:default:disabled {
+    -fx-opacity: 0.4;
+    -fx-background-color: #1d1d1d;
+    -fx-text-fill: white;
+}
+
+.button:default {
+    -fx-background-color: -fx-focus-color;
+    -fx-text-fill: #ffffff;
+}
+
+.button:default:hover {
+    -fx-background-color: derive(-fx-focus-color,30%);
+}
\ No newline at end of file

src/main/resources/view/view.fxml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import view.FirefighterGrid?>
+
+<?import javafx.scene.control.ToggleButton?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.Label?>
+<HBox styleClass="background" stylesheets="@DarkTheme.css"
+      xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+      fx:controller="controller.Controller">
+  <VBox>
+    <Separator maxHeight="-Infinity" maxWidth="-Infinity"
+               prefHeight="24.0" prefWidth="200.0"/>
+    <Label maxHeight="-Infinity" maxWidth="-Infinity" alignment="CENTER" prefHeight="24.0" prefWidth="200.0"
+           text="Generation number"/>
+    <Label fx:id="generationNumberLabel" alignment="CENTER" contentDisplay="TEXT_ONLY"
+           maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="24.0" prefWidth="200.0"/>
+    <Separator maxHeight="-Infinity" maxWidth="-Infinity"
+               prefHeight="24.0" prefWidth="200.0"/>
+    <Button fx:id="restartButton" maxHeight="-Infinity" maxWidth="-Infinity"
+            mnemonicParsing="false" onAction="#restartButtonAction" prefHeight="24.0" prefWidth="200.0"
+            text="Restart"/>
+    <Button fx:id="oneStepButton" maxHeight="-Infinity" maxWidth="-Infinity"
+            mnemonicParsing="false" onAction="#oneStepButtonAction" prefHeight="24.0" prefWidth="200.0"
+            text="One step"/>
+    <ToggleButton fx:id="playToggleButton" maxHeight="-Infinity" maxWidth="-Infinity"
+                  mnemonicParsing="false" onAction="#playToggleButtonAction" prefHeight="24.0"
+                  prefWidth="200.0" styleClass="button" text="Play"/>
+    <ToggleButton fx:id="pauseToggleButton" maxHeight="-Infinity" maxWidth="-Infinity"
+                  mnemonicParsing="false" onAction="#pauseToggleButtonAction" prefHeight="24.0"
+                  prefWidth="200.0" styleClass="button" text="Pause"/>
+  </VBox>
+  <FirefighterGrid fx:id="grid"
+                   xmlns="http://javafx.com/javafx"
+                   xmlns:fx="http://javafx.com/fxml">
+  </FirefighterGrid>
+</HBox>

src/test/java/model/FirefighterBoardTest.java

+package model;
+
+import org.junit.jupiter.api.Test;
+import util.Position;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.*;
+
+public class FirefighterBoardTest {
+  @Test
+  void testColumnCount(){
+    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+    assertThat(board.columnCount()).isEqualTo(20);
+  }
+  @Test
+  void testRowCount(){
+    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+    assertThat(board.rowCount()).isEqualTo(10);
+  }
+  @Test
+  void testStepNumber(){
+    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 1, 3);
+    for(int index = 0; index < 10; index++){
+      assertThat(board.stepNumber()).isEqualTo(index);
+      board.updateToNextGeneration();
+    }
+    assertThat(board.stepNumber()).isEqualTo(10);
+  }
+  @Test
+  void testGetState_afterSet(){
+    Board<List<ModelElement>> board = new FirefighterBoard(20, 10, 0, 0);
+    Position position = new Position(1,2);
+    assertThat(board.getState(position)).isEmpty();
+    board.setState(List.of(ModelElement.FIRE), position);
+    assertThat(board.getState(position)).containsExactly(ModelElement.FIRE);
+  }
+
+}

src/test/java/view/FirefighterGridTest.java

+package view;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FirefighterGridTest {
+  @Test
+  void testColumnCount(){
+    Grid<ViewElement> grid = new FirefighterGrid();
+    grid.setDimensions(20,10,10,10);
+    assertThat(grid.columnCount()).isEqualTo(20);
+  }
+  @Test
+  void testRowCount(){
+    Grid<ViewElement> grid = new FirefighterGrid();
+    grid.setDimensions(20,10,10,10);
+    assertThat(grid.rowCount()).isEqualTo(10);
+  }
+}