From f3de1fe29b151f163dd41d34e67b6909f8127967 Mon Sep 17 00:00:00 2001 From: Diego Torres Milano Date: Mon, 4 Sep 2023 13:29:36 -0700 Subject: [PATCH] Bump - Version 22.6.1 --- setup.py | 2 +- sphinx/conf.py | 2 +- src/com/dtmilano/android/adb/adbclient.py | 2 +- src/com/dtmilano/android/adb/dumpsys.py | 2 +- src/com/dtmilano/android/code_generator.py | 2 +- src/com/dtmilano/android/common.py | 2 +- src/com/dtmilano/android/concertina.py | 2 +- src/com/dtmilano/android/controlpanel.py | 2 +- src/com/dtmilano/android/plot.py | 2 +- .../robotframework/viewclientwrapper.py | 2 +- .../android/uiautomator/uiautomatorhelper.py | 2 +- src/com/dtmilano/android/viewclient.py | 19 ++++++++++--------- tools/culebra | 2 +- tools/dump | 2 +- 14 files changed, 23 insertions(+), 22 deletions(-) diff --git a/setup.py b/setup.py index c6249a48..4e025218 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages setup(name='androidviewclient', - version='22.6.0', + version='22.6.1', 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 diff --git a/sphinx/conf.py b/sphinx/conf.py index bc2fedb2..fb959950 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -11,7 +11,7 @@ project = 'AndroidViewClient/culebra' copyright = '2022, Diego Torres Milano' author = 'Diego Torres Milano' -release = '22.6.0' +release = '22.6.1' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py index b4312b1c..0b5f3a6e 100644 --- a/src/com/dtmilano/android/adb/adbclient.py +++ b/src/com/dtmilano/android/adb/adbclient.py @@ -27,7 +27,7 @@ from com.dtmilano.android.adb.dumpsys import Dumpsys -__version__ = '22.6.0' +__version__ = '22.6.1' import sys import warnings diff --git a/src/com/dtmilano/android/adb/dumpsys.py b/src/com/dtmilano/android/adb/dumpsys.py index 3fc1d12d..5cc4d547 100644 --- a/src/com/dtmilano/android/adb/dumpsys.py +++ b/src/com/dtmilano/android/adb/dumpsys.py @@ -23,7 +23,7 @@ import sys from _warnings import warn -__version__ = '22.6.0' +__version__ = '22.6.1' DEBUG = False diff --git a/src/com/dtmilano/android/code_generator.py b/src/com/dtmilano/android/code_generator.py index 6fc7aff9..862627d1 100644 --- a/src/com/dtmilano/android/code_generator.py +++ b/src/com/dtmilano/android/code_generator.py @@ -3,7 +3,7 @@ from abc import ABC from datetime import date -__version__ = '22.6.0' +__version__ = '22.6.1' from typing import TextIO, Union, Dict, List diff --git a/src/com/dtmilano/android/common.py b/src/com/dtmilano/android/common.py index 3087dc30..6bd6b458 100644 --- a/src/com/dtmilano/android/common.py +++ b/src/com/dtmilano/android/common.py @@ -20,7 +20,7 @@ from __future__ import print_function -__version__ = '22.6.0' +__version__ = '22.6.1' import ast import os diff --git a/src/com/dtmilano/android/concertina.py b/src/com/dtmilano/android/concertina.py index 4a10b9b3..60f8e2a9 100644 --- a/src/com/dtmilano/android/concertina.py +++ b/src/com/dtmilano/android/concertina.py @@ -22,7 +22,7 @@ import random __author__ = 'diego' -__version__ = '22.6.0' +__version__ = '22.6.1' DEBUG = True diff --git a/src/com/dtmilano/android/controlpanel.py b/src/com/dtmilano/android/controlpanel.py index 5adcfd4d..31a8733a 100755 --- a/src/com/dtmilano/android/controlpanel.py +++ b/src/com/dtmilano/android/controlpanel.py @@ -20,7 +20,7 @@ ''' import platform -__version__ = '22.6.0' +__version__ = '22.6.1' import tkinter import tkinter.ttk diff --git a/src/com/dtmilano/android/plot.py b/src/com/dtmilano/android/plot.py index a2487644..96589daf 100644 --- a/src/com/dtmilano/android/plot.py +++ b/src/com/dtmilano/android/plot.py @@ -31,7 +31,7 @@ from com.dtmilano.android.adb.dumpsys import Dumpsys -__version__ = '22.6.0' +__version__ = '22.6.1' DEBUG = False diff --git a/src/com/dtmilano/android/robotframework/viewclientwrapper.py b/src/com/dtmilano/android/robotframework/viewclientwrapper.py index 022a6376..d15c1a55 100644 --- a/src/com/dtmilano/android/robotframework/viewclientwrapper.py +++ b/src/com/dtmilano/android/robotframework/viewclientwrapper.py @@ -18,7 +18,7 @@ @author: Diego Torres Milano ''' -__version__ = '22.6.0' +__version__ = '22.6.1' __author__ = 'diego' import sys diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py index 7c4cc95d..4837665a 100644 --- a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py +++ b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py @@ -20,7 +20,7 @@ from __future__ import print_function -__version__ = '22.6.0' +__version__ = '22.6.1' import os import platform diff --git a/src/com/dtmilano/android/viewclient.py b/src/com/dtmilano/android/viewclient.py index ff3a4be8..cf8c9b4d 100644 --- a/src/com/dtmilano/android/viewclient.py +++ b/src/com/dtmilano/android/viewclient.py @@ -21,12 +21,12 @@ from __future__ import print_function import json -from typing import Optional, Union, Dict +from typing import Optional, Union, Dict, Tuple import culebratester_client from culebratester_client import WindowHierarchyChild, WindowHierarchy -__version__ = '22.6.0' +__version__ = '22.6.1' import sys import warnings @@ -1110,10 +1110,10 @@ def allPossibleNamesWithColon(self, name): def intersection(self, l1, l2): return list(set(l1) & set(l2)) - def containsPoint(self, xxx_todo_changeme): - (x, y) = xxx_todo_changeme + def containsPoint(self, point: Tuple[int, int]) -> bool: + (x, y) = point (X, Y, W, H) = self.getPositionAndSize() - return (((x >= X) and (x <= (X + W)) and ((y >= Y) and (y <= (Y + H))))) + return (x >= X) and (x <= (X + W)) and ((y >= Y) and (y <= (Y + H))) def add(self, child): """ @@ -4098,15 +4098,15 @@ def findViewWithContentDescriptionOrRaise(self, contentdescription, root="ROOT") return self.__findViewWithAttributeInTreeOrRaise('content-desc', contentdescription, root) - def findViewsContainingPoint(self, xxx_todo_changeme1, _filter=None): + def findViewsContainingPoint(self, point: Tuple[int, int], _filter=None): """ Finds the list of Views that contain the point (x, y). """ - (x, y) = xxx_todo_changeme1 if not _filter: - _filter = lambda v: True + def _filter(_): + return True - return [v for v in self.views if (v.containsPoint((x, y)) and _filter(v))] + return [v for v in self.views if (v.containsPoint(point) and _filter(v))] def findObject(self, **kwargs): if self.uiAutomatorHelper: @@ -4610,6 +4610,7 @@ class ConnectedDevice: """ A connected device. """ + def __init__(self, device, vc, serialno): """ Constructor. diff --git a/tools/culebra b/tools/culebra index 20d98dd2..0e59886f 100755 --- a/tools/culebra +++ b/tools/culebra @@ -27,7 +27,7 @@ import textwrap import culebratester_client from culebratester_client import WindowHierarchy -__version__ = '22.6.0' +__version__ = '22.6.1' import calendar import codecs diff --git a/tools/dump b/tools/dump index 12f93f5e..72ac8b39 100755 --- a/tools/dump +++ b/tools/dump @@ -8,7 +8,7 @@ Created on Feb 3, 2012 from __future__ import print_function -__version__ = '22.6.0' +__version__ = '22.6.1' import getopt import os