androidviewclient 23.1.1__tar.gz → 23.3.0__tar.gz

{androidviewclient-23.1.1/src/androidviewclient.egg-info → androidviewclient-23.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: androidviewclient
-Version: 23.1.1
+Version: 23.3.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.64
+Requires-Dist: culebratester-client>=2.0.70

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/README.md

@@ -1,19 +1,18 @@
 AndroidViewClient
 =================
 <a href="#"><img src="https://github.com/dtmilano/AndroidViewClient/wiki/images/culebra-logo-transparent-204x209-rb-border.png" align="left" hspace="0" vspace="6"></a>
-**AndroidViewClient** was originally conceived as an extension to [monkeyrunner](http://developer.android.com/tools/help/monkeyrunner_concepts.html) but lately evolved
-as a pure python tool that automates or simplifies test script creation.
-It is a test framework for Android applications that:
+**AndroidViewClient/culebra** was initially conceived as an extension to [monkeyrunner](http://developer.android.com/tools/help/monkeyrunner_concepts.html)  but has since evolved
+into a versatile pure Python tool.
+It streamlines test script creation for Android applications by automating tasks and simplifying interactions. This test framework:
 <ul><ul>
-    <li>Automates driving Android applications</li>
-    <li>Generates re-usable scripts</li>
-    <li>Provides view-based <i>device independent</i> UI interaction</li>
-    <li>Uses 'logical' screen comparison (UI Automator Hierarchy based) over image comparison (Avoiding extraneous 
-    detail issues, such as time or data changes)</li>
-    <li>Supports running concurrently on multiple devices</li>
-    <li>Provides simple control for high level operations like language change and activity start</li>
-    <li>Supports all Android APIs</li>
-    <li>Is written in python (python 3.6+ support in 20.x.y+)</li>
+  <li>Automates the navigation of Android applications.</li>
+  <li>Generates reusable scripts for efficient testing.</li>
+  <li>Offers device-independent UI interaction based on views.</li>
+  <li>Utilizes 'logical' screen comparison (UI Automator Hierarchy based) instead of image comparison, avoiding extraneous detail issues like time or data changes.</li>
+  <li>Supports concurrent operation on multiple devices.</li>
+  <li>Provides straightforward control for high-level operations such as language change and activity start.</li>
+  <li>Fully supports all Android APIs.</li>
+  <li>Written in Python with support for Python 3.6 and above in versions 20.x.y and beyond.</li>
 </ul></ul>
 
 **🛎** |A new Kotlin backend is under development to provide more functionality and improve performance.<br>Take a look at [CulebraTester2](https://github.com/dtmilano/CulebraTester2-public) and 20.x.y-series prerelease. |
@@ -26,9 +25,11 @@ It is a test framework for Android applications that:
 
 **NOTE**: Pypi statistics are broken see [here](https://github.com/aclark4life/vanity/issues/22). The new statistics can be obtained from [BigQuery](https://bigquery.cloud.google.com/queries/culebra-tester).
 
-As of August 2021 we have reached:
+As of February 2024 we have reached:
 
-<img src="https://github.com/dtmilano/AndroidViewClient/wiki/images/androidviewclient-culebra-1million.png" alt="culebra 1 million downloads" width="80%" align="center">
+<p align="center">
+  <img src="https://github.com/dtmilano/AndroidViewClient/wiki/images/androidviewclient-culebra-2-million-downloads.png" alt="culebra 2 million downloads" width="80%" align="center">
+</p>
 
 Thanks to all who made it possible.
 

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-      version='23.1.1',
+      version='23.3.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.64'],
+      install_requires=['setuptools', 'requests', 'numpy', 'matplotlib', 'culebratester-client >= 2.0.70'],
       )

{androidviewclient-23.1.1 → androidviewclient-23.3.0/src/androidviewclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: androidviewclient
-Version: 23.1.1
+Version: 23.3.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.64
+Requires-Dist: culebratester-client>=2.0.70

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/src/androidviewclient.egg-info/requires.txt

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

{androidviewclient-23.1.1 → androidviewclient-23.3.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.1.1'
+__version__ = '23.3.0'
 
 import sys
 import warnings
@@ -1023,8 +1023,8 @@ class AdbClient:
             output_type = pytesseract.Output.DICT
         return pytesseract.image_to_data(image, output_type=output_type)
 
-    def __transformPointByOrientation(self, xxx_todo_changeme, orientationOrig, orientationDest):
-        (x, y) = xxx_todo_changeme
+    def __transformPointByOrientation(self, initPoint, orientationOrig, orientationDest):
+        (x, y) = initPoint
         if orientationOrig != orientationDest:
             if orientationDest == 1:
                 _x = x
@@ -1075,7 +1075,7 @@ class AdbClient:
         self.__checkTransport()
         self.drag((x, y), (x, y), duration, orientation)
 
-    def drag(self, xxx_todo_changeme1, xxx_todo_changeme2, duration, steps=1, orientation=-1):
+    def drag(self, startCoords, endCoords, duration, steps=1, orientation=-1):
         """
         Sends drag event in PX (actually it's using C{input swipe} command).
 
@@ -1085,8 +1085,8 @@ class AdbClient:
         @param steps: number of steps (currently ignored by C{input swipe})
         @param orientation: the orientation (-1: undefined)
         """
-        (x0, y0) = xxx_todo_changeme1
-        (x1, y1) = xxx_todo_changeme2
+        (x0, y0) = startCoords
+        (x1, y1) = endCoords
         self.__checkTransport()
         if orientation == -1:
             orientation = self.display['orientation']
@@ -1101,7 +1101,7 @@ class AdbClient:
         else:
             self.shell('input touchscreen swipe %d %d %d %d %d' % (x0, y0, x1, y1, duration))
 
-    def dragDip(self, xxx_todo_changeme3, xxx_todo_changeme4, duration, steps=1, orientation=-1):
+    def dragDip(self, startCoords, endCoords, duration, steps=1, orientation=-1):
         """
         Sends drag event in DIP (actually it's using C{input swipe} command.
 
@@ -1110,8 +1110,8 @@ class AdbClient:
         @param duration: duration of the event in ms
         @param steps: number of steps (currently ignored by C{input swipe})
         """
-        (x0, y0) = xxx_todo_changeme3
-        (x1, y1) = xxx_todo_changeme4
+        (x0, y0) = startCoords
+        (x1, y1) = endCoords
         self.__checkTransport()
         if orientation == -1:
             orientation = self.display['orientation']

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/src/com/dtmilano/android/adb/dumpsys.py

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

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/src/com/dtmilano/android/code_generator.py

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

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/src/com/dtmilano/android/common.py

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

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/src/com/dtmilano/android/concertina.py

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

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/src/com/dtmilano/android/controlpanel.py

@@ -20,7 +20,7 @@
     '''
 import platform
 
-__version__ = '23.1.1'
+__version__ = '23.3.0'
 
 import tkinter
 import tkinter.ttk

{androidviewclient-23.1.1 → androidviewclient-23.3.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.1.1'
+__version__ = '23.3.0'
 
 import sys
 import threading

{androidviewclient-23.1.1 → androidviewclient-23.3.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.1.1'
+__version__ = '23.3.0'
 
 DEBUG = False
 

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/src/com/dtmilano/android/robotframework/viewclientwrapper.py

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

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py

@@ -20,8 +20,9 @@ limitations under the License.
 
 from __future__ import print_function
 
-__version__ = '23.1.1'
+__version__ = '23.3.0'
 
+import math
 import os
 import platform
 import re
@@ -36,7 +37,7 @@ from typing import Optional, List, Tuple
 
 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
@@ -317,6 +318,22 @@ class UiAutomatorHelper:
             """
             return self.uiAutomatorHelper.api_instance.device_display_real_size_get()
 
+        def display_physical_size(self):
+            """
+            Gets the physical width, height and diagonal
+            :return: physical width, height and diagonal
+            :rtype: dict
+            """
+            drs = self.uiAutomatorHelper.api_instance.device_display_real_size_get()
+            display = self.dumpsys("display")
+            m = re.search(r"density (\d+), ([\d.]+) x ([\d.]+) dpi", display)
+            assert len(m.groups()) == 3
+            density, xdpi, ydpi = m.groups()
+            pw = drs.x / float(xdpi)
+            ph = drs.y / float(xdpi)
+            diag = math.sqrt(pw * pw + ph * ph)
+            return {"physical_width": round(pw, 2), "physical_height": round(ph, 2), "screen": round(diag, 2)}
+
         def dumpsys(self, service, **kwargs) -> str:
             """
             :see https://github.com/dtmilano/CulebraTester2-public/blob/master/openapi.yaml
@@ -449,7 +466,18 @@ class UiAutomatorHelper:
             """
             check_response(self.uiAutomatorHelper.api_instance.ui_device_click_get(x=x, y=y))
 
-        def drag(self, start_x: int, start_y: int, end_x: int, end_y:int , steps: int) -> None:
+        def display_size_dp(self):
+            """
+            Returns the default display size in dp (device-independent pixel).
+
+            The returned display size is adjusted per screen rotation. Also this will return the actual size of the
+            screen, rather than adjusted per system decorations (like status bar).
+            :return: the DPs
+            :rtype:
+            """
+            return self.uiAutomatorHelper.api_instance.ui_device_display_size_dp_get()
+
+        def drag(self, start_x: int, start_y: int, end_x: int, end_y: int, steps: int) -> None:
             """Performs a swipe from one coordinate to another coordinate.
 
             Performs a swipe from one coordinate to another coordinate. You can control the smoothness and speed of the
@@ -463,7 +491,8 @@ class UiAutomatorHelper:
             :param int end_y: end y (required)
             :param int steps: is the number of move steps sent to the system (required)
             """
-            check_response(self.uiAutomatorHelper.api_instance.ui_device_drag_get(start_x, start_y, end_x, end_y, steps))
+            check_response(
+                self.uiAutomatorHelper.api_instance.ui_device_drag_get(start_x, start_y, end_x, end_y, steps))
 
         def dump_window_hierarchy(self, _format='JSON'):
             """
@@ -711,10 +740,23 @@ class UiAutomatorHelper:
             :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:
             """

{androidviewclient-23.1.1 → androidviewclient-23.3.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.1.1'
+__version__ = '23.3.0'
 
 import sys
 import warnings

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/tools/culebra

@@ -28,7 +28,7 @@ from typing import Pattern
 import culebratester_client
 from culebratester_client import WindowHierarchy, Selector
 
-__version__ = '23.1.1'
+__version__ = '23.3.0'
 
 import calendar
 import codecs

{androidviewclient-23.1.1 → androidviewclient-23.3.0}/tools/dump

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