Screenshots for play store graphics needed (EXPOSUREAPP-7484) (#3299)

* Change Max Mustermann to Andrea Schneider in VaccinationList Screenshots

* Fix Screenshot images in SubmissionDispatcherFragment

* Add new screenshot for the Home Screen with 2 negative tests PCR and RAT

Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt

@@ -8,6 +8,7 @@ import de.rki.coronawarnapp.coronatest.type.pcr.SubmissionStatePCR.TestInvalid
 import de.rki.coronawarnapp.coronatest.type.pcr.SubmissionStatePCR.TestNegative
 import de.rki.coronawarnapp.coronatest.type.pcr.SubmissionStatePCR.TestPending
 import de.rki.coronawarnapp.coronatest.type.pcr.SubmissionStatePCR.TestPositive
+import de.rki.coronawarnapp.coronatest.type.rapidantigen.SubmissionStateRAT
 import de.rki.coronawarnapp.risk.RiskState
 import de.rki.coronawarnapp.submission.ui.homecards.PcrTestErrorCard
 import de.rki.coronawarnapp.submission.ui.homecards.PcrTestInvalidCard
@@ -15,6 +16,7 @@ import de.rki.coronawarnapp.submission.ui.homecards.PcrTestNegativeCard
 import de.rki.coronawarnapp.submission.ui.homecards.PcrTestPendingCard
 import de.rki.coronawarnapp.submission.ui.homecards.PcrTestPositiveCard
 import de.rki.coronawarnapp.submission.ui.homecards.PcrTestSubmissionDoneCard
+import de.rki.coronawarnapp.submission.ui.homecards.RapidTestNegativeCard
 import de.rki.coronawarnapp.submission.ui.homecards.TestFetchingCard
 import de.rki.coronawarnapp.submission.ui.homecards.TestUnregisteredCard
 import de.rki.coronawarnapp.tracing.TracingProgress
@@ -153,6 +155,13 @@ object HomeData {
             onClickAction = {}
         )
 
+        val TEST_NEGATIVE_ITEM_RAT = RapidTestNegativeCard.Item(
+            state = SubmissionStateRAT.TestNegative(
+                testRegisteredAt = Instant.now()
+            ),
+            onClickAction = {}
+        )
+
         val TEST_INVALID_ITEM = PcrTestInvalidCard.Item(
             state = TestInvalid,
             onDeleteTest = {}

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentTest.kt

@@ -18,6 +18,8 @@ import de.rki.coronawarnapp.storage.TracingSettings
 import de.rki.coronawarnapp.submission.SubmissionRepository
 import de.rki.coronawarnapp.submission.ui.homecards.PcrTestPositiveCard
 import de.rki.coronawarnapp.submission.ui.homecards.PcrTestSubmissionDoneCard
+import de.rki.coronawarnapp.submission.ui.homecards.RapidTestPositiveCard
+import de.rki.coronawarnapp.submission.ui.homecards.RapidTestSubmissionDoneCard
 import de.rki.coronawarnapp.submission.ui.homecards.TestResultItem
 import de.rki.coronawarnapp.tracing.GeneralTracingStatus
 import de.rki.coronawarnapp.tracing.states.TracingStateProvider
@@ -179,7 +181,7 @@ class HomeFragmentTest : BaseUITest() {
     @Test
     fun captureHomeFragmentTestSubmissionDone() {
         every { homeFragmentViewModel.homeItems } returns homeFragmentItemsLiveData(
-            submissionTestResultItem = HomeData.Submission.TEST_SUBMISSION_DONE_ITEM
+            submissionTestResultItems = listOf(HomeData.Submission.TEST_SUBMISSION_DONE_ITEM)
         )
         captureHomeFragment("submission_done")
     }
@@ -188,7 +190,7 @@ class HomeFragmentTest : BaseUITest() {
     @Test
     fun captureHomeFragmentTestError() {
         every { homeFragmentViewModel.homeItems } returns homeFragmentItemsLiveData(
-            submissionTestResultItem = HomeData.Submission.TEST_ERROR_ITEM
+            submissionTestResultItems = listOf(HomeData.Submission.TEST_ERROR_ITEM)
         )
         captureHomeFragment("test_error")
     }
@@ -197,7 +199,7 @@ class HomeFragmentTest : BaseUITest() {
     @Test
     fun captureHomeFragmentTestFetching() {
         every { homeFragmentViewModel.homeItems } returns homeFragmentItemsLiveData(
-            submissionTestResultItem = HomeData.Submission.TEST_FETCHING_ITEM
+            submissionTestResultItems = listOf(HomeData.Submission.TEST_FETCHING_ITEM)
         )
         captureHomeFragment("test_fetching")
     }
@@ -206,7 +208,7 @@ class HomeFragmentTest : BaseUITest() {
     @Test
     fun captureHomeFragmentTestInvalid() {
         every { homeFragmentViewModel.homeItems } returns homeFragmentItemsLiveData(
-            submissionTestResultItem = HomeData.Submission.TEST_INVALID_ITEM
+            submissionTestResultItems = listOf(HomeData.Submission.TEST_INVALID_ITEM)
         )
         captureHomeFragment("test_invalid")
     }
@@ -215,16 +217,30 @@ class HomeFragmentTest : BaseUITest() {
     @Test
     fun captureHomeFragmentTestNegative() {
         every { homeFragmentViewModel.homeItems } returns homeFragmentItemsLiveData(
-            submissionTestResultItem = HomeData.Submission.TEST_NEGATIVE_ITEM
+            submissionTestResultItems = listOf(HomeData.Submission.TEST_NEGATIVE_ITEM)
         )
         captureHomeFragment("test_negative")
     }
 
+    @Screenshot
+    @Test
+    fun captureHomeFragmentTwoTestsNegative() {
+        every { homeFragmentViewModel.homeItems } returns homeFragmentItemsLiveData(
+            submissionTestResultItems = listOf(
+                HomeData.Submission.TEST_NEGATIVE_ITEM,
+                HomeData.Submission.TEST_NEGATIVE_ITEM_RAT
+            )
+        )
+        launchInMainActivity<HomeFragment>()
+        onView(withId(R.id.recycler_view)).perform(recyclerScrollTo(2, additionalY = -25))
+        takeScreenshot<HomeFragment>("tests_negative")
+    }
+
     @Screenshot
     @Test
     fun captureHomeFragmentTestPositive() {
         every { homeFragmentViewModel.homeItems } returns homeFragmentItemsLiveData(
-            submissionTestResultItem = HomeData.Submission.TEST_POSITIVE_ITEM
+            submissionTestResultItems = listOf(HomeData.Submission.TEST_POSITIVE_ITEM)
         )
         captureHomeFragment("test_positive")
     }
@@ -233,7 +249,7 @@ class HomeFragmentTest : BaseUITest() {
     @Test
     fun captureHomeFragmentTestPending() {
         every { homeFragmentViewModel.homeItems } returns homeFragmentItemsLiveData(
-            submissionTestResultItem = HomeData.Submission.TEST_PENDING_ITEM
+            submissionTestResultItems = listOf(HomeData.Submission.TEST_PENDING_ITEM)
         )
         captureHomeFragment("test_pending")
     }
@@ -360,24 +376,30 @@ class HomeFragmentTest : BaseUITest() {
     // LiveData item for fragments
     private fun homeFragmentItemsLiveData(
         tracingStateItem: TracingStateItem = HomeData.Tracing.LOW_RISK_ITEM_WITH_ENCOUNTERS,
-        submissionTestResultItem: TestResultItem = HomeData.Submission.TEST_UNREGISTERED_ITEM,
+        submissionTestResultItems: List<TestResultItem> = listOf(HomeData.Submission.TEST_UNREGISTERED_ITEM),
         vaccinationStatus: VaccinationStatusItem? = null,
     ): LiveData<List<HomeItem>> =
         MutableLiveData(
             mutableListOf<HomeItem>().apply {
-                when (submissionTestResultItem) {
-                    is PcrTestSubmissionDoneCard.Item,
-                    is PcrTestPositiveCard.Item -> {
-                        Timber.d("Tracing item is not added, submission:$submissionTestResultItem")
-                    }
-                    else -> add(tracingStateItem)
+
+                val hideTracingState = submissionTestResultItems.any {
+                    it is PcrTestPositiveCard.Item ||
+                        it is PcrTestSubmissionDoneCard.Item ||
+                        it is RapidTestPositiveCard.Item ||
+                        it is RapidTestSubmissionDoneCard.Item
+                }
+
+                if (hideTracingState) {
+                    Timber.d("Tracing item is not added, submission:$submissionTestResultItems")
+                } else {
+                    add(tracingStateItem)
                 }
 
                 vaccinationStatus?.let {
                     add(it)
                 }
 
-                add(submissionTestResultItem)
+                addAll(submissionTestResultItems)
 
                 add(CreateVaccinationHomeCard.Item {})
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/vaccination/ui/list/VaccinationListFragmentTest.kt

@@ -198,8 +198,8 @@ internal class VaccinationListFragmentTest : BaseUITest() {
     )
 
     private fun createNameCardItem() = VaccinationListNameCardItem(
-        fullName = "Max Mustermann",
-        dayOfBirth = LocalDate.parse("01.02.1976", formatter).toDayFormat()
+        fullName = "Andrea Schneider",
+        dayOfBirth = LocalDate.parse("18.04.1943", formatter).toDayFormat()
     )
 
     private fun createQrCodeCardItem(

Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml

@@ -37,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:paddingBottom="@dimen/spacing_normal">
 
-                <ImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/submission_dispatcher_illustration"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"

Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml

@@ -43,7 +43,7 @@
             app:layout_constraintTop_toTopOf="parent"
             tools:text="@string/submission_dispatcher_card_qr" />
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/dispatcher_card_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

Corona-Warn-App/src/main/res/layout/submission_create_rat_profile_card.xml

@@ -18,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/dispatcher_card_icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         app:srcCompat="@drawable/ic_forward"
         app:tint="@color/colorTextPrimary1" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/illustration"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"