feat: user steps

.circleci/config.yml

@@ -237,7 +237,7 @@ jobs:
       - setup_flutter
       - android/start-emulator-and-run-tests:
           run-tests-working-directory: e2e
-          additional-avd-args: --device 3
+          additional-avd-args: --device 25
           system-image: system-images;android-33;default;x86_64
           post-emulator-launch-assemble-command: cd packages/instabug_flutter/example && flutter build apk --debug
           test-command: dotnet test
@@ -278,7 +278,7 @@ jobs:
           command: flutter build ios --simulator
       - run:
           name: Run E2E Tests
-          no_output_timeout: 30m
+          no_output_timeout: 20m
           working_directory: e2e
           command: dotnet test
 

e2e/BugReportingTests.cs

@@ -1,9 +1,9 @@
-using System.Drawing;
 using E2E.Utils;
 using Xunit;
 using Instabug.Captain;
 
 using NoSuchElementException = OpenQA.Selenium.NoSuchElementException;
+using System.Drawing;
 
 namespace E2E;
 
@@ -46,6 +46,9 @@ public void ReportABug()
   [Fact]
   public void FloatingButtonInvocationEvent()
   {
+
+      Console.WriteLine("FloatingButtonInvocationEvent");
+
     captain.FindById(
         android: "instabug_floating_button",
         ios: "IBGFloatingButtonAccessibilityIdentifier"
@@ -57,9 +60,13 @@ public void FloatingButtonInvocationEvent()
   [Fact]
   public void ShakeInvocationEvent()
   {
+
+          Console.WriteLine("ShakeInvocationEvent");
+
     if (!Platform.IsIOS) return;
 
-    captain.FindByText("Shake").Tap();
+
+    captain.FindByTextScroll("Shake").Tap();
 
     captain.Shake();
 
@@ -69,8 +76,12 @@ public void ShakeInvocationEvent()
   [Fact]
   public void TwoFingersSwipeLeftInvocationEvent()
   {
-    ScrollUp();
-    captain.FindByText("Two Fingers Swipe Left").Tap();
+
+              Console.WriteLine("TwoFingersSwipeLeftInvocationEvent");
+
+
+
+    captain.FindByTextScroll("Two Fingers Swipe Left").Tap();
 
     Thread.Sleep(500);
 
@@ -89,7 +100,11 @@ public void TwoFingersSwipeLeftInvocationEvent()
   [Fact]
   public void NoneInvocationEvent()
   {
-    captain.FindByText("None").Tap();
+
+                  Console.WriteLine("NoneInvocationEvent");
+
+
+    captain.FindByTextScroll("None").Tap();
 
     captain.WaitForAssertion(() =>
       Assert.Throws<NoSuchElementException>(() =>
@@ -105,22 +120,38 @@ public void NoneInvocationEvent()
   [Fact]
   public void ManualInvocation()
   {
-    captain.FindByText("Invoke").Tap();
+
+
+                  Console.WriteLine("ManualInvocation");
+
+
+
+    captain.FindByTextScroll("Invoke").Tap();
 
     AssertOptionsPromptIsDisplayed();
   }
 
   [Fact]
   public void MultipleScreenshotsInReproSteps()
   {
-    ScrollDownLittle();
 
-    captain.FindByText("Enter screen name").Tap();
+
+    Console.WriteLine("MultipleScreenshotsInReproSteps");
+
+
+
+
+captain.FindByTextScroll("Enter screen name").Tap();
     captain.Type("My Screen");
     captain.HideKeyboard();
 
-    captain.FindByText("Report Screen Change").Tap();
-    captain.FindByText("Send Bug Report").Tap();
+    captain.HideKeyboard();
+    Thread.Sleep(500);
+
+    captain.FindByTextScroll("Report Screen Change")?.Tap();
+    Thread.Sleep(500);
+    captain.FindByTextScroll("Send Bug Report")?.Tap();
+
     captain.FindById(
         android: "instabug_text_view_repro_steps_disclaimer",
         ios: "IBGBugVCReproStepsDisclaimerAccessibilityIdentifier"
@@ -136,27 +167,30 @@ public void MultipleScreenshotsInReproSteps()
   [Fact(Skip = "The test is flaky on iOS so we're skipping it to unblock the v13.2.0 release")]
   public void ChangeReportTypes()
   {
-    ScrollUp();
-    captain.FindByText("Bug", exact: true).Tap();
+
+    Console.WriteLine("ChangeReportTypes");
+
+
+    captain.FindByTextScroll("Bug", exact: true).Tap();
 
     if (Platform.IsAndroid)
     {
-      captain.FindByText("Invoke").Tap();
+      captain.FindByTextScroll("Invoke").Tap();
 
       // Shows bug reporting screen
       Assert.True(captain.FindById("ib_bug_scroll_view").Displayed);
 
       // Close bug reporting screen
       captain.GoBack();
-      captain.FindByText("DISCARD").Tap();
+      captain.FindByTextScroll("DISCARD").Tap();
 
       Thread.Sleep(500);
 
     }
 
-    captain.FindByText("Feedback").Tap();
+    captain.FindByTextScroll("Feedback").Tap();
 
-    captain.FindByText("Invoke").Tap();
+    captain.FindByTextScroll("Invoke").Tap();
 
     // Shows both bug reporting and feature requests in prompt options
     AssertOptionsPromptIsDisplayed();
@@ -169,10 +203,12 @@ public void ChangeReportTypes()
   [Fact]
   public void ChangeFloatingButtonEdge()
   {
-    ScrollDown();
-    captain.FindByText("Move Floating Button to Left").Tap();
 
-    Thread.Sleep(500);
+    Console.WriteLine("ChangeFloatingButtonEdge");
+
+
+    captain.FindByTextScroll("Move Floating Button to Left",false,false)?.Tap();
+
 
     captain.WaitForAssertion(() =>
     {
@@ -189,16 +225,16 @@ public void ChangeFloatingButtonEdge()
   [Fact]
   public void OnDismissCallbackIsCalled()
   {
-    ScrollDownLittle();
 
-    captain.FindByText("Set On Dismiss Callback").Tap();
-    captain.FindByText("Invoke").Tap();
+    captain.FindByTextScroll("Set On Dismiss Callback",false,false).Tap();
+    captain.FindByTextScroll("Invoke",false,false).Tap();
 
     AssertOptionsPromptIsDisplayed();
 
-    captain.FindByText("Cancel").Tap();
+    captain.FindByTextScroll("Cancel").Tap();
 
     var popUpText = captain.FindByText("onDismiss callback called with DismissType.cancel and ReportType.other");
     Assert.True(popUpText.Displayed);
+
   }
 }

e2e/FeatureRequestsTests.cs

@@ -10,10 +10,10 @@ public class FeatureRequestsTests : CaptainTest
   [Fact]
   public void ShowFeatureRequetsScreen()
   {
-    ScrollDown();
-    ScrollDown();
 
-    captain.FindByText("Show Feature Requests").Tap();
+    Console.WriteLine("ShowFeatureRequetsScreen");
+
+    captain.FindByTextScroll("Show Feature Requests",false,false).Tap();
 
     var screenTitle = captain.FindById(
         android: "ib_fr_toolbar_main",

e2e/InstabugTests.cs

@@ -11,14 +11,16 @@ public class InstabugTests : CaptainTest
   [Fact]
   public void ChangePrimaryColor()
   {
+    Console.WriteLine("ChangePrimaryColor");
+
     var color = "#FF0000";
     var expected = Color.FromArgb(255, 0, 0);
 
-    captain.FindByText("Enter primary color").Tap();
+    captain.FindByTextScroll("Enter primary color").Tap();
     captain.Type(color);
     captain.HideKeyboard();
 
-    captain.FindByText("Change Primary Color").Tap();
+    captain.FindByTextScroll("Change Primary Color").Tap();
 
     captain.WaitForAssertion(() =>
     {

e2e/SurveysTests.cs

@@ -10,8 +10,9 @@ public class SurveysTests : CaptainTest
   [Fact]
   public void ShowManualSurvey()
   {
-    ScrollDownLittle();
-    captain.FindByText("Show Manual Survey").Tap();
+        Console.WriteLine("ShowManualSurvey");
+
+    captain.FindByTextScroll("Show Manual Survey",false,false).Tap();
 
     captain.WaitForAssertion(() =>
     {

e2e/Utils/CaptainTest.cs

@@ -1,5 +1,7 @@
 using System.Drawing;
 using Instabug.Captain;
+using OpenQA.Selenium;
+using OpenQA.Selenium.Appium.MultiTouch;
 
 namespace E2E.Utils;
 
@@ -10,6 +12,7 @@ public class CaptainTest : IDisposable
     AndroidApp = Path.GetFullPath("../../../../packages/instabug_flutter/example/build/app/outputs/flutter-apk/app-debug.apk"),
     AndroidAppId = "com.instabug.flutter.example",
     AndroidVersion = "13",
+
     IosApp = Path.GetFullPath("../../../../packages/instabug_flutter/example/build/ios/iphonesimulator/Runner.app"),
     IosAppId = "com.instabug.InstabugSample",
     IosVersion = "17.2",
@@ -28,28 +31,5 @@ public void Dispose()
     captain.RestartApp();
   }
 
-  protected void ScrollDown()
-  {
-    captain.Swipe(
-        start: new Point(captain.Window.Size.Width / 2, captain.Window.Size.Height - 200),
-        end: new Point(captain.Window.Size.Width / 2, 250)
-    );
-  }
 
-
- protected void ScrollDownLittle()
-  {
-    captain.Swipe(
-        start: new Point(captain.Window.Size.Width / 2, captain.Window.Size.Height - 200),
-        end: new Point(captain.Window.Size.Width / 2, captain.Window.Size.Height - 220)
-    );
-  }
-
-  protected void ScrollUp()
-  {
-    captain.Swipe(
-        start: new Point(captain.Window.Size.Width / 2, 250),
-        end: new Point(captain.Window.Size.Width / 2, captain.Window.Size.Height - 200)
-    );
-  }
 }

packages/instabug_flutter/android/build.gradle

@@ -16,6 +16,13 @@ rootProject.allprojects {
     repositories {
         google()
         mavenCentral()
+        maven {
+			url "https://mvn.instabug.com/nexus/repository/instabug-internal/"
+			credentials {
+			  username "instabug"
+			  password System.getenv('INSTABUG_REPOSITORY_PASSWORD')
+			}
+		}
     }
 }
 
@@ -44,7 +51,8 @@ android {
 }
 
 dependencies {
-    api 'com.instabug.library:instabug:14.1.0'
+    api 'com.instabug.library:instabug:14.2.0.6611870-SNAPSHOT'
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.mockito:mockito-inline:3.12.1"
     testImplementation "io.mockk:mockk:1.13.13"

packages/instabug_flutter/android/src/main/java/com/instabug/flutter/modules/InstabugApi.java

@@ -44,6 +44,7 @@
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -126,6 +127,16 @@ public void init(@NonNull String token, @NonNull List<String> invocationEvents,
                 .build();
 
         Instabug.setScreenshotProvider(screenshotProvider);
+
+        try{
+            Class<?> myClass = Class.forName("com.instabug.library.Instabug");
+            // Enable/Disable native user steps capturing
+            Method method = myClass.getDeclaredMethod("shouldDisableNativeUserStepsCapturing", boolean.class);
+            method.setAccessible(true);
+            method.invoke(null,true);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -159,6 +170,33 @@ public void logOut() {
         Instabug.logoutUser();
     }
 
+    @Override
+    public void setEnableUserSteps(@NonNull Boolean isEnabled) {
+        Instabug.setTrackingUserStepsState(isEnabled ? Feature.State.ENABLED : Feature.State.DISABLED);
+    }
+
+    @Override
+
+    public void logUserSteps(@NonNull String gestureType, @NonNull String message,@Nullable String viewName) {
+        try {
+            final String stepType = ArgsRegistry.gestureStepType.get(gestureType);
+            final long timeStamp = System.currentTimeMillis();
+            String view = "";
+
+            Method method = Reflection.getMethod(Class.forName("com.instabug.library.Instabug"), "addUserStep",
+                    long.class, String.class, String.class, String.class, String.class);
+            if (method != null) {
+                if (viewName != null){
+                    view = viewName;
+                }
+
+                method.invoke(null, timeStamp, stepType, message, null, view);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
     @Override
     public void setLocale(@NonNull String locale) {
         final InstabugLocale resolvedLocale = ArgsRegistry.locales.get(locale);
@@ -362,6 +400,13 @@ public void reportScreenChange(@NonNull String screenName) {
             if (method != null) {
                 method.invoke(null, null, screenName);
             }
+
+            Method reportViewChange = Reflection.getMethod(Class.forName("com.instabug.library.Instabug"), "reportCurrentViewChange",
+                    String.class);
+            if (reportViewChange != null) {
+                reportViewChange.invoke(null,screenName);
+            }
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -497,7 +542,7 @@ public void willRedirectToStore() {
         Instabug.willRedirectToStore();
     }
 
-    public static void setScreenshotCaptor(ScreenshotCaptor screenshotCaptor,InternalCore internalCore) {
+    public static void setScreenshotCaptor(ScreenshotCaptor screenshotCaptor, InternalCore internalCore) {
         internalCore._setScreenshotCaptor(new com.instabug.library.screenshot.ScreenshotCaptor() {
             @Override
             public void capture(@NonNull ScreenshotRequest screenshotRequest) {