From 4654ad33a6173eb74372ac1bbfb94f06465ebf26 Mon Sep 17 00:00:00 2001 From: Maria Glushchenko Date: Mon, 31 Jul 2023 12:22:46 +0300 Subject: [PATCH] ISSUE-543: review fixes --- .../activities/metadata/ActivityMetadata.kt | 53 ++++++++----------- .../ScreenshotActivityWithToolbarTest.kt | 2 +- .../kaspressample/screen/WithToolbarScreen.kt | 2 +- .../withtoolbar/WithToolbarActivity.kt | 1 - 4 files changed, 24 insertions(+), 34 deletions(-) diff --git a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/activities/metadata/ActivityMetadata.kt b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/activities/metadata/ActivityMetadata.kt index f0100d39c..b854fa528 100644 --- a/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/activities/metadata/ActivityMetadata.kt +++ b/kaspresso/src/main/kotlin/com/kaspersky/kaspresso/device/activities/metadata/ActivityMetadata.kt @@ -49,38 +49,30 @@ internal class ActivityMetadata( } private fun getLocalizedStrings(decorView: View): List { - val localizedStrings = TreeIterables.depthFirstViewTraversal(decorView) + return TreeIterables.depthFirstViewTraversal(decorView) .filter { it.visibility == View.VISIBLE } - .filter { it is TextView } - .map { it as TextView } + .filter { it is TextView || it is CollapsingToolbarLayout } .map { v -> - LocalizedString( - v.text.toString(), - getEntryName(decorView.resources, v), - v.left, - v.top, - v.width, - v.height - ) + if (v is TextView) { + LocalizedString( + v.text.toString(), + getEntryName(decorView.resources, v), + v.left, + v.top, + v.width, + v.height + ) + } else { + LocalizedString( + (v as CollapsingToolbarLayout).title.toString(), + getEntryNameFromLayout(decorView.resources, v), + v.left, + v.top, + v.width, + v.height + ) + } }.toMutableList() - - val stringsFromToolbarLayouts = TreeIterables.depthFirstViewTraversal(decorView) - .filter { it.visibility == View.VISIBLE } - .filter { it is CollapsingToolbarLayout } - .map { it as CollapsingToolbarLayout } - .map { v -> - LocalizedString( - v.title.toString(), - getEntryNameFromLayout(decorView.resources, v), - v.left, - v.top, - v.width, - v.height - ) - } - - localizedStrings.addAll(stringsFromToolbarLayouts) - return localizedStrings } private fun getEntryName(resources: Resources, v: TextView): String { @@ -95,8 +87,7 @@ internal class ActivityMetadata( private fun getEntryNameFromLayout(resources: Resources, layout: CollapsingToolbarLayout): String { return try { resources.getResourceEntryName(layout.id) - } - catch (ex: Resources.NotFoundException) { + } catch (ex: Resources.NotFoundException) { logger.e("Entry ${layout.id} not found") "[id:${Integer.toHexString(layout.id)}]" } diff --git a/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/ScreenshotActivityWithToolbarTest.kt b/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/ScreenshotActivityWithToolbarTest.kt index c57487e31..81cc6d018 100644 --- a/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/ScreenshotActivityWithToolbarTest.kt +++ b/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/ScreenshotActivityWithToolbarTest.kt @@ -9,7 +9,7 @@ import com.kaspersky.kaspresso.testcases.api.testcase.DocLocScreenshotTestCase import org.junit.Rule import org.junit.Test -class ScreenshotActivityWithToolbarTest : DocLocScreenshotTestCase(locales="en") { +class ScreenshotActivityWithToolbarTest : DocLocScreenshotTestCase(locales = "en") { @get:Rule val activityRule = activityScenarioRule() diff --git a/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/screen/WithToolbarScreen.kt b/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/screen/WithToolbarScreen.kt index 245ae8f7d..37f1e4349 100644 --- a/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/screen/WithToolbarScreen.kt +++ b/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/screen/WithToolbarScreen.kt @@ -8,5 +8,5 @@ object WithToolbarScreen : KScreen() { override val layoutId: Int? = null override val viewClass: Class<*>? = null - val collapsingToolbar = KToolbar { withId(R.id.collapsing_toolbar)} + val collapsingToolbar = KToolbar { withId(R.id.collapsing_toolbar) } } diff --git a/samples/kaspresso-sample/src/main/kotlin/com/kaspersky/kaspressample/withtoolbar/WithToolbarActivity.kt b/samples/kaspresso-sample/src/main/kotlin/com/kaspersky/kaspressample/withtoolbar/WithToolbarActivity.kt index f20e87750..b3eb197ec 100644 --- a/samples/kaspresso-sample/src/main/kotlin/com/kaspersky/kaspressample/withtoolbar/WithToolbarActivity.kt +++ b/samples/kaspresso-sample/src/main/kotlin/com/kaspersky/kaspressample/withtoolbar/WithToolbarActivity.kt @@ -8,7 +8,6 @@ import com.kaspersky.kaspressample.R class WithToolbarActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_with_toolbar)