feat: Create ElementFinder class

Author: igortavtib

AppiumFlutterLibrary/finder/__init__.py

@@ -0,0 +1,3 @@
+from .elementfinder import ElementFinder
+
+__all__ = ["ElementFinder"]

AppiumFlutterLibrary/finder/elementfinder.py

@@ -0,0 +1,11 @@
+from appium_flutter_finder import FlutterElement, FlutterFinder
+
+class ElementFinder():
+    def __init__(self):
+        self._element_finder = FlutterFinder()
+
+    def find_by_key(self, application, element_key):
+        finder_key = self._element_finder.by_value_key(element_key)
+        element = FlutterElement(application, finder_key)
+
+        return element

AppiumFlutterLibrary/keywords/_applicationmanagement.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import robot
-from appium import webdriver
 from AppiumFlutterLibrary.utils import ApplicationCache
 from AppiumFlutterLibrary.keywords.keywordgroup import KeywordGroup
 from appium.webdriver import Remote
-from appium_flutter_finder import FlutterElement, FlutterFinder
 
 class _ApplicationManagementKeyWords(KeywordGroup):
     def __init__(self):

AppiumFlutterLibrary/keywords/_element.py

@@ -1,49 +1,20 @@
 import time
-from robot.libraries.BuiltIn import BuiltIn
 from .keywordgroup import KeywordGroup
-from appium_flutter_finder import FlutterElement, FlutterFinder
+from AppiumFlutterLibrary.finder import ElementFinder
 
-try:
-    basestring  # attempt to evaluate basestring
-
-    def isstr(s):
-        return isinstance(s, basestring)
-except NameError:
-    def isstr(s):
-        return isinstance(s, str)
+def isstr(s):
+    return isinstance(s, str)
 
 class _ElementKeywords(KeywordGroup):
     def __init__(self):
-        self._element_finder = FlutterFinder()
-        self._bi = BuiltIn()
+        self._element_finder = ElementFinder()
 
     def input_text(self, locator, text):
         application = self._current_application()
-        finder = FlutterFinder()
-        key_finder = finder.by_value_key(locator)
-        element = FlutterElement(application, key_finder)
+        element = self._element_finder.find_by_key(application, locator)
         element.send_keys(text)
 
     def click_element(self, locator):
         application = self._current_application()
-        finder = FlutterFinder()
-        key_finder = finder.by_value_key(locator)
-        element = FlutterElement(application, key_finder)
+        element = self._element_finder.find_by_key(application, locator)
         element.click()
-
-
-    def _element_find(self, locator):
-        application = self._current_application()
-        element = None
-        if isstr(locator):
-            _locator = locator
-            _key_finder = self._element_finder.by_value_key(_locator)
-            element = FlutterElement(application, _key_finder)
-
-        return element
-
-    def _is_visible(self, locator):
-        element = self._element_find(locator)
-        if element is not None:
-            return element.is_displayed()
-        return None

AppiumFlutterLibrary/keywords/_screen.py

@@ -0,0 +1,12 @@
+from _typeshed import ReadableBuffer
+from AppiumFlutterLibrary.finder import ElementFinder
+from AppiumFlutterLibrary.keywords.keywordgroup import KeywordGroup
+
+class _ScreenKeywords(KeywordGroup):
+    def __init__(self):
+        self._element_finder = ElementFinder()
+
+    def scroll_to_element(self, locator):
+        application = self._current_application()
+        element = self._element_finder.find_by_key(application, locator)
+        application.execute_script('flutter:scrollIntoView', element)

AppiumFlutterLibrary/keywords/_waiting.py

@@ -1,14 +1,15 @@
 import robot
 from AppiumFlutterLibrary.keywords.keywordgroup import KeywordGroup
-from appium_flutter_finder import FlutterElement, FlutterFinder
+from AppiumFlutterLibrary.finder import ElementFinder
 
 
 class _WaintingKeywords(KeywordGroup):
+    def __init__(self):
+        self._element_finder = ElementFinder()
+
     def wait_for_element(self, locator, timeout=None, error=None):
         application = self._current_application()
-        finder = FlutterFinder()
-        key_finder = finder.by_value_key(locator)
-        element = FlutterElement(application, key_finder)
+        element = self._element_finder.find_by_key(application, locator)
         application.execute_script('flutter:waitFor', element)
 
     def _format_timeout(self, timeout):