Merge remote-tracking branch 'origin/main' into owen/v1-integration-tests

Author: OwenMcDonnell

client/pubspec.lock

@@ -29,10 +29,10 @@ packages:
     dependency: transitive
     description:
       name: audioplayers
-      sha256: e653f162ddfcec1da2040ba2d8553fff1662b5c2a5c636f4c21a3b11bee497de
+      sha256: "5441fa0ceb8807a5ad701199806510e56afde2b4913d9d17c2f19f2902cf0ae4"
       url: "https://pub.dev"
     source: hosted
-    version: "6.5.0"
+    version: "6.5.1"
   audioplayers_android:
     dependency: transitive
     description:
@@ -245,10 +245,10 @@ packages:
     dependency: transitive
     description:
       name: file_picker
-      sha256: ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2
+      sha256: e7e16c9d15c36330b94ca0e2ad8cb61f93cd5282d0158c09805aed13b5452f22
       url: "https://pub.dev"
     source: hosted
-    version: "10.3.1"
+    version: "10.3.2"
   fixnum:
     dependency: transitive
     description:
@@ -277,7 +277,7 @@ packages:
     description:
       path: "src/flutter/flet_ads"
       ref: main
-      resolved-ref: e847a431388733d6bcd81748c617a3b962c5efa9
+      resolved-ref: aa05773138be06e69353e2a223bd23c51b36dd3f
       url: "https://github.com/flet-dev/flet-ads.git"
     source: git
     version: "0.2.0"
@@ -286,7 +286,7 @@ packages:
     description:
       path: "src/flutter/flet_audio"
       ref: main
-      resolved-ref: "5611fa1ef47c2faeeb6317671932cfd3ee2888c3"
+      resolved-ref: "06fb901f133fab54e603f8039bc9a1d707d19068"
       url: "https://github.com/flet-dev/flet-audio.git"
     source: git
     version: "0.2.0"
@@ -295,7 +295,7 @@ packages:
     description:
       path: "src/flutter/flet_audio_recorder"
       ref: main
-      resolved-ref: "10c9108060410c3c4e2435311c8e4ee70daf24bf"
+      resolved-ref: "62a1934a34514e92617f4e090b53828474f5969e"
       url: "https://github.com/flet-dev/flet-audio-recorder.git"
     source: git
     version: "0.2.0"
@@ -313,7 +313,7 @@ packages:
     description:
       path: "src/flutter/flet_datatable2"
       ref: main
-      resolved-ref: ebd7adc75486b276df382ae6401037c45a6df2a3
+      resolved-ref: bf6af9c7a9c1962c36512ff5ab48eec9f14ef81a
       url: "https://github.com/flet-dev/flet-datatable2.git"
     source: git
     version: "0.1.0"
@@ -322,7 +322,7 @@ packages:
     description:
       path: "src/flutter/flet_flashlight"
       ref: main
-      resolved-ref: "88fb80a6b4032956282a4be9c60f3c25f3cfccb5"
+      resolved-ref: def30504c3ed6786dc2a1fdb4f18b226a284a7d2
       url: "https://github.com/flet-dev/flet-flashlight.git"
     source: git
     version: "0.2.0"
@@ -331,7 +331,7 @@ packages:
     description:
       path: "src/flutter/flet_geolocator"
       ref: main
-      resolved-ref: "94ed74df1a8b791d0afaccc2f9caac3456698f78"
+      resolved-ref: "25efd0a9d15f23bf284912814a131388f8de9ec4"
       url: "https://github.com/flet-dev/flet-geolocator.git"
     source: git
     version: "0.25.2"
@@ -340,7 +340,7 @@ packages:
     description:
       path: "src/flutter/flet_lottie"
       ref: main
-      resolved-ref: "86eaa0b59f3cc54f9b2fb57abce9c0d22de253ca"
+      resolved-ref: "5187fcf6bcb37f4bfa59cad127f6444d40cdb48c"
       url: "https://github.com/flet-dev/flet-lottie.git"
     source: git
     version: "0.2.0"
@@ -349,7 +349,7 @@ packages:
     description:
       path: "src/flutter/flet_map"
       ref: main
-      resolved-ref: "8507cda6616f555974fbdcd3df05c3f2b02c043f"
+      resolved-ref: d79ebf24ebad208a543b73a7f7511cd4da1d7ea9
       url: "https://github.com/flet-dev/flet-map.git"
     source: git
     version: "0.2.0"
