Container, padding, margin from JSON

Author: FeodorFitsner

client/lib/controls/container.dart

@@ -0,0 +1,46 @@
+import 'package:flet_view/controls/create_control.dart';
+import 'package:flet_view/controls/error.dart';
+import 'package:flet_view/utils/colors.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+
+import '../models/control.dart';
+
+class ContainerControl extends StatelessWidget {
+  final Control? parent;
+  final Control control;
+  final List<Control> children;
+  final bool parentDisabled;
+
+  const ContainerControl(
+      {Key? key,
+      this.parent,
+      required this.control,
+      required this.children,
+      required this.parentDisabled})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    debugPrint("Icon build: ${control.id}");
+
+    var bgColor =
+        HexColor.fromString(context, control.attrString("bgColor", "")!);
+    var contentCtrls = children.where((c) => c.name == "content");
+    bool disabled = control.isDisabled || parentDisabled;
+
+    if (contentCtrls.isEmpty) {
+      return const ErrorControl("Container does not contain any content.");
+    }
+
+    return constrainedControl(
+        Container(
+            color: bgColor,
+            padding: parseEdgeInsets(control, "padding"),
+            margin: parseEdgeInsets(control, "margin"),
+            alignment: parseAlignment(control, "alignment"),
+            child: createControl(control, contentCtrls.first.id, disabled)),
+        parent,
+        control);
+  }
+}

client/lib/controls/create_control.dart

@@ -1,10 +1,13 @@
 import 'dart:convert';
 
+import 'package:flet_view/controls/container.dart';
 import 'package:flet_view/controls/icon.dart';
 import 'package:flet_view/controls/image.dart';
 import 'package:flet_view/controls/list_view.dart';
 import 'package:flet_view/controls/snack_bar.dart';
 import 'package:flet_view/models/control_type.dart';
+import 'package:flet_view/utils/alignment.dart';
+import 'package:flet_view/utils/edge_insets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
@@ -88,6 +91,12 @@ Widget createControl(Control? parent, String id, bool parentDisabled) {
               control: controlView.control,
               children: controlView.children,
               parentDisabled: parentDisabled);
+        case ControlType.container:
+          return ContainerControl(
+              parent: parent,
+              control: controlView.control,
+              children: controlView.children,
+              parentDisabled: parentDisabled);
         case ControlType.listView:
           return ListViewControl(
               parent: parent,
@@ -197,20 +206,32 @@ WrapCrossAlignment parseWrapCrossAlignment(
       orElse: () => defValue);
 }
 
