From 21adbd2c86d5b62af2bebd550c0ec1f227a905c9 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@outlook.com>
Date: Fri, 5 Aug 2022 13:20:14 +0100
Subject: [PATCH 1/6] Allow scrolling on the login screen

---
 TransactionMobile.Maui/Pages/LoginPage.xaml | 59 ++++++++-------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/TransactionMobile.Maui/Pages/LoginPage.xaml b/TransactionMobile.Maui/Pages/LoginPage.xaml
index 11927399..0ea47fc6 100644
--- a/TransactionMobile.Maui/Pages/LoginPage.xaml
+++ b/TransactionMobile.Maui/Pages/LoginPage.xaml
@@ -6,58 +6,45 @@
              Shell.NavBarIsVisible="False"
              Shell.FlyoutItemIsVisible="True">
     <ContentPage.Content>
-        <!-- Main structure-->
-        <VerticalStackLayout x:Name="MainLayout">
-            <!--Main image-->
-            <Image Source="loginimage.jpg" VerticalOptions="Start" Aspect="AspectFit"/>
-
-            <!-- Title-->
-            <Label Text="Log In" FontSize="34" HorizontalOptions="Center" FontAttributes="Bold" Padding="20,0,0,20" 
+        <ScrollView Margin="20">
+            <!-- Main structure-->
+            <VerticalStackLayout x:Name="MainLayout">
+                <!--Main image-->
+                <Image Source="loginimage.jpg" VerticalOptions="Start" Aspect="AspectFit"/>
+
+                <!-- Title-->
+                <Label Text="Log In" FontSize="34" HorizontalOptions="Center" FontAttributes="Bold" Padding="20,0,0,20" 
                    AutomationId="LoginLabel"/>
 
-            <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" 
+                <Frame HasShadow="True" Padding="25,50" Margin="10,0,10,10" VerticalOptions="CenterAndExpand" 
                    CornerRadius="20" Opacity="0.9" BackgroundColor="#E5E9F0">
-                <VerticalStackLayout x:Name="SubLayout">
+                    <VerticalStackLayout x:Name="SubLayout">
 
-                    <Entry x:Name="UserNameEntry"
+                        <Entry x:Name="UserNameEntry"
                            Placeholder="User name or email address"
                            AutomationId="UserNameEntry"
                            Style="{DynamicResource UserNameEntryStyle}"
                            Text="{Binding UserName}">
-                    </Entry>
+                        </Entry>
 
-                    <Entry x:Name="PasswordEntry"
+                        <Entry x:Name="PasswordEntry"
                            Placeholder="******"
                            AutomationId="PasswordEntry"
                            Style="{DynamicResource PasswordEntryStyle}"
                            Text="{Binding Password}">
-                    </Entry>
-
-                    <!--<HorizontalStackLayout  x:Name="SwitchLayout">
-                        <Label Text="Use Training Mode?"/>
-                    
-                        <Switch x:Name="UseTrainingMode"
-                                AutomationId="UseTrainingModeSwitch"/>
-                    </HorizontalStackLayout>-->
-
-                    <HorizontalStackLayout Margin="20"
-                           Spacing="10">
-                        <!--<Rectangle Fill="Red"
-                  HeightRequest="30"
-                  WidthRequest="30" />
-                        <Label Text="Red"
-              FontSize="Large" />-->
-                        <Label Text="Use Training Mode?" VerticalOptions="Center" HorizontalOptions="Start"/>
+                        </Entry>
+                        <HorizontalStackLayout Margin="20" Spacing="10">
+                            <Label Text="Use Training Mode?" VerticalOptions="Center" HorizontalOptions="Start"/>
 
-                        <Switch x:Name="UseTrainingMode" VerticalOptions="Center" HorizontalOptions="Start" AutomationId="UseTrainingModeSwitch"
+                            <Switch x:Name="UseTrainingMode" VerticalOptions="Center" HorizontalOptions="Start" AutomationId="UseTrainingModeSwitch"
                                 IsToggled="{Binding UseTrainingMode}"
                                 />
