diff --git a/Corona-Warn-App/src/main/res/values/colors.xml b/Corona-Warn-App/src/main/res/values/colors.xml index 59d07e06e50d39b1c7d47581a4ee5ff854633fc9..87d18f60c8a14c251972cfc1a6c8af10c553b3e8 100644 --- a/Corona-Warn-App/src/main/res/values/colors.xml +++ b/Corona-Warn-App/src/main/res/values/colors.xml @@ -60,15 +60,6 @@ <color name="colorGreyLight">#F5F5F5</color> <color name="colorGreyDisabled">#9917191A</color> - <!-- Text Colors --> - <color name="textColorPrimary1">#17191A</color> - <color name="textColorPrimary2">#9917191A</color> - <color name="textColorPrimary3">#4D17191A</color> - <color name="textColorSemanticRed">#C00F2D</color> - <color name="textColorSemanticGreen">#2E854B</color> - <color name="textColorSemanticNeutral">#5D6E80</color> - <color name="textColorTint">#007FAD</color> - <!-- OLD Text Colors --> <color name="textColorPrimary">#000000</color> <color name="textColorSecondary">#333333</color> diff --git a/Corona-Warn-App/src/main/res/values/styles.xml b/Corona-Warn-App/src/main/res/values/styles.xml index 2232a8f423da5b7e162d1be1d9022fb59f50a963..d8808c8a6b833642a077117152541687c9f832b2 100644 --- a/Corona-Warn-App/src/main/res/values/styles.xml +++ b/Corona-Warn-App/src/main/res/values/styles.xml @@ -138,40 +138,40 @@ ###################################### --> <style name="headline4" parent="@style/TextAppearance.MaterialComponents.Headline4"> - <item name="android:textColor">@color/textColorPrimary1</item> + <item name="android:textColor">@color/colorTextPrimary1</item> </style> <style name="headline5" parent="@style/TextAppearance.MaterialComponents.Headline5"> - <item name="android:textColor">@color/textColorPrimary1</item> + <item name="android:textColor">@color/colorTextPrimary1</item> </style> <style name="headline6" parent="@style/TextAppearance.MaterialComponents.Headline6"> - <item name="android:textColor">@color/textColorPrimary1</item> + <item name="android:textColor">@color/colorTextPrimary1</item> <item name="android:textStyle">bold</item> </style> <style name="subtitle" parent="@style/TextAppearance.MaterialComponents.Subtitle1"> - <item name="android:textColor">@color/textColorPrimary1</item> + <item name="android:textColor">@color/colorTextPrimary1</item> </style> <style name="subtitleMedium" parent="@style/TextAppearance.MaterialComponents.Subtitle1"> - <item name="android:textColor">@color/textColorPrimary2</item> + <item name="android:textColor">@color/colorTextPrimary2</item> </style> <style name="body1" parent="@style/TextAppearance.MaterialComponents.Body1"> - <item name="android:textColor">@color/textColorPrimary1</item> + <item name="android:textColor">@color/colorTextPrimary1</item> </style> <style name="body2" parent="@style/TextAppearance.MaterialComponents.Body2"> - <item name="android:textColor">@color/textColorPrimary1</item> + <item name="android:textColor">@color/colorTextPrimary1</item> </style> <style name="body2Medium" parent="@style/TextAppearance.MaterialComponents.Body2"> - <item name="android:textColor">@color/textColorPrimary2</item> + <item name="android:textColor">@color/colorTextPrimary2</item> </style> <style name="bodyButton" parent="@style/TextAppearance.MaterialComponents.Button"> - <item name="android:textColor">@color/textColorPrimary1</item> + <item name="android:textColor">@color/colorTextPrimary1</item> </style>