feat: add new components

Add Progress, ListTileProgress

Add Flexible ButtonGroup

Author: New-dev0

swibots/api/callback/AppPage.py

@@ -2,7 +2,7 @@
 from swibots.base import SwitchObject
 from logging import getLogger
 from swibots.utils.types import JSONDict
-from .types import ScreenType, Component, Icon
+from .types import ScreenType, Component, Icon, Text
 from typing import List, Optional, Dict, Any, Union
 from .BottomBar import BottomBar
 from .ListView import ListView
@@ -59,6 +59,7 @@ def __init__(
         back_action: str = None,
         disable_appbar: bool = False,
         max_size: bool = True,
+        on_close: str = None,
         **kwargs
     ):
         super().__init__(app)
@@ -74,10 +75,12 @@ def __init__(
         self.bottom_bar = bottom_bar
         self.show_continue = show_continue
         self.max_size = max_size
+        self.on_close = on_close
 
     def to_json(self) -> JSONDict:
         components = []
         for component in self.components:
+            
             if isinstance(component, ListView):
                 if self.max_size != None:
                     component.max_size = self.max_size
@@ -91,6 +94,10 @@ def to_json(self) -> JSONDict:
                 if self.max_size != None:
                     componentJson["mainAxisSize"] = "max" if self.max_size else "min"
                 components.append(componentJson)
+            elif isinstance(component, str):
+                components.append(
+                    Text(component)
+                )
 
         data = {
             "type": self.type,
@@ -105,4 +112,6 @@ def to_json(self) -> JSONDict:
             data["showContinue"] = self.show_continue
         if self.back_action:
             data["pageId"] = self.back_action
+        if self.on_close:
+            data["onClose"] = self.on_close
         return data

swibots/api/callback/Button.py

@@ -120,15 +120,17 @@ def __init__(
 class ButtonGroup(Component):
     type = "button_group"
 
-    def __init__(self, buttons: List[Button], max_size: bool = None):
+    def __init__(self, buttons: List[Button], max_size: bool = None, flexible=False):
         self.buttons = buttons
         self.max_size = max_size
+        self.flexible = flexible
 
     def to_json(self):
         return {
             "type": self.type,
             "buttons": [button.to_json() for button in self.buttons],
             "mainAxisSize": "max" if self.max_size else "min",
+            "flexible": self.flexible
         }
 
 

swibots/api/callback/ListView.py

@@ -2,7 +2,7 @@
 from .types import SwitchObject, Component, Image, Badge
 from enum import Enum
 from typing import Union, List, Literal
-
+from .Progress import ListTileProgress
 
 class ListViewType(Enum):
     DEFAULT = "default"
@@ -26,6 +26,7 @@ def __init__(
         thumb: Union[Image, str] = "",
         badges: List[Badge] = None,
         max_size: bool = None,
+        progress: ListTileProgress = None
     ):
         self.title = title
         self.subtitle = subtitle
@@ -39,6 +40,7 @@ def __init__(
         self.thumb = thumb
         self.badges = badges
         self.max_size = max_size
+        self.progress = progress
 
     def to_json(self):
         data = {
@@ -54,6 +56,8 @@ def to_json(self):
         }
         if self.thumb:
             data["image"] = self.thumb.to_json()
+        if self.progress:
+            data["progress"] = self.progress.to_json()
         if self.badges:
             data["rightComponents"] = [badge.to_json() for badge in self.badges]
         return data

swibots/api/callback/Players.py

@@ -1,6 +1,6 @@
 from swibots.utils.types import JSONDict
 from typing import Dict, Any, Optional, Union, List
-from .types import Component, Image, Badge
+from .types import Component, Image, Badge, Icon
 
 
 class AudioPlayer(Component):
@@ -148,3 +148,53 @@ def __init__(self, url: str):
 
     def to_json(self):
         return {"type": self.type, "url": self.url}
+
+
+class ShortVideo(Component):
+    type = "short_video"
+
+    def __init__(
+        self,
+        url: str = None,
+        icons: List[Icon] = None,
+        user_image: str = None,
+        user_name: str = None,
+        title: str = None,
+        description: str = None,
+    ):
+        self.url = url
+        self.icons = icons
+        self.user_image = user_image
+        self.user_name = user_name
+        self.title = title
+        self.description = description
+
+    def to_json(self):
+        data = {
+            "type": self.type,
+            "videoUrl": self.url,
+            "bottom": [icon.to_json() for icon in self.icons],
+            "extraOptions": {
+                "userAvatar": self.user_image,
+                "userName": self.user_name,
+                "description": self.description,
+                "title": self.title,
+            },
+        }
+        return data
+
+
+class FeedPanel(Component):
+    type = "feed_panel"
+
+    def __init__(self, feeds, next_callback: str):
+        self.feeds = feeds
+        self.next_callback = next_callback
+
+    def to_json(self) -> Dict[str, Any]:
+        data = {
+            "type":  self.type,
+            "feeds": [feed.to_json() for feed in self.feeds],
+            "offsetCallbackData": self.next_callback,
+        }
+        return data

swibots/api/callback/Progress.py

@@ -0,0 +1,52 @@
+from swibots.utils.types import JSONDict
+from .types import Component
+from enum import Enum
+
+
+class Size(Enum):
+    LARGE = "large"
+    MEDIUM = "medium"
+    SMALL = "small"
+
+
+class ProgressStyle(Enum):
+    LINEAR = "linear"
+    CIRCULAR = "circular"
+
+
+class Progress(Component):
+    type = "progress_bar"
+
+    def __init__(
+        self,
+        color: str = None,
+        size: Size = Size.MEDIUM,
+        radius: int = 2,
+        progress: int = False,
+        animation: bool = False,
+        progress_style: ProgressStyle = ProgressStyle.LINEAR,
+    ):
+        self.color = color
+        self.size = size
+        self.radius = radius
+        self.progress = progress
+        self.animation = animation
+        self.progress_style = progress_style
+
+    def to_json(self):
+        return {
+            "type": self.type,
+            "color": self.color,
+            "radius": self.radius,
+            "interdeterminate": self.animation,
+            "progress": self.progress,
+            "barSize": self.size.value,
+            "progressBarType": self.progress_style.value,
+        }
+
+
+class ListTileProgress(Progress):
+    def __init__(
+        self, color: str = None, progress: str = None, animation: bool = False
+    ):
+        super().__init__(color, progress=progress, animation=animation)

swibots/api/callback/__init__.py

@@ -1,10 +1,11 @@
 from .Accordian import Accordian
 from .AppPage import AppPage, AppBar
 from .Dropdown import Dropdown
-from .ListView import ListView, ListTile, ListViewType
+from .ListView import ListView, ListTile, ListViewType, ListTileProgress
 from .ListItem import ListItem
 from .Grid import Grid, GridItem, GridType
 from .Search import SearchBar, SearchHolder
+from .Progress import Progress, ProgressStyle, Size
 from .Tab import TabBar, TabBarTile, TabBarType
 from .types import Text, Image, Icon, ScreenType, TextSize, Expansion, Spacer, Badge
 from .BottomBar import BottomBarTile, BottomBarType, BottomBar
@@ -60,12 +61,16 @@
     "Image",
     "ListItem",
     "ListTile",
+    "ListTileProgress",
     "ListView",
     "ListViewType",
+    "Progress",
+    "ProgressStyle",
     "ScreenType",
     "SearchBar",
     "SearchHolder",
     "ShareButton",
+    "Size",
     "Spacer",
     "StickyHeader",
     "Table",

swibots/api/callback/callbackResponse.py

@@ -36,5 +36,5 @@ def to_json(self) -> Dict[str, Any]:
             "fileName": self.file_name,
             "callbackQueryId": self.parent_id,
             "inputValue": self.input_value,
-            "url": self.url,
+            "url": self.new_url,
         }

swibots/api/callback/types.py

@@ -36,12 +36,18 @@ class Component(SwitchObject):
 class Icon(Component):
     type = "icon"
 
-    def __init__(self, url: str, dark_url: str = None):
+    def __init__(self, url: str, dark_url: str = None,
+                 text: str = "",
+                 callback_data: str = None):
         self.url = url
         self.dark_url = dark_url or url
+        self.text = text
+        self.callback_data = callback_data
 
     def to_json(self) -> Dict[str, Any]:
-        return {"type": self.type, "name": self.url, "darkIcon": self.dark_url}
+        return {"type": self.type, "name": self.url, "darkIcon": self.dark_url,
+                "alt": self.text,
+                "callbackData": self.callback_data}
 
 
 class Text(Component):