-                    </HorizontalStackLayout>
+                        </HorizontalStackLayout>
 
-                    <Button Text="Continue" Style="{StaticResource StandardButton}" Command="{Binding LoginCommand}" AutomationId="LoginButton"/>
-                    <!--<Label Grid.ColumnSpan="2" Grid.Row="3" Text="Forgot your password?" TextColor="{StaticResource P}" FontAttributes="Bold"/>-->
-                </VerticalStackLayout>
-            </Frame>
-        </VerticalStackLayout>
+                        <Button Text="Continue" Style="{StaticResource StandardButton}" Command="{Binding LoginCommand}" AutomationId="LoginButton"/>
+                    </VerticalStackLayout>
+                </Frame>
+            </VerticalStackLayout>
+        </ScrollView>
     </ContentPage.Content>
 </ContentPage>
\ No newline at end of file

From e2a1ee3d4d513558e61e8cec55356c783550e4e8 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@outlook.com>
Date: Fri, 5 Aug 2022 15:05:59 +0100
Subject: [PATCH 2/6] :|

---
 TransactionMobile.Maui.UiTests/Drivers/AppiumDriver.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TransactionMobile.Maui.UiTests/Drivers/AppiumDriver.cs b/TransactionMobile.Maui.UiTests/Drivers/AppiumDriver.cs
