ISSUE-543: review fixes

KasperskyLab · Jul 31, 2023 · 4654ad3 · 4654ad3
1 parent 6939527
commit 4654ad3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 34 deletions.
diff --git a/...so/src/main/kotlin/com/kaspersky/kaspresso/device/activities/metadata/ActivityMetadata.kt b/...so/src/main/kotlin/com/kaspersky/kaspresso/device/activities/metadata/ActivityMetadata.kt
@@ -49,38 +49,30 @@ internal class ActivityMetadata(
     }
 
     private fun getLocalizedStrings(decorView: View): List<LocalizedString> {
-        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/...Test/kotlin/com/kaspersky/kaspressample/docloc_tests/ScreenshotActivityWithToolbarTest.kt b/...Test/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<MainActivity>()

diff --git a/...sso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/screen/WithToolbarScreen.kt b/...sso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/screen/WithToolbarScreen.kt
@@ -8,5 +8,5 @@ object WithToolbarScreen : KScreen<WithToolbarScreen>() {
     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/...sso-sample/src/main/kotlin/com/kaspersky/kaspressample/withtoolbar/WithToolbarActivity.kt b/...sso-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)