More native styling

islekcaganmert · islekcaganmert · commit a49f2915cbab · 2024-07-19T07:30:52.000+03:00
diff --git a/src/bevyframe/Widgets/Style.py b/src/bevyframe/Widgets/Style.py
@@ -0,0 +1,87 @@
+class Align:
+    center = 'center'
+    left = 'left'
+    right = 'right'
+    baseline = 'baseline'
+    sub = 'sub'
+
+
+class Color:
+    transparent = 'transparent'
+    black = '#000000'
+    white = '#ffffff'
+    red = '#ff0000'
+    hex = lambda x: f'#{x}'
+    rgb = lambda r, g, b: f'rgb({r}, {g}, {b})'
+
+
+class Size:
+    max_content = 'max-content'
+    fit_content = 'fit-content'
+    percent = lambda x: f'{x}%'
+    pixel = lambda x: f'{x}px'
+    auto = 'auto'
+
+    class Relative:
+        font = lambda i: f'{i}em'
+        x = lambda i: f'{i}ex'
+
+    class Viewport:
+        height = lambda x: f'{x}vh'
+        width = lambda x: f'{x}vw'
+        min = lambda x: f'{x}vmin'
+        max = lambda x: f'{x}vmax'
+
+
+class FourSided:
+    def __init__(self, top=None, right=None, bottom=None, left=None):
+        self.top = top
+        self.right = right
+        self.bottom = bottom
+        self.left = left
+
+
+class Margin(FourSided):
+    pass
+
+
+class Padding(FourSided):
+    pass
+
+
+class Position:
+    class absolute(FourSided):
+        def __init__(self, top=None, right=None, bottom=None, left=None):
+            self.item = 'absolute'
+            super().__init__(top, right, bottom, left)
+
+    class relative(FourSided):
+        def __init__(self, top=None, right=None, bottom=None, left=None):
+            self.item = 'relative'
+            super().__init__(top, right, bottom, left)
+
+    class fixed(FourSided):
+        def __init__(self, top=None, right=None, bottom=None, left=None):
+            self.item = 'fixed'
+            super().__init__(top, right, bottom, left)
+
+    class sticky(FourSided):
+        def __init__(self, top=None, right=None, bottom=None, left=None):
+            self.item = 'sticky'
+            super().__init__(top, right, bottom, left)
+
+
+def add_style(p1, p2):
+    return f"calc({p1} + {p2})"
+
+
+def substract_style(p1, p2):
+    return f"calc({p1} - {p2})"
+
+
+def multiply_style(p1, p2):
+    return f"calc({p1} * {p2})"
+
+
+def divide_style(p1, p2):
+    return f"calc({p1} / {p2})"
diff --git a/src/bevyframe/Widgets/Templates/Containers.py b/src/bevyframe/Widgets/Templates/Containers.py
@@ -6,25 +6,27 @@
     **kwargs
 )
 
