From 581b6a93bf14b27a971354478440ee3422115ee2 Mon Sep 17 00:00:00 2001
From: Rituraj Sambherao <git.rituraj.sambherao@gmail.com>
Date: Wed, 15 Jul 2020 09:36:39 +0100
Subject: [PATCH] logic simplified
---
.../util/formatter/FormatterRiskHelper.kt | 15 ++++-----------
...nclude_risk_details_period_logged_progress.xml | 2 +-
.../include_setting_tracing_period_logged.xml | 1 -
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
index 4cc0e1a46..1d7886809 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt
@@ -212,26 +212,19 @@ fun formatRiskActiveTracingDaysInRetentionPeriod(
}
/**
- * Formats the risk loggin period card text display of tracing active duration in days depending on risk level
+ * Formats the risk logged period card text display of tracing active duration in days depending on risk level
* Displayed in case riskLevel is High and Low level
*
- * @param riskLevelScore
* @param activeTracingDaysInRetentionPeriod
* @return
*/
fun formatRiskActiveTracingDaysInRetentionPeriodLogged(
- riskLevelScore: Int?,
activeTracingDaysInRetentionPeriod: Long
): String {
val appContext = CoronaWarnApplication.getAppContext()
- var periodLoggedString = ""
- if (riskLevelScore == RiskLevelConstants.LOW_LEVEL_RISK ||
- riskLevelScore == RiskLevelConstants.INCREASED_RISK) {
- periodLoggedString = appContext.getString(
- R.string.risk_details_information_body_period_logged_assessment
- ).format(activeTracingDaysInRetentionPeriod)
- }
- return periodLoggedString
+ return appContext.getString(
+ R.string.risk_details_information_body_period_logged_assessment)
+ .format(activeTracingDaysInRetentionPeriod)
}
fun formatRelativeDateTimeString(appContext: Context, date: Date): CharSequence? =
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_details_period_logged_progress.xml b/Corona-Warn-App/src/main/res/layout/include_risk_details_period_logged_progress.xml
index 1fac8333c..23ad95cdd 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_details_period_logged_progress.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_details_period_logged_progress.xml
@@ -47,7 +47,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
- android:text="@{FormatterRiskHelper.formatRiskActiveTracingDaysInRetentionPeriodLogged(tracingViewModel.riskLevel, tracingViewModel.activeTracingDaysInRetentionPeriod)}"
+ android:text="@{FormatterRiskHelper.formatRiskActiveTracingDaysInRetentionPeriodLogged(tracingViewModel.activeTracingDaysInRetentionPeriod)}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/risk_details_behavior_icon"
diff --git a/Corona-Warn-App/src/main/res/layout/include_setting_tracing_period_logged.xml b/Corona-Warn-App/src/main/res/layout/include_setting_tracing_period_logged.xml
index d83e827f5..0d07d89b4 100644
--- a/Corona-Warn-App/src/main/res/layout/include_setting_tracing_period_logged.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_setting_tracing_period_logged.xml
@@ -47,7 +47,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<include
- android:id="@+id/risk_details_behavior_stay_home"
layout="@layout/include_risk_details_period_logged_progress"
android:layout_width="0dp"
android:layout_height="wrap_content"
--
GitLab