Merge remote-tracking branch 'origin/dev' into dev

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt

@@ -367,7 +367,7 @@ fun formatStableIconColor(riskLevelScore: Int?): Int =
     formatColor(
         !isTracingOffRiskLevel(riskLevelScore),
         R.color.colorStableLight,
-        R.color.colorSemanticNeutralRisk
+        R.color.colorTextSemanticNeutral
     )
 
 /**
@@ -523,7 +523,7 @@ fun formatBehaviorIcon(riskLevelScore: Int?): Int {
     val appContext = CoronaWarnApplication.getAppContext()
     return when (riskLevelScore) {
         RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF,
-        RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS -> appContext.getColor(R.color.colorSemanticNeutralRisk)
+        RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS -> appContext.getColor(R.color.colorTextSemanticNeutral)
         else -> appContext.getColor(R.color.colorStableLight)
     }
 }

Corona-Warn-App/src/main/res/values-night/colors.xml

@@ -29,7 +29,7 @@
     <color name="colorSemanticHighRiskPressed">#CA465C</color>
     <color name="colorSemanticLowRisk">#378250</color>
     <color name="colorSemanticLowRiskPressed">#378250</color>
-    <color name="colorSemanticNeutralRisk">#B8C8D9</color>
+    <color name="colorSemanticNeutralRisk">#5D6E80</color>
     <color name="colorSemanticNeutralRiskPressed">#556675</color>
     <color name="colorSemanticUnknownRisk">#232324</color>
     <color name="colorSemanticUnknownRiskPressed">#39393A</color>