-Root = lambda childs, style = None, onclick = None: Container(
+Root = lambda childs, style = None, **kwargs: Container(
     selector='root',
     childs=childs if isinstance(childs, list) else [childs],
     style=style if style else {},
-    onclick=onclick if onclick else ''
+    **kwargs
 )
 
-Box = lambda childs, style = None, onclick = None: Container(
+Box = lambda childs, style = None, onclick = None, **kwargs: Container(
     selector='the_box',
     childs=childs if isinstance(childs, list) else [childs],
     style=style if style else {},
-    onclick=onclick if onclick else ''
+    onclick=onclick if onclick else '',
+    **kwargs
 )
 
-Post = lambda childs, style = None, onclick = None: Container(
+Post = lambda childs, style = None, onclick = None, **kwargs: Container(
     selector='post',
     childs=childs if isinstance(childs, list) else [childs],
     style=style if style else {},
-    onclick=onclick if onclick else ''
+    onclick=onclick if onclick else '',
+    **kwargs
 )
 
 Line = lambda childs, style = None, onclick = None, **kwargs: Widget(
diff --git a/src/bevyframe/Widgets/Widget.py b/src/bevyframe/Widgets/Widget.py
@@ -1,18 +1,64 @@
 from bevyframe.Helpers.RenderCSS import RenderCSS
+from bevyframe.Widgets.Style import Margin, Padding, Position
 
 
 class Widget:
-    def __init__(self, item, **kwargs):
+    def __init__(
+            self,
+            item,
+            style: dict = None,
+            css: dict = None,
+            color: str = None,
+            background_color: str = None,
+            height: str = None,
+            width: str = None,
+            min_height: str = None,
+            max_height: str = None,
+            min_width: str = None,
+            max_width: str = None,
+            text_align: str = None,
+            margin: (str, Margin) = None,
+            padding: (str, Padding) = None,
+            position: Position = None,
+            border_radius: str = None,
+            font_size: str = None,
+            vertical_align: str = None,
+            **kwargs,
+    ):
         self.data = {}
         self.element = item
-        self.style = {}
+        self.style = {} if style is None else style
+        self.content = ''
+        if style is None:
+            if css is not None:
+                self.style = css
+            if isinstance(margin, str):
+                self.style.update({'margin': margin})
+            elif isinstance(margin, Margin):
+                for i in ['top', 'right', 'bottom', 'left']:
+                    if getattr(margin, i) is not None:
+                        self.style.update({f'margin-{i}': getattr(margin, i)})
+            if isinstance(padding, str):
+                self.style.update({'padding': padding})
+            elif isinstance(padding, Padding):
+                for i in ['top', 'right', 'bottom', 'left']:
+                    if getattr(padding, i) is not None:
+                        self.style.update({f'padding-{i}': getattr(padding, i)})
+            if position is not None:
+                self.style.update({'position': position.item})
+                for i in ['top', 'right', 'bottom', 'left']:
+                    if getattr(position, i) is not None:
+                        self.style.update({i: getattr(position, i)})
+            k = [i for i in locals().keys()]
+            for i in k:
+                if i not in ['self', 'item', 'style', 'css', 'data', 'element', 'content', 'margin', 'padding', 'position', 'kwargs']:
+                    if locals().get(i, None) is not None:
+                        self.style.update({i.replace('_', '-'): locals()[i]})
         for arg in kwargs:
             if arg == 'innertext':
                 self.content = [kwargs['innertext']]
             elif arg == 'childs':
                 self.content = kwargs['childs']
-            elif arg == 'style':
-                self.style = kwargs['style']
             else:
                 self.data.update({arg: kwargs[arg]})
 
diff --git a/src/bevyframe/Widgets/__pycache__/Widget.cpython-312.pyc b/src/bevyframe/Widgets/__pycache__/Widget.cpython-312.pyc
diff --git a/src/bevyframe/__init__.py b/src/bevyframe/__init__.py
@@ -1,5 +1,6 @@
 from bevyframe.Widgets.Page import Page
 from bevyframe.Widgets.Widget import Widget
+from bevyframe.Widgets.Style import *
 from bevyframe.Helpers.RenderCSS import RenderCSS
 from bevyframe.Widgets.Templates import *
 from bevyframe.Objects.Request import Request
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -12,14 +12,15 @@ def get(request: Request) -> (Page, Response):
         selector=f'body_{request.user.id.settings.theme_color}',
         childs=[
             Title(f'Hello, {request.user.id.name} {request.user.id.surname} from {request.user.network}!'),
-            Box(style={
-                "width": "max-content",
-                "text-align": "center"
-            }, childs=[
-                Line([Textbox('', type="text", placeholder='textbox')]),
-                Line([Button(innertext='Button')]),
-                Line([Button(selector='small', innertext='Button')]),
-                Line([Button(selector='mini', innertext='Button')])
-            ])
+            Box(
+                width=Size.max_content,
+                text_align=Align.center,
+                childs=[
+                    Line([Textbox('', type="text", placeholder='textbox')]),
+                    Line([Button(innertext='Button')]),
+                    Line([Button(selector='small', innertext='Button')]),
+                    Line([Button(selector='mini', innertext='Button')])
+                ]
+            )
         ]
     )
