Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

addressed comments

Murat Yenere18f7cb3764c
diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt
index 5e4952fbb..8599bddd0 100644
--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt
+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt
@@ -88,3 +88,17 @@ fun MacrobenchmarkScope.forYouScrollFeedDownUp() {
val feedList = device.findObject(By.res("forYou:feed"))
device.flingElementDownUp(feedList)
}
+
+fun MacrobenchmarkScope.setAppTheme(isDark: Boolean) {
+ when (isDark) {
+ true -> device.findObject(By.text("Dark")).click()
+ false -> device.findObject(By.text("Light")).click()
+ }
+ device.waitForIdle()
+ device.findObject(By.text("OK")).click()
+
+ // Wait until the top app bar is visible on screen
+ device.wait(Until.hasObject(By.res("niaTopAppBar")), 2_000)
+ val topAppBar = device.findObject(By.res("niaTopAppBar"))
+ topAppBar.wait(Until.hasObject(By.text("Now in Android")), 2_000)
+}
diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt
index a6420a7fd..e94369ce2 100644
--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt
+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt
@@ -48,17 +48,3 @@ fun MacrobenchmarkScope.interestsToggleBookmarked() {
checkable.click()
device.waitForIdle()
}
-
-fun MacrobenchmarkScope.setAppTheme(isDark: Boolean) {
- when (isDark) {
- true -> device.findObject(By.text("Dark")).click()
- false -> device.findObject(By.text("Light")).click()
- }
- device.waitForIdle()
- device.findObject(By.text("OK")).click()
-
- // Wait until interests are shown on screen
- device.wait(Until.hasObject(By.res("niaTopAppBar")), 2_000)
- val topAppBar = device.findObject(By.res("niaTopAppBar"))
- topAppBar.wait(Until.hasObject(By.text("Now in Android")), 2_000)
-}
diff --git a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/ScrollTopicListPowerMetricsBenchmark.kt b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/ScrollTopicListPowerMetricsBenchmark.kt
index 8ede75e4b..13c6f55e3 100644
--- a/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/ScrollTopicListPowerMetricsBenchmark.kt
+++ b/benchmarks/src/main/java/com/google/samples/apps/nowinandroid/interests/ScrollTopicListPowerMetricsBenchmark.kt
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import com.google.samples.apps.nowinandroid.allowNotifications
import com.google.samples.apps.nowinandroid.foryou.forYouScrollFeedDownUp
import com.google.samples.apps.nowinandroid.foryou.forYouSelectTopics
import com.google.samples.apps.nowinandroid.foryou.forYouWaitForContent
+import com.google.samples.apps.nowinandroid.foryou.setAppTheme
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -67,7 +68,7 @@ class ScrollTopicListPowerMetricsBenchmark {
pressHome()
startActivityAndWait()
allowNotifications()
- // Navigate to interests screen
+ // Navigate to Settings
device.findObject(By.desc("Settings")).click()
device.waitForIdle()
setAppTheme(isDark)