-EdgeInsetsGeometry? parseEdgeInsets(Control control, String propName) {
-  var d = control.attrDouble(propName, null);
-  if (d == null) {
+ThemeData? parseTheme(Control control, String propName) {
+  var v = control.attrString(propName, null);
+  if (v == null) {
+    return null;
+  }
+
+  final j1 = json.decode(v);
+  return themeFromJson(j1);
+}
+
+EdgeInsets? parseEdgeInsets(Control control, String propName) {
+  var v = control.attrString(propName, null);
+  if (v == null) {
     return null;
   }
-  return EdgeInsets.all(d);
+
+  final j1 = json.decode(v);
+  return edgeInsetsFromJson(j1);
 }
 
-ThemeData? parseTheme(Control control, String propName) {
+Alignment? parseAlignment(Control control, String propName) {
   var v = control.attrString(propName, null);
   if (v == null) {
     return null;
   }
 
   final j1 = json.decode(v);
-  return themeFromJson(j1);
+  return alignmentFromJson(j1);
 }

client/lib/utils/alignment.dart

@@ -0,0 +1,5 @@
+import 'package:flutter/cupertino.dart';
+
+Alignment alignmentFromJson(Map<String, dynamic> json) {
+  return Alignment(json['x'] as double, json['y'] as double);
+}

client/lib/utils/edge_insets.dart

@@ -0,0 +1,6 @@
+import 'package:flutter/cupertino.dart';
+
+EdgeInsets edgeInsetsFromJson(Map<String, dynamic> json) {
+  return EdgeInsets.fromLTRB(json['left'] as double, json['top'] as double,
+      json['right'] as double, json['bottom'] as double);
+}

sdk/python/flet/alert_dialog.py

@@ -1,8 +1,10 @@
+import json
 from typing import List, Optional
 
 from beartype import beartype
 
-from flet.control import Control, MainAxisAlignment, OptionalNumber
+from flet import padding
+from flet.control import Control, MainAxisAlignment, OptionalNumber, PaddingValue
 from flet.ref import Ref
 
 try:
@@ -24,11 +26,11 @@ def __init__(
         open: bool = False,
         modal: bool = False,
         title: Control = None,
-        title_padding: OptionalNumber = None,
+        title_padding: PaddingValue = None,
         content: Control = None,
-        content_padding: OptionalNumber = None,
+        content_padding: PaddingValue = None,
         actions: List[Control] = None,
-        actions_padding: OptionalNumber = None,
+        actions_padding: PaddingValue = None,
         actions_alignment: MainAxisAlignment = None,
     ):
 
@@ -100,11 +102,17 @@ def title(self, value):
     # title_padding
     @property
     def title_padding(self):
-        return self._get_attr("titlePadding")
+        return self.__title_padding
 
     @title_padding.setter
-    def title_padding(self, value):
-        self._set_attr("titlePadding", value)
+    @beartype
+    def title_padding(self, value: PaddingValue):
+        self.__title_padding = value
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr(
+            "titlePadding", json.dumps(value, default=vars) if value else None
+        )
 
     # content
     @property
@@ -118,11 +126,17 @@ def content(self, value):
     # content_padding
     @property
     def content_padding(self):
-        return self._get_attr("contentPadding")
+        return self.__content_padding
 
     @content_padding.setter
-    def content_padding(self, value):
-        self._set_attr("contentPadding", value)
+    @beartype
+    def content_padding(self, value: PaddingValue):
+        self.__content_padding = value
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr(
+            "contentPadding", json.dumps(value, default=vars) if value else None
+        )
 
     # actions
     @property
@@ -136,11 +150,17 @@ def actions(self, value):
     # actions_padding
     @property
     def actions_padding(self):
-        return self._get_attr("actionsPadding")
+        return self.__actions_padding
 
     @actions_padding.setter
-    def actions_padding(self, value):
-        self._set_attr("actionsPadding", value)
+    @beartype
+    def actions_padding(self, value: PaddingValue):
+        self.__actions_padding = value
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr(
+            "actionsPadding", json.dumps(value, default=vars) if value else None
+        )
 
     # actions_alignment
     @property

sdk/python/flet/alignment.py

@@ -0,0 +1,22 @@
+import dataclasses
+from typing import Union
+
+from beartype._decor.main import beartype
+
+
+@beartype
+@dataclasses.dataclass
+class Alignment:
+    x: Union[float, int]
+    y: Union[float, int]
+
+
+bottom_center = Alignment(0, 1)
+bottom_left = Alignment(-1, 1)
+bottom_right = Alignment(1, 1)
+center = Alignment(0, 0)
+center_left = Alignment(-1, 0)
+center_right = Alignment(1, 0)
+top_center = Alignment(0, -1)
+top_left = Alignment(-1, -1)
+top_right = Alignment(1, -1)

sdk/python/flet/banner.py

@@ -1,8 +1,10 @@
+import json
 from typing import List, Optional
 
 from beartype import beartype
 
-from flet.control import Control, MainAxisAlignment, OptionalNumber
+from flet import padding
+from flet.control import Control, MainAxisAlignment, OptionalNumber, PaddingValue
 from flet.ref import Ref
 
 try:
@@ -23,9 +25,9 @@ def __init__(
         #
         open: bool = False,
         leading: Control = None,
-        leading_padding: OptionalNumber = None,
+        leading_padding: PaddingValue = None,
         content: Control = None,
-        content_padding: OptionalNumber = None,
+        content_padding: PaddingValue = None,
         actions: List[Control] = None,
         force_actions_below: bool = None,
         bgcolor: str = None,
@@ -98,11 +100,17 @@ def leading(self, value):
     # leading_padding
     @property
     def leading_padding(self):
-        return self._get_attr("titlePadding")
+        return self.__leading_padding
 
     @leading_padding.setter
-    def leading_padding(self, value):
-        self._set_attr("titlePadding", value)
+    @beartype
+    def leading_padding(self, value: PaddingValue):
+        self.__leading_padding = value
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr(
+            "leadingPadding", json.dumps(value, default=vars) if value else None
+        )
 
     # content
     @property
@@ -116,11 +124,17 @@ def content(self, value):
     # content_padding
     @property
     def content_padding(self):
-        return self._get_attr("contentPadding")
+        return self.__content_padding
 
     @content_padding.setter
-    def content_padding(self, value):
-        self._set_attr("contentPadding", value)
+    @beartype
+    def content_padding(self, value: PaddingValue):
+        self.__content_padding = value
+        if value and isinstance(value, (int, float)):
+            value = padding.all(value)
+        self._set_attr(
+            "contentPadding", json.dumps(value, default=vars) if value else None
+        )
 
     # actions
     @property