Bump

- Version 22.6.1

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

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

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

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
 

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
 

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

src/com/dtmilano/android/concertina.py

@@ -22,7 +22,7 @@
 import random
 
 __author__ = 'diego'
-__version__ = '22.6.0'
+__version__ = '22.6.1'
 
 DEBUG = True
 

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

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
 

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

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

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.

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

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