Merge pull request #320 from moririnson/feature/flex-update2

Flex Update 2

Author: moririnson

src/LINEBot/Constant/Flex/ComponentAdjustMode.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Copyright 2020 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+namespace LINE\LINEBot\Constant\Flex;
+
+class ComponentAdjustMode
+{
+    const SHRINK_TO_FIT = 'shrink-to-fit';
+}

src/LINEBot/Constant/Flex/ComponentAlignItems.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Copyright 2020 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+namespace LINE\LINEBot\Constant\Flex;
+
+class ComponentAlignItems
+{
+    const FLEX_START = 'flex-start';
+    const FLEX_END = 'flex-end';
+    const CENTER = 'center';
+}

src/LINEBot/Constant/Flex/ComponentBackgroundType.php

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Copyright 2020 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+namespace LINE\LINEBot\Constant\Flex;
+
+class ComponentBackgroundType
+{
+    const LINEAR_GRADIENT = 'linearGradient';
+}

src/LINEBot/Constant/Flex/ComponentJustifyContent.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Copyright 2020 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+namespace LINE\LINEBot\Constant\Flex;
+
+class ComponentJustifyContent
+{
+    const FLEX_START = 'flex-start';
+    const FLEX_END = 'flex-end';
+    const CENTER = 'center';
+    const SPACE_BETWEEN = 'space-between';
+    const SPACE_AROUND = 'space-around';
+    const SPACE_EVENLY = 'space-evenly';
+}

src/LINEBot/MessageBuilder/Flex/ComponentBuilder/BoxComponentBuilder.php

@@ -24,6 +24,9 @@
 use LINE\LINEBot\Constant\Flex\ComponentSpacing;
 use LINE\LINEBot\Constant\Flex\ComponentType;
 use LINE\LINEBot\Constant\Flex\ComponentPosition;
+use LINE\LINEBot\Constant\Flex\ComponentJustifyContent;
+use LINE\LINEBot\Constant\Flex\ComponentAlignItems;
+use LINE\LINEBot\Constant\Flex\ComponentBackgroundType;
 use LINE\LINEBot\MessageBuilder\Flex\ComponentBuilder;
 use LINE\LINEBot\Util\BuildUtil;
 
@@ -82,6 +85,24 @@ class BoxComponentBuilder implements ComponentBuilder
     /** @var string */
     private $offsetEnd;
 
+    /** @var ComponentJustifyContent */
+    private $justifyContent;
+    /** @var ComponentAlignItems */
+    private $alignItems;
+
+    /** @var ComponentBackgroundType */
+    private $backgroundType;
+    /** @var string */
+    private $backgroundAngle;
+    /** @var string */
+    private $backgroundStartColor;
+    /** @var string */
+    private $backgroundEndColor;
+    /** @var string */
+    private $backgroundCenterColor;
+    /** @var string */
+    private $backgroundCenterPosition;
+
     /** @var array */
     private $component;
 
@@ -470,6 +491,114 @@ public function setHeight($height)
         return $this;
     }
 
