diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CircleProgress.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CircleProgress.kt
index bef8b354ff1f19b73fa79e234202a224cec75d54..9cc4e390765bfe5b95e10883f2cbd8edd56b3b29 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/view/CircleProgress.kt
+++ b/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)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt
index 0a895a569e71c49b3d672bfe5ba2d3db2a8199b8..6acacc3870b65a03848a6df9934ee53413674377 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterHelper.kt
+++ b/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)
}
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 0af1aaeb045d49377b6b32bf745ca8c356f170e3..743c2af945954f058c4744f8078ab7ca29b2b2fd 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
@@ -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)
}
}
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 80c8a4b94798ba34f815da9b6fbcbb5cbb85ffa6..d4309d4e4de144b32d22176daadc7175433d1945 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
@@ -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)
}
}
diff --git a/Corona-Warn-App/src/main/res/color/button_back.xml b/Corona-Warn-App/src/main/res/color/button_back.xml
index efafab00fb8d1fefb7c77d552acf42698c691a6f..ae25457c52f41ff53f460586ce4e4cb282b311c5 100644
--- a/Corona-Warn-App/src/main/res/color/button_back.xml
+++ b/Corona-Warn-App/src/main/res/color/button_back.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/button_back_stable.xml b/Corona-Warn-App/src/main/res/color/button_back_stable.xml
index 247883582d19e77c0244cc07485d21db38890b23..8e9ee708c671bd5819295899e24e59ca63bcff05 100644
--- a/Corona-Warn-App/src/main/res/color/button_back_stable.xml
+++ b/Corona-Warn-App/src/main/res/color/button_back_stable.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/button_light.xml b/Corona-Warn-App/src/main/res/color/button_light.xml
index d57581e9c479ca3a19b5716883aea7a25a8b2bc1..3b4d4735efe14b72cfe77e5a1f330a738f60e912 100644
--- a/Corona-Warn-App/src/main/res/color/button_light.xml
+++ b/Corona-Warn-App/src/main/res/color/button_light.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/button_main_tracing.xml b/Corona-Warn-App/src/main/res/color/button_main_tracing.xml
index efafab00fb8d1fefb7c77d552acf42698c691a6f..ae25457c52f41ff53f460586ce4e4cb282b311c5 100644
--- a/Corona-Warn-App/src/main/res/color/button_main_tracing.xml
+++ b/Corona-Warn-App/src/main/res/color/button_main_tracing.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/button_primary.xml b/Corona-Warn-App/src/main/res/color/button_primary.xml
index 2555dd3e1ef9aadc91def1cf2b254fa49629de86..72706c8363909a69540881ae6f0c9542b902523e 100644
--- a/Corona-Warn-App/src/main/res/color/button_primary.xml
+++ b/Corona-Warn-App/src/main/res/color/button_primary.xml
@@ -1,6 +1,6 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/button_red.xml b/Corona-Warn-App/src/main/res/color/button_red.xml
index e1733036b1610e9dea31655f8d6cbda59eaadb46..4d42fdd5d8682606ac8bee5815c604ea53cb5446 100644
--- a/Corona-Warn-App/src/main/res/color/button_red.xml
+++ b/Corona-Warn-App/src/main/res/color/button_red.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/card_increased.xml b/Corona-Warn-App/src/main/res/color/card_increased.xml
index e1733036b1610e9dea31655f8d6cbda59eaadb46..4d42fdd5d8682606ac8bee5815c604ea53cb5446 100644
--- a/Corona-Warn-App/src/main/res/color/card_increased.xml
+++ b/Corona-Warn-App/src/main/res/color/card_increased.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/card_light.xml b/Corona-Warn-App/src/main/res/color/card_light.xml
index b41eb530170ab63be39e99f9c2d1fe971a13bebf..3b4d4735efe14b72cfe77e5a1f330a738f60e912 100644
--- a/Corona-Warn-App/src/main/res/color/card_light.xml
+++ b/Corona-Warn-App/src/main/res/color/card_light.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/card_low.xml b/Corona-Warn-App/src/main/res/color/card_low.xml
index dfb7f33c820fbcfa2dbbbfe715abafe09bc74f8d..1b4f227ceb3f2aca13a12c8405daa353279cbe10 100644
--- a/Corona-Warn-App/src/main/res/color/card_low.xml
+++ b/Corona-Warn-App/src/main/res/color/card_low.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/card_no_calculation.xml b/Corona-Warn-App/src/main/res/color/card_no_calculation.xml
index b41eb530170ab63be39e99f9c2d1fe971a13bebf..2b89bf182cf7cb786659513362cedf31d51da51b 100644
--- a/Corona-Warn-App/src/main/res/color/card_no_calculation.xml
+++ b/Corona-Warn-App/src/main/res/color/card_no_calculation.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/card_outdated.xml b/Corona-Warn-App/src/main/res/color/card_outdated.xml
index 1e68d9dc371f64442328f085d6d5ea2be0660de2..2b89bf182cf7cb786659513362cedf31d51da51b 100644
--- a/Corona-Warn-App/src/main/res/color/card_outdated.xml
+++ b/Corona-Warn-App/src/main/res/color/card_outdated.xml
@@ -1,7 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/card_unknown.xml b/Corona-Warn-App/src/main/res/color/card_unknown.xml
index bbb24111da6e9f982b4d8c67e98320510641a079..03c3a4f6dc017e402c3604ff157608314a2744ff 100644
--- a/Corona-Warn-App/src/main/res/color/card_unknown.xml
+++ b/Corona-Warn-App/src/main/res/color/card_unknown.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/color/row.xml b/Corona-Warn-App/src/main/res/color/row.xml
index efafab00fb8d1fefb7c77d552acf42698c691a6f..ae25457c52f41ff53f460586ce4e4cb282b311c5 100644
--- a/Corona-Warn-App/src/main/res/color/row.xml
+++ b/Corona-Warn-App/src/main/res/color/row.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/drawable/circle.xml b/Corona-Warn-App/src/main/res/drawable/circle.xml
index 7e73f1ae2ee3eed19f8746288035b5617378975c..5c7a6fe8f61532c21f4abfdea6bbbf04344fe09b 100644
--- a/Corona-Warn-App/src/main/res/drawable/circle.xml
+++ b/Corona-Warn-App/src/main/res/drawable/circle.xml
@@ -1,5 +1,5 @@
<?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
diff --git a/Corona-Warn-App/src/main/res/drawable/rectangle.xml b/Corona-Warn-App/src/main/res/drawable/rectangle.xml
index 008626e4dd00765ad9a8b3e3113276c796c1fa0b..bacee7d14ef48e25a498fcf6c690e130225ac088 100644
--- a/Corona-Warn-App/src/main/res/drawable/rectangle.xml
+++ b/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
diff --git a/Corona-Warn-App/src/main/res/drawable/splash_screen.xml b/Corona-Warn-App/src/main/res/drawable/splash_screen.xml
index 353d82c48201a8272f22e2115a0d8bb55b03cd8f..ac1ae9a8e85c9ae9562f6f81e6d037102f8c907b 100644
--- a/Corona-Warn-App/src/main/res/drawable/splash_screen.xml
+++ b/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
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 22d3ea2f87ee6b5acbf241fb0efbf28706267e1c..eaa120b82ef7ceb7416512cf285fc42cc590fdd5 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main.xml
@@ -119,8 +119,8 @@
layout="@layout/include_divider"
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
- app:layout_constraintEnd_toStartOf="@+id/guideline_end"
- app:layout_constraintStart_toStartOf="@+id/guideline_start"
+ app:layout_constraintEnd_toStartOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_tracing" />
<include
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 de2d830e42092e68974fe63c610d10bd98286744..ea311e0253aaa1a30c0f121772cce202e2b62e08 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
@@ -98,7 +98,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
app:iconStart="@{@drawable/ic_main_overview_circle}"
- app:iconTint="@{@color/colorRiskCardIncreasedRisk}"
+ app:iconTint="@{@color/colorSemanticHighRisk}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_overview_risk_subtitle"
@@ -110,7 +110,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:iconStart="@{@drawable/ic_main_overview_circle}"
- app:iconTint="@{@color/colorRiskCardLowRisk}"
+ app:iconTint="@{@color/colorSemanticLowRisk}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_overview_risk_increased_risk"
@@ -122,7 +122,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
app:iconStart="@{@drawable/ic_main_overview_circle}"
- app:iconTint="@{@color/colorRiskCardUnknownRisk}"
+ app:iconTint="@{@color/colorSemanticNeutralRisk}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_overview_risk_low_risk"
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 8512a25e6b1230ff55d7c4941d83c4186b89059b..7d2d230a84920ceb97e1d1801dde2862ebb7f052 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
@@ -150,12 +150,10 @@
<androidx.constraintlayout.widget.ConstraintLayout
+ style="@style/greyBodyBackground"
android:id="@+id/risk_details_body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
- android:background="@color/colorGreyLight"
- android:padding="@dimen/spacing_normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
index ae1053e307cded9831f98a823a37294175b29ea1..dc11a23c5f69dbc3275c0d4e5eb3572afc6cb427 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
@@ -57,7 +57,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:background="@drawable/ic_registration_qr_code_scan_torch_toggle"
- android:backgroundTint="@color/iconColor"
+ android:backgroundTint="@color/colorTextPrimary3"
android:textOff=""
android:textOn=""
app:layout_constraintBottom_toTopOf="@+id/submission_qr_code_scan_guideline_top"
diff --git a/Corona-Warn-App/src/main/res/layout/include_button_icon.xml b/Corona-Warn-App/src/main/res/layout/include_button_icon.xml
index 430f639c7907b8fdd6a03a655178f6d0c063f0c1..4bdf45b4d27ca08c927f169c26b0471d1960f299 100644
--- a/Corona-Warn-App/src/main/res/layout/include_button_icon.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_button_icon.xml
@@ -8,7 +8,6 @@
name="icon"
type="android.graphics.drawable.Drawable" />
-
</data>
<androidx.constraintlayout.widget.ConstraintLayout
diff --git a/Corona-Warn-App/src/main/res/layout/include_divider.xml b/Corona-Warn-App/src/main/res/layout/include_divider.xml
index 4816dc247c5b47a43cc593fb9f6425f3f5e5ddea..04ae33d52d8aa29f546aaabf4e1355adc2bc1d19 100644
--- a/Corona-Warn-App/src/main/res/layout/include_divider.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_divider.xml
@@ -10,10 +10,10 @@
app:layout_constraintTop_toTopOf="parent">
<View
- android:id="@+id/dividerColor"
+ android:id="@+id/colorHairline"
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
- android:background="@color/dividerColor"
+ android:background="@color/colorHairline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
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 11379380988543c4fc011d7ee0e76eaf84e7384c..4155aa9faab68e50281e7ac53832543e7d98ae02 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
@@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
android:indeterminate="true"
- android:indeterminateTint="@color/stableBackgroundColor"
+ android:indeterminateTint="@color/colorStableLight"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -164,7 +164,7 @@
<de.rki.coronawarnapp.ui.view.CircleProgress
android:layout_width="23dp"
android:layout_height="23dp"
- app:circleColor="@color/stableLightTransparent"
+ app:circleColor="@color/colorStableMedium"
app:disableText="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -172,7 +172,7 @@
app:layout_constraintTop_toTopOf="parent"
app:circleWidth="5"
app:progress="@{tracingViewModel.activeTracingDaysInRetentionPeriod}"
- app:progressColor="@color/stableIconColor" />
+ app:progressColor="@color/colorStableLight" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
index 41d9b1a6bb33400587b06fc1d7c10d2436b5c3f2..d92171dc9f0db7a8ca0c7ada98d88ee5049f705b 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
@@ -76,7 +76,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:text="@string/submission_contact_number"
- android:textColor="@color/textColorBlue"
+ android:textColor="@color/colorTextTint"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/submission_contact_step_1_body" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_test_result_card.xml b/Corona-Warn-App/src/main/res/layout/include_test_result_card.xml
index a51ace56cb54b246d5eec521cc1aae1a36b2886c..df1b8c286304e112ce20421737f72a7806401914 100644
--- a/Corona-Warn-App/src/main/res/layout/include_test_result_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_test_result_card.xml
@@ -17,7 +17,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/colorGreyLight"
+ android:background="@color/colorSurface2"
android:padding="@dimen/card_padding">
<TextView
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 5fe8cdc29c5adc78e9165b32273bbde65efd4d34..d8440ecb3aa742f0bf27223988f09ac6a89b5caf 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
@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:contentDescription="Sie haben alle tage erfasst"
android:src="@drawable/ic_risk_card_saved_days"
- android:tint="@color/colorPrimary"
+ android:tint="@color/colorAccentTintIcon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/view_step_entry.xml b/Corona-Warn-App/src/main/res/layout/view_step_entry.xml
index bcde333ba9cd008322bad8be87fb41f63a123b07..ffaaca906aab9c234ff17e92dfded7e547111243 100644
--- a/Corona-Warn-App/src/main/res/layout/view_step_entry.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_step_entry.xml
@@ -38,7 +38,7 @@
android:id="@+id/step_entry_line"
android:layout_width="@dimen/test_result_step_progress_line_width"
android:layout_height="@dimen/match_constraint"
- android:background="@color/colorGreyLight"
+ android:background="@color/colorSurface2"
app:layout_constraintBottom_toBottomOf="@+id/step_entry_placeholder"
app:layout_constraintEnd_toEndOf="@id/step_entry_icon"
app:layout_constraintStart_toStartOf="@id/step_entry_icon"
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 1d4f677586a9bba8c68d0b74d4040115eafafc99..aa86c95574cd0fbfc80a6d6fdca97aeb377ebe52 100644
--- a/Corona-Warn-App/src/main/res/values-night/colors.xml
+++ b/Corona-Warn-App/src/main/res/values-night/colors.xml
@@ -9,6 +9,7 @@
<!-- Backgrounds and Separators -->
<color name="colorBackground">#000000</color>
<color name="colorSurface1">#232324</color>
+ <color name="colorSurface1Pressed">#39393A</color>
<color name="colorSurface2">#434445</color>
<color name="colorHairline">#4DFFFFFF</color>
@@ -22,63 +23,22 @@
<color name="colorTextSemanticNeutral">#B8C8D9</color>
<color name="colorTextTint">#83D2F2</color>
- <!-- Accent -->
- <color name="colorAccentTintButton">#007FAD</color>
- <color name="colorAccentTintIcon">#83D2F2</color>
-
<!-- Semantic -->
<color name="colorSemanticHighRisk">#C4314A</color>
+ <color name="colorSemanticHighRiskPressed">#CA465C</color>
<color name="colorSemanticLowRisk">#378250</color>
+ <color name="colorSemanticLowRiskPressed">#378250</color>
<color name="colorSemanticNeutralRisk">#5D6E80</color>
+ <color name="colorSemanticNeutralRiskPressed">#556675</color>
+ <color name="colorSemanticUnknownRisk">#232324</color>
+ <color name="colorSemanticUnknownRiskPressed">#39393A</color>
- <!-- TODO: Add variables when colors are final to reduce maintenance -->
-
- <!-- App Color -->
- <color name="appTheme">#000000</color>
+ <!-- Accent -->
+ <color name="colorAccentTintButton">#007FAD</color>
+ <color name="colorAccentTintButtonPressed">#1B4865</color>
+ <color name="colorAccentTintIcon">#83D2F2</color>
- <!-- Primary Colors -->
- <color name="colorPrimary">#2C79A9</color>
- <color name="colorPrimaryDark">#1B4865</color>
+ <!-- Misc -->
<color name="colorTransparent">#00FFFFFF</color>
- <!-- Risk Card Colors -->
- <color name="colorRiskCardIncreasedRiskPressed">#A30C26</color>
- <color name="colorRiskCardLowRiskPressed">#27713F</color>
- <color name="colorRiskCardNoCalculationPossible">@color/colorLight</color>
- <color name="colorRiskCardNoCalculationPossiblePressed">@color/colorGreyLight</color>
- <color name="colorRiskCardOutdatedRisk">#657888</color>
- <color name="colorRiskCardOutdatedRiskPressed">#556673</color>
- <color name="colorRiskCardUnknownRisk">#657888</color>
- <color name="colorRiskCardUnknownRiskPressed">#556673</color>
- <color name="riskCardGrey">#F5F5F5</color>
-
- <!-- Light Colors -->
- <color name="colorLight">#212121</color>
- <color name="colorGrey">#434343</color>
- <color name="colorGreyLight">#565656</color>
-
- <!-- Text Colors -->
- <color name="textColorPrimary">#ffffff</color>
- <color name="textColorSecondary">#DFD8D8</color>
- <color name="textColorLight">#ffffff</color>
- <color name="textColorBlue">#2C79A9</color>
- <color name="textColorGrey">#D3D3D3</color>
-
- <!-- Visual Elements-->
- <color name="dividerColor">#0D000000</color>
- <color name="iconColor">#ffffff</color>
-
- <!-- Stable Colors TODO: can be removed after testing -->
- <color name="stableBackgroundColor">#ffffff</color>
- <color name="stableHighlightColor">#C3C3C3</color>
- <color name="stableTextColor">#000000</color>
- <color name="stableIconColor">#ffffff</color>
-
- <!-- Tracing Icon -->
- <color name="tracingIconActive">#80CDEC</color>
- <color name="tracingIconInactive">#DE4355</color>
-
- <!-- Settings Icon -->
- <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 020f7711acfe4633ae76d4aa731ea806726f06bf..8996a7170adbdb1d970a9be70c01317fd6bbcdb5 100644
--- a/Corona-Warn-App/src/main/res/values/colors.xml
+++ b/Corona-Warn-App/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
<!-- Backgrounds and Separators -->
<color name="colorBackground">#FFFFFF</color>
<color name="colorSurface1">#FFFFFF</color>
+ <color name="colorSurface1Pressed">#E7E8E8</color>
<color name="colorSurface2">#F5F5F5</color>
<color name="colorHairline">#3317191A</color>
@@ -21,70 +22,32 @@
<color name="colorTextSemanticGreen">#2E854B</color>
<color name="colorTextSemanticNeutral">#5D6E80</color>
<color name="colorTextTint">#007FAD</color>
-
- <!-- Accent -->
- <color name="colorAccentTintButton">#007FAD</color>
- <color name="colorAccentTintIcon">#007FAD</color>
+ <color name="colorTextLight">#FFFFFF</color>
<!-- Semantic -->
<color name="colorSemanticHighRisk">#C00F2D</color>
+ <color name="colorSemanticHighRiskPressed">#AE102B</color>
<color name="colorSemanticLowRisk">#2E854B</color>
+ <color name="colorSemanticLowRiskPressed">#2B7A46</color>
<color name="colorSemanticNeutralRisk">#5D6E80</color>
+ <color name="colorSemanticNeutralRiskPressed">#556675</color>
+ <color name="colorSemanticUnknownRisk">#FFFFFF</color>
+ <color name="colorSemanticUnknownRiskPressed">#E7E8E8</color>
- <!-- TODO: Add variables when colors are final to reduce maintenance -->
-
- <!-- App Color -->
- <color name="appTheme">#ffffff</color>
+ <!-- Accent -->
+ <color name="colorAccentTintButton">#007FAD</color>
+ <color name="colorAccentTintButtonPressed">#02759E</color>
+ <color name="colorAccentTintIcon">#007FAD</color>
- <!-- Primary Colors -->
- <color name="colorPrimary">#2C79A9</color>
- <color name="colorPrimaryDark">#1B4865</color>
+ <!-- Misc -->
<color name="colorTransparent">#00FFFFFF</color>
- <!-- Risk Card Colors -->
- <color name="colorRiskCardIncreasedRisk">@color/colorSemanticHighRisk</color>
- <color name="colorRiskCardIncreasedRiskPressed">#A30C26</color>
- <color name="colorRiskCardLowRisk">@color/colorSemanticLowRisk</color>
- <color name="colorRiskCardLowRiskPressed">#27713F</color>
- <color name="colorRiskCardNoCalculationPossible">@color/colorLight</color>
- <color name="colorRiskCardNoCalculationPossiblePressed">@color/colorGreyLight</color>
- <color name="colorRiskCardOutdatedRisk">#657888</color>
- <color name="colorRiskCardOutdatedRiskPressed">#556673</color>
- <color name="colorRiskCardUnknownRisk">#657888</color>
- <color name="colorRiskCardUnknownRiskPressed">#556673</color>
- <color name="riskCardGrey">#F5F5F5</color>
-
- <!-- Light/Grey Colors -->
- <color name="colorLight">#ffffff</color>
- <color name="colorGrey">#747576</color>
- <color name="colorGreyLight">#F5F5F5</color>
- <color name="colorGreyDisabled">#9917191A</color>
-
- <!-- OLD Text Colors -->
- <color name="textColorPrimary">#000000</color>
- <color name="textColorSecondary">#333333</color>
- <color name="textColorLight">#ffffff</color>
- <color name="textColorBlue">#2C79A9</color>
- <color name="textColorGrey">#747576</color>
-
- <!-- Visual Elements -->
- <color name="dividerColor">#0D000000</color>
- <color name="iconColor">@color/colorGrey</color>
-
- <!-- Stable Colors -->
- <color name="stableBackgroundColor">#ffffff</color>
- <color name="stableHighlightColor">#C3C3C3</color>
- <color name="stableTextColor">#000000</color>
- <color name="stableIconColor">#ffffff</color>
- <color name="stableLightTransparent">#33FFFFFF</color>
-
- <!-- Tracing Icon -->
- <color name="tracingIconActive">#007FAD</color>
- <color name="tracingIconInactive">#C00F2D</color>
- <color name="settingsIconInactive">#C3C3C3</color>
-
<!-- Tan Input -->
<color name="tanInputBackground">#1A17191A</color>
+ <!-- Stable Colors -->
+ <color name="colorStableDark">#000000</color>
+ <color name="colorStableMedium">#4D17191A</color>
+ <color name="colorStableLight">#FFFFFF</color>
</resources>
diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml
index cff746d8d7f9bcd91e866ce419e72dc3583fad25..5265348f75d00a56dc6eb4691f65ab331e4e5edd 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -1,9 +1,9 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="AppTheme" parent="Theme.AppCompat.DayNight">
- <item name="colorPrimary">@color/colorPrimary</item>
- <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
- <item name="android:windowBackground">@color/appTheme</item>
+ <item name="colorPrimary">@color/colorBrandSecondary</item>
+ <item name="colorPrimaryDark">@color/colorAccentTintButtonPressed</item>
+ <item name="android:windowBackground">@color/colorBackground</item>
</style>
<style name="AppTheme.NoActionBar">
@@ -24,7 +24,7 @@
<style name="AppTheme.Main" parent="AppTheme.NoActionBar" />
<style name="actionBar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">
- <item name="android:background">@color/colorLight</item>
+ <item name="android:background">@color/colorSurface1</item>
</style>
<!-- ####################################
@@ -62,7 +62,7 @@
</style>
<style name="buttonTracing">
- <item name="android:textColor">@color/textColorPrimary</item>
+ <item name="android:textColor">@color/colorTextPrimary1</item>
<item name="android:background">@drawable/rectangle</item>
<item name="android:backgroundTint">@color/button_main_tracing</item>
<item name="android:paddingStart">@dimen/button_padding_start_end</item>
@@ -72,7 +72,7 @@
</style>
<style name="switchBase" parent="@style/Widget.AppCompat.CompoundButton.Switch">
- <item name="android:colorControlActivated">@color/colorPrimary</item>
+ <item name="android:colorControlActivated">@color/colorAccentTintIcon</item>
</style>
<!-- ####################################
@@ -86,7 +86,7 @@
<item name="android:elevation">@dimen/elevation_weak</item>
<item name="android:textAllCaps">false</item>
<item name="android:background">@drawable/row</item>
- <item name="android:textColor">@color/textColorPrimary</item>
+ <item name="android:textColor">@color/colorTextPrimary1</item>
</style>
<style name="rowDanger" parent="row">
@@ -108,24 +108,24 @@
<style name="cardTracing">
<item name="android:padding">@dimen/card_padding</item>
<item name="android:background">@drawable/card</item>
- <item name="android:backgroundTint">@color/colorGreyLight</item>
+ <item name="android:backgroundTint">@color/colorSurface2</item>
</style>
<!-- todo unify padding with main card - tbr -->
<style name="cardHeadline" parent="@style/Widget.AppCompat.TextView">
<item name="android:textSize">@dimen/font_larger</item>
- <item name="android:textColor">@color/textColorLight</item>
+ <item name="android:textColor">@color/colorTextLight</item>
<item name="android:textStyle">bold</item>
</style>
<style name="cardText" parent="@style/Widget.AppCompat.TextView">
<item name="android:textSize">@dimen/font_normal</item>
- <item name="android:textColor">@color/textColorLight</item>
+ <item name="android:textColor">@color/colorTextLight</item>
</style>
<style name="cardTextDispatcher" parent="@style/Widget.AppCompat.TextView">
<item name="android:textSize">@dimen/font_normal</item>
- <item name="android:textColor">@color/textColorSecondary</item>
+ <item name="android:textColor">@color/colorTextPrimary2</item>
</style>
<style name="cardGrey">
@@ -231,7 +231,7 @@
<style name="textLargeEmphasized" parent="@style/TextAppearance.AppCompat.Headline">
<item name="android:textSize">@dimen/font_large</item>
- <item name="android:textColor">@color/textColorPrimary</item>
+ <item name="android:textColor">@color/colorTextPrimary1</item>
<item name="android:textStyle">bold</item>
</style>
@@ -249,7 +249,7 @@
</style>
<style name="textLink" parent="@style/textMultilineEmphasized">
- <item name="android:textColor">@color/textColorBlue</item>
+ <item name="android:textColor">@color/colorTextTint</item>
<item name="android:textSize">@dimen/font_large</item>
</style>
@@ -257,11 +257,15 @@
Icons
###################################### -->
<style name="icon">
- <item name="android:tint">@color/iconColor</item>
+ <item name="android:tint">@color/colorTextPrimary1</item>
</style>
<style name="iconStable">
- <item name="android:tint">@color/stableIconColor</item>
+ <item name="android:tint">@color/colorStableLight</item>
+ </style>
+
+ <style name="iconTracingStatus">
+ <item name="android:tint">@color/colorAccentTintIcon</item>
</style>
<!-- ####################################
@@ -308,7 +312,7 @@
<style name="testResultCardLargeText">
<item name="android:textSize">@dimen/font_larger</item>
- <item name="android:textColor">@color/textColorPrimary</item>
+ <item name="android:textColor">@color/colorTextPrimary1</item>
</style>
<!-- ####################################
@@ -316,7 +320,7 @@
###################################### -->
<style name="registrationQRCodeScanBody">
<item name="android:textAlignment">center</item>
- <item name="android:textColor">@color/colorLight</item>
+ <item name="android:textColor">@color/colorTextLight</item>
<item name="android:textSize">14sp</item>
</style>
</resources>