@@ -358,7 +358,7 @@ packages:
     description:
       path: "src/flutter/flet_permission_handler"
       ref: main
-      resolved-ref: "2a56423dd77d220a0067f4097f9e25659b2f9b36"
+      resolved-ref: dbd04f183b8452a5247f2807007cc40a2381a172
       url: "https://github.com/flet-dev/flet-permission-handler.git"
     source: git
     version: "0.2.0"
@@ -367,7 +367,7 @@ packages:
     description:
       path: "src/flutter/flet_rive"
       ref: main
-      resolved-ref: "67256e81ec7c906ae03790b0c180c9be018ed7a4"
+      resolved-ref: "6d78b068940afa5126fc38374ea326e710d43862"
       url: "https://github.com/flet-dev/flet-rive.git"
     source: git
     version: "0.2.0"
@@ -376,7 +376,7 @@ packages:
     description:
       path: "src/flutter/flet_video"
       ref: main
-      resolved-ref: a086b89d74f96e052a450d6c2a50c812a035ce45
+      resolved-ref: abeea4e9a3a2864299743726b26d5a245a4389d6
       url: "https://github.com/flet-dev/flet-video.git"
     source: git
     version: "0.2.0"
@@ -385,7 +385,7 @@ packages:
     description:
       path: "src/flutter/flet_webview"
       ref: main
-      resolved-ref: "9e2b64171f81cbe72a8a61ee9ba9d2af69587837"
+      resolved-ref: cb3d07bfb84ae1b51be25388ca04c03a9dafd7f3
       url: "https://github.com/flet-dev/flet-webview.git"
     source: git
     version: "0.2.0"
@@ -1028,18 +1028,18 @@ packages:
     dependency: transitive
     description:
       name: record_android
-      sha256: "8b170e33d9866f9b51e01a767d7e1ecb97b9ecd629950bd87a47c79359ec57f8"
+      sha256: "8361a791c9a3fa5c065f0b8b5adb10f12531f8538c86b19474cf7b56ea80d426"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   record_ios:
     dependency: transitive
     description:
       name: record_ios
-      sha256: ad97d0a75933c44bcf5aff648e86e32fc05eb61f8fbef190f14968c8eaf86692
+      sha256: "13e241ed9cbc220534a40ae6b66222e21288db364d96dd66fb762ebd3cb77c71"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.2"
   record_linux:
     dependency: transitive
     description:
@@ -1052,10 +1052,10 @@ packages:
     dependency: transitive
     description:
       name: record_macos
-      sha256: f1399bca76a1634da109e5b0cba764ed8332a2b4da49c704c66d2c553405ed81
+      sha256: "2849068bb59072f300ad63ed146e543d66afaef8263edba4de4834fc7c8d4d35"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   record_platform_interface:
     dependency: transitive
     description:
@@ -1076,10 +1076,10 @@ packages:
     dependency: transitive
     description:
       name: record_windows
-      sha256: "85a22fc97f6d73ecd67c8ba5f2f472b74ef1d906f795b7970f771a0914167e99"
+      sha256: "223258060a1d25c62bae18282c16783f28581ec19401d17e56b5205b9f039d78"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.7"
   rive:
     dependency: transitive
     description:
@@ -1108,10 +1108,10 @@ packages:
     dependency: transitive
     description:
       name: screen_brightness_android
-      sha256: fb5fa43cb89d0c9b8534556c427db1e97e46594ac5d66ebdcf16063b773d54ed
+      sha256: d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   screen_brightness_platform_interface:
     dependency: transitive
     description:

packages/flet/lib/src/controls/alert_dialog.dart

@@ -75,8 +75,6 @@ class _AlertDialogControlState extends State<AlertDialogControl> {
           iconPadding: widget.control.getPadding("icon_padding"),
           backgroundColor: widget.control.getColor("bgcolor", context),
           buttonPadding: widget.control.getPadding("action_button_padding"),
-          surfaceTintColor:
-              widget.control.getColor("surface_tint_color", context),
           shadowColor: widget.control.getColor("shadow_color", context),
           elevation: widget.control.getDouble("elevation"),
           clipBehavior:

packages/flet/lib/src/controls/animated_switcher.dart

@@ -47,6 +47,6 @@ class AnimatedSwitcherControl extends StatelessWidget {
       },
       child: content,
     );
-    return ConstrainedControl(control: control, child: animatedSwitcher);
+    return LayoutControl(control: control, child: animatedSwitcher);
   }
 }

packages/flet/lib/src/controls/app_bar.dart

