fix ui

Author: Androz2091

src/ch/epfl/chacun/Base32.java

@@ -1,5 +1,7 @@
 package ch.epfl.chacun;
 
+import java.util.Objects;
+
 /**
  * This is a utility class containing useful methods to work with Base32
  *
@@ -38,6 +40,7 @@ private Base32() {
      * @return if all the characters of the given string belong to the charset of Base32
      */
     public static boolean isValid(String encoded) {
+        Objects.requireNonNull(encoded);
         return encoded.chars().allMatch(c -> ALPHABET.indexOf(c) != -1);
     }
 

src/ch/epfl/chacun/gui/BoardUI.java

@@ -228,16 +228,16 @@ private static Node getCancelledAnimalNode(
             Animal animal, ObservableValue<Set<Animal>> cancelledAnimalsO,
             double negatedTileRotation
     ) {
-        ImageView cancelledAnimalView = new ImageView();
-        cancelledAnimalView.visibleProperty().bind(cancelledAnimalsO.map(
+        ImageView imageView = new ImageView();
+        imageView.visibleProperty().bind(cancelledAnimalsO.map(
                 cancelledAnimals -> cancelledAnimals.contains(animal)
         ));
-        cancelledAnimalView.setId(STR."marker_\{animal.id()}");
-        cancelledAnimalView.getStyleClass().add("marker");
-        cancelledAnimalView.setFitHeight(ImageLoader.MARKER_FIT_SIZE);
-        cancelledAnimalView.setFitWidth(ImageLoader.MARKER_FIT_SIZE);
-        cancelledAnimalView.setRotate(negatedTileRotation);
-        return cancelledAnimalView;
+        imageView.setId(STR."marker_\{animal.id()}");
+        imageView.getStyleClass().add("marker");
+        imageView.setFitHeight(ImageLoader.MARKER_FIT_SIZE);
+        imageView.setFitWidth(ImageLoader.MARKER_FIT_SIZE);
+        imageView.setRotate(negatedTileRotation);
+        return imageView;
     }
 
     private static Node getOccupantNode(

src/ch/epfl/chacun/gui/DecksUI.java

@@ -52,11 +52,11 @@ public static Node create(
 
 
         // ImageView of the next tile to place, which has to be shown in large size
-        ImageView view = new ImageView();
+        ImageView imageView = new ImageView();
         // we bind the graphical view of the tile to place to the tile itself
-        view.imageProperty().bind(tileO.map(tile -> ImageLoader.largeImageForTile(tile.id())));
-        view.setFitHeight(ImageLoader.LARGE_TILE_FIT_SIZE);
-        view.setFitWidth(ImageLoader.LARGE_TILE_FIT_SIZE);
+        imageView.imageProperty().bind(tileO.map(tile -> ImageLoader.largeImageForTile(tile.id())));
+        imageView.setFitHeight(ImageLoader.LARGE_TILE_FIT_SIZE);
+        imageView.setFitWidth(ImageLoader.LARGE_TILE_FIT_SIZE);
 
         // Text, occupy tile (only visible if textToDisplay is not empty,
         // meaning that the player does not want to do some action)
@@ -67,7 +67,7 @@ public static Node create(
         text.setWrappingWidth(WRAPPING_WIDTH * ImageLoader.LARGE_TILE_FIT_SIZE);
 
         // Here we handle the next tile to place
-        StackPane stackPane = new StackPane(view, text);
+        StackPane stackPane = new StackPane(imageView, text);
         stackPane.setId("next-tile");
         // if the player clicks on the text, it means that he does not want to place or retake an occupant
         stackPane.setOnMouseClicked(_ -> onOccupantClick.accept(null));
@@ -93,13 +93,13 @@ public static Node create(
      * @return a node representing the deck
      */
     private static Node getDeckNode(Tile.Kind kind, ObservableValue<Integer> leftTiles) {
-        ImageView image = new ImageView();
-        image.setId(kind.toString());
-        image.setFitHeight(ImageLoader.NORMAL_TILE_FIT_SIZE);
-        image.setFitWidth(ImageLoader.NORMAL_TILE_FIT_SIZE);
+        ImageView imageView = new ImageView();
+        imageView.setId(kind.toString());
+        imageView.setFitHeight(ImageLoader.NORMAL_TILE_FIT_SIZE);
+        imageView.setFitWidth(ImageLoader.NORMAL_TILE_FIT_SIZE);
         Text text = new Text();
         text.textProperty().bind(leftTiles.map(String::valueOf));
-        return new StackPane(image, text);
+        return new StackPane(imageView, text);
     }
 
 }