Matplotlib and Plotly Charts (#509)

* Line chart initial commit

* More chart classes

* LineChart Python model

* Use custom flutter_svg library

* aspect_ratio added to all controls

* AspectRatio on Flutter side

* Changed flutter_svg reference to flet-fixes branch

* MatplotlibChart control

* Added MatplotlibChart.isolated

* Create plotly_chart.py

* Update pubspec.lock

* original_size

Author: FeodorFitsner

client/pubspec.lock

@@ -196,9 +196,11 @@ packages:
   flutter_svg:
     dependency: transitive
     description:
-      name: flutter_svg
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "."
+      ref: flet-fixes
+      resolved-ref: "71166dc07d39b686f117319a04479d26e44c2a24"
+      url: "https://github.com/flet-dev/flutter_svg.git"
+    source: git
     version: "1.1.5"
   flutter_test:
     dependency: "direct dev"

package/lib/src/controls/create_control.dart

@@ -326,15 +326,20 @@ Widget constrainedControl(
   return _expandable(
       _positionedControl(
           context,
-          _offsetControl(
-              context,
-              _scaledControl(
+          _aspectRatio(
+              _offsetControl(
                   context,
-                  _rotatedControl(
+                  _scaledControl(
                       context,
-                      _sizedControl(
-                          _tooltip(_opacity(context, widget, parent, control),
-                              parent, control),
+                      _rotatedControl(
+                          context,
+                          _sizedControl(
+                              _tooltip(
+                                  _opacity(context, widget, parent, control),
+                                  parent,
+                                  control),
+                              parent,
+                              control),
                           parent,
                           control),
                       parent,
@@ -391,6 +396,16 @@ Widget _tooltip(Widget widget, Control? parent, Control control) {
       : widget;
 }
 
+Widget _aspectRatio(Widget widget, Control? parent, Control control) {
+  var aspectRatio = control.attrDouble("aspectRatio");
+  return aspectRatio != null
+      ? AspectRatio(
+          aspectRatio: aspectRatio,
+          child: widget,
+        )
+      : widget;
+}
+
 Widget _rotatedControl(
     BuildContext context, Widget widget, Control? parent, Control control) {
   var rotationDetails = parseRotate(control, "rotate");

package/pubspec.yaml

@@ -23,7 +23,10 @@ dependencies:
   markdown: ^6.0.1
   file_picker: ^5.0.1
   shared_preferences: ^2.0.15
-  flutter_svg: ^1.1.5
+  flutter_svg:
+    git:
+      url: https://github.com/flet-dev/flutter_svg.git
+      ref: flet-fixes
   window_to_front: ^0.0.3
   audioplayers: ^1.1.0
 

sdk/python/flet/animated_switcher.py

@@ -25,6 +25,7 @@ def __init__(
         rotate: RotateValue = None,
         scale: ScaleValue = None,
         offset: OffsetValue = None,
+        aspect_ratio: OptionalNumber = None,
         animate_opacity: AnimationValue = None,
         animate_size: AnimationValue = None,
         animate_position: AnimationValue = None,
@@ -59,6 +60,7 @@ def __init__(
             rotate=rotate,
             scale=scale,
             offset=offset,
+            aspect_ratio=aspect_ratio,
             animate_opacity=animate_opacity,
             animate_size=animate_size,
             animate_position=animate_position,

sdk/python/flet/card.py

@@ -24,6 +24,7 @@ def __init__(
         rotate: RotateValue = None,
         scale: ScaleValue = None,
         offset: OffsetValue = None,
+        aspect_ratio: OptionalNumber = None,
         animate_opacity: AnimationValue = None,
         animate_size: AnimationValue = None,
         animate_position: AnimationValue = None,
@@ -55,6 +56,7 @@ def __init__(
             rotate=rotate,
             scale=scale,
             offset=offset,
+            aspect_ratio=aspect_ratio,
             animate_opacity=animate_opacity,
             animate_size=animate_size,
             animate_position=animate_position,

sdk/python/flet/checkbox.py

@@ -33,6 +33,7 @@ def __init__(
         rotate: RotateValue = None,
         scale: ScaleValue = None,
         offset: OffsetValue = None,
+        aspect_ratio: OptionalNumber = None,
         animate_opacity: AnimationValue = None,
         animate_size: AnimationValue = None,
         animate_position: AnimationValue = None,
@@ -72,6 +73,7 @@ def __init__(
             rotate=rotate,
             scale=scale,
             offset=offset,
+            aspect_ratio=aspect_ratio,
             animate_opacity=animate_opacity,
             animate_size=animate_size,
             animate_position=animate_position,

sdk/python/flet/circle_avatar.py

@@ -24,6 +24,7 @@ def __init__(
         rotate: RotateValue = None,
         scale: ScaleValue = None,
         offset: OffsetValue = None,
+        aspect_ratio: OptionalNumber = None,
         animate_opacity: AnimationValue = None,
         animate_size: AnimationValue = None,
         animate_position: AnimationValue = None,
@@ -61,6 +62,7 @@ def __init__(
             rotate=rotate,
             scale=scale,
             offset=offset,
+            aspect_ratio=aspect_ratio,
             animate_opacity=animate_opacity,
             animate_size=animate_size,
             animate_position=animate_position,

sdk/python/flet/column.py

@@ -30,6 +30,7 @@ def __init__(
         rotate: RotateValue = None,
         scale: ScaleValue = None,
         offset: OffsetValue = None,
+        aspect_ratio: OptionalNumber = None,
         animate_opacity: AnimationValue = None,
         animate_size: AnimationValue = None,
         animate_position: AnimationValue = None,
@@ -66,6 +67,7 @@ def __init__(
             rotate=rotate,
             scale=scale,
             offset=offset,
+            aspect_ratio=aspect_ratio,
             animate_opacity=animate_opacity,
             animate_size=animate_size,
             animate_position=animate_position,

sdk/python/flet/constrained_control.py

@@ -29,6 +29,7 @@ def __init__(
         rotate: RotateValue = None,
         scale: ScaleValue = None,
         offset: OffsetValue = None,
+        aspect_ratio: OptionalNumber = None,
         animate_opacity: AnimationValue = None,
         animate_size: AnimationValue = None,
         animate_position: AnimationValue = None,
@@ -57,6 +58,7 @@ def __init__(
         self.scale = scale
         self.rotate = rotate
         self.offset = offset
+        self.aspect_ratio = aspect_ratio
         self.animate_opacity = animate_opacity
         self.animate_size = animate_size
         self.animate_position = animate_position
@@ -169,6 +171,16 @@ def offset(self) -> OffsetValue:
     def offset(self, value: OffsetValue):
         self.__offset = value
 
+    # aspect_ratio
+    @property
+    def aspect_ratio(self) -> OptionalNumber:
+        return self._get_attr("aspectRatio")
+
+    @aspect_ratio.setter
+    @beartype
+    def aspect_ratio(self, value: OptionalNumber):
+        self._set_attr("aspectRatio", value)
+
     # animate_opacity
     @property
     def animate_opacity(self) -> AnimationValue:

sdk/python/flet/container.py

@@ -55,6 +55,7 @@ def __init__(
         rotate: RotateValue = None,
         scale: ScaleValue = None,
         offset: OffsetValue = None,
+        aspect_ratio: OptionalNumber = None,
         animate_opacity: AnimationValue = None,
         animate_size: AnimationValue = None,
         animate_position: AnimationValue = None,
@@ -104,6 +105,7 @@ def __init__(
             rotate=rotate,
             scale=scale,
             offset=offset,
+            aspect_ratio=aspect_ratio,
             animate_opacity=animate_opacity,
             animate_size=animate_size,
             animate_position=animate_position,