index a2fda26e..10b6ce92 100644
--- a/TransactionMobile.Maui.UiTests/Drivers/AppiumDriver.cs
+++ b/TransactionMobile.Maui.UiTests/Drivers/AppiumDriver.cs
@@ -89,6 +89,7 @@ private static void SetupAndroidDriver(AppiumLocalService appiumService) {
             driverOptions.AddAdditionalAppiumOption("appPackage", "com.transactionprocessing.pos");
             //driverOptions.AddAdditionalAppiumOption("forceEspressoRebuild", true);
             driverOptions.AddAdditionalAppiumOption("enforceAppInstall", true);
+            driverOptions.AddAdditionalAppiumOption("uiautomator2ServerInstallTimeout", "40000");
             //driverOptions.AddAdditionalAppiumOption("noSign", true);
             //driverOptions.AddAdditionalAppiumOption("espressoBuildConfig",
             //    "{ \"additionalAppDependencies\": [ \"com.google.android.material:material:1.0.0\", \"androidx.lifecycle:lifecycle-extensions:2.1.0\" ] }");

From de638359eb61db0e70cc82bb693b4ffd53cc594b Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@outlook.com>
Date: Fri, 5 Aug 2022 15:57:24 +0100
Subject: [PATCH 3/6] ..

---
 TransactionMobile.Maui.UiTests/Pages/BasePage.cs  | 7 +++++--
 TransactionMobile.Maui.UiTests/Pages/LoginPage.cs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/TransactionMobile.Maui.UiTests/Pages/BasePage.cs b/TransactionMobile.Maui.UiTests/Pages/BasePage.cs
index 84137de5..1248e80f 100644
--- a/TransactionMobile.Maui.UiTests/Pages/BasePage.cs
+++ b/TransactionMobile.Maui.UiTests/Pages/BasePage.cs
@@ -9,6 +9,7 @@ namespace TransactionMobile.Maui.UITests
 {
     using Common;
     using OpenQA.Selenium;
+    using OpenQA.Selenium.Interactions;
     using Shouldly;
 
     public abstract class BasePage
@@ -43,7 +44,10 @@ public void WaitForPageToLeave(TimeSpan? timeout = null)
 
         public async Task<IWebElement> WaitForElementByAccessibilityId(String accessibilityId, TimeSpan? timeout = null)
         {
-            return await AppiumDriverWrapper.Driver.WaitForElementByAccessibilityId(accessibilityId, timeout);
+            IWebElement element = await AppiumDriverWrapper.Driver.WaitForElementByAccessibilityId(accessibilityId, timeout);
+            TouchActions action = new TouchActions(AppiumDriverWrapper.Driver);
+            action.Scroll(element, 0, 0);
+            return element;
         }
         
         public async Task<String> GetPageSource()
@@ -63,7 +67,6 @@ public async Task WaitForToastMessage(String toastMessage)
 
         public void HideKeyboard()
         {
-            //AppiumDriverWrapper.Driver.HideKeyboard();
             if (AppiumDriverWrapper.MobileTestPlatform == MobileTestPlatform.Android)
             {
                 AppiumDriverWrapper.Driver.HideKeyboard();
diff --git a/TransactionMobile.Maui.UiTests/Pages/LoginPage.cs b/TransactionMobile.Maui.UiTests/Pages/LoginPage.cs
index db5b56c1..a5f12162 100644
--- a/TransactionMobile.Maui.UiTests/Pages/LoginPage.cs
+++ b/TransactionMobile.Maui.UiTests/Pages/LoginPage.cs
@@ -5,6 +5,7 @@ namespace TransactionMobile.Maui.UITests;
 using System;
 using System.Threading.Tasks;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Interactions;
 
 public class LoginPage : BasePage
 {
@@ -78,7 +79,6 @@ public async Task EnterPassword(String password)
 
     public async Task ClickLoginButton()
     {
-        //this.HideKeyboard();
         IWebElement element = await this.WaitForElementByAccessibilityId(this.LoginButton);
         element.Click();
     }

From d51cc4d3bc2d3d7ed7186bb8f42e24d8f81f2650 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@outlook.com>
Date: Sat, 6 Aug 2022 07:13:46 +0100
Subject: [PATCH 4/6] Added scrolling to test

---
 .../Pages/BasePage.cs                         |  8 +---
 .../Pages/Extenstions.cs                      | 39 ++++++++++++++++---
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/TransactionMobile.Maui.UiTests/Pages/BasePage.cs b/TransactionMobile.Maui.UiTests/Pages/BasePage.cs
index 1248e80f..61c12312 100644
--- a/TransactionMobile.Maui.UiTests/Pages/BasePage.cs
+++ b/TransactionMobile.Maui.UiTests/Pages/BasePage.cs
@@ -42,12 +42,8 @@ public void WaitForPageToLeave(TimeSpan? timeout = null)
             Should.NotThrow(() => this.WaitForNoElementByAccessibilityId(this.Trait), message);
         }
 
-        public async Task<IWebElement> WaitForElementByAccessibilityId(String accessibilityId, TimeSpan? timeout = null)
-        {
-            IWebElement element = await AppiumDriverWrapper.Driver.WaitForElementByAccessibilityId(accessibilityId, timeout);
-            TouchActions action = new TouchActions(AppiumDriverWrapper.Driver);
-            action.Scroll(element, 0, 0);
-            return element;
+        public async Task<IWebElement> WaitForElementByAccessibilityId(String accessibilityId, TimeSpan? timeout = null) {
+            return await AppiumDriverWrapper.Driver.WaitForElementByAccessibilityId(accessibilityId, timeout);
         }
         
         public async Task<String> GetPageSource()
diff --git a/TransactionMobile.Maui.UiTests/Pages/Extenstions.cs b/TransactionMobile.Maui.UiTests/Pages/Extenstions.cs
index 72d87cb0..4b595260 100644
--- a/TransactionMobile.Maui.UiTests/Pages/Extenstions.cs
+++ b/TransactionMobile.Maui.UiTests/Pages/Extenstions.cs
@@ -11,6 +11,8 @@ namespace TransactionMobile.Maui.UITests;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium.Android;
 using OpenQA.Selenium.Appium.iOS;
+using OpenQA.Selenium.Appium.MultiTouch;
+using OpenQA.Selenium.Interactions;
 using Shouldly;
 
 public static class Extenstions
@@ -21,21 +23,46 @@ public static class Extenstions
     //{
     //    return driver.FindElementByClassName("androidx.appcompat.widget.AppCompatTextView");
     //}
-
+    
     public static async Task<IWebElement> WaitForElementByAccessibilityId(this AppiumDriver driver,
                                                                String selector,
                                                                TimeSpan? timeout = null) {
         IWebElement? element = null;
         timeout ??= TimeSpan.FromSeconds(60);
-
-        await Retry.For(async () =>
-                        {
-                            element = driver.FindElement(MobileBy.AccessibilityId(selector));
-                            element.ShouldNotBeNull();
+        await Retry.For(async () => {
+                            for (int i = 0; i < 5; i++) {
+                                driver.ScrollDown();
+                                element = driver.FindElement(MobileBy.AccessibilityId(selector));
+                                element.ShouldNotBeNull();
+                                // All good so exit the loop
+                                break;
+                            }
                         });
         return element;
     }
 
+    public static void ScrollDown(this AppiumDriver driver)
+    {
+        //if pressX was zero it didn't work for me
+        int pressX = driver.Manage().Window.Size.Width / 2;
+        // 4/5 of the screen as the bottom finger-press point
+        int bottomY = driver.Manage().Window.Size.Height * 4 / 5;
+        // just non zero point, as it didn't scroll to zero normally
+        int topY = driver.Manage().Window.Size.Height / 8;
+        //scroll with TouchAction by itself
+        driver.Scroll(pressX, bottomY, pressX, topY);
+    }
+
+    /*
+     * don't forget that it's "natural scroll" where 
+     * fromY is the point where you press the and toY where you release it
+     */
+    public static void Scroll(this AppiumDriver driver, int fromX, int fromY, int toX, int toY)
+    {
+        TouchAction touchAction = new TouchAction(driver);
+        touchAction.LongPress(fromX, fromY).MoveTo(toX, toY).Release().Perform();
+    }
+
     public static async Task WaitForNoElementByAccessibilityId(this AppiumDriver driver,
                                                                String selector,
                                                                TimeSpan? timeout = null)

From fa516c31e00c043e36279fd05e6f0f881d88027a Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@outlook.com>
Date: Sat, 6 Aug 2022 07:31:20 +0100
Subject: [PATCH 5/6] .

---
 TransactionMobile.Maui.UiTests/Pages/Extenstions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TransactionMobile.Maui.UiTests/Pages/Extenstions.cs b/TransactionMobile.Maui.UiTests/Pages/Extenstions.cs
index 4b595260..e1b31697 100644
--- a/TransactionMobile.Maui.UiTests/Pages/Extenstions.cs
+++ b/TransactionMobile.Maui.UiTests/Pages/Extenstions.cs
@@ -30,7 +30,7 @@ public static async Task<IWebElement> WaitForElementByAccessibilityId(this Appiu
         IWebElement? element = null;
         timeout ??= TimeSpan.FromSeconds(60);
         await Retry.For(async () => {
-                            for (int i = 0; i < 5; i++) {
+                            for (int i = 0; i < 10; i++) {
                                 driver.ScrollDown();
                                 element = driver.FindElement(MobileBy.AccessibilityId(selector));
                                 element.ShouldNotBeNull();

From 3ca3ddda9a7ac34f19deaf8da14fd5b1603d855d Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@outlook.com>
Date: Sat, 6 Aug 2022 08:30:18 +0100
Subject: [PATCH 6/6] ..

---
 TransactionMobile.Maui/Pages/LoginPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TransactionMobile.Maui/Pages/LoginPage.xaml b/TransactionMobile.Maui/Pages/LoginPage.xaml
index 0ea47fc6..b5478b76 100644
--- a/TransactionMobile.Maui/Pages/LoginPage.xaml
+++ b/TransactionMobile.Maui/Pages/LoginPage.xaml
@@ -6,7 +6,7 @@
              Shell.NavBarIsVisible="False"
              Shell.FlyoutItemIsVisible="True">
     <ContentPage.Content>
-        <ScrollView Margin="20">
+        <ScrollView>
             <!-- Main structure-->
             <VerticalStackLayout x:Name="MainLayout">
                 <!--Main image-->