@@ -36,7 +36,6 @@ class AppBarControl extends StatelessWidget implements PreferredSizeWidget {
           .extension<SystemUiOverlayStyleTheme>()
           ?.systemUiOverlayStyle,
       shadowColor: control.getColor("shadow_color", context),
-      surfaceTintColor: control.getColor("surface_tint_color", context),
       scrolledUnderElevation: control.getDouble("elevation_on_scroll"),
       forceMaterialTransparency:
           control.getBool("force_material_transparency", false)!,

packages/flet/lib/src/controls/banner.dart

@@ -52,7 +52,6 @@ class _BannerControlState extends State<BannerControl> {
       backgroundColor: widget.control.getColor("bgcolor", context),
       contentTextStyle:
           widget.control.getTextStyle("content_text_style", Theme.of(context)),
-      surfaceTintColor: widget.control.getColor("surface_tint_color", context),
       shadowColor: widget.control.getColor("shadow_color", context),
       dividerColor: widget.control.getColor("divider_color", context),
       elevation: widget.control.getDouble("elevation"),

packages/flet/lib/src/controls/base_controls.dart

@@ -29,11 +29,20 @@ class BaseControl extends StatelessWidget {
   }
 }
 
-class ConstrainedControl extends StatelessWidget {
+// TODO - remove when extensions migrated to LayoutControl
+class ConstrainedControl extends LayoutControl {
+  const ConstrainedControl({
+    super.key,
+    required super.control,
+    required super.child,
+  });
+}
+
+class LayoutControl extends StatelessWidget {
   final Control control;
   final Widget child;
 
-  const ConstrainedControl({
+  const LayoutControl({
     super.key,
     required this.control,
     required this.child,

packages/flet/lib/src/controls/bottom_app_bar.dart

@@ -17,12 +17,11 @@ class BottomAppBarControl extends StatelessWidget {
       elevation: control.getDouble("elevation"),
       shape: control.getNotchedShape("shape", Theme.of(context)),
       shadowColor: control.getColor("shadow_color", context),
-      surfaceTintColor: control.getColor("surface_tint_color", context),
       color: control.getColor("bgcolor", context),
       notchMargin: control.getDouble("notch_margin", 4.0)!,
       child: control.buildWidget("content"),
     );
 
-    return ConstrainedControl(control: control, child: bottomAppBar);
+    return LayoutControl(control: control, child: bottomAppBar);
   }
 }

packages/flet/lib/src/controls/button.dart

@@ -218,6 +218,6 @@ class _ButtonControlState extends State<ButtonControl> with FletStoreMixin {
       }
     }
 
-    return ConstrainedControl(control: widget.control, child: button);
+    return LayoutControl(control: widget.control, child: button);
   }
 }

packages/flet/lib/src/controls/canvas.dart

@@ -167,7 +167,7 @@ class _CanvasControlState extends State<CanvasControl> {
       child: widget.control.buildWidget("content"),
     );
 
-    return ConstrainedControl(control: widget.control, child: paint);
+    return LayoutControl(control: widget.control, child: paint);
   }
 }
 

packages/flet/lib/src/controls/card.dart

@@ -36,7 +36,6 @@ class CardControl extends StatelessWidget {
         control.getBool("show_border_on_foreground", true)!;
     var bgcolor = control.getColor("bgcolor", context);
     var shadowColor = control.getColor("shadow_color", context);
-    var surfaceTintColor = control.getColor("surface_tint_color", context);
 
     Widget? card;
 
@@ -53,7 +52,6 @@ class CardControl extends StatelessWidget {
           clipBehavior: clipBehavior,
           color: bgcolor,
           shadowColor: shadowColor,
-          surfaceTintColor: surfaceTintColor,
           child: contentWidget);
     } else if (variant == CardVariant.filled) {
       card = Card.filled(
@@ -65,7 +63,6 @@ class CardControl extends StatelessWidget {
           clipBehavior: clipBehavior,
           color: bgcolor,
           shadowColor: shadowColor,
-          surfaceTintColor: surfaceTintColor,
           child: contentWidget);
     } else {
       card = Card(
@@ -77,10 +74,9 @@ class CardControl extends StatelessWidget {
           clipBehavior: clipBehavior,
           color: bgcolor,
           shadowColor: shadowColor,
-          surfaceTintColor: surfaceTintColor,
           child: contentWidget);
     }
 
-    return ConstrainedControl(control: control, child: card);
+    return LayoutControl(control: control, child: card);
   }
 }