fix: merge conflicts

Author: igortavtib

.gitignore

@@ -30,8 +30,9 @@ nosetests.xml
 # Translations
 *.mo
 
-# PyCharm
+# IDE
 .idea
+.vscode
 
 # Mr Developer
 .mr.developer.cfg

AppiumFlutterLibrary/__init__.py

@@ -8,9 +8,11 @@
 class AppiumFlutterLibrary(
 	_ApplicationManagementKeyWords,
 	_ElementKeywords,
+	_KeyeventsKeywords,
 	_LoggingKeywords,
 	_ScreenKeywords,
 	_RunOnFailureKeyWords,
+	_TouchKeywords,
 	_WaintingKeywords,
 ):
 	""" AppiumFlutterLibrary is a flutter testing library for Robot Framework

AppiumFlutterLibrary/keywords/__init__.py

@@ -1,15 +1,19 @@
 from ._applicationmanagement import _ApplicationManagementKeyWords
 from ._element import _ElementKeywords
+from ._keyevents import _KeyeventsKeywords
 from ._logging import _LoggingKeywords
 from ._runonfailure import _RunOnFailureKeyWords
 from ._screen import _ScreenKeywords
+from ._touch import _TouchKeywords
 from ._waiting import _WaintingKeywords
 
 __all__ = [
             "_ApplicationManagementKeyWords",
             "_ElementKeywords",
+            "_KeyeventsKeywords",
             "_LoggingKeywords",
             "_RunOnFailureKeyWords",
             "_ScreenKeywords",
-            "_WaintingKeywords"
+            "_TouchKeywords",
+            "_WaintingKeywords",
           ]

AppiumFlutterLibrary/keywords/_keyevents.py

@@ -0,0 +1,30 @@
+from .keywordgroup import KeywordGroup
+
+class _KeyeventsKeywords(KeywordGroup):
+    def press_keycode(self, keycode, metastate=None):
+        """Sends a press of keycode to the device.
+        Android only.
+        Possible keycodes & meta states can be found in
+        http://developer.android.com/reference/android/view/KeyEvent.html
+        Meta state describe the pressed state of key modifiers such as
+        Shift, Ctrl & Alt keys. The Meta State is an integer in which each
+        bit set to 1 represents a pressed meta key.
+        For example
+        - META_SHIFT_ON = 1
+        - META_ALT_ON = 2
+        | metastate=1 --> Shift is pressed
+        | metastate=2 --> Alt is pressed
+        | metastate=3 --> Shift+Alt is pressed
+         - _keycode- - the keycode to be sent to the device
+         - _metastate- - status of the meta keys
+        """
+        driver = self._current_application()
+        driver.press_keycode(keycode, metastate)
+
+    def long_press_keycode(self, keycode, metastate=None):
+        """Sends a long press of keycode to the device.
+        Android only.
+        See `press keycode` for more details.
+        """
+        driver = self._current_application()
+        driver.long_press_keycode(int(keycode), metastate)

AppiumFlutterLibrary/keywords/_touch.py

@@ -0,0 +1,29 @@
+from .keywordgroup import  KeywordGroup
+from AppiumFlutterLibrary.finder import ElementFinder
+
+class _TouchKeywords(KeywordGroup):
+    def init(self):
+        self._element_finder = ElementFinder()
+
+    def scroll(self, start_locator, end_locator):
+        """
+        Scrolls from one element to another
+        Key attributes for arbitrary elements are `id` and `name`. See
+        `introduction` for details about locating elements.
+        """
+        el1 = self._find_element(self, start_locator)
+        el2 = self._find_element(self, end_locator)
+        driver = self._current_application()
+        driver.scroll(el1, el2)
+
+    def scroll_down(self, locator):
+        """Scrolls down to element"""
+        driver = self._current_application()
+        element = self._find_element(self, locator)
+        driver.execute_script("mobile: scroll", {"direction": 'down', 'elementid': element.id})
+
+    def scroll_up(self, locator):
+        """Scrolls up to element"""
+        driver = self._current_application()
+        element = self._element_find(locator, True, True)
+        driver.execute_script("mobile: scroll", {"direction": 'up', 'elementid': element.id})

AppiumFlutterLibrary/version.py

@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
-VERSION = '1.0.0-beta2'
+
+VERSION = '1.0.0-beta.2'

docs/AppiumFlutterLibrary.html

@@ -11,7 +11,7 @@
 setup(name='robotframework-appiumflutterlibrary',
       version=VERSION,
       description='Robot Framework Mobile flutter app testing library for Appium Client Android & iOS & Web',
-      long_description=open(join(ROOT, 'README.md')).read(),
+      long_description=open(join(ROOT, 'README.rst')).read(),
       author='Igor Augusto',
       author_email='igortavtib@gmail.com',
       url='https://github.com/igortavtib/robotframework-appiumflutterlibrary',