diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/RiskLevelRepository.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/RiskLevelRepository.kt
index 61f9627f2b6bf8e2a067026723db217e7e7d3ebe..3b82b42cd28e0b03506e9b770b0f318ca43673cf 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/RiskLevelRepository.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/RiskLevelRepository.kt
@@ -7,9 +7,10 @@ import de.rki.coronawarnapp.risk.RiskLevelConstants
object RiskLevelRepository {
/**
- * LiveData variable that can be consumed in a ViewModel to observe RiskLevel changes
+ * LiveData variables that can be consumed in a ViewModel to observe RiskLevel changes
*/
val riskLevelScore = MutableLiveData(RiskLevelConstants.UNKNOWN_RISK_INITIAL)
+ val riskLevelScoreLastSuccessfulCalculated = MutableLiveData(LocalData.lastSuccessfullyCalculatedRiskLevel().raw)
/**
* Set the new calculated [RiskLevel]
@@ -61,6 +62,7 @@ object RiskLevelRepository {
private fun setLastSuccessfullyCalculatedScore(riskLevel: RiskLevel) {
if (!RiskLevel.UNSUCCESSFUL_RISK_LEVELS.contains(riskLevel)) {
LocalData.lastSuccessfullyCalculatedRiskLevel(riskLevel.raw)
+ riskLevelScoreLastSuccessfulCalculated.postValue(riskLevel.raw)
}
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt
index cba690c3fe4b55a27a20ed3c68a47a1efa739b21..ad8a5d362fc296584c87a942d437928615bd9752 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/TracingViewModel.kt
@@ -32,6 +32,7 @@ class TracingViewModel : ViewModel() {
// TODO: comments for variables
// Values from RiskLevelRepository
val riskLevel: LiveData<Int> = RiskLevelRepository.riskLevelScore
+ val riskLevelScoreLastSuccessfulCalculated = RiskLevelRepository.riskLevelScoreLastSuccessfulCalculated
// Values from ExposureSummaryRepository
val daysSinceLastExposure: LiveData<Int?> = ExposureSummaryRepository.daysSinceLastExposure
@@ -44,9 +45,6 @@ class TracingViewModel : ViewModel() {
val activeTracingDaysInRetentionPeriod = TracingRepository.activeTracingDaysInRetentionPeriod
var isRefreshing: LiveData<Boolean> = TracingRepository.isRefreshing
- // Todo exchange and get real stored risk level
- val savedRiskLevel = 2
-
// Todo exchange and get the real next update date
val nextUpdate = Date()
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 d5c825cb6f4a0e3a7d42923f7cc5da947aae2b6d..0af1aaeb045d49377b6b32bf745ca8c356f170e3 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
@@ -82,21 +82,21 @@ fun formatRiskBody(riskLevelScore: Int?): String {
* the persisted risk level is of importance
*
* @param riskLevelScore
- * @param savedRiskLevelScore
+ * @param riskLevelScoreLastSuccessfulCalculated
* @return
*/
-fun formatRiskSavedRisk(riskLevelScore: Int?, savedRiskLevelScore: Int?): String {
+fun formatRiskSavedRisk(riskLevelScore: Int?, riskLevelScoreLastSuccessfulCalculated: Int?): String {
val appContext = CoronaWarnApplication.getAppContext()
return if (
riskLevelScore == RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF ||
riskLevelScore == RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS
) {
- when (savedRiskLevelScore) {
+ when (riskLevelScoreLastSuccessfulCalculated) {
RiskLevelConstants.LOW_LEVEL_RISK,
RiskLevelConstants.INCREASED_RISK,
RiskLevelConstants.UNKNOWN_RISK_INITIAL ->
appContext.getString(R.string.risk_card_no_calculation_possible_body_saved_risk)
- .format(formatRiskLevelHeadline(savedRiskLevelScore, false))
+ .format(formatRiskLevelHeadline(riskLevelScoreLastSuccessfulCalculated, false))
else -> ""
}
} else {
@@ -195,13 +195,13 @@ fun formatRiskActiveTracingDaysInRetentionPeriod(
* successfully fetched from the server
*
* @param riskLevelScore
- * @param savedRiskLevelScore
+ * @param riskLevelScoreLastSuccessfulCalculated
* @param lastTimeDiagnosisKeysFetched
* @return
*/
fun formatTimeFetched(
riskLevelScore: Int?,
- savedRiskLevelScore: Int?,
+ riskLevelScoreLastSuccessfulCalculated: Int?,
lastTimeDiagnosisKeysFetched: Date?
): String {
val appContext = CoronaWarnApplication.getAppContext()
@@ -221,7 +221,7 @@ fun formatTimeFetched(
}
RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF,
RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS -> {
- when (savedRiskLevelScore) {
+ when (riskLevelScoreLastSuccessfulCalculated) {
RiskLevelConstants.LOW_LEVEL_RISK,
RiskLevelConstants.INCREASED_RISK,
RiskLevelConstants.UNKNOWN_RISK_INITIAL -> {
@@ -272,21 +272,6 @@ fun formatNextUpdate(
}
}
-/**
- * Formats the risk details subtitle text display depending on risk level
- *
- * @param riskLevelScore
- * @return
- */
-fun formatRiskDetailsRiskLevelSubtitle(riskLevelScore: Int?): String {
- val appContext = CoronaWarnApplication.getAppContext()
- return when (riskLevelScore) {
- RiskLevelConstants.LOW_LEVEL_RISK,
- RiskLevelConstants.INCREASED_RISK -> appContext.getString(R.string.risk_details_subtitle_infection_risk_past)
- else -> appContext.getString(R.string.risk_details_subtitle_infection_risk)
- }
-}
-
/**
* Formats the risk details text display for each risk level
*
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt
index 9194931d5c1a9c9d9f038525f79324c52697b092..80c8a4b94798ba34f815da9b6fbcbb5cbb85ffa6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSettingsHelper.kt
@@ -7,6 +7,7 @@ import de.rki.coronawarnapp.CoronaWarnApplication
import de.rki.coronawarnapp.R
/*Texter*/
+
/**
* Formats the text display of settings item status depending on flag provided
*
@@ -34,6 +35,43 @@ fun formatNotificationsStatusText(
): String =
formatStatus((notifications && (notificationsRisk || notificationsTest)))
+/**
+ * Formats the settings notifications title display depending on notifications status
+ *
+ * @param notifications
+ * @return
+ */
+fun formatNotificationsTitle(notifications: Boolean): String = formatText(
+ notifications,
+ R.string.settings_notifications_headline_active,
+ R.string.settings_notifications_headline_inactive
+)
+
+/**
+ * Formats the settings notifications description text display depending on notifications status
+ *
+ * @param notifications
+ * @return
+ */
+fun formatNotificationsDescription(notifications: Boolean): String = formatText(
+ notifications,
+ R.string.settings_notifications_body_active,
+ R.string.settings_notifications_body_inactive
+)
+
+/**
+ * Formats the settings notifications details illustration description depending on notifications status
+ *
+ * @param notifications
+ * @return
+ */
+fun formatNotificationIllustrationText(notifications: Boolean): String =
+ formatText(
+ notifications,
+ R.string.settings_notifications_illustration_description_active,
+ R.string.settings_notifications_illustration_description_inactive
+ )
+
/**
* Change the tracing text in the row based on the tracing status.
*
@@ -78,30 +116,6 @@ fun formatTracingDescription(tracing: Boolean, bluetooth: Boolean, connection: B
}
}
-/**
- * Formats the settings notifications title display depending on notifications status
- *
- * @param notifications
- * @return
- */
-fun formatNotificationsTitle(notifications: Boolean): String = formatText(
- notifications,
- R.string.settings_notifications_headline_active,
- R.string.settings_notifications_headline_inactive
-)
-
-/**
- * Formats the settings notifications description text display depending on notifications status
- *
- * @param notifications
- * @return
- */
-fun formatNotificationsDescription(notifications: Boolean): String = formatText(
- notifications,
- R.string.settings_notifications_body_active,
- R.string.settings_notifications_body_inactive
-)
-
/**
* Formats the tracing body depending on the tracing status and the days since last exposure.
*
@@ -116,19 +130,6 @@ fun formatTracingStatusBody(activeTracingDaysInRetentionPeriod: Long): String {
return resources.getQuantityString(R.plurals.settings_tracing_status_body_active, days, days)
}
-/**
- * Formats the settings notifications details illustration description depending on notifications status
- *
- * @param notifications
- * @return
- */
-fun formatNotificationIllustrationText(notifications: Boolean): String =
- formatText(
- notifications,
- R.string.settings_notifications_illustration_description_active,
- R.string.settings_notifications_illustration_description_inactive
- )
-
/**
* Format the settings tracing content description for the header illustration
*
@@ -157,29 +158,103 @@ fun formatTracingIllustrationText(
}
/*Styler*/
+
/**
- * Formats the settings icon color depending on flag provided
+ * Formats the settings icon color for notifications depending on notification values
*
- * @param active
+ * @param notifications
+ * @param notificationsRisk
+ * @param notificationsTest
* @return Int
*/
-fun formatIconColor(active: Boolean): Int =
- formatColor(active, R.color.settingsIconActive, R.color.settingsIconInactive)
+fun formatNotificationIconColor(
+ notifications: Boolean,
+ notificationsRisk: Boolean,
+ notificationsTest: Boolean
+): Int =
+ formatColor(
+ (notifications && (notificationsRisk || notificationsTest)),
+ R.color.tracingIconActive,
+ R.color.tracingIconInactive
+ )
/**
- * Formats the settings icon color for notifications depending on notification values
+ * Formats settings icon color for notifications depending on notification values
*
* @param notifications
* @param notificationsRisk
* @param notificationsTest
- * @return Int
+ * @return
*/
-fun formatIconColor(
+fun formatNotificationIcon(
notifications: Boolean,
notificationsRisk: Boolean,
notificationsTest: Boolean
-): Int =
- formatIconColor((notifications && (notificationsRisk || notificationsTest)))
+): Drawable? =
+ formatDrawable(
+ (notifications && (notificationsRisk || notificationsTest)),
+ R.drawable.ic_settings_notification_active,
+ R.drawable.ic_settings_notification_inactive
+ )
+
+/**
+ * Formats the settings notifications details illustration depending on notifications status
+ *
+ * @param notifications
+ * @return
+ */
+fun formatNotificationImage(notifications: Boolean): Drawable? =
+ formatDrawable(
+ notifications,
+ R.drawable.ic_settings_illustration_notification_on,
+ R.drawable.ic_settings_illustration_notification_off
+ )
+
+/**
+ * Formats the settings icon color for tracing depending on tracing values
+ *
+ * @param tracing
+ * @param bluetooth
+ * @param connection
+ * @return
+ */
+fun formatSettingsTracingIconColor(tracing: Boolean, bluetooth: Boolean, connection: Boolean): Int {
+ val appContext = CoronaWarnApplication.getAppContext()
+ return when (tracingStatusHelper(tracing, bluetooth, connection)) {
+ TracingStatusHelper.CONNECTION, TracingStatusHelper.BLUETOOTH ->
+ appContext.getColor(R.color.settingsIconInactive)
+ TracingStatusHelper.TRACING_ACTIVE ->
+ appContext.getColor(R.color.tracingIconActive)
+ TracingStatusHelper.TRACING_INACTIVE ->
+ appContext.getColor(R.color.tracingIconInactive)
+ else -> appContext.getColor(R.color.tracingIconInactive)
+ }
+}
+
+/**
+ * Formats the settings icon for tracing depending on tracing values
+ *
+ * @param tracing
+ * @param bluetooth
+ * @param connection
+ * @return
+ */
+fun formatSettingsTracingIcon(
+ tracing: Boolean,
+ bluetooth: Boolean,
+ connection: Boolean
+): Drawable? {
+ val appContext = CoronaWarnApplication.getAppContext()
+ return when (tracingStatusHelper(tracing, bluetooth, connection)) {
+ TracingStatusHelper.CONNECTION,
+ TracingStatusHelper.BLUETOOTH,
+ TracingStatusHelper.TRACING_ACTIVE ->
+ appContext.getDrawable(R.drawable.ic_settings_tracing_active)
+ TracingStatusHelper.TRACING_INACTIVE ->
+ appContext.getDrawable(R.drawable.ic_settings_tracing_inactive)
+ else -> appContext.getDrawable(R.drawable.ic_settings_tracing_inactive)
+ }
+}
/**
* Formats the tracing switch status based on the tracing status
@@ -330,16 +405,3 @@ fun formatTracingStatusVisibilityTracing(
tracingStatus == TracingStatusHelper.TRACING_INACTIVE
)
}
-
-/**
- * Formats the settings notifications details illustration depending on notifications status
- *
- * @param notifications
- * @return
- */
-fun formatNotificationImage(notifications: Boolean): Drawable? =
- formatDrawable(
- notifications,
- R.drawable.ic_settings_illustration_notification_on,
- R.drawable.ic_settings_illustration_notification_off
- )
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_notification_active.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_notification_active.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a989615c231c44f67924b5cf06b03608b3a2337
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_notification_active.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M20,10C19.172,10 18.5,10.672 18.5,11.5L18.5,12.1953C15.9132,12.8621 14,15.2048 14,18L14,24L12,26L12,27L18.2695,27C18.0934,27.3039 18.0005,27.6488 18,28C18,29.1046 18.8954,30 20,30C21.1046,30 22,29.1046 22,28C21.9989,27.6486 21.9053,27.3037 21.7285,27L28,27L28,26L26,24L26,18C26,15.2048 24.0868,12.8621 21.5,12.1953L21.5,11.5C21.5,10.672 20.828,10 20,10ZM20,14C22.206,14 24,15.794 24,18L24,24L24,24.8281L24.1719,25L15.8281,25L16,24.8281L16,24L16,18C16,15.794 17.794,14 20,14Z"
+ android:strokeWidth="1"
+ android:fillColor="#007FAD"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_notification_inactive.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_notification_inactive.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4285730c936c7ebb30cacaee64f445d5236d2b82
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_notification_inactive.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="40dp"
+ android:height="41dp"
+ android:viewportWidth="40"
+ android:viewportHeight="41">
+ <path
+ android:pathData="M14.2583,16.2546L15.9991,17.995L16,24.8281L15.8281,25L23.0031,25L25.0031,27L21.7285,27C21.8758,27.2531 21.9654,27.5348 21.9918,27.825L22,28C22,29.1046 21.1046,30 20,30C18.8954,30 18,29.1046 18,28C18.0005,27.6488 18.0934,27.3039 18.2695,27L18.2695,27L12,27L12,26L14,24L14,18C14,17.3927 14.0903,16.8067 14.2583,16.2546ZM12.7856,11.7951L12.8521,11.8538L28.1462,27.1479C28.4219,27.4236 28.4219,27.8705 28.1462,28.1462C27.8917,28.4007 27.4913,28.4202 27.2144,28.2049L27.1479,28.1462L11.8538,12.8521C11.5781,12.5764 11.5781,12.1295 11.8538,11.8538C12.1083,11.5993 12.5087,11.5798 12.7856,11.7951ZM20,10C20.828,10 21.5,10.672 21.5,11.5L21.5,11.5L21.5,12.1953C24.0868,12.8621 26,15.2048 26,18L26,18L26,24L28,26L27.9991,26.002L23.9991,22.002L24,18C24,15.8608 22.3131,14.1091 20.1994,14.0049L20,14C18.896,14 17.8952,14.4493 17.1708,15.1747L15.7578,13.7618C16.5042,13.0167 17.4462,12.4669 18.5,12.1953L18.5,12.1953L18.5,11.5C18.5,10.672 19.172,10 20,10Z"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_reset_circle.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_reset_circle.xml
index b9f5b384bcc063b20c4113eab431cc658c593699..0bfe1b0a09bed9946c4aa45bc84060c01eaa5286 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_settings_reset_circle.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_reset_circle.xml
@@ -1,28 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:fillAlpha="0.14092727"
- android:fillColor="#95B9CB"
- android:fillType="evenOdd"
- android:pathData="M3.6247,3.6245L8.5508,8.5516C7.6686,9.4342 7.1229,10.6533 7.1229,11.9998C7.1229,13.3114 7.6421,14.5391 8.5512,15.4483L8.5522,15.4493L3.6245,20.3755C1.5605,18.3107 0.2549,15.4886 0.161,12.3619L0.1555,11.9998C0.1555,8.729 1.4813,5.7679 3.6247,3.6245ZM20.3753,3.6245C22.5187,5.7679 23.8445,8.729 23.8445,11.9998C23.8445,15.2705 22.5187,18.2317 20.3753,20.3751L15.4481,15.4489C16.331,14.5663 16.8771,13.3468 16.8771,11.9998C16.8771,10.6533 16.3314,9.4342 15.4492,8.5516Z"
- android:strokeWidth="1"
- android:strokeAlpha="0.14092727"
- android:strokeColor="#00000000" />
- <path
- android:fillAlpha="0.36"
- android:fillColor="#95B9CB"
- android:fillType="evenOdd"
- android:pathData="M5.5954,5.5952L8.5508,8.5517C7.6686,9.4343 7.1229,10.6533 7.1229,11.9999C7.1229,13.3115 7.6421,14.5392 8.5512,15.4484C8.5515,15.4487 8.5519,15.449 8.5522,15.4493L5.5955,18.4042C4.0274,16.8364 3.0318,14.6966 2.9482,12.3247L2.9425,11.9999C2.9425,9.4987 3.9563,7.2343 5.5954,5.5952ZM18.4046,5.5952C20.0437,7.2343 21.0575,9.4987 21.0575,11.9999C21.0575,14.501 20.0437,16.7654 18.4046,18.4045L15.4481,15.449C16.331,14.5664 16.8771,13.3469 16.8771,11.9999C16.8771,10.6533 16.3314,9.4343 15.4492,8.5517Z"
- android:strokeWidth="1"
- android:strokeAlpha="0.36"
- android:strokeColor="#00000000" />
- <path
- android:fillColor="#007FAD"
- android:fillType="nonZero"
- android:pathData="M12,5.7293C8.5368,5.7293 5.7294,8.5367 5.7294,11.9999C5.7294,13.6849 6.398,15.2657 7.5658,16.4336C8.7338,17.6017 10.3148,18.2704 12,18.2704C15.4632,18.2704 18.2706,15.463 18.2706,11.9999C18.2706,8.5367 15.4632,5.7293 12,5.7293ZM12,7.1227C14.6936,7.1227 16.8771,9.3063 16.8771,11.9999C16.8771,14.6934 14.6936,16.877 12,16.877C10.6882,16.877 9.4604,16.3576 8.5512,15.4484C7.6421,14.5392 7.1229,13.3115 7.1229,11.9999C7.1229,9.3063 9.3064,7.1227 12,7.1227Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M20,0L20,0A20,20 0,0 1,40 20L40,20A20,20 0,0 1,20 40L20,40A20,20 0,0 1,0 20L0,20A20,20 0,0 1,20 0z"
+ android:strokeWidth="1"
+ android:fillColor="#FFFFFF"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M11.5147,11.5007L12.513,12.499C10.5969,14.4151 9.4118,17.0622 9.4118,19.9861C9.4118,22.7197 10.4506,25.2854 12.2799,27.2326L12.5127,27.4727L11.5143,28.4709C9.343,26.2994 8,23.2995 8,19.986C8,16.6723 9.3431,13.6723 11.5147,11.5007ZM28.4853,11.5007C30.6569,13.6723 32,16.6723 32,19.986C32,23.2994 30.6571,26.2992 28.4858,28.4708L27.487,27.4731C29.4031,25.557 30.5882,22.9099 30.5882,19.9861C30.5882,17.0622 29.4031,14.4151 27.487,12.499Z"
+ android:strokeAlpha="0.24"
+ android:strokeWidth="1"
+ android:fillColor="#95B9CB"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.24"/>
+ <path
+ android:pathData="M26.4882,13.4968C28.1492,15.1575 29.1765,17.4518 29.1765,19.9861C29.1765,22.5203 28.1492,24.8146 26.4882,26.4753L25.4905,25.4765C26.8956,24.0714 27.7647,22.1302 27.7647,19.9861C27.7647,17.8419 26.8956,15.9007 25.4905,14.4956ZM13.5118,13.4968L14.5095,14.4956C13.1044,15.9007 12.2353,17.8419 12.2353,19.9861C12.2353,21.9699 12.9813,23.833 14.2969,25.2554L14.5093,25.4763L13.511,26.4745C11.8505,24.8139 10.8235,22.5199 10.8235,19.9861C10.8235,17.4518 11.8508,15.1575 13.5118,13.4968Z"
+ android:strokeAlpha="0.6"
+ android:strokeWidth="1"
+ android:fillColor="#95B9CB"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.6"/>
+ <path
+ android:pathData="M20,13.6331C16.4914,13.6331 13.6471,16.4774 13.6471,19.9861C13.6471,21.6932 14.3245,23.2948 15.5076,24.4781C16.6909,25.6614 18.2927,26.339 20,26.339C23.5086,26.339 26.3529,23.4947 26.3529,19.9861C26.3529,16.4774 23.5086,13.6331 20,13.6331ZM20,15.4379C22.5118,15.4379 24.5481,17.4742 24.5481,19.9861C24.5481,22.4979 22.5118,24.5342 20,24.5342C18.7767,24.5342 17.6317,24.0498 16.7839,23.2019C15.9361,22.3541 15.4519,21.2092 15.4519,19.9861C15.4519,17.4742 17.4882,15.4379 20,15.4379Z"
+ android:strokeWidth="1"
+ android:fillColor="#007FAD"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_active.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_active.xml
index b543f752ee6fa141e8d7bcac157cbc52cb35f10e..d8f8b595c8b18a4398b324004516890311ea78b9 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_active.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_active.xml
@@ -3,26 +3,26 @@
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
- <path
- android:fillAlpha="0.14092727"
- android:fillColor="#95B9CB"
- android:fillType="evenOdd"
- android:pathData="M7.9792,7.9791L15.0503,15.0502C13.7835,16.3169 13,18.0669 13,19.9999C13,21.7779 13.6647,23.4484 14.8378,24.7278L15.05,24.9494C15.0504,24.9498 15.0507,24.9501 15.051,24.9504L7.979,32.0211C4.9958,29.0371 3.1164,24.9505 3.0052,20.4254L3,19.9999C3,15.3055 4.9028,11.0555 7.9792,7.9791ZM32.0208,7.9791C35.0972,11.0555 37,15.3055 37,19.9999C37,24.6943 35.0972,28.9443 32.0208,32.0207L24.9497,24.9497C26.2165,23.6829 27,21.9329 27,19.9999C27,18.0674 26.2169,16.3178 24.9507,15.0511Z"
- android:strokeWidth="1"
- android:strokeAlpha="0.14092727"
- android:strokeColor="#00000000" />
- <path
- android:fillAlpha="0.36"
- android:fillColor="#95B9CB"
- android:fillType="evenOdd"
- android:pathData="M10.8076,10.8076L15.0503,15.0503C13.7835,16.317 13,18.067 13,20C13,21.8826 13.7452,23.6446 15.05,24.9495C15.0504,24.9499 15.0507,24.9502 15.051,24.9505L10.808,29.1926C8.5389,26.9235 7.1051,23.8206 7.0055,20.3833L7,20C7,16.4101 8.4551,13.1601 10.8076,10.8076ZM29.1934,10.8086C31.5453,13.1611 33,16.4107 33,20C33,23.5899 31.5449,26.8399 29.1924,29.1924L24.9497,24.9497C26.2165,23.683 27,21.933 27,20C27,18.0675 26.2169,16.3179 24.9507,15.0512Z"
- android:strokeWidth="1"
- android:strokeAlpha="0.36"
- android:strokeColor="#00000000" />
- <path
- android:fillColor="#007FAD"
- android:fillType="nonZero"
- android:pathData="M20,11C15.0294,11 11,15.0294 11,20C11,22.4184 11.9596,24.6874 13.6358,26.3637C15.3121,28.0401 17.5813,29 20,29C24.9706,29 29,24.9706 29,20C29,15.0294 24.9706,11 20,11ZM20,13C23.866,13 27,16.134 27,20C27,23.866 23.866,27 20,27C18.1172,27 16.355,26.2546 15.05,24.9495C13.7452,23.6446 13,21.8826 13,20C13,16.134 16.134,13 20,13Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ <path
+ android:pathData="M7.9802,7.9781L9.3939,9.3929C6.6791,12.1074 5,15.8576 5,20C5,24.0341 6.5969,27.8099 9.3929,30.6061C9.3933,30.6065 9.3936,30.6068 9.3939,30.6071L7.979,32.0211C4.9958,29.0371 3.1164,24.9505 3.0052,20.4254L3,19.9999C3,15.305 4.9032,11.0546 7.9802,7.9781ZM32.0208,7.9791C35.0972,11.0555 37,15.3055 37,19.9999C37,24.6943 35.0972,28.9443 32.0208,32.0207L30.6066,30.6066C33.3211,27.8921 35,24.1421 35,20C35,15.8581 33.3213,12.1083 30.6071,9.3939Z"
+ android:strokeAlpha="0.24"
+ android:strokeWidth="1"
+ android:fillColor="#95B9CB"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.24"/>
+ <path
+ android:pathData="M10.8076,10.8076L12.2218,12.2218C10.2312,14.2124 9,16.9624 9,20C9,22.84 10.0793,25.5054 11.9797,27.5284L12.2215,27.7778C12.2218,27.7782 12.2221,27.7785 12.2225,27.7788L10.808,29.1926C8.5389,26.9235 7.1051,23.8206 7.0055,20.3833L7,20C7,16.4101 8.4551,13.1601 10.8076,10.8076ZM29.1934,10.8086C31.5453,13.1611 33,16.4107 33,20C33,23.5899 31.5449,26.8399 29.1924,29.1924L27.7782,27.7782C29.7688,25.7876 31,23.0376 31,20C31,16.9629 29.7692,14.2134 27.7792,12.2228Z"
+ android:strokeAlpha="0.6"
+ android:strokeWidth="1"
+ android:fillColor="#95B9CB"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.6"/>
+ <path
+ android:pathData="M20,11C15.0294,11 11,15.0294 11,20C11,22.4184 11.9596,24.6874 13.6358,26.3637C15.3121,28.0401 17.5813,29 20,29C24.9706,29 29,24.9706 29,20C29,15.0294 24.9706,11 20,11ZM20,13C23.866,13 27,16.134 27,20C27,23.866 23.866,27 20,27C18.1172,27 16.355,26.2546 15.05,24.9495C13.7452,23.6446 13,21.8826 13,20C13,16.134 16.134,13 20,13Z"
+ android:strokeWidth="1"
+ android:fillColor="#007FAD"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_bluetooth.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_bluetooth.xml
index 66c42c5e858be53b624901794abfc46536214256..5100ec034f130dc16953fc08d6ae86f5ab20560c 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_bluetooth.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_bluetooth.xml
@@ -1,12 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="42dp"
- android:height="42dp"
- android:viewportWidth="42"
- android:viewportHeight="42">
- <path
- android:fillColor="#0071F0"
- android:fillType="evenOdd"
- android:pathData="M21,1C32.0457,1 41,9.9543 41,21C41,32.0457 32.0457,41 21,41C9.9543,41 1,32.0457 1,21C1,9.9543 9.9543,1 21,1ZM20.2935,10.586L20.2935,18.586L16.7245,15.016L15.3105,16.431L19.8795,21L15.2925,25.587L16.7065,27.001L20.2935,23.414L20.2935,31.414L26.7075,25L22.7075,21L26.7075,17L20.2935,10.586ZM22.2935,23.414L23.8795,25L22.2935,26.586L22.2935,23.414ZM22.2935,15.414L23.8795,17L22.2935,18.586L22.2935,15.414Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M20,0L20,0A20,20 0,0 1,40 20L40,20A20,20 0,0 1,20 40L20,40A20,20 0,0 1,0 20L0,20A20,20 0,0 1,20 0z"
+ android:strokeWidth="1"
+ android:fillColor="#0071F0"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M25.7075,16L19.2935,9.586L19.2935,17.586L19.2935,17.586L15.7245,14.016L14.3105,15.431L18.8795,20L14.2925,24.587L15.7065,26.001L19.2935,22.414L19.2935,30.414L25.7075,24L21.7075,20L25.7075,16ZM21.2935,14.414L22.8795,16L21.2935,17.586L21.2935,14.414ZM21.2935,25.586L21.2935,22.414L22.8795,24L21.2935,25.586Z"
+ android:strokeWidth="1"
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_bluetooth_inactive.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_bluetooth_inactive.xml
index c241107eb76957afb13f01a7b8c18e286b6f3445..5669ab489f49d42d14b663750ebd9e62594962d4 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_bluetooth_inactive.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_bluetooth_inactive.xml
@@ -1,12 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="22dp"
- android:height="22dp"
- android:viewportWidth="22"
- android:viewportHeight="22">
- <path
- android:fillColor="#C00F2D"
- android:fillType="nonZero"
- android:pathData="M2.414,1.43L8.566,7.583L8.5655,7.5846L12.397,11.412L12.397,11.414L20.4068,19.4179L18.9816,20.8458L14.9877,16.8581L9.983,21.828L9.983,13.828L6.396,17.415L4.982,16.001L9.569,11.414L1,2.845L2.414,1.43ZM11.983,13.828L11.983,17L13.569,15.414L11.983,13.828ZM9.983,1L16.397,7.414L13.8225,9.9885L13.812,9.998L12.236,8.44L12.3872,8.5875L13.569,7.414L11.983,5.828L11.983,8.19L9.982,6.212L9.983,1Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ android:width="41dp"
+ android:height="40dp"
+ android:viewportWidth="41"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M11.914,10.2096L18.066,16.3626L18.0655,16.3642L21.897,20.1916L21.897,20.1936L29.9068,28.1975L28.4816,29.6254L24.4877,25.6377L19.483,30.6076L19.483,22.6076L15.896,26.1946L14.482,24.7806L19.069,20.1936L10.5,11.6246L11.914,10.2096ZM21.483,22.6076L21.483,25.7796L23.069,24.1936L21.483,22.6076ZM19.483,9.7796L25.897,16.1936L23.3225,18.7681L23.312,18.7776L21.736,17.2196L21.8872,17.3671L23.069,16.1936L21.483,14.6076L21.483,16.9696L19.482,14.9916L19.483,9.7796Z"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_connection.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_connection.xml
index 734f6ebf89019f28d5932e16337d0cb03f7bc0d4..85e7eb1cc86ecf5bdcf84712f374eefbd83898f7 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_connection.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_connection.xml
@@ -1,12 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="42dp"
- android:height="42dp"
- android:viewportWidth="42"
- android:viewportHeight="42">
- <path
- android:fillColor="#0071F0"
- android:fillType="evenOdd"
- android:pathData="M21,1C32.0457,1 41,9.9543 41,21C41,32.0457 32.0457,41 21,41C9.9543,41 1,32.0457 1,21C1,9.9543 9.9543,1 21,1ZM21.001,23.5C19.601,23.5 18.3159,23.987 17.2939,24.793L21.001,28.5L24.708,24.793C23.686,23.987 22.401,23.5 21.001,23.5ZM21.001,18.5C18.222,18.5 15.688,19.543 13.749,21.248L15.8701,23.3691C17.2611,22.2041 19.05,21.5 21.001,21.5C22.952,21.5 24.7418,22.2031 26.1318,23.3691L28.251,21.25C26.313,19.544 23.78,18.5 21.001,18.5ZM21.001,13.5C16.859,13.5 13.1086,15.1786 10.3936,17.8926L12.3369,19.8359C14.6399,17.7699 17.671,16.5 21.001,16.5C24.331,16.5 27.363,17.7689 29.665,19.8359L31.6064,17.8945C28.8924,15.1795 25.143,13.5 21.001,13.5Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ android:width="40dp"
+ android:height="40dp"
+ android:viewportWidth="40"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M20,0L20,0A20,20 0,0 1,40 20L40,20A20,20 0,0 1,20 40L20,40A20,20 0,0 1,0 20L0,20A20,20 0,0 1,20 0z"
+ android:strokeWidth="1"
+ android:fillColor="#2296F3"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M20.001,12.5C15.859,12.5 12.1086,14.1786 9.3936,16.8926L11.3369,18.8359C13.6399,16.7699 16.671,15.5 20.001,15.5C23.331,15.5 26.363,16.7689 28.665,18.8359L30.6064,16.8945C27.8924,14.1795 24.143,12.5 20.001,12.5ZM20.001,17.5C17.222,17.5 14.688,18.543 12.749,20.248L14.8701,22.3691C16.2611,21.2041 18.05,20.5 20.001,20.5C21.952,20.5 23.7418,21.2031 25.1318,22.3691L27.251,20.25C25.313,18.544 22.78,17.5 20.001,17.5ZM20.001,22.5C18.601,22.5 17.3159,22.987 16.2939,23.793L20.001,27.5L23.708,23.793C22.686,22.987 21.401,22.5 20.001,22.5Z"
+ android:strokeWidth="1"
+ android:fillColor="#FFFFFF"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_connection_inactive.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_connection_inactive.xml
index 42e277ea0e266a85f70005a7b0bc11f8a8f332d9..5bcad91c3635d6c617513a06b444a985d097c9ec 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_connection_inactive.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_connection_inactive.xml
@@ -1,12 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="21dp"
- android:height="21dp"
- android:viewportWidth="21"
- android:viewportHeight="21">
- <path
- android:fillColor="#C00F2D"
- android:fillType="nonZero"
- android:pathData="M2.3145,1L0.9004,2.4141L3.8262,5.3398C2.4087,6.0602 1.1139,6.9866 0,8.0996L1.9434,10.043C3.1338,8.9748 4.5264,8.1366 6.0469,7.5605L7.623,9.1367C6.0257,9.5901 4.5707,10.3863 3.3555,11.4551L5.4766,13.5762C6.7722,12.4911 8.4155,11.8135 10.2109,11.7246L12.5137,14.0273C11.9142,13.8243 11.275,13.707 10.6074,13.707C9.2074,13.707 7.9224,14.194 6.9004,15L10.6074,18.707L13.9004,15.4141L18.9004,20.4141L20.3145,19L2.3145,1ZM10.6074,3.707C9.7544,3.707 8.9244,3.7946 8.1094,3.9316L10.8965,6.7207C14.1115,6.7927 17.0365,8.037 19.2715,10.043L21.2129,8.1016C18.4989,5.3866 14.7494,3.707 10.6074,3.707ZM13.209,9.0313L16.7461,12.5684L17.8574,11.457C16.5454,10.302 14.958,9.4602 13.209,9.0313Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ android:width="41dp"
+ android:height="40dp"
+ android:viewportWidth="41"
+ android:viewportHeight="40">
+ <path
+ android:pathData="M12.208,10.293L10.7939,11.707L13.7197,14.6328C12.3022,15.3532 11.0074,16.2795 9.8936,17.3926L11.8369,19.3359C13.0273,18.2677 14.42,17.4296 15.9404,16.8535L17.5166,18.4297C15.9193,18.883 14.4643,19.6793 13.249,20.748L15.3701,22.8691C16.6657,21.784 18.309,21.1064 20.1045,21.0176L22.4072,23.3203C21.8077,23.1173 21.1686,23 20.501,23C19.101,23 17.8159,23.487 16.7939,24.293L20.501,28L23.7939,24.707L28.7939,29.707L30.208,28.293L12.208,10.293ZM20.501,13C19.648,13 18.8179,13.0876 18.0029,13.2246L20.79,16.0137C24.005,16.0857 26.93,17.3299 29.165,19.3359L31.1064,17.3945C28.3924,14.6795 24.643,13 20.501,13ZM23.1025,18.3242L26.6396,21.8613L27.751,20.75C26.439,19.595 24.8515,18.7532 23.1025,18.3242Z"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
</vector>
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive.xml b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive.xml
index 947c3ba9c57cf98b403bca79d24da9ad444fbf77..58dd5566f9821a96cbd275c76088e6d609653abb 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_settings_tracing_inactive.xml
@@ -3,26 +3,26 @@
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
- <path
- android:fillAlpha="0.12"
- android:fillColor="#C00F2D"
- android:fillType="evenOdd"
- android:pathData="M7.9792,7.9791L10.5233,10.5233C9.7422,11.3043 9.7422,12.5707 10.5233,13.3517L10.5233,13.3517L13.8414,16.6696C13.3048,17.66 13,18.7943 13,19.9999C13,21.7779 13.6647,23.4484 14.8378,24.7278L15.05,24.9494C15.0504,24.9498 15.0507,24.9501 15.051,24.9504L7.979,32.0211C4.9958,29.0371 3.1164,24.9505 3.0052,20.4254L3,19.9999C3,15.3055 4.9028,11.0555 7.9792,7.9791ZM32.0208,7.9791C35.0972,11.0555 37,15.3055 37,19.9999C37,24.6943 35.0972,28.9443 32.0208,32.0207L29.4767,29.4767C30.2578,28.6957 30.2578,27.4293 29.4767,26.6483L29.4767,26.6483L26.158,23.3312C26.695,22.3406 27,21.2059 27,19.9999C27,18.0674 26.2169,16.3178 24.9507,15.0511Z"
- android:strokeWidth="1"
- android:strokeAlpha="0.12"
- android:strokeColor="#00000000" />
- <path
- android:fillAlpha="0.28"
- android:fillColor="#C00F2D"
- android:fillType="evenOdd"
- android:pathData="M9.9456,11.7571C9.8943,12.3273 10.0868,12.9153 10.5233,13.3517L10.5233,13.3517L13.8414,16.6697C13.3048,17.6601 13,18.7944 13,20C13,21.8826 13.7452,23.6446 15.05,24.9495C15.0504,24.9499 15.0507,24.9502 15.051,24.9505L10.808,29.1926C8.5389,26.9235 7.1051,23.8206 7.0055,20.3833L7,20C7,16.923 8.069,14.0957 9.856,11.8692ZM29.1924,10.8076C31.5449,13.1601 33,16.4101 33,20C33,23.1288 31.8947,25.9994 30.0533,28.2427C30.1056,27.6725 29.9131,27.0846 29.4767,26.6483L29.4767,26.6483L26.1586,23.3303C26.6952,22.3399 27,21.2056 27,20C27,18.0675 26.2169,16.3179 24.9507,15.0512Z"
- android:strokeWidth="1"
- android:strokeAlpha="0.28"
- android:strokeColor="#00000000" />
- <path
- android:fillColor="#C00F2D"
- android:fillType="nonZero"
- android:pathData="M12.3804,15.208L13.8411,16.6703C13.3046,17.6605 13,18.7947 13,20C13,21.8826 13.7452,23.6446 15.05,24.9495C16.355,26.2546 18.1172,27 20,27C21.2053,27 22.3395,26.6954 23.3297,26.1589L24.791,27.6202C23.4037,28.4943 21.7609,29 20,29C17.5813,29 15.3121,28.0401 13.6358,26.3637C11.9596,24.6874 11,22.4184 11,20C11,18.2387 11.506,16.5955 12.3804,15.208ZM12.5504,11.1472L12.6446,11.2304L28.6446,27.2304C29.0351,27.6209 29.0351,28.2541 28.6446,28.6446C28.2841,29.0051 27.7169,29.0328 27.3246,28.7278L27.2304,28.6446L11.2304,12.6446C10.8399,12.2541 10.8399,11.6209 11.2304,11.2304C11.5909,10.8699 12.1581,10.8422 12.5504,11.1472ZM20,11C24.9706,11 29,15.0294 29,20C29,21.7609 28.4943,23.4037 27.6202,24.791L26.1589,23.3297C26.6954,22.3395 27,21.2053 27,20C27,16.134 23.866,13 20,13C18.7947,13 17.6605,13.3046 16.6703,13.8411L15.208,12.3804C16.5955,11.506 18.2387,11 20,11Z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
+ <path
+ android:pathData="M7.9802,7.9781L9.3939,9.3929C6.6791,12.1074 5,15.8576 5,20C5,24.0341 6.5969,27.8099 9.3929,30.6061C9.3933,30.6065 9.3936,30.6068 9.3939,30.6071L7.979,32.0211C4.9958,29.0371 3.1164,24.9505 3.0052,20.4254L3,19.9999C3,15.305 4.9032,11.0546 7.9802,7.9781ZM32.0208,7.9791C35.0972,11.0555 37,15.3055 37,19.9999C37,24.6943 35.0972,28.9443 32.0208,32.0207L30.6066,30.6066C33.3211,27.8921 35,24.1421 35,20C35,15.8581 33.3213,12.1083 30.6071,9.3939Z"
+ android:strokeAlpha="0.12"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.12"/>
+ <path
+ android:pathData="M9.0937,12.9225L10.5452,14.3747C9.5638,16.0206 9,17.9445 9,20C9,22.84 10.0793,25.5054 11.9797,27.5284L12.2215,27.7778C12.2218,27.7782 12.2221,27.7785 12.2225,27.7788L10.808,29.1926C8.5389,26.9235 7.1051,23.8206 7.0055,20.3833L7,20C7,17.3897 7.7694,14.959 9.0937,12.9225ZM29.1924,10.8076C31.5449,13.1601 33,16.4101 33,20C33,22.6103 32.2306,25.041 30.9063,27.0775L29.4545,25.6257C30.4361,23.9797 31,22.0557 31,20C31,16.9629 29.7692,14.2134 27.7792,12.2228Z"
+ android:strokeAlpha="0.28"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="evenOdd"
+ android:strokeColor="#00000000"
+ android:fillAlpha="0.28"/>
+ <path
+ android:pathData="M12.5504,11.1472L12.6446,11.2304L28.6446,27.2304C29.0351,27.6209 29.0351,28.2541 28.6446,28.6446C28.2841,29.0051 27.7169,29.0328 27.3246,28.7278L27.2304,28.6446L25.6172,27.0323C24.0776,28.2637 22.1248,29 20,29C17.5813,29 15.3121,28.0401 13.6358,26.3637C11.9596,24.6874 11,22.4184 11,20C11,17.8752 11.7363,15.9224 12.9677,14.3828L11.2304,12.6446C10.8399,12.2541 10.8399,11.6209 11.2304,11.2304C11.5909,10.8699 12.1581,10.8422 12.5504,11.1472ZM14.3933,15.8083C13.5183,16.9768 13,18.4279 13,20C13,21.8826 13.7452,23.6446 15.05,24.9495C16.355,26.2546 18.1172,27 20,27C21.5721,27 23.0232,26.4817 24.1917,25.6067ZM20,11C24.9706,11 29,15.0294 29,20C29,21.4993 28.6334,22.913 27.9849,24.1563L26.4806,22.6511C26.8154,21.8334 27,20.9383 27,20C27,16.134 23.866,13 20,13C19.0617,13 18.1666,13.1846 17.3489,13.5194L15.8437,12.0151C17.087,11.3666 18.5007,11 20,11Z"
+ android:strokeWidth="1"
+ android:fillColor="#C00F2D"
+ android:fillType="nonZero"
+ android:strokeColor="#00000000"/>
</vector>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information.xml b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
index 5c8d871ef9284aae09b3ec5d5b39c57426848484..da08ae6e6ea78c7906618762bfef64f31a23aad0 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
@@ -111,7 +111,7 @@
<TextView
android:id="@+id/information_version"
- style="@style/textMultiline"
+ style="@style/body2Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
index 707b00daa06e77937dc352153247ad5ef0053293..61e087242eef80317df5c73fd162136f0b335a7a 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
@@ -46,7 +46,7 @@
<TextView
android:id="@+id/information_about_body_emphasized"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
@@ -57,7 +57,7 @@
<TextView
android:id="@+id/information_about_body"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
index 8e84d3badd74f2bc5d0add8a2347ee7dfb318f50..c11640c3c59c0484c59af41225c390932f279ef2 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
@@ -57,7 +57,7 @@
<TextView
android:id="@+id/information_contact_subtitle_phone"
- style="@style/textLargeEmphasized"
+ style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
@@ -78,6 +78,7 @@
<TextView
android:id="@+id/information_contact_body_phone"
+ style="@style/body2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/information_contact_body_phone"
@@ -87,6 +88,7 @@
<TextView
android:id="@+id/information_contact_body_open"
+ style="@style/body2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -97,6 +99,7 @@
<TextView
android:id="@+id/information_contact_body_other"
+ style="@style/body2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main.xml b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
index c1c6d292abdb9cbbb7a1f485fb5098ee935908b5..22d3ea2f87ee6b5acbf241fb0efbf28706267e1c 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
@@ -92,7 +92,7 @@
<TextView
android:id="@+id/main_tracing_headline"
- style="@style/textLargeEmphasized"
+ style="@style/bodyButton"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{FormatterSettingsHelper.formatTracingDescription(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml b/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
index 4bc3d8aef383c86ed2f4186a6e96c8001951f63b..de2d830e42092e68974fe63c610d10bd98286744 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main_overview.xml
@@ -23,7 +23,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
- app:layout_constraintBottom_toBottomOf="@+id/guideline_bottom"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_overview_header">
@@ -80,7 +80,7 @@
app:layout_constraintTop_toBottomOf="@+id/main_overview_risk">
<TextView
- style="@style/textLargeEmphasized"
+ style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_body_title"
@@ -96,7 +96,7 @@
layout="@layout/include_row"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
+ android:layout_marginTop="@dimen/spacing_small"
app:iconStart="@{@drawable/ic_main_overview_circle}"
app:iconTint="@{@color/colorRiskCardIncreasedRisk}"
app:layout_constraintEnd_toEndOf="parent"
@@ -152,93 +152,101 @@
app:layout_constraintTop_toBottomOf="@id/main_overview_test" />
<androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/main_overview_glossary_headline"
- style="@style/row"
- android:layout_width="0dp"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_small"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
+ android:background="@color/colorSurface2"
app:layout_constraintTop_toBottomOf="@+id/main_overview_divider">
- <TextView
- style="@style/textLargeEmphasized"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/main_overview_glossary_headline"
+ style="@style/row"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/guideline_body_title"
- android:text="@string/main_overview_headline_glossary"
+ android:paddingTop="@dimen/spacing_small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
+ app:layout_constraintTop_toTopOf="parent">
+
+ <TextView
+ style="@style/headline5"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/guideline_body_title"
+ android:text="@string/main_overview_headline_glossary"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <include
+ android:id="@+id/main_overview_glossary_tracing"
+ layout="@layout/include_main_overview_glossary"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:body="@{@string/main_overview_body_glossary_tracing}"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_headline"
+ app:subtitle="@{@string/main_overview_subtitle_glossary_tracing}" />
- <include
- android:id="@+id/main_overview_glossary_tracing"
- layout="@layout/include_main_overview_glossary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:body="@{@string/main_overview_body_glossary_tracing}"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_headline"
- app:subtitle="@{@string/main_overview_subtitle_glossary_tracing}" />
+ <include
+ android:id="@+id/main_overview_glossary_calculation"
+ layout="@layout/include_main_overview_glossary"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:body="@{@string/main_overview_body_glossary_calculation}"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_tracing"
+ app:subtitle="@{@string/main_overview_subtitle_glossary_calculation}" />
- <include
- android:id="@+id/main_overview_glossary_calculation"
- layout="@layout/include_main_overview_glossary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:body="@{@string/main_overview_body_glossary_calculation}"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_tracing"
- app:subtitle="@{@string/main_overview_subtitle_glossary_calculation}" />
+ <include
+ android:id="@+id/main_overview_glossary_contact"
+ layout="@layout/include_main_overview_glossary"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:body="@{@string/main_overview_body_glossary_contact}"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_calculation"
+ app:subtitle="@{@string/main_overview_subtitle_glossary_contact}" />
- <include
- android:id="@+id/main_overview_glossary_contact"
- layout="@layout/include_main_overview_glossary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:body="@{@string/main_overview_body_glossary_contact}"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_calculation"
- app:subtitle="@{@string/main_overview_subtitle_glossary_contact}" />
+ <include
+ android:id="@+id/main_overview_glossary_notification"
+ layout="@layout/include_main_overview_glossary"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:body="@{@string/main_overview_body_glossary_notification}"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_contact"
+ app:subtitle="@{@string/main_overview_subtitle_glossary_notification}" />
- <include
- android:id="@+id/main_overview_glossary_notification"
- layout="@layout/include_main_overview_glossary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:body="@{@string/main_overview_body_glossary_notification}"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_contact"
- app:subtitle="@{@string/main_overview_subtitle_glossary_notification}" />
+ <include
+ android:id="@+id/main_overview_glossary_keys"
+ layout="@layout/include_main_overview_glossary"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ app:body="@{@string/main_overview_body_glossary_keys}"
+ app:layout_constraintBottom_toBottomOf="@+id/guideline_bottom"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_notification"
+ app:subtitle="@{@string/main_overview_subtitle_glossary_keys}" />
- <include
- android:id="@+id/main_overview_glossary_keys"
- layout="@layout/include_main_overview_glossary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:body="@{@string/main_overview_body_glossary_keys}"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/main_overview_glossary_notification"
- app:subtitle="@{@string/main_overview_subtitle_glossary_keys}" />
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/guideline_bottom"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintGuide_end="@dimen/guideline_bottom" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
- <androidx.constraintlayout.widget.Guideline
- android:id="@+id/guideline_bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintGuide_end="@dimen/guideline_bottom" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
index d639faf38c333c983ee94efa4a58900a5334bb15..72b5d8ce5652d703f3fbf04fab7e3e3b43312b8d 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
@@ -53,7 +53,7 @@
<TextView
android:id="@+id/risk_details_behavior_headline"
- style="@style/textLargeEmphasized"
+ style="@style/headline5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -64,7 +64,7 @@
<TextView
android:id="@+id/risk_details_behavior_subtitle"
- style="@style/textMultiline"
+ style="@style/body2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
@@ -118,7 +118,7 @@
<TextView
android:id="@+id/risk_details_information_headline"
- style="@style/textLargeEmphasized"
+ style="@style/headline5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/risk_details_headline_infection_risk"
@@ -128,18 +128,18 @@
<TextView
android:id="@+id/risk_details_information_subtitle"
- style="@style/textMultiline"
+ style="@style/body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
- android:text="@{FormatterRiskHelper.formatRiskDetailsRiskLevelSubtitle(tracingViewModel.riskLevel)}"
+ android:text="@string/risk_details_subtitle_infection_risk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/risk_details_information_headline" />
<TextView
android:id="@+id/risk_details_information_body"
- style="@style/textMultiline"
+ style="@style/body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
@@ -151,7 +151,7 @@
<TextView
android:id="@+id/risk_details_information_body_notice"
- style="@style/textMultiline"
+ style="@style/body2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
index 677f97666dcc200d60321584251722a3ae349f5c..6810f17bb7747502c0e47209e6970b04303316ca 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings.xml
@@ -1,7 +1,6 @@
<?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">
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
@@ -54,8 +53,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
app:body="@{@string/settings_tracing_body_description}"
- app:color="@{FormatterSettingsHelper.formatIconColor(tracingViewModel.isTracingEnabled())}"
- app:icon="@{@drawable/ic_settings_tracing_active}"
+ app:color="@{FormatterSettingsHelper.formatSettingsTracingIconColor(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}"
+ app:icon="@{FormatterSettingsHelper.formatSettingsTracingIcon(tracingViewModel.isTracingEnabled(), settingsViewModel.isBluetoothEnabled(), settingsViewModel.isConnectionEnabled())}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -70,8 +69,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:body="@{@string/settings_notifications_body_description}"
- app:color="@{FormatterSettingsHelper.formatIconColor(settingsViewModel.isNotificationsEnabled(), settingsViewModel.isNotificationsRiskEnabled(), settingsViewModel.isNotificationsTestEnabled())}"
- app:icon="@{@drawable/ic_settings_notification}"
+ app:color="@{FormatterSettingsHelper.formatNotificationIconColor(settingsViewModel.isNotificationsEnabled(), settingsViewModel.isNotificationsRiskEnabled(), settingsViewModel.isNotificationsTestEnabled())}"
+ app:icon="@{FormatterSettingsHelper.formatNotificationIcon(settingsViewModel.isNotificationsEnabled(), settingsViewModel.isNotificationsRiskEnabled(), settingsViewModel.isNotificationsTestEnabled())}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/settings_tracing"
@@ -99,7 +98,7 @@
<TextView
android:id="@+id/settings_reset_subtitle"
- style="@style/textDanger"
+ style="@style/subtitleSemanticRed"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/settings_reset_button_positive"
@@ -109,6 +108,7 @@
<TextView
android:id="@+id/settings_reset_body"
+ style="@style/body2Medium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/settings_reset_body_description"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_reset.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_reset.xml
index 0c76491c61d580da937cf98638b5670ffa4f8f10..b0ed452fa6920e0a505c6252a2cf84ee37b6e502 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_reset.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_reset.xml
@@ -22,6 +22,7 @@
style="@style/fadingScrollView"
android:layout_width="0dp"
android:layout_height="0dp"
+ android:layout_marginBottom="@dimen/spacing_normal"
android:fillViewport="true"
app:layout_constraintBottom_toTopOf="@+id/settings_reset_button_delete"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
index 5859c7b3e4e125ae913184e6fd38a3601bc5fd64..8512a25e6b1230ff55d7c4941d83c4186b89059b 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_tracing.xml
@@ -124,7 +124,7 @@
<TextView
android:id="@+id/settings_tracing_status_tracing_body"
- style="@style/textMultiline"
+ style="@style/body2Medium"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_small"
@@ -163,7 +163,7 @@
<TextView
android:id="@+id/settings_tracing_body"
- style="@style/textMultiline"
+ style="@style/body1"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/settings_tracing_body_text"
diff --git a/Corona-Warn-App/src/main/res/layout/include_header.xml b/Corona-Warn-App/src/main/res/layout/include_header.xml
index 9c5112d53c487581afdfedcc09db41e0d165d42d..6e9a9fe879ab364aa50b8a4b0d91d0d7d351fcf2 100644
--- a/Corona-Warn-App/src/main/res/layout/include_header.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_header.xml
@@ -30,7 +30,7 @@
<TextView
android:id="@+id/header_title"
- style="@style/textTitle"
+ style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/guideline_body_title"
diff --git a/Corona-Warn-App/src/main/res/layout/include_information_details.xml b/Corona-Warn-App/src/main/res/layout/include_information_details.xml
index 51369af74de9f34fc419eafd6b02f8b669a94f8c..83abb7ab3510f60fc0d359cf85a4a8f231b40e58 100644
--- a/Corona-Warn-App/src/main/res/layout/include_information_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_information_details.xml
@@ -41,7 +41,7 @@
<TextView
android:id="@+id/information_details_header_headline"
- style="@style/textTitle"
+ style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{headline}"
@@ -53,7 +53,7 @@
<TextView
android:id="@+id/information_details_header_body"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
diff --git a/Corona-Warn-App/src/main/res/layout/include_main_card.xml b/Corona-Warn-App/src/main/res/layout/include_main_card.xml
index e91c385620a02f2ba22e711b1028eff628d643c3..51c774e2b549907c54f7f270cad174915db7532d 100644
--- a/Corona-Warn-App/src/main/res/layout/include_main_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_main_card.xml
@@ -68,7 +68,7 @@
<TextView
android:id="@+id/main_card_header_headline"
- style="@style/textLargeEmphasized"
+ style="@style/headline5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_small"
@@ -103,6 +103,7 @@
<TextView
android:id="@+id/main_card_content_body"
+ style="@style/subtitleMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
diff --git a/Corona-Warn-App/src/main/res/layout/include_main_overview_glossary.xml b/Corona-Warn-App/src/main/res/layout/include_main_overview_glossary.xml
index 9f8203e2e2c649868625060d9768300fd99403c4..034ca86550058683bbefd6711a5f8d94c0637d1e 100644
--- a/Corona-Warn-App/src/main/res/layout/include_main_overview_glossary.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_main_overview_glossary.xml
@@ -29,7 +29,7 @@
<TextView
android:id="@+id/main_overview_glossary_subtitle"
- style="@style/textLargeEmphasized"
+ style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{subtitle}"
@@ -39,7 +39,7 @@
<TextView
android:id="@+id/main_overview_glossary_body"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/include_main_overview_segment.xml b/Corona-Warn-App/src/main/res/layout/include_main_overview_segment.xml
index 58ad4f38207bfcb4f9444d88ecf6490b25547231..25644c52e5182575a2a066fbd613c20e1ee9fc82 100644
--- a/Corona-Warn-App/src/main/res/layout/include_main_overview_segment.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_main_overview_segment.xml
@@ -42,7 +42,7 @@
<TextView
android:id="@+id/main_overview_segment_subtitle"
- style="@style/textLargeEmphasized"
+ style="@style/headline5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{subtitle}"
@@ -52,7 +52,7 @@
<TextView
android:id="@+id/main_overview_segment_body"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/include_navigation_row.xml b/Corona-Warn-App/src/main/res/layout/include_navigation_row.xml
index 79826222250f19c7c6870a8bd545d5ead45abd32..0092de70be966880ba68f3672b156e30f1fbb05e 100644
--- a/Corona-Warn-App/src/main/res/layout/include_navigation_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_navigation_row.xml
@@ -51,7 +51,7 @@
<TextView
android:id="@+id/navigation_row_subtitle"
- style="@style/textLink"
+ style="@style/headline5Tint"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{subtitle}"
diff --git a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
index aecd930e41354adaa3d184411ff09f77079caa87..6ab7be454594ea3aeca151cf16336b2ce14ed9d4 100644
--- a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
@@ -54,7 +54,7 @@
<TextView
android:id="@+id/onboarding_headline"
- style="@style/textTitle"
+ style="@style/headline4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -66,7 +66,7 @@
<TextView
android:id="@+id/onboarding_subtitle"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
@@ -78,7 +78,7 @@
<TextView
android:id="@+id/onboarding_body"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -90,7 +90,7 @@
<TextView
android:id="@+id/onboarding_body_emphasized"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_card.xml b/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
index 6c7e4acf01323c113ae031e718140b69ca1e743b..11379380988543c4fc011d7ee0e76eaf84e7384c 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_card.xml
@@ -63,6 +63,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
@@ -85,6 +86,7 @@
<TextView
android:id="@+id/risk_card_body"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
@@ -102,8 +104,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
- android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatRiskSavedRisk(tracingViewModel.riskLevel, tracingViewModel.savedRiskLevel))}"
- app:body="@{FormatterRiskHelper.formatRiskSavedRisk(tracingViewModel.riskLevel, tracingViewModel.savedRiskLevel)}"
+ android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatRiskSavedRisk(tracingViewModel.riskLevel, tracingViewModel.riskLevelScoreLastSuccessfulCalculated))}"
+ app:body="@{FormatterRiskHelper.formatRiskSavedRisk(tracingViewModel.riskLevel, tracingViewModel.riskLevelScoreLastSuccessfulCalculated)}"
app:icon="@{@drawable/ic_risk_card_saved_risk}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -176,7 +178,7 @@
<TextView
android:id="@+id/risk_card_row_saved_days_body"
- style="@style/cardText"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
@@ -195,8 +197,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
- android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatTimeFetched(tracingViewModel.riskLevel, tracingViewModel.savedRiskLevel, tracingViewModel.lastTimeDiagnosisKeysFetched))}"
- app:body="@{FormatterRiskHelper.formatTimeFetched(tracingViewModel.riskLevel, tracingViewModel.savedRiskLevel, tracingViewModel.lastTimeDiagnosisKeysFetched)}"
+ android:visibility="@{FormatterHelper.formatVisibilityText(FormatterRiskHelper.formatTimeFetched(tracingViewModel.riskLevel, tracingViewModel.riskLevelScoreLastSuccessfulCalculated, tracingViewModel.lastTimeDiagnosisKeysFetched))}"
+ app:body="@{FormatterRiskHelper.formatTimeFetched(tracingViewModel.riskLevel, tracingViewModel.riskLevelScoreLastSuccessfulCalculated, tracingViewModel.lastTimeDiagnosisKeysFetched)}"
app:icon="@{@drawable/ic_risk_card_time_fetched}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -224,6 +226,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
+ style="@style/body2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml b/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
index dbf30e558a1e75581206394ada4b0f9d10ee598c..ee0b7536a9eb58119714b7397015ccfb443d4eb5 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_card_header.xml
@@ -50,7 +50,7 @@
<TextView
android:id="@+id/risk_card_header_headline"
- style="@style/cardHeadline"
+ style="@style/headline5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_card_row.xml b/Corona-Warn-App/src/main/res/layout/include_risk_card_row.xml
index 86b08d0cf417ce2a41e03abc8aa34aab5b3a5d4e..5182c4d51e8bb5a754db454a7a92cda6a9729ca3 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_card_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_card_row.xml
@@ -39,7 +39,7 @@
<TextView
android:id="@+id/risk_card_row_body"
- style="@style/cardText"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_row.xml b/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_row.xml
index 3f25ee1b1a52bca155fe14e9a201da9b08996e03..82bfcf512a4176334a8a3cb165d13b17b75c10a1 100644
--- a/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_risk_details_behavior_row.xml
@@ -49,7 +49,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/include_row.xml b/Corona-Warn-App/src/main/res/layout/include_row.xml
index 2141885a816fc573fd054846137720c72e8a42c8..8de928fde488e8b11f2d44695253d15231578a62 100644
--- a/Corona-Warn-App/src/main/res/layout/include_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_row.xml
@@ -64,7 +64,7 @@
<TextView
android:id="@+id/main_row_item_headline"
- style="@style/textMultiline"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{title}"
diff --git a/Corona-Warn-App/src/main/res/layout/include_setting_row.xml b/Corona-Warn-App/src/main/res/layout/include_setting_row.xml
index 303bc36e88017eb7124aeb3ca29f0e1bdc4a3e64..42d3408f15d278881522970ed586bd45e6574ca9 100644
--- a/Corona-Warn-App/src/main/res/layout/include_setting_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_setting_row.xml
@@ -72,7 +72,7 @@
<TextView
android:id="@+id/settings_row_header_subtitle"
- style="@style/textLargeEmphasized"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{subtitle}"
@@ -81,6 +81,7 @@
app:layout_constraintTop_toTopOf="parent" />
<TextView
+ style="@style/body2Medium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="@dimen/spacing_mega_tiny"
@@ -93,6 +94,7 @@
<TextView
android:id="@+id/settings_row_body"
+ style="@style/body2Medium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingTop="@dimen/spacing_tiny"
diff --git a/Corona-Warn-App/src/main/res/layout/include_settings_switch_row.xml b/Corona-Warn-App/src/main/res/layout/include_settings_switch_row.xml
index f332d875ca7b850880c2677e1d477dd72a391277..1b8527107cbdad6a0e14a60936190d4bcde98542 100644
--- a/Corona-Warn-App/src/main/res/layout/include_settings_switch_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_settings_switch_row.xml
@@ -26,10 +26,6 @@
name="statusText"
type="String" />
- <variable
- name="body"
- type="String" />
-
<variable
name="showDivider"
type="Boolean" />
@@ -61,7 +57,7 @@
<TextView
android:id="@+id/settings_switch_row_header_subtitle"
- style="@style/textLargeEmphasized"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{subtitle}"
@@ -71,6 +67,7 @@
<TextView
android:id="@+id/settings_switch_row_header_body"
+ style="@style/body2Medium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_mega_tiny"
@@ -105,26 +102,6 @@
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/settings_switch_row" />
- <androidx.constraintlayout.widget.ConstraintLayout
- style="@style/row"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="@{FormatterHelper.formatVisibilityText(body)}"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/divider">
-
- <TextView
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_mega_tiny"
- android:text="@{body}"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
- </androidx.constraintlayout.widget.ConstraintLayout>
-
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_start"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/include_tracing_status_card.xml b/Corona-Warn-App/src/main/res/layout/include_tracing_status_card.xml
index 13f9ddcf6f5961a6d0babd1a645d4fa447a157e4..2523df6dfe468e90fb211da42ac66d5816012562 100644
--- a/Corona-Warn-App/src/main/res/layout/include_tracing_status_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_tracing_status_card.xml
@@ -47,7 +47,7 @@
<TextView
android:id="@+id/tracing_status_card_header_headline"
- style="@style/textLargeEmphasized"
+ style="@style/headline6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_small"
@@ -59,7 +59,6 @@
<ImageView
android:id="@+id/tracing_status_card_header_icon"
- style="@style/iconTracingStatus"
android:layout_width="@dimen/icon_size_main_card_end"
android:layout_height="@dimen/icon_size_main_card_end"
android:importantForAccessibility="no"
@@ -73,6 +72,7 @@
<TextView
android:id="@+id/tracing_status_card_body"
+ style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
diff --git a/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml b/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
index d530834bfdf2d1ff098c99dda184adc83bceb621..5fe8cdc29c5adc78e9165b32273bbde65efd4d34 100644
--- a/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_circle_progress.xml
@@ -7,6 +7,7 @@
<TextView
android:id="@+id/circle_progress_body"
+ style="@style/body2Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/Corona-Warn-App/src/main/res/values-night/colors.xml b/Corona-Warn-App/src/main/res/values-night/colors.xml
index 6a95e8dcce64d4ef75ceb2f34543982e4bf55833..1d4f677586a9bba8c68d0b74d4040115eafafc99 100644
--- a/Corona-Warn-App/src/main/res/values-night/colors.xml
+++ b/Corona-Warn-App/src/main/res/values-night/colors.xml
@@ -79,7 +79,6 @@
<color name="tracingIconInactive">#DE4355</color>
<!-- Settings Icon -->
- <color name="settingsIconActive">#2C79A9</color>
<color name="settingsIconInactive">#C3C3C3</color>
</resources>
diff --git a/Corona-Warn-App/src/main/res/values/colors.xml b/Corona-Warn-App/src/main/res/values/colors.xml
index 87d18f60c8a14c251972cfc1a6c8af10c553b3e8..020f7711acfe4633ae76d4aa731ea806726f06bf 100644
--- a/Corona-Warn-App/src/main/res/values/colors.xml
+++ b/Corona-Warn-App/src/main/res/values/colors.xml
@@ -81,9 +81,6 @@
<!-- Tracing Icon -->
<color name="tracingIconActive">#007FAD</color>
<color name="tracingIconInactive">#C00F2D</color>
-
- <!-- Settings Icon -->
- <color name="settingsIconActive">#2C79A9</color>
<color name="settingsIconInactive">#C3C3C3</color>
<!-- Tan Input -->
diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml
index bc5ac0396b1bb9563c492ea295d51018469db949..cff746d8d7f9bcd91e866ce419e72dc3583fad25 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -158,6 +158,10 @@
<item name="android:textColor">@color/colorTextPrimary1</item>
</style>
+ <style name="headline5Tint" parent="@style/headline5">
+ <item name="android:textColor">@color/colorTextTint</item>
+ </style>
+
<style name="headline6" parent="@style/TextAppearance.MaterialComponents.Headline6">
<item name="android:textColor">@color/colorTextPrimary1</item>
<item name="android:textStyle">bold</item>
@@ -167,6 +171,10 @@
<item name="android:textColor">@color/colorTextPrimary1</item>
</style>
+ <style name="subtitleSemanticRed" parent="@style/subtitle">
+ <item name="android:textColor">@color/colorTextSemanticRed</item>
+ </style>
+
<style name="subtitleMedium" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
<item name="android:textColor">@color/colorTextPrimary2</item>
</style>
@@ -256,10 +264,6 @@
<item name="android:tint">@color/stableIconColor</item>
</style>
- <style name="iconTracingStatus">
- <item name="android:tint">@color/colorPrimary</item>
- </style>
-
<!-- ####################################
Progress Bar
###################################### -->
@@ -278,7 +282,7 @@
<style name="fadingScrollView">
<item name="android:requiresFadingEdge">vertical</item>
- <item name="android:fadingEdgeLength">150dp</item>
+ <item name="android:fadingEdgeLength">50dp</item>
</style>
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
index db67511c30dbcf80eafd6701fef7667b3dfe5065..e38eecbc249dcaf85442458bc03919307b6b9eff 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/transaction/RiskLevelTransactionTest.kt
@@ -15,6 +15,7 @@ import de.rki.coronawarnapp.server.protocols.ApplicationConfigurationOuterClass.
import de.rki.coronawarnapp.server.protocols.ApplicationConfigurationOuterClass.RiskScoreClassification
import de.rki.coronawarnapp.service.applicationconfiguration.ApplicationConfigurationService
import de.rki.coronawarnapp.storage.ExposureSummaryRepository
+import de.rki.coronawarnapp.storage.LocalData
import de.rki.coronawarnapp.storage.RiskLevelRepository
import io.mockk.MockKAnnotations
import io.mockk.Runs
@@ -42,6 +43,8 @@ class RiskLevelTransactionTest {
mockkObject(InternalExposureNotificationClient)
mockkObject(ApplicationConfigurationService)
+ mockkObject(LocalData)
+ every { LocalData.lastSuccessfullyCalculatedRiskLevel() } returns UNDETERMINED
mockkObject(RiskLevelRepository)
mockkObject(RiskLevelTransaction)
mockkObject(TimeVariables)