Merge branch 'main' into inesa/fix-tutorials

Author: InesaFitsner

client/integration_test/flutter_tester.dart

@@ -74,23 +74,24 @@ class FlutterWidgetTester implements Tester {
   }
 
   @override
-  Future<void> tap(TestFinder finder, int finderIndex) async {
-    await _tester.tap((finder as FlutterTestFinder).raw.at(finderIndex));
-  }
+  Future<void> tap(TestFinder finder, int finderIndex) =>
+      _tester.tap((finder as FlutterTestFinder).raw.at(finderIndex));
 
   @override
-  Future<void> longPress(TestFinder finder, int finderIndex) async {
-    await _tester.longPress((finder as FlutterTestFinder).raw.at(finderIndex));
-  }
+  Future<void> tapAt(Offset offset) =>
+      _tester.tapAt(offset);
+
+  @override
+  Future<void> longPress(TestFinder finder, int finderIndex) =>
+      _tester.longPress((finder as FlutterTestFinder).raw.at(finderIndex));
 
   @override
   Future<void> enterText(
-      TestFinder finder, int finderIndex, String text) async {
-    await _tester.enterText(
-      (finder as FlutterTestFinder).raw.at(finderIndex),
-      text,
-    );
-  }
+      TestFinder finder, int finderIndex, String text) =>
+      _tester.enterText(
+        (finder as FlutterTestFinder).raw.at(finderIndex),
+        text,
+      );
 
   @override
   Future<void> mouseHover(TestFinder finder, int finderIndex) async {

packages/flet/lib/src/services/tester.dart

@@ -5,6 +5,8 @@ import '../testing/test_finder.dart';
 import '../utils/icons.dart';
 import '../utils/keys.dart';
 import '../utils/time.dart';
+import 'package:flet/src/utils/transforms.dart';
+
 
 class TesterService extends FletService {
   TesterService({required super.control});
@@ -82,6 +84,12 @@ class TesterService extends FletService {
           await control.backend.tester!.tap(finder, args["finder_index"]);
         }
 
+      case "tap_at":
+        var offset = parseOffset(args["offset"]);
+        if (offset != null) {
+          await control.backend.tester!.tapAt(offset);
+        }
+
       case "long_press":
         var finder = _finders[args["finder_id"]];
         if (finder != null) {

packages/flet/lib/src/testing/tester.dart

@@ -13,6 +13,7 @@ abstract class Tester {
   TestFinder findByTooltip(String value);
   TestFinder findByIcon(IconData icon);
   Future<Uint8List> takeScreenshot(String name);
+  Future<void> tapAt(Offset offset);
   Future<void> tap(TestFinder finder, int finderIndex);
   Future<void> longPress(TestFinder finder, int finderIndex);
   Future<void> enterText(TestFinder finder, int finderIndex, String text);

sdk/python/examples/apps/custom_controls/custom_buttons.py

@@ -0,0 +1,45 @@
+from dataclasses import dataclass, field
+from typing import Any
+
+import flet as ft
+
+
+def main(page: ft.Page):
+    @ft.control
+    class MyButton(ft.Button):
+        expand: int = field(default_factory=lambda: 1)
+        style: ft.ButtonStyle = field(
+            default_factory=lambda: ft.ButtonStyle(
+                shape=ft.RoundedRectangleBorder(radius=10)
+            )
+        )
+        bgcolor: ft.Colors = ft.Colors.BLUE_ACCENT
+        icon: Any = ft.Icons.HEADPHONES
+
+    @dataclass
+    class MyButton2(ft.Button):
+        expand: Any = 1
+        bgcolor: ft.Colors = ft.Colors.GREEN_ACCENT
+        style: ft.ButtonStyle = field(
+            default_factory=lambda: ft.ButtonStyle(
+                shape=ft.RoundedRectangleBorder(radius=20)
+            )
+        )
+        icon: ft.IconDataOrControl = ft.Icons.HEADPHONES
+
+    @ft.control
+    class MyButton3(ft.Button):
+        def init(self):
+            self.expand = 1
+            self.bgcolor = ft.Colors.RED_ACCENT
+            self.style = ft.ButtonStyle(shape=ft.RoundedRectangleBorder(radius=30))
+            self.icon = ft.Icons.HEADPHONES
+
+    page.add(
+        ft.Row([MyButton(content="1")]),
+        ft.Row([MyButton2(content="2")]),
+        ft.Row([MyButton3(content="3")]),
+    )
+
+
+ft.run(main)

sdk/python/examples/controls/row/__init__.py

@@ -44,4 +44,5 @@ def main(page: ft.Page):
     )
 
 
-ft.run(main)
+if __name__ == "__main__":
+    ft.run(main)

sdk/python/examples/controls/row/alignment.py

@@ -24,6 +24,7 @@ def handle_slider_change(e: ft.Event[ft.Slider]):
             controls=[
                 ft.Text("Spacing between items"),
                 ft.Slider(
+                    key="slider",
                     min=0,
                     max=50,
                     divisions=50,
@@ -39,4 +40,5 @@ def handle_slider_change(e: ft.Event[ft.Slider]):
     )
 
 
-ft.run(main)
+if __name__ == "__main__":
+    ft.run(main)

sdk/python/examples/controls/row/spacing.py

@@ -35,4 +35,5 @@ def main(page: ft.Page):
     )
 
 
-ft.run(main)
+if __name__ == "__main__":
+    ft.run(main)

sdk/python/examples/controls/row/vertical_alignment.py

@@ -45,4 +45,5 @@ def handle_slider_change(e: ft.Event[ft.Slider]):
     )
 
 
-ft.run(main)
+if __name__ == "__main__":
+    ft.run(main)