From 83c36d9dc3bf024e61e63ca0bab6dbb14d9060d6 Mon Sep 17 00:00:00 2001
From: Diego Torres Milano <dtmilano@gmail.com>
Date: Sat, 24 Feb 2024 11:16:59 -0800
Subject: [PATCH] Update culebratester client dependency

- Update culebratester client to 2.0.70
- Add ui_object get bounds
- Fix ui_object get content description
---
 setup.py                                        |  2 +-
 .../android/uiautomator/uiautomatorhelper.py    | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 769d77ee..2c29820e 100644
--- a/setup.py
+++ b/setup.py
@@ -22,5 +22,5 @@
       classifiers=['Development Status :: 5 - Production/Stable',
                    'Intended Audience :: Developers',
                    'License :: OSI Approved :: Apache Software License'],
-      install_requires=['setuptools', 'requests', 'numpy', 'matplotlib', 'culebratester-client >= 2.0.64'],
+      install_requires=['setuptools', 'requests', 'numpy', 'matplotlib', 'culebratester-client >= 2.0.70'],
       )
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
index 8cfba1dc..c7603668 100644
--- a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
+++ b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -36,7 +36,7 @@
 
 import culebratester_client
 from culebratester_client import Text, ObjectRef, DefaultApi, Point, PerformTwoPointerGestureBody, \
-    BooleanResponse, NumberResponse, StatusResponse, StringResponse
+    BooleanResponse, NumberResponse, StatusResponse, StringResponse, Rect
 
 from com.dtmilano.android.adb.adbclient import AdbClient
 from com.dtmilano.android.common import obtainAdbPath
@@ -711,10 +711,23 @@ def get_content_description(self, oid: int) -> str:
             :param oid: the oid
             :return: the content description
             """
-            response: StringResponse = self.uiAutomatorHelper.api_instance.ui_object2_oid_get_content_description_get(
+            response: StringResponse = self.uiAutomatorHelper.api_instance.ui_object_oid_get_content_description_get(
                 oid=oid)
             return response.value
 
+        def get_bounds(self, oid: int) -> Tuple[int, int, int, int]:
+            """
+            Gets the view's bounds property.  # noqa: E501
+            :see https://github.com/dtmilano/CulebraTester2-public/blob/master/openapi.yaml
+
+            :param oid:
+            :type oid:
+            :return:
+            :rtype:
+            """
+            rect: Rect = self.uiAutomatorHelper.api_instance.ui_object_oid_get_bounds_get(oid=oid)
+            return rect.left, rect.top, rect.right, rect.bottom
+
         def perform_two_pointer_gesture(self, oid: int, startPoint1: Tuple[int, int], startPoint2: Tuple[int, int],
                                         endPoint1: Tuple[int, int], endPoint2: Tuple[int, int], steps: int) -> None:
             """