Feature: Adapt all colors to latest designs (#221)

* grey background & removed light button elevation

* light theme

* dark & stable colors

* fix

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CircleProgress.kt

@@ -80,18 +80,19 @@ class CircleProgress @JvmOverloads constructor(
         setWillNotDraw(false)
         binding = ViewCircleProgressBinding.inflate(LayoutInflater.from(context), this)
         val styleAttrs = context.obtainStyledAttributes(attrs, R.styleable.CircleProgress)
-        // attribute circleColor; default = colorGreyLight
         val circleColor = styleAttrs.getColor(
             R.styleable.CircleProgress_circleColor,
-            ContextCompat.getColor(context, R.color.colorGreyLight)
+            ContextCompat.getColor(context, R.color.colorSurface2)
         )
-        // attribute progressColor; default = colorPrimary
-        val progressColor = styleAttrs.getColor(R.styleable.CircleProgress_progressColor,
-            ContextCompat.getColor(context, R.color.colorPrimary))
-        // attribute textColor; default = colorGrey
+        // attribute progressColor; default = colorAccentTintIcon
+        val progressColor = styleAttrs.getColor(
+            R.styleable.CircleProgress_progressColor,
+            ContextCompat.getColor(context, R.color.colorAccentTintIcon)
+        )
+        // attribute textColor; default = colorTextPrimary2
         val textColor = styleAttrs.getColor(
             R.styleable.CircleProgress_textColor,
-            ContextCompat.getColor(context, R.color.textColorGrey)
+            ContextCompat.getColor(context, R.color.colorTextPrimary2)
         )
         // attribute disableText; default = true
         disableText = styleAttrs.getBoolean(R.styleable.CircleProgress_disableText, false)

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

@@ -113,5 +113,5 @@ fun formatText(value: Boolean?, stringTrue: Int, stringFalse: Int): String {
  */
 fun formatColorIcon(color: Int?): Int {
     val appContext = CoronaWarnApplication.getAppContext()
-    return color ?: appContext.getColor(R.color.colorLight)
+    return color ?: appContext.getColor(R.color.colorAccentTintIcon)
 }

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

@@ -340,8 +340,8 @@ fun formatRiskShape(showDetails: Boolean): Drawable? =
 fun formatStableIconColor(riskLevelScore: Int?): Int =
     formatColor(
         !isTracingOffRiskLevel(riskLevelScore),
-        R.color.stableIconColor,
-        R.color.iconColor
+        R.color.colorStableLight,
+        R.color.colorTextPrimary1
     )
 
 /**
@@ -372,8 +372,8 @@ fun formatStableBackButtonColor(riskLevelScore: Int?): ColorStateList? {
 fun formatStableTextColor(riskLevelScore: Int?): Int =
     formatColor(
         !isTracingOffRiskLevel(riskLevelScore),
-        R.color.stableBackgroundColor,
-        R.color.textColorPrimary
+        R.color.colorStableLight,
+        R.color.colorTextPrimary1
     )
 
 /**
@@ -491,8 +491,8 @@ 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.colorTextSemanticNeutral)
-        else -> appContext.getColor(R.color.stableIconColor)
+        RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS -> appContext.getColor(R.color.colorAccentTintIcon)
+        else -> appContext.getColor(R.color.colorStableLight)
     }
 }
 
@@ -505,10 +505,10 @@ fun formatBehaviorIcon(riskLevelScore: Int?): Int {
 fun formatBehaviorIconBackground(riskLevelScore: Int?): Int {
     val appContext = CoronaWarnApplication.getAppContext()
     return when (riskLevelScore) {
-        RiskLevelConstants.INCREASED_RISK -> appContext.getColor(R.color.colorRiskCardIncreasedRisk)
-        RiskLevelConstants.LOW_LEVEL_RISK -> appContext.getColor(R.color.colorRiskCardLowRisk)
-        RiskLevelConstants.UNKNOWN_RISK_INITIAL -> appContext.getColor(R.color.colorRiskCardUnknownRisk)
-        else -> appContext.getColor(R.color.riskCardGrey)
+        RiskLevelConstants.INCREASED_RISK -> appContext.getColor(R.color.colorSemanticHighRisk)
+        RiskLevelConstants.LOW_LEVEL_RISK -> appContext.getColor(R.color.colorSemanticLowRisk)
+        RiskLevelConstants.UNKNOWN_RISK_INITIAL -> appContext.getColor(R.color.colorSemanticNeutralRisk)
+        else -> appContext.getColor(R.color.colorSurface2)
     }
 }
 

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

@@ -158,6 +158,14 @@ fun formatTracingIllustrationText(
 }
 
 /*Styler*/
+/**
+ * Formats the settings icon color depending on flag provided
+ *
+ * @param active
+ * @return Int
+ */
+fun formatIconColor(active: Boolean): Int =
+    formatColor(active, R.color.colorAccentTintIcon, R.color.colorTextPrimary3)
 
 /**
  * Formats the settings icon color for notifications depending on notification values
@@ -174,8 +182,8 @@ fun formatNotificationIconColor(
 ): Int =
     formatColor(
         (notifications && (notificationsRisk || notificationsTest)),
-        R.color.tracingIconActive,
-        R.color.tracingIconInactive
+        R.color.colorAccentTintIcon,
+        R.color.colorTextSemanticRed
     )
 
 /**
@@ -222,12 +230,12 @@ fun formatSettingsTracingIconColor(tracing: Boolean, bluetooth: Boolean, connect
     val appContext = CoronaWarnApplication.getAppContext()
     return when (tracingStatusHelper(tracing, bluetooth, connection)) {
         TracingStatusHelper.CONNECTION, TracingStatusHelper.BLUETOOTH ->
-            appContext.getColor(R.color.settingsIconInactive)
+            appContext.getColor(R.color.colorTextSemanticRed)
         TracingStatusHelper.TRACING_ACTIVE ->
-            appContext.getColor(R.color.tracingIconActive)
+            appContext.getColor(R.color.colorAccentTintIcon)
         TracingStatusHelper.TRACING_INACTIVE ->
-            appContext.getColor(R.color.tracingIconInactive)
-        else -> appContext.getColor(R.color.tracingIconInactive)
+            appContext.getColor(R.color.colorTextSemanticRed)
+        else -> appContext.getColor(R.color.colorTextSemanticRed)
     }
 }
 
@@ -320,9 +328,9 @@ fun formatTracingIconColor(tracing: Boolean, bluetooth: Boolean, connection: Boo
     val appContext = CoronaWarnApplication.getAppContext()
     return when (tracingStatusHelper(tracing, bluetooth, connection)) {
         TracingStatusHelper.TRACING_ACTIVE ->
-            appContext.getColor(R.color.tracingIconActive)
+            appContext.getColor(R.color.colorAccentTintIcon)
         else ->
-            appContext.getColor(R.color.tracingIconInactive)
+            appContext.getColor(R.color.colorTextSemanticRed)
     }
 }
 

Corona-Warn-App/src/main/res/color/button_back.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorGreyLight" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSurface1Pressed" android:state_pressed="true" /> <!-- pressed -->
     <item android:color="@color/colorTransparent" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/button_back_stable.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/stableHighlightColor" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorStableMedium" android:state_pressed="true" /> <!-- pressed -->
     <item android:color="@color/colorTransparent" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/button_light.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorGreyLight" android:state_pressed="true" /> <!-- pressed -->
-    <item android:color="@color/colorLight" /> <!-- default -->
+    <item android:color="@color/colorSurface1Pressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSurface1" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/button_main_tracing.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorGreyLight" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSurface1Pressed" android:state_pressed="true" /> <!-- pressed -->
     <item android:color="@color/colorTransparent" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/button_primary.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorPrimaryDark" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorAccentTintButtonPressed" android:state_pressed="true" /> <!-- pressed -->
     <item android:color="@color/colorSurface2" android:state_enabled="false" /> <!-- disabled -->
     <item android:color="@color/colorAccentTintButton" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/button_red.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorRiskCardIncreasedRiskPressed" android:state_pressed="true" /> <!-- pressed -->
-    <item android:color="@color/colorRiskCardIncreasedRisk" /> <!-- default -->
+    <item android:color="@color/colorSemanticHighRiskPressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSemanticHighRisk" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/card_increased.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorRiskCardIncreasedRiskPressed" android:state_pressed="true" /> <!-- pressed -->
-    <item android:color="@color/colorRiskCardIncreasedRisk" /> <!-- default -->
+    <item android:color="@color/colorSemanticHighRiskPressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSemanticHighRisk" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/card_light.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorRiskCardNoCalculationPossiblePressed" android:state_pressed="true" /> <!-- pressed -->
-    <item android:color="@color/colorRiskCardNoCalculationPossible" /> <!-- default -->
+    <item android:color="@color/colorSurface1Pressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSurface1" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/card_low.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorRiskCardLowRiskPressed" android:state_pressed="true" /> <!-- pressed -->
-    <item android:color="@color/colorRiskCardLowRisk" /> <!-- default -->
+    <item android:color="@color/colorSemanticLowRiskPressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSemanticLowRisk" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/card_no_calculation.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorRiskCardNoCalculationPossiblePressed" android:state_pressed="true" /> <!-- pressed -->
-    <item android:color="@color/colorRiskCardNoCalculationPossible" /> <!-- default -->
+    <item android:color="@color/colorSemanticUnknownRiskPressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSemanticUnknownRisk" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/card_outdated.xml

 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"> <!--
-    <item android:color="@color/colorRiskCardOutdatedRiskPressed" android:state_pressed="true" />  pressed -->
-    <!--<item android:color="@color/colorRiskCardOutdatedRisk" /> default -->
-    <item android:color="@color/colorRiskCardNoCalculationPossiblePressed" android:state_pressed="true" /> <!-- pressed -->
-    <item android:color="@color/colorRiskCardNoCalculationPossible" /> <!-- default -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorSemanticUnknownRiskPressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSemanticUnknownRisk" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/card_unknown.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorRiskCardUnknownRiskPressed" android:state_pressed="true" /> <!-- pressed -->
-    <item android:color="@color/colorRiskCardUnknownRisk" /> <!-- default -->
+    <item android:color="@color/colorSemanticNeutralRiskPressed" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSemanticNeutralRisk" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/color/row.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorGreyLight" android:state_pressed="true" /> <!-- pressed -->
+    <item android:color="@color/colorSurface1Pressed" android:state_pressed="true" /> <!-- pressed -->
     <item android:color="@color/colorTransparent" /> <!-- default -->
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/drawable/circle.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/colorPrimary" />
+    <solid android:color="@color/colorAccentTintIcon" />
 </shape>
\ No newline at end of file

Corona-Warn-App/src/main/res/drawable/rectangle.xml

@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/colorLight" />
+            <solid android:color="@color/colorSurface1" />
         </shape>
     </item>
 </selector>
\ No newline at end of file

Corona-Warn-App/src/main/res/drawable/splash_screen.xml

@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- background with solid color -->
-    <item android:drawable="@color/appTheme" />
+    <item android:drawable="@color/colorBackground" />
 
     <!-- logo -->
     <item