androidviewclient 23.4.1__tar.gz → 24.1.0__tar.gz

{androidviewclient-23.4.1/src/androidviewclient.egg-info → androidviewclient-24.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: androidviewclient
-Version: 23.4.1
+Version: 24.1.0
 Summary: AndroidViewClient is a 100% pure python library and tools
 Home-page: https://github.com/dtmilano/AndroidViewClient/
 Author: Diego Torres Milano
@@ -15,4 +15,4 @@ Requires-Dist: setuptools
 Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: matplotlib
-Requires-Dist: culebratester-client>=2.0.70
+Requires-Dist: culebratester-client>=2.0.73

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-      version='23.4.1',
+      version='24.1.0',
       description='''AndroidViewClient is a 100% pure python library and tools
         that simplifies test script creation providing higher level
         operations and the ability of obtaining the tree of Views present at
@@ -22,5 +22,5 @@ setup(name='androidviewclient',
       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.70'],
+      install_requires=['setuptools', 'requests', 'numpy', 'matplotlib', 'culebratester-client >= 2.0.73'],
       )

{androidviewclient-23.4.1 → androidviewclient-24.1.0/src/androidviewclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: androidviewclient
-Version: 23.4.1
+Version: 24.1.0
 Summary: AndroidViewClient is a 100% pure python library and tools
 Home-page: https://github.com/dtmilano/AndroidViewClient/
 Author: Diego Torres Milano
@@ -15,4 +15,4 @@ Requires-Dist: setuptools
 Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: matplotlib
-Requires-Dist: culebratester-client>=2.0.70
+Requires-Dist: culebratester-client>=2.0.73

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/androidviewclient.egg-info/requires.txt

@@ -2,4 +2,4 @@ setuptools
 requests
 numpy
 matplotlib
-culebratester-client>=2.0.70
+culebratester-client>=2.0.73

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/adb/adbclient.py

@@ -27,7 +27,7 @@ from typing import Optional
 
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 import sys
 import warnings

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/adb/dumpsys.py

@@ -23,7 +23,7 @@ import re
 import sys
 from _warnings import warn
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 DEBUG = False
 

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/code_generator.py

@@ -3,7 +3,7 @@ import textwrap
 from abc import ABC
 from datetime import date
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 from typing import TextIO, Union, Dict, List
 

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/common.py

@@ -20,7 +20,7 @@ limitations under the License.
 
 from __future__ import print_function
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 import ast
 import os

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/concertina.py

@@ -22,7 +22,7 @@ import json
 import random
 
 __author__ = 'diego'
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 DEBUG = True
 

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/controlpanel.py

@@ -20,7 +20,7 @@
     '''
 import platform
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 import tkinter
 import tkinter.ttk

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/culebron.py

@@ -38,7 +38,7 @@ from com.dtmilano.android.keyevent import KEY_EVENT
 from com.dtmilano.android.uiautomator.uiautomatorhelper import UiAutomatorHelper
 from com.dtmilano.android.viewclient import ViewClient, View, VERSION_SDK_PROPERTY
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 import sys
 import threading
@@ -412,7 +412,7 @@ This is usually installed by python package. Check your distribution details.
         if self.scale != 1:
             scaledWidth = int(width * self.scale)
             scaledHeight = int(height * self.scale)
-            self.image = self.image.resize((scaledWidth, scaledHeight), PIL.Image.ANTIALIAS)
+            self.image = self.image.resize((scaledWidth, scaledHeight), PIL.Image.LANCZOS)
             (width, height) = self.image.size
             if self.isDarwin and 14 < self.sdkVersion < 23:
                 if sys.version_info[0] < 3:

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/plot.py

@@ -31,7 +31,7 @@ from mpl_toolkits.axes_grid1 import host_subplot
 
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 DEBUG = False
 

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/robotframework/viewclientwrapper.py

@@ -18,7 +18,7 @@ limitations under the License.
 @author: Diego Torres Milano
 '''
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 __author__ = 'diego'
 
 import sys

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py

@@ -20,7 +20,7 @@ limitations under the License.
 
 from __future__ import print_function
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 import math
 import os
@@ -33,7 +33,7 @@ import time
 import warnings
 from abc import ABC
 from datetime import datetime
-from typing import Optional, List, Tuple
+from typing import Optional, List, Tuple, Union
 
 import culebratester_client
 from culebratester_client import Text, ObjectRef, DefaultApi, Point, PerformTwoPointerGestureBody, \
@@ -259,9 +259,9 @@ class UiAutomatorHelper:
             self.uiAutomatorHelper = uiAutomatorHelper
 
         @staticmethod
-        def intersection(l1: list, l2: list) -> list:
+        def intersection(l1: Union[list, tuple], l2: Union[list, tuple]) -> list:
             """
-            Obtains the intersection between the two lists.
+            Obtains the intersection between the two lists or tuples.
 
             :param l1: list 1
             :type l1: list
@@ -272,7 +272,7 @@ class UiAutomatorHelper:
             """
             return list(set(l1) & set(l2))
 
-        def some(self, l1: list, l2: list) -> bool:
+        def some(self, l1: Union[list, tuple], l2: Union[list, tuple]) -> bool:
             """
             Some elements are in both lists.
 
@@ -285,7 +285,7 @@ class UiAutomatorHelper:
             """
             return len(self.intersection(l1, l2)) > 0
 
-        def all(self, l1: list, l2: list) -> bool:
+        def all(self, l1: Union[list, tuple], l2: Union[list, tuple]) -> bool:
             """
             All the elements are in both lists.
 
@@ -550,7 +550,7 @@ class UiAutomatorHelper:
             """
             if 'body' in kwargs:
                 return self.uiAutomatorHelper.api_instance.ui_device_has_object_post(**kwargs).value
-            if self.some(['resource_id', 'ui_selector', 'by_selector'], kwargs):
+            if self.some(('resource_id', 'ui_selector', 'by_selector'), tuple(kwargs.keys())):
                 return self.uiAutomatorHelper.api_instance.ui_device_has_object_get(**kwargs).value
             body = culebratester_client.Selector(**kwargs)
             return self.uiAutomatorHelper.api_instance.ui_device_has_object_post(body=body).value
@@ -611,7 +611,7 @@ class UiAutomatorHelper:
             :param kwargs:
             :return:
             """
-            if self.all(['start_x', 'start_y', 'end_x', 'end_y', 'steps'], kwargs):
+            if self.all(('start_x', 'start_y', 'end_x', 'end_y', 'steps'), tuple(kwargs.keys())):
                 check_response(self.uiAutomatorHelper.api_instance.ui_device_swipe_get(**kwargs))
                 return
             if 'segments' in kwargs:
@@ -757,11 +757,41 @@ class UiAutomatorHelper:
             rect: Rect = self.uiAutomatorHelper.api_instance.ui_object_oid_get_bounds_get(oid=oid)
             return rect.left, rect.top, rect.right, rect.bottom
 
+        def get_child(self, oid: int, ui_selector: str) -> ObjectRef:
+            """
+            Creates a new UiObject for a child view that is under the present UiObject.
+            :see https://github.com/dtmilano/CulebraTester2-public/blob/master/openapi.yaml
+
+            :param oid: The oid
+            :type oid: int
+            :param ui_selector:
+            :type ui_selector:
+            :return:
+            :rtype: ObjectRef
+            """
+            return self.uiAutomatorHelper.api_instance.ui_object_oid_get_child(oid, ui_selector=ui_selector)
+
+        def get_from_parent(self, oid: int, ui_selector: str) -> ObjectRef:
+            """
+            Creates a new UiObject for a sibling view or a child of the sibling view, relative to the present UiObject.
+            :see https://github.com/dtmilano/CulebraTester2-public/blob/master/openapi.yaml
+
+            :param oid: The oid
+            :type oid: int
+            :param ui_selector:
+            :type ui_selector:
+            :return:
+            :rtype: ObjectRef
+            """
+            return self.uiAutomatorHelper.api_instance.ui_object_oid_get_from_parent_get(oid,
+                                                                                         ui_selector=ui_selector)
+
         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:
             """
             Generates a two-pointer gesture with arbitrary starting and ending points.
             :see https://github.com/dtmilano/CulebraTester2-public/blob/master/openapi.yaml
+
             :param oid: the oid
             :param startPoint1:
             :param startPoint2:

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/src/com/dtmilano/android/viewclient.py

@@ -26,7 +26,7 @@ from typing import Optional, Union, Dict, Tuple
 import culebratester_client
 from culebratester_client import WindowHierarchyChild, WindowHierarchy
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 import sys
 import warnings

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/tools/culebra

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-"""
+r"""
 Copyright (C) 2013-2023  Diego Torres Milano
 Created on Mar 28, 2013
 
@@ -28,7 +28,7 @@ from typing import Pattern
 import culebratester_client
 from culebratester_client import WindowHierarchy, Selector
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 import calendar
 import codecs
@@ -1295,7 +1295,7 @@ def getWindowOption():
 
 
 def printScriptHeader():
-    print(f'''{getShebangJar()}
+    print(rf'''{getShebangJar()}
 # -*- coding: utf-8 -*-
 """
 Copyright (C) 2013-2023  Diego Torres Milano

{androidviewclient-23.4.1 → androidviewclient-24.1.0}/tools/dump

@@ -8,7 +8,7 @@ Created on Feb 3, 2012
 
 from __future__ import print_function
 
-__version__ = '23.4.1'
+__version__ = '24.1.0'
 
 import getopt
 import os