Add support for themes service data

src/DiagramGenerator/Board.php

@@ -5,6 +5,7 @@
 use DiagramGenerator\Config;
 use DiagramGenerator\Fen;
 use DiagramGenerator\Image\Storage;
+use DiagramGenerator\Image\StorageNew;
 use DiagramGenerator\Image\Image;
 
 /**
@@ -76,7 +77,11 @@ public function getImage()
      */
     protected function generateImage()
     {
-        $storage = new Storage($this->cacheDir, $this->pieceThemeUrl, $this->boardTextureUrl);
+        if ($this->config->hasThemeUrls()) {
+            $storage = new StorageNew($this->cacheDir);
+        } else {
+            $storage = new Storage($this->cacheDir, $this->pieceThemeUrl, $this->boardTextureUrl);
+        }
         $image = new Image($storage, $this->config);
         $topPadding = $storage->getMaxPieceHeight($this->fen, $this->config) - $this->config->getSize()->getCell();
 

src/DiagramGenerator/Config.php

@@ -136,6 +136,15 @@ class Config
     #[Range(min: 0, max: 100)]
     protected $compressionQualityJpg;
 
+    /**
+     * Custom theme URLs object with board and piece URLs.
+     * Structure: { board: boardUrl, wp: pieceUrl, bp: pieceUrl, ... }
+     *
+     * @var array|null
+     */
+    #[Type('array')]
+    protected $themeUrls;
+
     /**
      * Gets the value of fen.
      *
@@ -454,6 +463,41 @@ public function setCompressionQualityJpg($compressionQualityJpg)
         return $this;
     }
 
+    /**
+     * Gets the theme URLs object.
+     *
+     * @return array|null
+     */
+    public function getThemeUrls()
+    {
+        return $this->themeUrls;
+    }
+
+    /**
+     * Sets the theme URLs object.
+     * Structure: { board: boardUrl, wp: pieceUrl, bp: pieceUrl, ... }
+     *
+     * @param array|null $themeUrls
+     *
+     * @return self
+     */
+    public function setThemeUrls($themeUrls)
+    {
+        $this->themeUrls = $themeUrls;
+
+        return $this;
+    }
+
+    /**
+     * Checks if custom theme URLs are configured.
+     *
+     * @return bool
+     */
+    public function hasThemeUrls()
+    {
+        return !empty($this->themeUrls) && is_array($this->themeUrls);
+    }
+
     public function getBorderThickness()
     {
         return (int) round($this->getSize()->getCell() / 2);

src/DiagramGenerator/Image/Image.php

@@ -7,6 +7,7 @@
 use DiagramGenerator\Board;
 use DiagramGenerator\Fen;
 use DiagramGenerator\Generator;
+use DiagramGenerator\Image\StorageInterface;
 use Intervention\Image\Gd\Decoder;
 use Intervention\Image\Gd\Font;
 use Intervention\Image\Image as BaseImage;
@@ -18,13 +19,17 @@ class Image
     /** @var BaseImage */
     protected $image;
 
-    /** @var Storage */
+    /** @var StorageInterface */
     protected $storage;
 
     /** @var Config */
     protected $config;
 
-    public function __construct(Storage $storage, Config $config)
+    /**
+     * @param StorageInterface $storage
+     * @param Config $config
+     */
+    public function __construct($storage, Config $config)
     {
         $this->image = (new Decoder())->initFromGdResource(imagecreatetruecolor(1, 1));
         $this->storage = $storage;
@@ -133,13 +138,17 @@ public function drawBoardWithFigures(Fen $fen, $cellSize, $topPaddingOfCell)
     {
         $this->image = $this->drawBoard($this->storage->getBackgroundTextureImage($this->config), $cellSize, $topPaddingOfCell);
 
+        $boardHasTexture = $this->config->hasThemeUrls() 
+            ? isset($this->config->getThemeUrls()['board'])
+            : !empty($this->config->getTexture());                  
+
         $this->drawCells(
             $this->config->getSize()->getCell(),
             $this->config->getDark(),
             $this->config->getLight(),
             $this->config->getHighlightSquaresColor(),
             $topPaddingOfCell,
-            !empty($this->config->getTexture()),
+            $boardHasTexture,
             $this->config->getHighlightSquares()
         );
 
@@ -196,13 +205,18 @@ protected function getBaseBoard(BaseImage $backgroundTexture = null, $cellSize,
         if ($backgroundTexture) {
             $this->addTransparencyIfNeeded($board, $backgroundTexture->getCore());
 
+            $destWidth = $cellSize * Board::SQUARES_IN_ROW;
+            $destHeight = $cellSize * Board::SQUARES_IN_ROW + $topPaddingOfCell;
+            $srcWidth = $backgroundTexture->getWidth();
+            $srcHeight = $backgroundTexture->getHeight();
+
             imagecopyresampled(
                 $board, $backgroundTexture->getCore(),
                 0, 0, 0, 0,
-                $cellSize * Board::SQUARES_IN_ROW,
-                $cellSize * Board::SQUARES_IN_ROW + $topPaddingOfCell,
-                $cellSize * Board::SQUARES_IN_ROW,
-                $cellSize * Board::SQUARES_IN_ROW + $topPaddingOfCell
+                $destWidth,
+                $destHeight,
+                $srcWidth,
+                $srcHeight
             );
         }
 

src/DiagramGenerator/Image/Storage.php

@@ -11,7 +11,7 @@
 use Intervention\Image\ImageManagerStatic;
 use RuntimeException;
 
-class Storage
+class Storage implements StorageInterface
 {
     protected $pieces = [];
 

src/DiagramGenerator/Image/StorageInterface.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace DiagramGenerator\Image;
+
+use DiagramGenerator\Config;
+use DiagramGenerator\Fen;
+use DiagramGenerator\Fen\Piece;
+use Intervention\Image\Image;
+
+interface StorageInterface
+{
+    /**
+     * @return Image
+     */
+    public function getPieceImage(Piece $piece, Config $config);
+
+    /**
+     * @return Image|null
+     */
+    public function getBackgroundTextureImage(Config $config);
+
+    /**
+     * @return int
+     */
+    public function getMaxPieceHeight(Fen $fen, Config $config);
+}
+