Fix bookmarks actions

Change-Id: I415d651414d68a312498d5faff799d72145a53ed

benchmarks/src/main/java/com/google/samples/apps/nowinandroid/baselineprofile/BaselineProfileGenerator.kt

@@ -18,8 +18,8 @@ package com.google.samples.apps.nowinandroid.baselineprofile
 
 import androidx.benchmark.macro.ExperimentalBaselineProfilesApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
-import androidx.test.uiautomator.By
 import com.google.samples.apps.nowinandroid.PACKAGE_NAME
+import com.google.samples.apps.nowinandroid.bookmarks.goToBookmarksScreen
 import com.google.samples.apps.nowinandroid.foryou.forYouScrollFeedDownUp
 import com.google.samples.apps.nowinandroid.foryou.forYouSelectTopics
 import com.google.samples.apps.nowinandroid.foryou.forYouWaitForContent
@@ -51,8 +51,7 @@ class BaselineProfileGenerator {
             forYouScrollFeedDownUp()
 
             // Navigate to saved screen
-            device.findObject(By.text("Saved")).click()
+            goToBookmarksScreen()
-            device.waitForIdle()
             // TODO: we need to implement adding stuff to bookmarks before able to scroll it
             // bookmarksScrollFeedDownUp()
 

benchmarks/src/main/java/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt

@@ -18,8 +18,17 @@ package com.google.samples.apps.nowinandroid.bookmarks
 
 import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.test.uiautomator.By
+import androidx.test.uiautomator.Until
 import com.google.samples.apps.nowinandroid.flingElementDownUp
 
+fun MacrobenchmarkScope.goToBookmarksScreen() {
+    device.findObject(By.text("Saved")).click()
+    device.waitForIdle()
+    // Wait until saved title are shown on screen
+    val topAppBar = device.findObject(By.res("niaTopAppBar"))
+    topAppBar.wait(Until.hasObject(By.text("Saved")), 2_000)
+}
+
 fun MacrobenchmarkScope.bookmarksScrollFeedDownUp() {
     val feedList = device.findObject(By.res("bookmarks:feed"))
     device.flingElementDownUp(feedList)