From 4b35622731f813f07838c0f52db2efe4cdf96d8f Mon Sep 17 00:00:00 2001
From: chris-cwa <69595386+chris-cwa@users.noreply.github.com>
Date: Mon, 25 Jan 2021 16:27:53 +0100
Subject: [PATCH] updated screenshots for contact diary (#2199)
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../ContactDiaryOverviewFragmentTest.kt | 8 ++++++--
.../rki/coronawarnapp/ui/contactdiary/DiaryData.kt | 14 +++++++++++++-
.../{ui => storage}/ContactDiaryPreferences.kt | 3 ++-
.../contactdiary/ui/ContactDiarySettings.kt | 1 +
.../java/de/rki/coronawarnapp/util/DataReset.kt | 2 +-
.../contactdiary/ui/ContactDiarySettingsTest.kt | 1 +
6 files changed, 24 insertions(+), 5 deletions(-)
rename Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/{ui => storage}/ContactDiaryPreferences.kt (86%)
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
index eb3cd813f..2b0e52b55 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
@@ -5,13 +5,16 @@ import androidx.lifecycle.MutableLiveData
import androidx.test.ext.junit.runners.AndroidJUnit4
import dagger.Module
import dagger.android.ContributesAndroidInjector
+import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
import de.rki.coronawarnapp.contactdiary.ui.overview.ContactDiaryOverviewFragment
import de.rki.coronawarnapp.contactdiary.ui.overview.ContactDiaryOverviewViewModel
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.ListItem
import de.rki.coronawarnapp.risk.storage.RiskLevelStorage
import de.rki.coronawarnapp.task.TaskController
-import de.rki.coronawarnapp.ui.contactdiary.DiaryData.LIST_ITEMS
+import de.rki.coronawarnapp.ui.contactdiary.DiaryData.DATA_ITEMS
+import de.rki.coronawarnapp.ui.contactdiary.DiaryData.HIGH_RISK
+import de.rki.coronawarnapp.ui.contactdiary.DiaryData.LOW_RISK
import io.mockk.MockKAnnotations
import io.mockk.every
import io.mockk.impl.annotations.MockK
@@ -91,7 +94,8 @@ class ContactDiaryOverviewFragmentTest : BaseUITest() {
.map { LocalDate.now().minusDays(it) }
.map {
ListItem(it).apply {
- data.apply { addAll(LIST_ITEMS) }
+ data.addAll(DATA_ITEMS)
+ risk = if (it.dayOfYear % 2 == 0) HIGH_RISK else LOW_RISK
}
}
)
diff --git a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
index 910abff26..c6b8e97ff 100644
--- a/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
+++ b/Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
@@ -11,7 +11,7 @@ import de.rki.coronawarnapp.util.ui.toLazyString
object DiaryData {
- val LIST_ITEMS = listOf(
+ val DATA_ITEMS = listOf(
ListItem.Data(
R.drawable.ic_contact_diary_person_item,
"Max Mustermann",
@@ -37,6 +37,18 @@ object DiaryData {
)
)
+ val HIGH_RISK = ListItem.Risk(
+ R.string.contact_diary_risk_body,
+ R.string.contact_diary_high_risk_title,
+ R.drawable.ic_high_risk_alert
+ )
+
+ val LOW_RISK = ListItem.Risk(
+ R.string.contact_diary_risk_body,
+ R.string.contact_diary_low_risk_title,
+ R.drawable.ic_low_risk_alert
+ )
+
val LOCATIONS: List<SelectableItem<ContactDiaryLocation>> = listOf(
SelectableItem(
selected = true,
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryPreferences.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryPreferences.kt
similarity index 86%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryPreferences.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryPreferences.kt
index 431a2cdc5..a54333b68 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryPreferences.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/ContactDiaryPreferences.kt
@@ -1,6 +1,7 @@
-package de.rki.coronawarnapp.contactdiary.ui
+package de.rki.coronawarnapp.contactdiary.storage
import android.content.Context
+import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
import de.rki.coronawarnapp.util.di.AppContext
import de.rki.coronawarnapp.util.preferences.clearAndNotify
import de.rki.coronawarnapp.util.preferences.createFlowPreference
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt
index 6649f1b58..060f31727 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettings.kt
@@ -1,5 +1,6 @@
package de.rki.coronawarnapp.contactdiary.ui
+import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryPreferences
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
index 2c63dab77..7bafedc84 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
import android.content.Context
import de.rki.coronawarnapp.appconfig.AppConfigProvider
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
-import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryPreferences
+import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryPreferences
import de.rki.coronawarnapp.diagnosiskeys.download.DownloadDiagnosisKeysSettings
import de.rki.coronawarnapp.diagnosiskeys.storage.KeyCacheRepository
import de.rki.coronawarnapp.main.CWASettings
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettingsTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettingsTest.kt
index 576ed764c..f2827a44b 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettingsTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiarySettingsTest.kt
@@ -1,5 +1,6 @@
package de.rki.coronawarnapp.contactdiary.ui
+import de.rki.coronawarnapp.contactdiary.storage.ContactDiaryPreferences
import de.rki.coronawarnapp.util.preferences.FlowPreference
import io.kotest.matchers.shouldBe
import io.mockk.MockKAnnotations
--
GitLab