From c7321ea746c1848634fccbe708a3811d5ff92139 Mon Sep 17 00:00:00 2001
From: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com>
Date: Mon, 26 Apr 2021 19:59:30 +0300
Subject: [PATCH] EOL obsolete card (EXPOSUREAPP-6700) (#2963)
* Removed obsolete home screen card
* Remove unused layout and strings.
* Only remove german, otherwise CI and translation tool are not going to be friends.
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
---
.../coronawarnapp/ui/main/home/HomeAdapter.kt | 2 -
.../ui/main/home/HomeFragment.kt | 20 ----
.../ui/main/home/HomeFragmentEvents.kt | 2 -
.../ui/main/home/HomeFragmentViewModel.kt | 18 ----
.../ui/main/home/items/ReenableRiskCard.kt | 42 --------
.../layout/home_reenable_risk_card_layout.xml | 99 -------------------
.../src/main/res/values-de/strings.xml | 18 ----
7 files changed, 201 deletions(-)
delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/items/ReenableRiskCard.kt
delete mode 100644 Corona-Warn-App/src/main/res/layout/home_reenable_risk_card_layout.xml
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeAdapter.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeAdapter.kt
index be2720d7a..07aafffde 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeAdapter.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeAdapter.kt
@@ -29,7 +29,6 @@ import de.rki.coronawarnapp.tracing.ui.homecards.TracingProgressCard
import de.rki.coronawarnapp.ui.main.home.items.CreateTraceLocationCard
import de.rki.coronawarnapp.ui.main.home.items.FAQCard
import de.rki.coronawarnapp.ui.main.home.items.HomeItem
-import de.rki.coronawarnapp.ui.main.home.items.ReenableRiskCard
import de.rki.coronawarnapp.util.lists.BindableVH
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffer
@@ -52,7 +51,6 @@ class HomeAdapter :
DataBinderMod<HomeItem, HomeItemVH<HomeItem, ViewBinding>>(data),
TypedVHCreatorMod({ data[it] is FAQCard.Item }) { FAQCard(it) },
TypedVHCreatorMod({ data[it] is CreateTraceLocationCard.Item }) { CreateTraceLocationCard(it) },
- TypedVHCreatorMod({ data[it] is ReenableRiskCard.Item }) { ReenableRiskCard(it) },
TypedVHCreatorMod({ data[it] is IncreasedRiskCard.Item }) { IncreasedRiskCard(it) },
TypedVHCreatorMod({ data[it] is LowRiskCard.Item }) { LowRiskCard(it) },
TypedVHCreatorMod({ data[it] is TracingFailedCard.Item }) { TracingFailedCard(it) },
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
index ad760fe10..dfbad3ce5 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
@@ -101,9 +101,6 @@ class HomeFragment : Fragment(R.layout.home_fragment_layout), AutoInject {
HomeFragmentEvents.GoToStatisticsExplanation -> doNavigate(
HomeFragmentDirections.actionMainFragmentToStatisticsExplanationFragment()
)
- HomeFragmentEvents.ShowReactivateRiskCheckDialog -> {
- showReactivateRiskCheckDialog()
- }
HomeFragmentEvents.ShowTracingExplanation -> {
tracingExplanationDialog.show {
viewModel.tracingExplanationWasShown()
@@ -147,23 +144,6 @@ class HomeFragment : Fragment(R.layout.home_fragment_layout), AutoInject {
}
}
- private fun showReactivateRiskCheckDialog() {
- val removeTestDialog = DialogHelper.DialogInstance(
- requireActivity(),
- R.string.dialog_reactivate_risk_calculation_title,
- R.string.dialog_reactivate_risk_calculation_message,
- R.string.dialog_reactivate_risk_calculation_button_positive,
- R.string.dialog_reactivate_risk_calculation_button_negative,
- positiveButtonFunction = {
- viewModel.reenableRiskCalculation()
- }
- )
- DialogHelper.showDialog(removeTestDialog).apply {
- getButton(AlertDialog.BUTTON_POSITIVE)
- .setTextColor(context.getColorCompat(R.color.colorTextSemanticRed))
- }
- }
-
private fun showRiskLevelLoweredDialog() {
val riskLevelLoweredDialog = DialogHelper.DialogInstance(
context = requireActivity(),
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt
index 45f581002..b219536e6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentEvents.kt
@@ -8,7 +8,5 @@ sealed class HomeFragmentEvents {
object ShowDeleteTestDialog : HomeFragmentEvents()
- object ShowReactivateRiskCheckDialog : HomeFragmentEvents()
-
object GoToStatisticsExplanation : HomeFragmentEvents()
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt
index 25200c580..924c15e01 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragmentViewModel.kt
@@ -10,7 +10,6 @@ import de.rki.coronawarnapp.appconfig.CoronaTestConfig
import de.rki.coronawarnapp.coronatest.CoronaTestRepository
import de.rki.coronawarnapp.coronatest.latestPCRT
import de.rki.coronawarnapp.coronatest.latestRAT
-import de.rki.coronawarnapp.coronatest.type.CommonSubmissionStates
import de.rki.coronawarnapp.coronatest.type.CoronaTest
import de.rki.coronawarnapp.coronatest.type.pcr.PCRCoronaTest
import de.rki.coronawarnapp.coronatest.type.pcr.SubmissionStatePCR
@@ -61,7 +60,6 @@ import de.rki.coronawarnapp.ui.main.home.HomeFragmentEvents.ShowTracingExplanati
import de.rki.coronawarnapp.ui.main.home.items.CreateTraceLocationCard
import de.rki.coronawarnapp.ui.main.home.items.FAQCard
import de.rki.coronawarnapp.ui.main.home.items.HomeItem
-import de.rki.coronawarnapp.ui.main.home.items.ReenableRiskCard
import de.rki.coronawarnapp.ui.presencetracing.organizer.TraceLocationOrganizerSettings
import de.rki.coronawarnapp.util.TimeStamper
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -309,16 +307,6 @@ class HomeFragmentViewModel @AssistedInject constructor(
}
}
- bothTestStates.firstOrNull { it is CommonSubmissionStates.SubmissionDone }?.let {
- it as CommonSubmissionStates.SubmissionDone
- add(
- ReenableRiskCard.Item(
- data = it,
- onClickAction = { popupEvents.postValue(HomeFragmentEvents.ShowReactivateRiskCheckDialog) }
- )
- )
- }
-
if (statsData.isDataAvailable) {
add(
StatisticsHomeCard.Item(
@@ -338,12 +326,6 @@ class HomeFragmentViewModel @AssistedInject constructor(
.distinctUntilChanged()
.asLiveData(dispatcherProvider.Default)
- fun reenableRiskCalculation() {
- deregisterWarningAccepted()
- deadmanNotificationScheduler.schedulePeriodic()
- refreshRiskResult()
- }
-
private var isLoweredRiskLevelDialogBeingShown = false
// TODO only lazy to keep tests going which would break because of LocalData access
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/items/ReenableRiskCard.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/items/ReenableRiskCard.kt
deleted file mode 100644
index 5c9df231a..000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/items/ReenableRiskCard.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package de.rki.coronawarnapp.ui.main.home.items
-
-import android.view.ViewGroup
-import android.widget.Button
-import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.coronatest.type.CommonSubmissionStates
-import de.rki.coronawarnapp.databinding.HomeReenableRiskCardLayoutBinding
-import de.rki.coronawarnapp.ui.main.home.HomeAdapter
-import de.rki.coronawarnapp.ui.main.home.items.ReenableRiskCard.Item
-import de.rki.coronawarnapp.util.TimeAndDateExtensions.toUIFormat
-import de.rki.coronawarnapp.util.lists.diffutil.HasPayloadDiffer
-
-class ReenableRiskCard(parent: ViewGroup) : HomeAdapter.HomeItemVH<Item, HomeReenableRiskCardLayoutBinding>(
- R.layout.home_card_container_layout,
- parent
-) {
-
- override val viewBinding = lazy {
- HomeReenableRiskCardLayoutBinding.inflate(layoutInflater, itemView.findViewById(R.id.card_container), true)
- }
-
- override val onBindData: HomeReenableRiskCardLayoutBinding.(Item, List<Any>) -> Unit = { item, payloads ->
- reenableRiskCardTestRegistrationDate.text =
- context.getString(R.string.reenable_risk_card_test_registration_string)
- .format(item.data.testRegisteredAt.toDate().toUIFormat(context))
-
- itemView.findViewById<Button>(R.id.reenable_risk_card_button).setOnClickListener {
- val curItem = payloads.filterIsInstance<Item>().singleOrNull() ?: item
- curItem.onClickAction(item)
- }
- }
-
- data class Item(
- val data: CommonSubmissionStates.SubmissionDone,
- val onClickAction: (Item) -> Unit
- ) : HomeItem,
- HasPayloadDiffer {
- override val stableId: Long = Item::class.java.name.hashCode().toLong()
-
- override fun diffPayload(old: Any, new: Any): Any? = if (old::class == new::class) new else null
- }
-}
diff --git a/Corona-Warn-App/src/main/res/layout/home_reenable_risk_card_layout.xml b/Corona-Warn-App/src/main/res/layout/home_reenable_risk_card_layout.xml
deleted file mode 100644
index 34fcc4561..000000000
--- a/Corona-Warn-App/src/main/res/layout/home_reenable_risk_card_layout.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools">
-
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/card_padding"
- tools:showIn="@layout/home_card_container_layout">
-
- <TextView
- android:id="@+id/reenable_risk_card_title"
- style="@style/headline5"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/spacing_small"
- android:accessibilityHeading="true"
- android:text="@string/reenable_risk_card_title"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <TextView
- android:id="@+id/reenable_risk_card_positive_title"
- style="@style/headline6"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
- android:layout_marginEnd="@dimen/spacing_small"
- android:accessibilityHeading="true"
- android:text="@string/submission_test_result_card_positive_title"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/reenable_risk_card_title" />
-
- <ImageView
- android:id="@+id/reenable_risk_card_positive_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_test_result_illustration_positive_card"
- android:importantForAccessibility="no"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@id/reenable_risk_card_positive_title"
- tools:src="@drawable/ic_test_result_illustration_positive" />
-
- <TextView
- android:id="@+id/reenable_risk_card_positive_body"
- style="@style/body2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
- android:layout_marginEnd="@dimen/spacing_small"
- android:text="@string/submission_test_result_card_positive_body"
- app:layout_constraintEnd_toStartOf="@id/reenable_risk_card_positive_icon"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/reenable_risk_card_positive_title" />
-
- <TextView
- android:id="@+id/reenable_risk_card_test_registration_date"
- style="@style/body2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/spacing_small"
- tools:text="@string/reenable_risk_card_test_registration_string"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/reenable_risk_card_positive_body" />
-
- <View
- android:id="@+id/reenable_risk_card_divider"
- android:layout_width="match_parent"
- android:layout_height="@dimen/card_divider"
- android:layout_marginTop="@dimen/spacing_normal"
- android:background="@color/colorHairline"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/reenable_risk_card_test_registration_date" />
-
- <TextView
- android:id="@+id/reenable_risk_card_description"
- style="@style/body1"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_medium"
- android:layout_marginEnd="@dimen/spacing_small"
- android:text="@string/reenable_risk_card_description_text"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/reenable_risk_card_divider" />
-
- <Button
- android:id="@+id/reenable_risk_card_button"
- style="@style/buttonPrimary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
- android:text="@string/reenable_risk_card_button_text"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/reenable_risk_card_description" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 9262ba4a7..43ef93ddc 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -1384,24 +1384,6 @@
<!-- YTXT: text for share result card-->
<string name="submission_status_card_positive_result_share">"Teilen Sie Ihre Zufalls-IDs, damit andere gewarnt werden können."</string>
- <!-- Reenable risk card -->
- <!-- XHED: Card title for re-enable risk card -->
- <string name="reenable_risk_card_title">"Risiko-Überprüfung beendet"</string>
- <!-- YTXT: Body text for test registration date -->
- <string name="reenable_risk_card_test_registration_string">"Test registriert am %s"</string>
- <!-- YTXT: Description text for re-enable risk card -->
- <string name="reenable_risk_card_description_text">"Die automatische Risiko-Überprüfung wurde beendet, weil Sie sich aufgrund Ihres positiven Tests aktuell in Isolation befinden. Sie können die Risiko-Überprüfung jederzeit wieder einschalten. Ihr registrierter Test wird dann automatisch gelöscht."</string>
- <!-- XBUT: Button for re-enabling risk calculation -->
- <string name="reenable_risk_card_button_text">"Risiko-Überprüfung Einschalten "</string>
- <!-- XHED: Dialog title for reactivate risk calculation -->
- <string name="dialog_reactivate_risk_calculation_title">"Risiko-Überprüfung aktivieren."</string>
- <!-- YTXT: Dialog text for reactivate risk calculation -->
- <string name="dialog_reactivate_risk_calculation_message">"Ihr aktueller Test wird aus der App gelöscht, damit Sie bei Bedarf einen neuen Test registrieren können."</string>
- <!-- XBUT: Positive button for reactivate risk calculation -->
- <string name="dialog_reactivate_risk_calculation_button_positive">"Aktivieren"</string>
- <!-- XBUT: Negative button for reactivate risk calculation -->
- <string name="dialog_reactivate_risk_calculation_button_negative">"Abbrechen"</string>
-
<!-- Test Result Card -->
<string name="test_result_card_headline">"Ihr %s-Befund:"</string>
<!-- YTXT: virus name text -->
--
GitLab