[widget Audit] toga.DetailedList

android/tests_backend/widgets/base.py

@@ -182,31 +182,41 @@ def find_dialog(self):
     async def press(self):
         self.native.performClick()
 
-    def motion_event(self, down_time, action, x, y):
-        event = MotionEvent.obtain(
-            down_time,
-            SystemClock.uptimeMillis(),  # eventTime
-            action,
-            x,
-            y,
-            0,  # metaState
-        )
+    def motion_event(self, down_time, event_time, action, x, y):
+        event = MotionEvent.obtain(down_time, event_time, action, x, y, 0)
         self.native.dispatchTouchEvent(event)
         event.recycle()
 
-    async def swipe(self, dx, dy):
+    async def swipe(self, start_x, start_y, end_x, end_y, *, duration=0.3, hold=0.2):
         down_time = SystemClock.uptimeMillis()
-        start_x, start_y = (
-            self.native.getWidth() / 2,
-            self.native.getHeight() / 2,
-        )
-        end_x, end_y = (
-            start_x + (dx * self.scale_factor),
-            start_y + (dy * self.scale_factor),
+        self.motion_event(
+            down_time, down_time, MotionEvent.ACTION_DOWN, start_x, start_y
         )
-        self.motion_event(down_time, MotionEvent.ACTION_DOWN, start_x, start_y)
-        self.motion_event(down_time, MotionEvent.ACTION_MOVE, end_x, end_y)
-        self.motion_event(down_time, MotionEvent.ACTION_UP, end_x, end_y)
+
+        # Convert to milliseconds
+        duration *= 1000
+        hold *= 1000
+        end_time = down_time + duration
+
+        dx, dy = end_x - start_x, end_y - start_y
+        while (time := SystemClock.uptimeMillis()) < end_time:
+            fraction = (time - down_time) / duration
+            self.motion_event(
+                down_time,
+                time,
+                MotionEvent.ACTION_MOVE,
+                start_x + (dx * fraction),
+                start_y + (dy * fraction),
+            )
+            await asyncio.sleep(0.02)
+
+        # Hold at the end of the swipe to prevent it becoming a "fling"
+        end_time += hold
+        while (time := SystemClock.uptimeMillis()) < end_time:
+            self.motion_event(down_time, time, MotionEvent.ACTION_MOVE, end_x, end_y)
+            await asyncio.sleep(0.02)
+
+        self.motion_event(down_time, time, MotionEvent.ACTION_UP, end_x, end_y)
 
     @property
     def is_hidden(self):

android/tests_backend/widgets/detailedlist.py

@@ -85,11 +85,18 @@ def refresh_available(self):
         return self.scroll_position <= 0
 
     async def non_refresh_action(self):
-        await self.swipe(0, 100)
-        await asyncio.sleep(0.5)  # Handler isn't called until animation completes.
+        await self._swipe_down(80)
 
     async def refresh_action(self, active=True):
-        await self.swipe(0, 300)
+        await self._swipe_down(180)
+
+    # The minimum distance to trigger a refresh is 128 dp.
+    async def _swipe_down(self, distance):
+        x = self.native.getWidth() * 0.5
+        start_y = self.native.getHeight() * 0.1
+        end_y = start_y + (distance * self.scale_factor)
+
+        await self.swipe(x, start_y, x, end_y)
         await asyncio.sleep(0.5)  # Handler isn't called until animation completes.
 
     async def perform_primary_action(self, row, active=True):
@@ -127,8 +134,8 @@ async def _perform_action(self, row, action, active):
             timestamp = SystemClock.uptimeMillis()
             decor.dispatchKeyEvent(
                 KeyEvent(
-                    timestamp,
-                    timestamp,
+                    timestamp,  # downTime
+                    timestamp,  # eventTime
                     KeyEvent.ACTION_UP,
                     KeyEvent.KEYCODE_BACK,
                     0,  # repeat

android/tests_backend/widgets/scrollcontainer.py

@@ -1,5 +1,3 @@
-import asyncio
-
 from android.widget import HorizontalScrollView, RelativeLayout, ScrollView
 
 from .base import SimpleProbe
@@ -33,14 +31,9 @@ def document_width(self):
         return round(self.native_content.getWidth() / self.scale_factor)
 
     async def scroll(self):
-        await self.swipe(0, -30)  # Swipe up
+        x = self.native.getWidth() * 0.5
+        height = self.native.getHeight()
+        await self.swipe(x, height * 0.9, x, height * 0.1)
 
     async def wait_for_scroll_completion(self):
-        position = self.widget.position
-        current = None
-        # Iterate until 2 successive reads of the scroll position,
-        # 0.05s apart, return the same value
-        while position != current:
-            position = current
-            await asyncio.sleep(0.05)
-            current = self.widget.position
+        pass

testbed/tests/widgets/test_detailedlist.py

@@ -233,14 +233,9 @@ async def test_refresh(widget, probe):
         pytest.skip("This backend doesn't support the refresh action")
 
     # Set a refresh handler that simulates a reload altering data.
-    async def add_row(event_widget, **kwargs):
+    def add_row(event_widget, **kwargs):
         assert event_widget == widget
         assert kwargs == {}
-
-        # Simulate a reload delay
-        await probe.redraw("Wait for simulated reload")
-
-        # Add new data as part of the reload.
         widget.data.insert(0, {"a": "NEW A", "b": "NEW B"})
 
     widget.on_refresh = add_row