+    /**
+     * Set justifyContent
+     *
+     * @param string|ComponentJustifyContent|null $justifyContent
+     * @return $this
+     */
+    public function setJustifyContent($justifyContent)
+    {
+        $this->justifyContent = $justifyContent;
+        return $this;
+    }
+
+    /**
+     * Set alignItems
+     *
+     * @param string|ComponentAlignItems|null $alignItems
+     * @return $this
+     */
+    public function setAlignItems($alignItems)
+    {
+        $this->alignItems = $alignItems;
+        return $this;
+    }
+
+    /**
+     * Set backgroundType
+     *
+     * @param string|ComponentBackgroundType|null $backgroundType
+     * @return $this
+     */
+    public function setBackgroundType($backgroundType)
+    {
+        $this->backgroundType = $backgroundType;
+        return $this;
+    }
+
+    /**
+     * Set backgroundAngle
+     *
+     * specifiable "**deg".
+     * (e.g. 90deg, 23.5deg
+     *
+     * @param string $backgroundAngle
+     * @return $this
+     */
+    public function setBackgroundAngle($backgroundAngle)
+    {
+        $this->backgroundAngle = $backgroundAngle;
+        return $this;
+    }
+
+    /**
+     * Set backgroundStartColor
+     *
+     * Hex color string: #RRGGBB or #RRGGBBAA
+     *
+     * @param string $backgroundStartColor
+     * @return $this
+     */
+    public function setBackgroundStartColor($backgroundStartColor)
+    {
+        $this->backgroundStartColor = $backgroundStartColor;
+        return $this;
+    }
+
+    /**
+     * Set backgroundEndColor
+     *
+     * Hex color string: #RRGGBB or #RRGGBBAA
+     *
+     * @param string $backgroundEndColor
+     * @return $this
+     */
+    public function setBackgroundEndColor($backgroundEndColor)
+    {
+        $this->backgroundEndColor = $backgroundEndColor;
+        return $this;
+    }
+
+    /**
+     * Set backgroundCenterColor
+     *
+     * Hex color string: #RRGGBB or #RRGGBBAA
+     *
+     * @param string $backgroundCenterColor
+     * @return $this
+     */
+    public function setBackgroundCenterColor($backgroundCenterColor)
+    {
+        $this->backgroundCenterColor = $backgroundCenterColor;
+        return $this;
+    }
+
+    /**
+     * Set backgroundCenterPosition
+     *
+     * specifiable percentage (0%~100%).
+     * (e.g. 5%, 10.1%, 100%
+     *
+     * @param string $backgroundCenterPosition
+     * @return $this
+     */
+    public function setBackgroundCenterPosition($backgroundCenterPosition)
+    {
+        $this->backgroundCenterPosition = $backgroundCenterPosition;
+        return $this;
+    }
+
     /**
      * Builds box component structure.
      *
@@ -481,6 +610,15 @@ public function build()
             return $this->component;
         }
 
+        $background = BuildUtil::removeNullElements([
+            'type' => $this->backgroundType,
+            'angle' => $this->backgroundAngle,
+            'startColor' => $this->backgroundStartColor,
+            'endColor' => $this->backgroundEndColor,
+            'centerColor' => $this->backgroundCenterColor,
+            'centerPosition' => $this->backgroundCenterPosition,
+        ]);
+
         $contents = array_map(function ($componentBuilder) {
             /** @var ComponentBuilder $componentBuilder */
             return $componentBuilder->build();
@@ -510,6 +648,9 @@ public function build()
             'offsetBottom' => $this->offsetBottom,
             'offsetStart' => $this->offsetStart,
             'offsetEnd' => $this->offsetEnd,
+            'justifyContent' => $this->justifyContent,
+            'alignItems' => $this->alignItems,
+            'background' => empty($background) ? null : $background,
         ]);
 
         return $this->component;

src/LINEBot/MessageBuilder/Flex/ComponentBuilder/ButtonComponentBuilder.php

@@ -24,6 +24,7 @@
 use LINE\LINEBot\Constant\Flex\ComponentGravity;
 use LINE\LINEBot\Constant\Flex\ComponentMargin;
 use LINE\LINEBot\Constant\Flex\ComponentType;
+use LINE\LINEBot\Constant\Flex\ComponentAdjustMode;
 use LINE\LINEBot\MessageBuilder\Flex\ComponentBuilder;
 use LINE\LINEBot\Util\BuildUtil;
 
@@ -60,6 +61,9 @@ class ButtonComponentBuilder implements ComponentBuilder
     /** @var string */
     private $offsetEnd;
 
+    /** @var ComponentAdjustMode */
+    private $adjustMode;
+
     /** @var array */
     private $component;
 
@@ -272,6 +276,18 @@ public function setOffsetEnd($offsetEnd)
         return $this;
     }
 
+    /**
+     * Set adjustMode
+     *
+     * @param ComponentAdjustMode|null $adjustMode
+     * @return $this
+     */
+    public function setAdjustMode($adjustMode)
+    {
+        $this->adjustMode = $adjustMode;
+        return $this;
+    }
+
     /**
      * Builds button component structure.
      *
@@ -297,6 +313,7 @@ public function build()
             'offsetBottom' => $this->offsetBottom,
             'offsetStart' => $this->offsetStart,
             'offsetEnd' => $this->offsetEnd,
+            'adjustMode' => $this->adjustMode,
         ]);
 
         return $this->component;

src/LINEBot/MessageBuilder/Flex/ComponentBuilder/IconComponentBuilder.php

@@ -60,7 +60,7 @@ class IconComponentBuilder implements ComponentBuilder
      *
      * @param string $url
      * @param ComponentMargin|null $margin
-     * @param ComponentIconSize|null $size
+     * @param ComponentIconSize|string|null $size
      * @param ComponentIconAspectRatio|null $aspectRatio
      */
     public function __construct($url, $margin = null, $size = null, $aspectRatio = null)
@@ -108,6 +108,11 @@ public function setMargin($margin)
     /**
      * Set size.
      *
+     * specifiable pixel and keyword.
+     * (e.g.
+     * pixel: 5px
+     * keyword: xxs (defined in ComponentIconSize)
+     *
      * @param ComponentIconSize|string|null $size
      * @return IconComponentBuilder
      */