From 6c7588f59195cc2e8925b8dbc8643d9d4dfbd308 Mon Sep 17 00:00:00 2001
From: Mohamed Metwalli <mohamed.metwalli@sap.com>
Date: Thu, 10 Jun 2021 16:41:48 +0200
Subject: [PATCH] =?UTF-8?q?Material=20Design=20=F0=9F=8E=A8=20(DEV)=20(#34?=
=?UTF-8?q?01)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Material migration
* Use named color
* Phase 1
* Remove explicit color from indicators
* Divider color
* Phase 2
* Light toolbar
* Phase 3
* Fix merge issues
* Progress Bar
* Fix merge issues
* use primary color
* Lint
* Update activity_main.xml
* Fix style change issues
* Renaming
* Rename c
* Fix indicator tinting
* Remove Toolbar menu style
* Fix test
* Run screenshots
* Fix test
* Update config.yml
* Disable shadows
* Show labels in screenshots
* Fix button style
* Bring Navbar color back
* Revert
* Fix accent color in light theme
---
.../debug/res/layout/activity_fake_main.xml | 3 -
.../debugoptions/ui/DebugOptionsFragment.kt | 2 +-
.../ui/PresenceTracingTestFragment.kt | 4 +-
.../ui/poster/QrCodePosterTestFragment.kt | 2 +-
.../layout/fragment_test_contact_diary.xml | 4 +-
...fragment_test_keydownload_adapter_line.xml | 9 +-
.../layout/fragment_test_presence_tracing.xml | 2 +-
.../layout/fragment_test_qr_code_poster.xml | 3 +-
.../tracing/states/TracingState.kt | 46 ++---
.../tracing/ui/details/TracingDetailsState.kt | 4 +-
.../attendee/checkins/CheckInsFragment.kt | 1 -
.../ui/submission/SubmissionCancelDialog.kt | 14 +-
.../ui/submission/tan/TanInput.kt | 2 +-
.../coronawarnapp/util/DataBindingAdapters.kt | 10 +-
.../formatter/FormatterSubmissionHelper.kt | 2 +-
.../src/main/res/color/button_alert_red.xml | 2 +-
.../res/color/button_contact_diary_person.xml | 2 +-
.../src/main/res/color/button_light.xml | 2 +-
.../src/main/res/color/button_primary.xml | 4 +-
.../src/main/res/color/button_text_color.xml | 2 +-
.../color/contact_diary_tab_text_color.xml | 2 +-
.../main/res/color/radiobutton_accented.xml | 5 -
.../src/main/res/drawable/bullet_point.xml | 2 +-
...act_diary_duration_background_selected.xml | 2 +-
.../src/main/res/drawable/dashed_box.xml | 2 +-
.../src/main/res/drawable/ic_main_share.xml | 2 +-
.../src/main/res/drawable/splash_screen.xml | 2 +-
.../src/main/res/layout/activity_main.xml | 4 -
...lytics_ppa_userinfo_input_adapter_item.xml | 2 -
.../analytics_ppa_userinfo_input_fragment.xml | 2 +-
.../bugreporting_debuglog_upload_dialog.xml | 5 +-
.../contact_diary_add_location_fragment.xml | 2 +-
.../contact_diary_add_person_fragment.xml | 2 +-
.../res/layout/contact_diary_day_fragment.xml | 3 +-
.../contact_diary_overview_fragment.xml | 5 +-
.../layout/contact_diary_person_list_item.xml | 12 +-
.../main/res/layout/covid_test_error_card.xml | 18 +-
.../src/main/res/layout/duration_picker.xml | 4 -
.../main/res/layout/fragment_calendar_day.xml | 2 +-
.../main/res/layout/fragment_certificates.xml | 3 +-
.../res/layout/fragment_confirm_check_in.xml | 6 +-
.../fragment_covid_certificate_details.xml | 5 +-
.../res/layout/fragment_edit_check_in.xml | 8 +-
.../fragment_request_covid_certificate.xml | 4 +-
.../main/res/layout/fragment_scan_qr_code.xml | 9 +-
.../fragment_settings_notifications.xml | 4 +-
.../res/layout/fragment_settings_tracing.xml | 4 +-
.../fragment_statistics_explanation.xml | 4 +-
.../layout/fragment_submission_consent.xml | 76 +++----
.../fragment_submission_deletion_warning.xml | 8 +-
...sion_no_consent_positive_other_warning.xml | 4 +-
.../fragment_submission_qr_code_scan.xml | 1 -
.../res/layout/fragment_submission_tan.xml | 4 +-
...ragment_submission_test_result_pending.xml | 28 +--
.../fragment_submission_your_consent.xml | 6 +-
.../fragment_test_home_test_cards_layout.xml | 3 +-
.../fragment_trace_location_onboarding.xml | 2 +-
.../layout/fragment_vaccination_details.xml | 3 +-
.../res/layout/fragment_vaccination_list.xml | 3 +-
.../main/res/layout/home_fragment_layout.xml | 2 +-
.../home_submission_status_card_fetching.xml | 8 +-
.../include_certificate_qrcode_card.xml | 1 -
.../res/layout/include_dispatcher_card.xml | 2 +-
.../src/main/res/layout/include_divider.xml | 2 +-
.../new_release_info_screen_fragment.xml | 2 +-
.../res/layout/onboaring_loading_layout.xml | 15 +-
.../res/layout/qr_code_poster_fragment.xml | 1 -
.../rat_profile_onboarding_fragment.xml | 2 +-
.../layout/rat_profile_qr_code_fragment.xml | 7 +-
.../submission_blocking_dialog_view.xml | 7 +-
.../submission_create_rat_profile_card.xml | 2 +-
...urvey_consent_blocking_progress_dialog.xml | 4 +-
.../res/layout/survey_consent_fragment.xml | 4 +-
.../src/main/res/layout/switch_row.xml | 1 -
...ce_location_attendee_checkins_fragment.xml | 4 +-
...location_attendee_checkins_item_active.xml | 4 +-
.../layout/trace_location_create_fragment.xml | 4 +-
...e_location_organizer_category_fragment.xml | 2 +-
..._location_organizer_category_separator.xml | 2 +-
...tion_organizer_qr_code_detail_fragment.xml | 4 +-
...cation_organizer_qr_code_info_fragment.xml | 2 +-
...ocation_organizer_trace_locations_item.xml | 4 +-
...rganizer_trace_locations_list_fragment.xml | 6 +-
.../layout/tracing_card_info_row_layout.xml | 4 +-
.../layout/tracing_content_disabled_view.xml | 6 +-
.../layout/tracing_content_failed_view.xml | 6 +-
.../layout/tracing_content_progress_view.xml | 16 +-
.../tracing_details_fragment_layout.xml | 2 +-
...details_item_container_elevated_layout.xml | 2 +-
.../layout/vaccination_consent_fragment.xml | 7 +-
.../main/res/layout/view_consent_status.xml | 4 +-
...view_country_list_entry_flag_container.xml | 4 +-
.../main/res/layout/view_more_information.xml | 5 +-
.../menu_trace_location_qr_code_poster.xml | 4 +-
.../src/main/res/values-night/colors.xml | 14 +-
.../src/main/res/values-v28/styles.xml | 6 +-
.../src/main/res/values/colors.xml | 35 ++--
.../src/main/res/values/styles.xml | 185 +++++++-----------
.../util/DataBindingAdaptersTest.kt | 14 +-
99 files changed, 351 insertions(+), 438 deletions(-)
delete mode 100644 Corona-Warn-App/src/main/res/color/radiobutton_accented.xml
diff --git a/Corona-Warn-App/src/debug/res/layout/activity_fake_main.xml b/Corona-Warn-App/src/debug/res/layout/activity_fake_main.xml
index 132484be8..dd71ff901 100644
--- a/Corona-Warn-App/src/debug/res/layout/activity_fake_main.xml
+++ b/Corona-Warn-App/src/debug/res/layout/activity_fake_main.xml
@@ -15,11 +15,8 @@
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/fake_bottom_navigation"
- style="@style/Widget.MaterialComponents.BottomNavigationView"
android:layout_width="0dp"
android:layout_height="wrap_content"
- app:itemIconTint="@color/nav_item_color"
- app:itemTextColor="@color/nav_item_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt
index f3b5ff6b4..9f31f351d 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt
@@ -85,7 +85,7 @@ class DebugOptionsFragment : Fragment(R.layout.fragment_test_debugoptions), Auto
}
private infix fun String.styleTo(value: String) = buildSpannedString {
- val color = requireContext().getColorCompat(R.color.colorAccent)
+ val color = requireContext().getColorCompat(R.color.colorPrimary)
append("${this@styleTo}:")
appendLine()
color(color) { append(value) }
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt
index 6bb242129..7e2ceebc2 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/PresenceTracingTestFragment.kt
@@ -116,13 +116,13 @@ class PresenceTracingTestFragment : Fragment(R.layout.fragment_test_presence_tra
private fun styleText(key: String, value: Any?): SpannedString =
buildSpannedString {
bold {
- color(requireContext().getColorCompat(R.color.colorAccent)) {
+ color(requireContext().getColorCompat(R.color.colorPrimary)) {
append("$key = ")
}
}
scale(0.85f) {
- color(requireContext().getColorCompat(R.color.colorTextPrimary1)) {
+ color(requireContext().getColorCompat(R.color.colorOnPrimary)) {
append(value.toString())
}
}
diff --git a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt
index 62b579655..cb4fa278a 100644
--- a/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt
+++ b/Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/presencetracing/ui/poster/QrCodePosterTestFragment.kt
@@ -143,7 +143,7 @@ class QrCodePosterTestFragment : Fragment(R.layout.fragment_test_qr_code_poster)
bold {
append("Tips:")
}
- color(requireContext().getColorCompat(R.color.colorAccent)) {
+ color(requireContext().getColorCompat(R.color.colorPrimary)) {
appendLine()
appendLine()
append(
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_contact_diary.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_contact_diary.xml
index 573345c1d..49ce40f15 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_contact_diary.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_contact_diary.xml
@@ -244,7 +244,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="@dimen/spacing_small"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/location_visits_fancy" />
@@ -286,7 +286,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="@dimen/spacing_small"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/person_encounters_fancy" />
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload_adapter_line.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload_adapter_line.xml
index ba86dfd17..5991b1b70 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload_adapter_line.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload_adapter_line.xml
@@ -3,8 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:background="?selectableItemBackground"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:background="?selectableItemBackground">
<TextView
android:id="@+id/location_info"
style="@style/body1"
@@ -42,9 +42,9 @@
<TextView
android:id="@+id/creation_label"
+ style="@style/TextAppearance.AppCompat.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- style="@style/TextAppearance.AppCompat.Caption"
android:layout_marginEnd="16dp"
android:text="Downloaded at"
app:layout_constraintBottom_toBottomOf="@+id/location_info"
@@ -65,11 +65,12 @@
app:layout_constraintTop_toTopOf="@+id/time_info"
tools:text="1111-11-11 11:11" />
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_indicator"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginEnd="16dp"
+ android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_presence_tracing.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_presence_tracing.xml
index 19c37f7ec..1e761e8a7 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_presence_tracing.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_presence_tracing.xml
@@ -121,7 +121,7 @@
android:layout_gravity="center"
android:text="Qr Code"
android:textColor="@android:color/white"
- app:backgroundTint="@color/colorAccent"
+ app:backgroundTint="@color/colorPrimary"
app:icon="@drawable/ic_qrcode"
app:iconTint="@android:color/white" />
</LinearLayout>
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_qr_code_poster.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_qr_code_poster.xml
index f6b509899..35cd82501 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_qr_code_poster.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_qr_code_poster.xml
@@ -117,7 +117,6 @@
android:layout_height="wrap_content"
android:indeterminate="true"
app:hideAnimationBehavior="inward"
- app:indicatorColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -159,7 +158,7 @@
android:layout_width="100dp"
android:layout_height="5dp"
android:layout_gravity="center"
- android:background="@color/colorAccent" />
+ android:background="@color/colorPrimary" />
</FrameLayout>
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingState.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingState.kt
index d105c9676..0bf78537a 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingState.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/states/TracingState.kt
@@ -15,9 +15,9 @@ sealed class TracingState {
abstract val riskState: RiskState
abstract val isInDetailsMode: Boolean
- internal fun formatRelativeDateTimeString(c: Context, date: Instant): CharSequence? =
+ internal fun formatRelativeDateTimeString(context: Context, date: Instant): CharSequence? =
DateUtils.getRelativeDateTimeString(
- c,
+ context,
date.millis,
DateUtils.DAY_IN_MILLIS,
DateUtils.DAY_IN_MILLIS * 2,
@@ -177,15 +177,15 @@ data class TracingFailed(
context.getString(R.string.risk_card_body_not_yet_fetched)
}
- fun getLastRiskState(c: Context): String {
- val argumentValue = c.getString(
+ fun getLastRiskState(context: Context): String {
+ val argumentValue = context.getString(
when (riskState) {
RiskState.INCREASED_RISK -> R.string.risk_card_increased_risk_headline
RiskState.LOW_RISK -> R.string.risk_card_low_risk_headline
RiskState.CALCULATION_FAILED -> R.string.risk_card_check_failed_no_internet_headline
}
)
- return c.getString(R.string.risk_card_no_calculation_possible_body_saved_risk).format(argumentValue)
+ return context.getString(R.string.risk_card_no_calculation_possible_body_saved_risk).format(argumentValue)
}
}
@@ -198,24 +198,24 @@ data class TracingDisabled(
val showEnableTracingButton: Boolean = !isInDetailsMode
- fun getTimeFetched(c: Context): String = if (lastExposureDetectionTime != null) {
- c.getString(
+ fun getTimeFetched(context: Context): String = if (lastExposureDetectionTime != null) {
+ context.getString(
R.string.risk_card_body_time_fetched,
- formatRelativeDateTimeString(c, lastExposureDetectionTime)
+ formatRelativeDateTimeString(context, lastExposureDetectionTime)
)
} else {
- c.getString(R.string.risk_card_body_not_yet_fetched)
+ context.getString(R.string.risk_card_body_not_yet_fetched)
}
- fun getLastRiskState(c: Context): String {
- val argumentValue = c.getString(
+ fun getLastRiskState(context: Context): String {
+ val argumentValue = context.getString(
when (riskState) {
RiskState.INCREASED_RISK -> R.string.risk_card_increased_risk_headline
RiskState.LOW_RISK -> R.string.risk_card_low_risk_headline
RiskState.CALCULATION_FAILED -> R.string.risk_card_check_failed_no_internet_headline
}
)
- return c.getString(R.string.risk_card_no_calculation_possible_body_saved_risk).format(argumentValue)
+ return context.getString(R.string.risk_card_no_calculation_possible_body_saved_risk).format(argumentValue)
}
}
@@ -225,37 +225,37 @@ data class TracingInProgress(
val tracingProgress: TracingProgress
) : TracingState() {
- fun getProgressCardHeadline(c: Context): String = when (tracingProgress) {
+ fun getProgressCardHeadline(context: Context): String = when (tracingProgress) {
TracingProgress.Downloading -> R.string.risk_card_progress_download_headline
TracingProgress.IsCalculating -> R.string.risk_card_progress_calculation_headline
TracingProgress.Idle -> null
- }?.let { c.getString(it) } ?: ""
+ }?.let { context.getString(it) } ?: ""
- fun getProgressCardBody(c: Context): String = when (tracingProgress) {
+ fun getProgressCardBody(context: Context): String = when (tracingProgress) {
TracingProgress.Downloading -> R.string.risk_card_progress_download_body
TracingProgress.IsCalculating -> R.string.risk_card_progress_calculation_body
TracingProgress.Idle -> null
- }?.let { c.getString(it) } ?: ""
+ }?.let { context.getString(it) } ?: ""
/**
* Formats the risk card icon color depending on risk level
* This special handling is required due to light / dark mode differences and switches
* between colored / light / dark background
*/
- fun getStableIconColor(c: Context): Int = when (riskState) {
+ fun getStableIconColor(context: Context): Int = when (riskState) {
RiskState.INCREASED_RISK, RiskState.LOW_RISK -> R.color.colorStableLight
else -> R.color.colorTextSemanticNeutral
- }.let { c.getColorCompat(it) }
+ }.let { context.getColorCompat(it) }
- fun getStableTextColor(c: Context): Int = when (riskState) {
+ fun getStableTextColor(context: Context): Int = when (riskState) {
RiskState.INCREASED_RISK, RiskState.LOW_RISK -> R.color.colorTextPrimary1InvertedStable
- else -> R.color.colorTextPrimary1
- }.let { c.getColorCompat(it) }
+ else -> R.color.colorOnPrimary
+ }.let { context.getColorCompat(it) }
@ColorInt
- fun getContainerColor(c: Context): Int = when (riskState) {
+ fun getContainerColor(context: Context): Int = when (riskState) {
RiskState.INCREASED_RISK -> R.color.colorSemanticHighRisk
RiskState.LOW_RISK -> R.color.colorSemanticLowRisk
RiskState.CALCULATION_FAILED -> R.color.colorSemanticUnknownRisk
- }.let { c.getColorCompat(it) }
+ }.let { context.getColorCompat(it) }
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsState.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsState.kt
index d3b79ddad..49de33c13 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsState.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsState.kt
@@ -20,10 +20,10 @@ data class TracingDetailsState(
}.let { c.getColorCompat(it) }
fun getStableTextColor(c: Context): Int = when {
- tracingStatus == GeneralTracingStatus.Status.TRACING_INACTIVE -> R.color.colorTextPrimary1
+ tracingStatus == GeneralTracingStatus.Status.TRACING_INACTIVE -> R.color.colorOnPrimary
riskState == RiskState.INCREASED_RISK ||
riskState == RiskState.LOW_RISK -> R.color.colorTextPrimary1InvertedStable
- else -> R.color.colorTextPrimary1
+ else -> R.color.colorOnPrimary
}.let { c.getColorCompat(it) }
fun isUpdateButtonEnabled(): Boolean = isManualKeyRetrievalEnabled
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt
index 488b48271..2ca5bc261 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/attendee/checkins/CheckInsFragment.kt
@@ -210,7 +210,6 @@ class CheckInsFragment : Fragment(R.layout.trace_location_attendee_checkins_frag
}.show()
private fun setupMenu(toolbar: Toolbar) = toolbar.apply {
- inflateMenu(R.menu.menu_trace_location_attendee_checkins)
setOnMenuItemClickListener {
when (it.itemId) {
R.id.menu_information -> {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionCancelDialog.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionCancelDialog.kt
index 5bee17983..26544ddf2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionCancelDialog.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionCancelDialog.kt
@@ -8,15 +8,15 @@ class SubmissionCancelDialog(
val context: Context
) {
fun show(onUserDidCancel: () -> Unit) {
- MaterialAlertDialogBuilder(context).apply {
- setTitle(R.string.submission_error_dialog_confirm_cancellation_title)
- setMessage(R.string.submission_error_dialog_confirm_cancellation_body)
- setPositiveButton(R.string.submission_error_dialog_confirm_cancellation_button_positive) { _, _ ->
+ MaterialAlertDialogBuilder(context)
+ .setTitle(R.string.submission_error_dialog_confirm_cancellation_title)
+ .setMessage(R.string.submission_error_dialog_confirm_cancellation_body)
+ .setPositiveButton(R.string.submission_error_dialog_confirm_cancellation_button_positive) { _, _ ->
onUserDidCancel()
}
- setNegativeButton(R.string.submission_error_dialog_confirm_cancellation_button_negative) { _, _ ->
- // NOOP
+ .setNegativeButton(R.string.submission_error_dialog_confirm_cancellation_button_negative) { _, _ ->
+ /* NOOP */
}
- }.show()
+ .show()
}
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/TanInput.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/TanInput.kt
index dd01faced..b5d603398 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/TanInput.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/tan/TanInput.kt
@@ -107,7 +107,7 @@ class TanInput(context: Context, attrs: AttributeSet) : ViewGroup(context, attrs
tanDigit.setTextColor(
if (Tan.isTanCharacterValid(text))
- context.getColorCompat(R.color.colorTextPrimary1)
+ context.getColorCompat(R.color.colorOnPrimary)
else
context.getColorCompat(R.color.colorTextSemanticRed)
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt
index 5147b479b..58693c021 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataBindingAdapters.kt
@@ -4,20 +4,21 @@ import android.content.res.ColorStateList
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.widget.ImageView
-import android.widget.Switch
import androidx.core.widget.ImageViewCompat
import androidx.databinding.BindingAdapter
import com.airbnb.lottie.LottieAnimationView
import com.airbnb.lottie.LottieDrawable
import com.airbnb.lottie.LottieProperty
import com.airbnb.lottie.model.KeyPath
+import com.google.android.material.progressindicator.CircularProgressIndicator
+import com.google.android.material.switchmaterial.SwitchMaterial
import de.rki.coronawarnapp.util.ContextExtensions.getDrawableCompat
const val IGNORE_CHANGE_TAG = "ignore"
const val DRAWABLE_TYPE = "drawable"
@BindingAdapter("checked")
-fun setChecked(switch: Switch, status: Boolean?) {
+fun setChecked(switch: SwitchMaterial, status: Boolean?) {
if (status != null) {
switch.tag = IGNORE_CHANGE_TAG
switch.isChecked = status
@@ -57,3 +58,8 @@ fun setAnimationColor(view: LottieAnimationView, color: Int?) {
fun setTint(view: ImageView, color: Int) {
ImageViewCompat.setImageTintList(view, ColorStateList.valueOf(color))
}
+
+@BindingAdapter("app:indicatorColor")
+fun setIndicatorColor(view: CircularProgressIndicator, color: Int) {
+ view.setIndicatorColor(color)
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
index c309f2188..0e458a6a2 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
@@ -151,4 +151,4 @@ fun formatCountrySelectCardColor(context: Context, isActive: Boolean?): Int =
formatColor(context, isActive == true, R.color.colorTextSemanticNeutral, R.color.card_dark)
fun formatCountrySelectCardTextColor(context: Context, isActive: Boolean?): Int =
- formatColor(context, isActive == true, R.color.colorTextEmphasizedButton, R.color.colorTextPrimary1)
+ formatColor(context, isActive == true, R.color.colorTextEmphasizedButton, R.color.colorOnPrimary)
diff --git a/Corona-Warn-App/src/main/res/color/button_alert_red.xml b/Corona-Warn-App/src/main/res/color/button_alert_red.xml
index 061c98a5f..75cb91168 100644
--- a/Corona-Warn-App/src/main/res/color/button_alert_red.xml
+++ b/Corona-Warn-App/src/main/res/color/button_alert_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/colorAccentTintButton" android:state_activated="false" /> <!-- default -->
+ <item android:color="@color/colorPrimary" android:state_activated="false" /> <!-- default -->
<item android:color="@color/colorSemanticHighRiskPressed" /> <!-- enabled -->
</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/color/button_contact_diary_person.xml b/Corona-Warn-App/src/main/res/color/button_contact_diary_person.xml
index 271ca0d8e..0966022c3 100644
--- a/Corona-Warn-App/src/main/res/color/button_contact_diary_person.xml
+++ b/Corona-Warn-App/src/main/res/color/button_contact_diary_person.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/colorBackground" android:state_checked="false" />
+ <item android:color="@color/colorSurface" android:state_checked="false" />
<item android:color="@color/colorAccentTintButtonPressed" android:state_checked="true" />
</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 0f25c2ad0..a37ac26a5 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/colorSurface1Pressed" android:state_pressed="true" /> <!-- pressed -->
- <item android:color="@color/colorBackground" /> <!-- default -->
+ <item android:color="@color/colorSurface" /> <!-- 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 72706c836..692e1aae2 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/colorAccentTintButtonPressed" android:state_pressed="true" /> <!-- pressed -->
+ <item android:color="@color/colorPrimary" android:state_pressed="true" /> <!-- pressed -->
<item android:color="@color/colorSurface2" android:state_enabled="false" /> <!-- disabled -->
- <item android:color="@color/colorAccentTintButton" /> <!-- default -->
+ <item android:color="@color/colorPrimary" /> <!-- default -->
</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/color/button_text_color.xml b/Corona-Warn-App/src/main/res/color/button_text_color.xml
index d99d75969..56de7ad7a 100644
--- a/Corona-Warn-App/src/main/res/color/button_text_color.xml
+++ b/Corona-Warn-App/src/main/res/color/button_text_color.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/colorTextPrimary2" android:state_enabled="false" /> <!-- disabled -->
- <item android:color="@color/colorTextPrimary1" /> <!-- default -->
+ <item android:color="@color/colorOnPrimary" /> <!-- default -->
</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/color/contact_diary_tab_text_color.xml b/Corona-Warn-App/src/main/res/color/contact_diary_tab_text_color.xml
index 9faf0a4c6..23abe765e 100644
--- a/Corona-Warn-App/src/main/res/color/contact_diary_tab_text_color.xml
+++ b/Corona-Warn-App/src/main/res/color/contact_diary_tab_text_color.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:color="@color/colorTextPrimary1"/>
+ <item android:state_selected="true" android:color="@color/colorOnPrimary"/>
<item android:color="@color/colorTextPrimary2"/>
</selector>
diff --git a/Corona-Warn-App/src/main/res/color/radiobutton_accented.xml b/Corona-Warn-App/src/main/res/color/radiobutton_accented.xml
deleted file mode 100644
index d5cb9bf2e..000000000
--- a/Corona-Warn-App/src/main/res/color/radiobutton_accented.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/colorAccent" android:state_checked="true" />
- <item android:color="@color/colorStableHairlineLight" />
-</selector>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/drawable/bullet_point.xml b/Corona-Warn-App/src/main/res/drawable/bullet_point.xml
index 9b3021520..5f1cc480d 100644
--- a/Corona-Warn-App/src/main/res/drawable/bullet_point.xml
+++ b/Corona-Warn-App/src/main/res/drawable/bullet_point.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/colorTextPrimary1" />
+ <solid android:color="@color/colorOnPrimary" />
</shape>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/drawable/contact_diary_duration_background_selected.xml b/Corona-Warn-App/src/main/res/drawable/contact_diary_duration_background_selected.xml
index 9a9dca8a8..75e486910 100644
--- a/Corona-Warn-App/src/main/res/drawable/contact_diary_duration_background_selected.xml
+++ b/Corona-Warn-App/src/main/res/drawable/contact_diary_duration_background_selected.xml
@@ -3,5 +3,5 @@
android:shape="rectangle">
<corners android:radius="@dimen/radius_card" />
<solid android:color="@color/colorSurface1" />
- <stroke android:width="2dip" android:color="@color/colorAccent" />
+ <stroke android:width="2dip" android:color="@color/colorPrimary" />
</shape>
diff --git a/Corona-Warn-App/src/main/res/drawable/dashed_box.xml b/Corona-Warn-App/src/main/res/drawable/dashed_box.xml
index 1cda84ea2..52efa9ed7 100644
--- a/Corona-Warn-App/src/main/res/drawable/dashed_box.xml
+++ b/Corona-Warn-App/src/main/res/drawable/dashed_box.xml
@@ -5,7 +5,7 @@
<solid android:color="@color/colorSurface2" />
<stroke
android:width="2dp"
- android:color="@color/colorHairline"
+ android:color="@color/dividerColor"
android:dashWidth="5dp"
android:dashGap="5dp" />
<padding
diff --git a/Corona-Warn-App/src/main/res/drawable/ic_main_share.xml b/Corona-Warn-App/src/main/res/drawable/ic_main_share.xml
index 686289392..f70fee7d0 100644
--- a/Corona-Warn-App/src/main/res/drawable/ic_main_share.xml
+++ b/Corona-Warn-App/src/main/res/drawable/ic_main_share.xml
@@ -6,7 +6,7 @@
<group>
<clip-path android:pathData="M26,25.08C25.24,25.08 24.56,25.38 24.04,25.85L16.91,21.7C16.96,21.47 17,21.24 17,21C17,20.76 16.96,20.53 16.91,20.3L23.96,16.19C24.5,16.69 25.21,17 26,17C27.66,17 29,15.66 29,14C29,12.34 27.66,11 26,11C24.34,11 23,12.34 23,14C23,14.24 23.04,14.47 23.09,14.7L16.04,18.81C15.5,18.31 14.79,18 14,18C12.34,18 11,19.34 11,21C11,22.66 12.34,24 14,24C14.79,24 15.5,23.69 16.04,23.19L23.16,27.35C23.11,27.56 23.08,27.78 23.08,28C23.08,29.61 24.39,30.92 26,30.92C27.61,30.92 28.92,29.61 28.92,28C28.92,26.39 27.61,25.08 26,25.08Z" />
<path
- android:fillColor="@color/colorTextPrimary1"
+ android:fillColor="@color/colorOnPrimary"
android:fillType="evenOdd"
android:pathData="M8,9h24v24h-24z"
android:strokeWidth="1"
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 f3cffa04d..ee18178a8 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/colorBackground" />
+ <item android:drawable="@color/colorSurface" />
<!-- logo -->
<item>
diff --git a/Corona-Warn-App/src/main/res/layout/activity_main.xml b/Corona-Warn-App/src/main/res/layout/activity_main.xml
index 076a8e9d5..67d76cfbe 100644
--- a/Corona-Warn-App/src/main/res/layout/activity_main.xml
+++ b/Corona-Warn-App/src/main/res/layout/activity_main.xml
@@ -25,12 +25,8 @@
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/main_bottom_navigation"
- style="@style/Widget.MaterialComponents.BottomNavigationView"
android:layout_width="0dp"
android:layout_height="wrap_content"
- app:itemIconTint="@color/nav_item_color"
- app:itemTextColor="@color/nav_item_color"
- app:labelVisibilityMode="labeled"
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/analytics_ppa_userinfo_input_adapter_item.xml b/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_adapter_item.xml
index 6c52c3330..8cf5aeaa9 100644
--- a/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_adapter_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_adapter_item.xml
@@ -13,8 +13,6 @@
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
- android:buttonTint="@color/radiobutton_accented"
- android:buttonTintMode="src_atop"
android:clickable="false"
android:focusable="false" />
diff --git a/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_fragment.xml b/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_fragment.xml
index a4edac6db..0b625ab97 100644
--- a/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/analytics_ppa_userinfo_input_fragment.xml
@@ -11,7 +11,7 @@
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
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/bugreporting_debuglog_upload_dialog.xml b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_upload_dialog.xml
index 7a719f9e6..20cec6b64 100644
--- a/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_upload_dialog.xml
+++ b/Corona-Warn-App/src/main/res/layout/bugreporting_debuglog_upload_dialog.xml
@@ -4,15 +4,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- style="@style/Widget.AppCompat.ProgressBar"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:progressTint="@color/colorAccentTintIcon"
+ android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_add_location_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_add_location_fragment.xml
index b7c82a8de..82566d31f 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_add_location_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_add_location_fragment.xml
@@ -2,7 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
android:fillViewport="true"
android:transitionName="contact_diary_shared_content">
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
index 9b51a88a0..0b3dcc93b 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_add_person_fragment.xml
@@ -2,7 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
android:fillViewport="true"
android:transitionName="contact_diary_shared_content">
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
index 5e28a5a9d..a33956d31 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml
@@ -31,7 +31,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contact_diary_day_header"
- app:tabIndicatorColor="@color/colorAccent"
+ app:tabIndicatorColor="@color/colorPrimary"
app:tabTextColor="@color/contact_diary_tab_text_color" />
<androidx.viewpager2.widget.ViewPager2
@@ -45,7 +45,6 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/contact_diary_day_fab"
- style="@style/Widget.App.ExtendedFloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
index b66cdd2c0..1131e3baf 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_overview_fragment.xml
@@ -6,15 +6,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/contact_diary_overview_title"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
android:orientation="vertical">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/colorBackground"
- app:popupTheme="@style/CWAToolbar.Menu"
+ android:background="@color/colorSurface"
app:title="@string/contact_diary_overview_title" />
<androidx.recyclerview.widget.RecyclerView
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml
index df108259f..d030574de 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml
@@ -23,7 +23,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/duration_below_15"
android:layout_width="match_parent"
- app:backgroundTint="@color/colorBackground"
+ app:backgroundTint="@color/colorSurface"
style="@style/contactDiaryPersonButton"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -38,7 +38,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/duration_above_15"
style="@style/contactDiaryPersonButton"
- app:backgroundTint="@color/colorBackground"
+ app:backgroundTint="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -62,7 +62,7 @@
android:id="@+id/mask_with"
style="@style/contactDiaryPersonButton"
android:layout_width="match_parent"
- app:backgroundTint="@color/colorBackground"
+ app:backgroundTint="@color/colorSurface"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/contact_diary_person_encounter_mask_with" />
@@ -70,7 +70,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/mask_without"
style="@style/contactDiaryPersonButton"
- app:backgroundTint="@color/colorBackground"
+ app:backgroundTint="@color/colorSurface"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
@@ -95,7 +95,7 @@
style="@style/contactDiaryPersonButton"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:backgroundTint="@color/colorBackground"
+ app:backgroundTint="@color/colorSurface"
android:layout_weight="1"
android:text="@string/contact_diary_person_encounter_environment_outside" />
@@ -104,7 +104,7 @@
style="@style/contactDiaryPersonButton"
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:backgroundTint="@color/colorBackground"
+ app:backgroundTint="@color/colorSurface"
android:layout_weight="1"
android:text="@string/contact_diary_person_encounter_environment_inside" />
diff --git a/Corona-Warn-App/src/main/res/layout/covid_test_error_card.xml b/Corona-Warn-App/src/main/res/layout/covid_test_error_card.xml
index d71d68829..a401b3ec4 100644
--- a/Corona-Warn-App/src/main/res/layout/covid_test_error_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/covid_test_error_card.xml
@@ -73,10 +73,10 @@
android:layout_marginBottom="@dimen/spacing_small"
android:indeterminate="true"
android:visibility="gone"
- app:indicatorColor="@color/colorAccent"
+ app:indicatorColor="@color/colorPrimary"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/test_time"
- app:layout_constraintBottom_toBottomOf="parent"
app:showAnimationBehavior="inward"
app:trackColor="@android:color/transparent" />
@@ -88,11 +88,11 @@
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/card_padding"
android:focusable="false"
- android:visibility="gone"
android:text="@string/test_certificate_error_refreshing_status"
+ android:visibility="gone"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/progress_bar"
app:layout_constraintTop_toTopOf="@id/progress_bar"
- app:layout_constraintEnd_toEndOf="parent"
tools:text="@string/test_certificate_error_refreshing_status" />
<com.google.android.material.button.MaterialButton
@@ -105,25 +105,25 @@
android:layout_marginEnd="@dimen/card_padding"
android:layout_marginBottom="@dimen/spacing_small"
android:text="@string/test_certificate_error_retry_button"
- android:textColor="@color/colorAccent"
+ android:textColor="@color/colorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/test_time"
- app:strokeColor="@color/colorAccent" />
+ app:strokeColor="@color/colorPrimary" />
<Button
android:id="@+id/delete_button"
style="@style/buttonLight"
- android:backgroundTint="@color/button_main_tracing"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/card_padding"
android:layout_marginEnd="@dimen/card_padding"
android:layout_marginBottom="@dimen/spacing_small"
+ android:backgroundTint="@color/button_main_tracing"
android:text="@string/test_certificate_error_delete_button"
- android:textColor="@color/colorAccent"
+ android:textColor="@color/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/retry_button"
- app:strokeColor="@color/colorAccent" />
+ app:strokeColor="@color/colorPrimary" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/duration_picker.xml b/Corona-Warn-App/src/main/res/layout/duration_picker.xml
index 5115ad426..f15ea35eb 100644
--- a/Corona-Warn-App/src/main/res/layout/duration_picker.xml
+++ b/Corona-Warn-App/src/main/res/layout/duration_picker.xml
@@ -61,7 +61,6 @@
android:text=":"
app:layout_constraintBottom_toBottomOf="@+id/minutes"
app:layout_constraintEnd_toStartOf="@+id/minutes"
- app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/hours"
app:layout_constraintTop_toTopOf="@+id/minutes"
tools:ignore="HardcodedText"
@@ -74,7 +73,6 @@
android:layout_marginEnd="67dp"
android:theme="@style/DefaultNumberPickerTheme"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/divider"
app:layout_constraintTop_toBottomOf="@+id/labelMinutes" />
@@ -85,7 +83,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/duration_dialog_cancel_button"
- android:textColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="@+id/ok_button"
app:layout_constraintEnd_toStartOf="@id/ok_button"
app:layout_constraintTop_toTopOf="@+id/ok_button" />
@@ -99,7 +96,6 @@
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="@string/duration_dialog_ok_button"
- android:textColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/minutes" />
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_calendar_day.xml b/Corona-Warn-App/src/main/res/layout/fragment_calendar_day.xml
index 8daa8976e..6c8dba216 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_calendar_day.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_calendar_day.xml
@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
- android:textColor="@color/colorTextPrimary1"
+ android:textColor="@color/colorOnPrimary"
android:textSize="@dimen/font_button" />
</LinearLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_certificates.xml b/Corona-Warn-App/src/main/res/layout/fragment_certificates.xml
index 54fc467de..a5000060c 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_certificates.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_certificates.xml
@@ -13,11 +13,10 @@
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/main_tracing"
+ style="@style/CWAToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/colorBackground"
app:menu="@menu/menu_certificates_fragment"
- app:popupTheme="@style/CWAToolbar.Menu"
app:title="@string/certification_screen_title" />
</com.google.android.material.appbar.AppBarLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_confirm_check_in.xml b/Corona-Warn-App/src/main/res/layout/fragment_confirm_check_in.xml
index 787d27288..d45bba219 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_confirm_check_in.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_confirm_check_in.xml
@@ -67,8 +67,7 @@
app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways"
app:navigationIcon="@drawable/ic_close"
- app:navigationIconTint="@color/colorStableLight"
- app:titleTextColor="@color/colorAccentTintButton">
+ app:navigationIconTint="@color/colorStableLight">
<LinearLayout
android:id="@+id/header_text_layout"
@@ -195,8 +194,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/confirm_checkin_settings_card_checkout_toggle_label"
- android:textSize="14sp"
- android:theme="@style/switchBase" />
+ android:textSize="14sp" />
<View
android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_covid_certificate_details.xml b/Corona-Warn-App/src/main/res/layout/fragment_covid_certificate_details.xml
index fbc6609fc..17c546e57 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_covid_certificate_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_covid_certificate_details.xml
@@ -67,12 +67,13 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:theme="@style/CWAToolbar.Theme"
+ android:theme="@style/Theme.MaterialComponents"
app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways"
app:menu="@menu/menu_covid_certificate_detail"
app:navigationIcon="@drawable/ic_back"
- app:navigationIconTint="@android:color/white">
+ app:navigationIconTint="@android:color/white"
+ app:popupTheme="@style/Theme.MaterialComponents.Light">
<LinearLayout
android:id="@+id/header_text_layout"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_edit_check_in.xml b/Corona-Warn-App/src/main/res/layout/fragment_edit_check_in.xml
index d36602946..09083dbc6 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_edit_check_in.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_edit_check_in.xml
@@ -7,7 +7,7 @@
android:background="@drawable/trace_location_gradient_background">
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+ <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -54,9 +54,9 @@
android:layout_marginTop="110dp"
android:layout_marginBottom="12dp"
android:gravity="start"
- android:textSize="20sp"
android:text="@string/edit_checkin_title_text"
android:textColor="@color/colorStableLight"
+ android:textSize="20sp"
tools:text="Aufenthaltsdauer anpassen für:" />
@@ -69,9 +69,7 @@
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways"
- app:navigationIcon="@drawable/ic_close"
- app:navigationIconTint="@color/colorStableLight"
- app:titleTextColor="@color/colorAccentTintButton">
+ app:navigationIcon="@drawable/ic_close_white">
<LinearLayout
android:id="@+id/header_text_layout"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_request_covid_certificate.xml b/Corona-Warn-App/src/main/res/layout/fragment_request_covid_certificate.xml
index 31c266359..5a0047549 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_request_covid_certificate.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_request_covid_certificate.xml
@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground"
tools:context="ui.submission.covidcertificate.RequestCovidCertificateFragment">
<com.google.android.material.appbar.MaterialToolbar
@@ -192,7 +191,7 @@
<Button
android:id="@+id/disagree_button"
- style="@style/button"
+ style="@style/buttonLight"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
@@ -209,7 +208,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
- app:indicatorColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="@+id/disagree_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_scan_qr_code.xml b/Corona-Warn-App/src/main/res/layout/fragment_scan_qr_code.xml
index 76e16aaad..84b3906a2 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_scan_qr_code.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_scan_qr_code.xml
@@ -28,8 +28,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:zxing_viewfinder_mask="@color/colorQrCodeScanMask"
- app:zxing_viewfinder_laser_visibility="false" />
+ app:zxing_viewfinder_laser_visibility="false"
+ app:zxing_viewfinder_mask="@color/colorQrCodeScanMask" />
<TextView
android:id="@+id/qr_code_scan_body"
@@ -49,12 +49,13 @@
android:layout_marginTop="@dimen/spacing_normal"
android:indeterminate="true"
android:visibility="invisible"
+ app:hideAnimationBehavior="inward"
app:indicatorColor="@android:color/white"
app:indicatorSize="64dp"
- app:trackColor="@android:color/transparent"
app:layout_constraintEnd_toEndOf="@id/qr_code_scan_body"
app:layout_constraintStart_toStartOf="@id/qr_code_scan_body"
- app:layout_constraintTop_toBottomOf="@id/qr_code_scan_body" />
+ app:layout_constraintTop_toBottomOf="@id/qr_code_scan_body"
+ app:trackColor="@android:color/transparent" />
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/qr_code_scan_toolbar"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
index 0b3690fb5..cf3859ac0 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_notifications.xml
@@ -75,7 +75,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
android:layout_marginHorizontal="@dimen/spacing_normal"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintTop_toBottomOf="@id/settings_switch_row_notifications_risk" />
<de.rki.coronawarnapp.ui.view.SwitchRowView
@@ -97,7 +97,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
android:layout_marginHorizontal="@dimen/spacing_normal"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintTop_toBottomOf="@id/settings_switch_row_notifications_test" />
<include
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 fe996c6bc..bf240af29 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
@@ -94,7 +94,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
android:layout_marginHorizontal="@dimen/spacing_normal"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintTop_toBottomOf="@+id/switch_row" />
<androidx.constraintlayout.widget.ConstraintLayout
@@ -151,7 +151,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
android:layout_marginHorizontal="@dimen/spacing_normal"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/settingsInteroperabilityRow" />
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml b/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
index fa6a203d8..788ea1d62 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_statistics_explanation.xml
@@ -63,7 +63,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="13dp"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/statistics_explanation_header_subtitle" />
@@ -215,7 +215,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="43dp"
- android:background="@color/colorHairline" />
+ android:background="@color/dividerColor" />
<TextView
style="@style/headline5"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml
index c1cce928f..6e3f0aa13 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_consent.xml
@@ -32,10 +32,10 @@
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
+ app:layout_constraintBottom_toTopOf="@+id/guideline_action"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/submission_consent_header"
- app:layout_constraintBottom_toTopOf="@+id/guideline_action">
+ app:layout_constraintTop_toBottomOf="@id/submission_consent_header">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@@ -46,86 +46,88 @@
android:id="@+id/submission_consent_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
- app:srcCompat="@drawable/ic_submission_consent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
+ android:contentDescription="@string/submission_consent_main_illustration_description"
android:focusable="true"
- android:contentDescription="@string/submission_consent_main_illustration_description" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/ic_submission_consent" />
- <include layout="@layout/include_submission_consent_intro"
+ <include
android:id="@+id/include_submission_consent_intro"
+ layout="@layout/include_submission_consent_intro"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
- app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@id/submission_consent_illustration"/>
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/submission_consent_illustration" />
<de.rki.coronawarnapp.ui.view.CountryListView
android:id="@+id/countryList"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
android:layout_marginHorizontal="@dimen/spacing_normal"
- app:layout_constraintTop_toBottomOf="@+id/include_submission_consent_intro"
+ android:layout_marginTop="@dimen/spacing_normal"
+ app:countryList="@{countries}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:countryList="@{countries}"/>
+ app:layout_constraintTop_toBottomOf="@+id/include_submission_consent_intro" />
<TextView
android:id="@+id/submission_consent_hint"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
- app:layout_constraintTop_toBottomOf="@id/countryList"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"
android:text="@string/submission_consent_help_by_warning_others_body_event"
- style="@style/subtitle" />
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/countryList" />
- <include layout="@layout/include_submission_consent_body"
+ <include
android:id="@+id/include_submission_consent_body"
+ layout="@layout/include_submission_consent_body"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/spacing_normal"
android:layout_marginHorizontal="@dimen/guideline_card"
- app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginTop="@dimen/spacing_normal"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@id/submission_consent_hint"/>
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/submission_consent_hint" />
<FrameLayout
android:id="@+id/divider"
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="@dimen/spacing_tiny"
- android:background="@color/colorHairline"
- app:layout_constraintTop_toBottomOf="@id/include_submission_consent_body"
+ android:background="@color/dividerColor"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"/>
+ app:layout_constraintTop_toBottomOf="@id/include_submission_consent_body" />
<TextView
android:id="@+id/submission_consent_main_bottom_body"
+ style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:paddingVertical="@dimen/spacing_tiny"
- android:text="@string/submission_consent_main_bottom_body"
- android:focusable="true"
+ android:background="?selectableItemBackground"
android:clickable="true"
+ android:focusable="true"
android:onClick="@{ () -> viewModel.onDataPrivacyClick() }"
- android:background="?selectableItemBackground"
- app:layout_constraintTop_toBottomOf="@id/divider"
- app:layout_constraintStart_toStartOf="@id/guideline_start"
+ android:paddingVertical="@dimen/spacing_tiny"
+ android:text="@string/submission_consent_main_bottom_body"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
- style="@style/subtitle"/>
+ app:layout_constraintStart_toStartOf="@id/guideline_start"
+ app:layout_constraintTop_toBottomOf="@id/divider" />
<FrameLayout
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
- android:background="@color/colorHairline"
- app:layout_constraintTop_toBottomOf="@id/submission_consent_main_bottom_body"
+ android:background="@color/dividerColor"
+ app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
- app:layout_constraintEnd_toEndOf="@id/guideline_end"/>
+ app:layout_constraintTop_toBottomOf="@id/submission_consent_main_bottom_body" />
<include layout="@layout/merge_guidelines_side" />
@@ -138,9 +140,9 @@
style="@style/buttonPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:onClick="@{ () -> viewModel.onConsentButtonClick()}"
android:text="@string/submission_accept_button"
android:textAllCaps="true"
- android:onClick="@{ () -> viewModel.onConsentButtonClick()}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
@@ -155,11 +157,11 @@
<include layout="@layout/merge_guidelines_side" />
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_spinner"
- style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:indeterminate="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
index 5d0f28070..723c83773 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_deletion_warning.xml
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <ImageView
+ <ImageView
android:id="@+id/deletion_warning_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -101,14 +101,14 @@
app:layout_constraintStart_toStartOf="parent"
tools:text="@string/submission_deletion_warning_continue_button" />
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/submission_qr_code_scan_spinner"
- style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/spacing_normal"
+ android:indeterminate="true"
android:indeterminateTint="@color/colorAccentTintIcon"
android:indeterminateTintMode="src_in"
- android:layout_marginBottom="@dimen/spacing_normal"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/continue_button"
app:layout_constraintEnd_toEndOf="@id/continue_button"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
index c73df8d50..00f1532a9 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_no_consent_positive_other_warning.xml
@@ -156,7 +156,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="@dimen/spacing_small"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_no_consent_main_fifth_point" />
@@ -178,7 +178,7 @@
<FrameLayout
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_consent_main_bottom_body" />
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 040193d39..2b972712d 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
@@ -49,7 +49,6 @@
android:indeterminate="true"
android:visibility="gone"
app:hideAnimationBehavior="inward"
- app:indicatorColor="@color/colorAccent"
app:layout_constraintEnd_toEndOf="@+id/submission_qr_code_scan_body"
app:layout_constraintStart_toStartOf="@+id/submission_qr_code_scan_body"
app:layout_constraintTop_toBottomOf="@+id/submission_qr_code_scan_body"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml
index 6587c5eed..82e260841 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml
@@ -40,12 +40,12 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_tan_header" />
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/submission_tan_spinner"
- style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_normal"
+ android:indeterminate="true"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/guideline_action"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_pending.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_pending.xml
index a849728af..c902bc1ac 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_pending.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_pending.xml
@@ -21,11 +21,11 @@
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_test_result_headline}" />
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/submission_test_result_spinner"
- style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -81,8 +81,8 @@
<de.rki.coronawarnapp.ui.view.SimpleStepEntry
android:id="@+id/test_result_pending_steps_pcr_added"
android:layout_width="0dp"
- android:layout_marginTop="@dimen/spacing_normal"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_normal"
app:layout_constraintEnd_toEndOf="@id/submission_test_result_subtitle"
app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle"
app:layout_constraintTop_toBottomOf="@+id/submission_test_result_subtitle"
@@ -93,42 +93,42 @@
<de.rki.coronawarnapp.ui.view.SimpleStepEntry
android:id="@+id/test_result_pending_steps_rat_added"
android:layout_width="0dp"
- android:layout_marginTop="@dimen/spacing_normal"
android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/spacing_normal"
+ android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/submission_test_result_subtitle"
app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle"
app:layout_constraintTop_toBottomOf="@+id/test_result_pending_steps_pcr_added"
app:simple_step_entry_title="@string/submission_test_result_steps_added_rat_heading"
app:step_entry_final="false"
- android:visibility="gone"
- tools:visibility="visible"
- app:step_entry_icon="@drawable/ic_test_result_step_done" />
+ app:step_entry_icon="@drawable/ic_test_result_step_done"
+ tools:visibility="visible" />
<de.rki.coronawarnapp.ui.view.SimpleStepEntry
android:id="@+id/test_result_pending_steps_waiting_pcr_result"
android:layout_width="0dp"
android:layout_height="wrap_content"
- app:step_entry_final="false"
app:layout_constraintEnd_toEndOf="@id/submission_test_result_subtitle"
app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle"
app:layout_constraintTop_toBottomOf="@+id/test_result_pending_steps_rat_added"
app:simple_step_entry_text="@string/submission_test_result_pending_steps_waiting_pcr_body"
app:simple_step_entry_title="@string/submission_test_result_pending_steps_waiting_pcr_heading"
+ app:step_entry_final="false"
app:step_entry_icon="@drawable/ic_hourglass" />
<de.rki.coronawarnapp.ui.view.SimpleStepEntry
android:id="@+id/test_result_pending_steps_waiting_antigen_result"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/submission_test_result_subtitle"
app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle"
app:layout_constraintTop_toBottomOf="@+id/test_result_pending_steps_waiting_pcr_result"
- android:visibility="gone"
- app:step_entry_final="false"
app:simple_step_entry_text="@string/submission_test_result_pending_steps_waiting_rat_body"
app:simple_step_entry_title="@string/submission_test_result_pending_steps_waiting_rat_heading"
+ app:step_entry_final="false"
app:step_entry_icon="@drawable/ic_hourglass"
- tools:visibility="visible"/>
+ tools:visibility="visible" />
<de.rki.coronawarnapp.ui.view.SimpleStepEntry
android:id="@+id/test_result_pending_steps_contact_diary_result"
@@ -141,21 +141,21 @@
app:simple_step_entry_title="@string/submission_test_result_pending_steps_contact_diary_heading"
app:step_entry_final="false"
app:step_entry_icon="@drawable/ic_result_pending_contact_diary"
- tools:visibility="visible"/>
+ tools:visibility="visible" />
<de.rki.coronawarnapp.ui.view.SimpleStepEntry
android:id="@+id/test_result_pending_steps_certificate_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:visibility="visible"
app:layout_constraintEnd_toEndOf="@id/submission_test_result_subtitle"
app:layout_constraintStart_toStartOf="@id/submission_test_result_subtitle"
app:layout_constraintTop_toBottomOf="@+id/test_result_pending_steps_contact_diary_result"
app:simple_step_entry_text="@string/submission_test_result_pending_steps_test_certificate_not_supported_body"
app:simple_step_entry_title="@string/submission_test_result_pending_steps_test_certificate_heading"
app:step_entry_final="true"
- android:visibility="visible"
app:step_entry_icon="@drawable/ic_result_pending_certificate_info"
- tools:visibility="visible"/>
+ tools:visibility="visible" />
<de.rki.coronawarnapp.ui.submission.consentstatus.ConsentStatusView
android:id="@+id/consent_status"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_your_consent.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_your_consent.xml
index 20ee30c82..f3d49720a 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_your_consent.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_your_consent.xml
@@ -53,7 +53,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
android:layout_marginHorizontal="@dimen/spacing_normal"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintTop_toBottomOf="@id/submission_your_consent_switch" />
<TextView
@@ -118,7 +118,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="@dimen/spacing_medium"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_your_consent_agreement_card" />
@@ -140,7 +140,7 @@
android:id="@+id/submission_your_consent_agreement_details_divider_bottom"
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_your_consent_agreement_details_text" />
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_test_home_test_cards_layout.xml b/Corona-Warn-App/src/main/res/layout/fragment_test_home_test_cards_layout.xml
index 696c625e8..4b80c1c57 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_test_home_test_cards_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_test_home_test_cards_layout.xml
@@ -22,8 +22,7 @@
android:id="@+id/toolbar"
style="@style/CWAToolbar"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:popupTheme="@style/CWAToolbar.Menu">
+ android:layout_height="wrap_content">
<ImageView
android:id="@+id/main_header_logo"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
index d353db870..33fc3875c 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_trace_location_onboarding.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground">
+ android:background="@color/colorSurface">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/check_in_onboarding_toolbar"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_vaccination_details.xml b/Corona-Warn-App/src/main/res/layout/fragment_vaccination_details.xml
index c9a66cfe5..8a27ab3a8 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_vaccination_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_vaccination_details.xml
@@ -70,8 +70,7 @@
app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways"
app:navigationIcon="@drawable/ic_back"
- app:navigationIconTint="@android:color/white"
- app:titleTextColor="@color/colorAccentTintButton">
+ app:navigationIconTint="@android:color/white">
<LinearLayout
android:id="@+id/header_text_layout"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_vaccination_list.xml b/Corona-Warn-App/src/main/res/layout/fragment_vaccination_list.xml
index fd4da26fe..88820bcd0 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_vaccination_list.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_vaccination_list.xml
@@ -77,8 +77,7 @@
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways"
- app:navigationIcon="@drawable/ic_close_white"
- app:titleTextColor="@color/colorAccentTintButton">
+ app:navigationIcon="@drawable/ic_close_white">
<LinearLayout
android:id="@+id/header_text_layout"
diff --git a/Corona-Warn-App/src/main/res/layout/home_fragment_layout.xml b/Corona-Warn-App/src/main/res/layout/home_fragment_layout.xml
index 234652b85..06e48b692 100644
--- a/Corona-Warn-App/src/main/res/layout/home_fragment_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_fragment_layout.xml
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:menu="@menu/menu_main"
- app:popupTheme="@style/CWAToolbar.Menu">
+ >
<ImageView
android:id="@+id/main_header_logo"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_status_card_fetching.xml b/Corona-Warn-App/src/main/res/layout/home_submission_status_card_fetching.xml
index 8cab6e02e..2fc0e0d18 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_status_card_fetching.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_status_card_fetching.xml
@@ -16,10 +16,10 @@
android:layout_height="wrap_content"
android:accessibilityHeading="true"
android:text="@string/submission_status_card_title_fetching"
+ app:layout_constraintBottom_toTopOf="@+id/header_barrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toTopOf="@+id/header_barrier"/>
+ app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/header_barrier"
@@ -28,12 +28,12 @@
app:barrierDirection="top"
app:constraint_referenced_ids="submission_status_card_fetching_spinner,submission_status_card_fetching_body" />
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/submission_status_card_fetching_spinner"
- style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginVertical="@dimen/spacing_normal"
+ android:indeterminate="true"
app:layout_constraintStart_toStartOf="@+id/submission_status_card_fetching_title"
app:layout_constraintTop_toBottomOf="@+id/header_barrier" />
diff --git a/Corona-Warn-App/src/main/res/layout/include_certificate_qrcode_card.xml b/Corona-Warn-App/src/main/res/layout/include_certificate_qrcode_card.xml
index 3c640f5b6..1d7080b7f 100644
--- a/Corona-Warn-App/src/main/res/layout/include_certificate_qrcode_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_certificate_qrcode_card.xml
@@ -14,7 +14,6 @@
android:layout_height="24dp"
android:indeterminate="true"
app:hideAnimationBehavior="inward"
- app:indicatorColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="@id/image"
app:layout_constraintEnd_toEndOf="@id/image"
app:layout_constraintStart_toStartOf="@id/image"
diff --git a/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml b/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
index 6c000385c..58752fa90 100644
--- a/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_dispatcher_card.xml
@@ -53,7 +53,7 @@
app:srcCompat="@drawable/ic_forward"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:tint="@color/colorTextPrimary1" />
+ app:tint="@color/colorOnPrimary" />
<TextView
android:id="@+id/submission_dispatcher_card_text"
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 770870aba..30d829468 100644
--- a/Corona-Warn-App/src/main/res/layout/include_divider.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_divider.xml
@@ -22,7 +22,7 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
- android:background="@{(dividerColor != 0) ? dividerColor : @color/colorHairline}"
+ android:background="@{(dividerColor != 0) ? dividerColor : @color/dividerColor}"
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/new_release_info_screen_fragment.xml b/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
index 27abf1496..cb0f84f13 100644
--- a/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml
@@ -14,7 +14,7 @@
style="@style/CWAToolbar.Close"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
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/onboaring_loading_layout.xml b/Corona-Warn-App/src/main/res/layout/onboaring_loading_layout.xml
index ab53df91a..88e511e8e 100644
--- a/Corona-Warn-App/src/main/res/layout/onboaring_loading_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/onboaring_loading_layout.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ android:layout_height="match_parent">
- <ProgressBar
- app:layout_constraintTop_toTopOf="parent"
+ <com.google.android.material.progressindicator.CircularProgressIndicator
+ android:layout_width="32dp"
+ android:layout_height="32dp"
+ android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- android:layout_width="32dp"
- android:layout_height="32dp" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/qr_code_poster_fragment.xml b/Corona-Warn-App/src/main/res/layout/qr_code_poster_fragment.xml
index ce922477e..25564c478 100644
--- a/Corona-Warn-App/src/main/res/layout/qr_code_poster_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/qr_code_poster_fragment.xml
@@ -113,7 +113,6 @@
android:layout_height="wrap_content"
android:indeterminate="true"
app:hideAnimationBehavior="inward"
- app:indicatorColor="@color/colorAccent"
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/rat_profile_onboarding_fragment.xml b/Corona-Warn-App/src/main/res/layout/rat_profile_onboarding_fragment.xml
index e8edce2e0..deb5aedbf 100644
--- a/Corona-Warn-App/src/main/res/layout/rat_profile_onboarding_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/rat_profile_onboarding_fragment.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground">
+ android:background="@color/colorSurface">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
diff --git a/Corona-Warn-App/src/main/res/layout/rat_profile_qr_code_fragment.xml b/Corona-Warn-App/src/main/res/layout/rat_profile_qr_code_fragment.xml
index 854a73d92..214a94fee 100644
--- a/Corona-Warn-App/src/main/res/layout/rat_profile_qr_code_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/rat_profile_qr_code_fragment.xml
@@ -63,12 +63,12 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:theme="@style/CWAToolbar.Theme"
+ android:theme="@style/Theme.MaterialComponents"
app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways"
app:menu="@menu/menu_rat_qr_code_profile"
- app:navigationIcon="@drawable/ic_close"
- app:navigationIconTint="@android:color/white">
+ app:navigationIcon="@drawable/ic_close_white"
+ app:popupTheme="@style/Theme.MaterialComponents.Light">
<FrameLayout
android:layout_width="match_parent"
@@ -125,7 +125,6 @@
android:layout_height="wrap_content"
android:indeterminate="true"
app:hideAnimationBehavior="inward"
- app:indicatorColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="@id/qrCodeImage"
app:layout_constraintEnd_toEndOf="@id/qrCodeImage"
app:layout_constraintStart_toStartOf="@id/qrCodeImage"
diff --git a/Corona-Warn-App/src/main/res/layout/submission_blocking_dialog_view.xml b/Corona-Warn-App/src/main/res/layout/submission_blocking_dialog_view.xml
index 40cf09352..66659304d 100644
--- a/Corona-Warn-App/src/main/res/layout/submission_blocking_dialog_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/submission_blocking_dialog_view.xml
@@ -4,17 +4,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content">
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:progressTint="@color/colorAccentTintIcon"
+ android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:showAnimationBehavior="inward" />
<TextView
android:id="@+id/progress_message"
diff --git a/Corona-Warn-App/src/main/res/layout/submission_create_rat_profile_card.xml b/Corona-Warn-App/src/main/res/layout/submission_create_rat_profile_card.xml
index c530af992..d575570e1 100644
--- a/Corona-Warn-App/src/main/res/layout/submission_create_rat_profile_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/submission_create_rat_profile_card.xml
@@ -28,7 +28,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_forward"
- app:tint="@color/colorTextPrimary1" />
+ app:tint="@color/colorOnPrimary" />
<ImageView
android:id="@+id/illustration"
diff --git a/Corona-Warn-App/src/main/res/layout/survey_consent_blocking_progress_dialog.xml b/Corona-Warn-App/src/main/res/layout/survey_consent_blocking_progress_dialog.xml
index 11cb53804..df94a7265 100644
--- a/Corona-Warn-App/src/main/res/layout/survey_consent_blocking_progress_dialog.xml
+++ b/Corona-Warn-App/src/main/res/layout/survey_consent_blocking_progress_dialog.xml
@@ -4,14 +4,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
- android:progressTint="@color/colorAccentTintIcon"
+ android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml b/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
index ede7afa13..57acc21bb 100644
--- a/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/survey_consent_fragment.xml
@@ -188,7 +188,7 @@
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="@dimen/spacing_normal"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/consent_layout" />
@@ -210,7 +210,7 @@
<FrameLayout
android:layout_width="0dp"
android:layout_height="@dimen/card_divider"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/survey_consent_more_information" />
diff --git a/Corona-Warn-App/src/main/res/layout/switch_row.xml b/Corona-Warn-App/src/main/res/layout/switch_row.xml
index 502698f17..cb36b77db 100644
--- a/Corona-Warn-App/src/main/res/layout/switch_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/switch_row.xml
@@ -43,7 +43,6 @@
android:layout_height="wrap_content"
android:clickable="false"
android:importantForAccessibility="no"
- android:theme="@style/switchBase"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_fragment.xml
index b2934dbf9..a833895d8 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_fragment.xml
@@ -5,7 +5,7 @@
android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground">
+ android:background="@color/colorSurface">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
@@ -15,6 +15,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
+ app:menu="@menu/menu_trace_location_attendee_checkins"
app:title="@string/trace_location_checkins_title" />
<androidx.recyclerview.widget.RecyclerView
@@ -71,7 +72,6 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/scan_checkin_qrcode_fab"
- style="@style/Widget.App.ExtendedFloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_active.xml b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_active.xml
index 257c5d5d3..d245ae7b1 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_active.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_active.xml
@@ -117,11 +117,11 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:text="@string/trace_location_checkins_card_action_checkout"
- android:textColor="@color/colorAccent"
+ android:textColor="@color/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/checkout_info"
- app:strokeColor="@color/colorAccent" />
+ app:strokeColor="@color/colorPrimary" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_create_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_create_fragment.xml
index d7acf8acc..19572f383 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_create_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_create_fragment.xml
@@ -193,12 +193,12 @@
</LinearLayout>
</ScrollView>
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_bar"
- style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacing_large"
+ android:indeterminate="true"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@id/button_submit"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_fragment.xml
index 6f8f4439c..7c93c9ca2 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_fragment.xml
@@ -5,7 +5,7 @@
android:id="@+id/category_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
android:contentDescription="@string/tracelocation_organizer_category_title"
android:orientation="vertical"
android:transitionName="trace_location_organizer_category">
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_separator.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_separator.xml
index 98aa98353..591936543 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_separator.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_separator.xml
@@ -3,4 +3,4 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="@dimen/spacing_small"
- android:background="@color/colorHairline" />
\ No newline at end of file
+ android:background="@color/dividerColor" />
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml
index 5feffb94a..7e3f96ced 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml
@@ -79,8 +79,7 @@
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways"
- app:navigationIcon="@drawable/ic_close_white"
- app:titleTextColor="@color/colorAccentTintButton">
+ app:navigationIcon="@drawable/ic_close_white">
<LinearLayout
android:id="@+id/header_text_layout"
@@ -139,7 +138,6 @@
android:layout_height="wrap_content"
android:indeterminate="true"
app:hideAnimationBehavior="inward"
- app:indicatorColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="@id/qrCodeImage"
app:layout_constraintEnd_toEndOf="@id/qrCodeImage"
app:layout_constraintStart_toStartOf="@id/qrCodeImage"
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
index c7326c58b..332a35daa 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/tracelocation_organizer_category_title"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
tools:context=".ui.presencetracing.organizer.qrinfo.TraceLocationQRInfoFragment">
<com.google.android.material.appbar.MaterialToolbar
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
index 89a547a81..f37154f3b 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_item.xml
@@ -99,11 +99,11 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:text="@string/trace_location_organizer_list_item_action_checkin"
- android:textColor="@color/colorAccent"
+ android:textColor="@color/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/button_barrier"
- app:strokeColor="@color/colorAccent" />
+ app:strokeColor="@color/colorPrimary" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_list_fragment.xml b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_list_fragment.xml
index 255ed0fa8..f21fd9b94 100644
--- a/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_list_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/trace_location_organizer_trace_locations_list_fragment.xml
@@ -5,7 +5,7 @@
android:id="@+id/content_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
android:focusable="true">
<com.google.android.material.appbar.MaterialToolbar
@@ -18,7 +18,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:popupTheme="@style/CWAToolbar.Menu"
app:title="@string/trace_location_organiser_list_title"
tools:title="Meine QR-Codes" />
@@ -42,7 +41,7 @@
android:layout_height="wrap_content"
app:constraint_referenced_ids="qr_codes__list_no_items_image,qr_codes_list_no_items_title,qr_codes_list_no_items_subtitle" />
- <ImageView
+ <ImageView
android:id="@+id/qr_codes__list_no_items_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -84,7 +83,6 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/qr_code_fab"
- style="@style/Widget.App.ExtendedFloatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml b/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
index 9b121ddcd..fc59ad7b6 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_card_info_row_layout.xml
@@ -15,7 +15,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/body"
tools:src="@drawable/ic_risk_details_home"
- tools:tint="@color/colorTextPrimary1" />
+ tools:tint="@color/colorOnPrimary" />
<TextView
android:id="@+id/body"
@@ -30,5 +30,5 @@
app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/lorem_ipsum"
- tools:textColor="@color/colorTextPrimary1" />
+ tools:textColor="@color/colorOnPrimary" />
</merge>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
index 527c1a7f5..37ef68077 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_disabled_view.xml
@@ -35,7 +35,7 @@
android:layout_height="@dimen/icon_size_risk_card"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_forward"
- app:tint="@color/colorTextPrimary1"
+ app:tint="@color/colorOnPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -57,7 +57,7 @@
android:layout_marginTop="@dimen/spacing_small"
android:icon="@drawable/ic_risk_card_saved_risk"
android:text="@{state.getLastRiskState(context)}"
- android:textColor="@color/colorTextPrimary1"
+ android:textColor="@color/colorOnPrimary"
app:compatIconTint="@color/colorSemanticNeutralRisk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:icon="@drawable/ic_risk_card_time_fetched"
android:text="@{state.getTimeFetched(context)}"
- android:textColor="@color/colorTextPrimary1"
+ android:textColor="@color/colorOnPrimary"
app:compatIconTint="@color/colorSemanticNeutralRisk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
index 874f5f839..d0ca6138e 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_failed_view.xml
@@ -34,7 +34,7 @@
android:layout_height="@dimen/icon_size_risk_card"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_forward"
- app:tint="@color/colorTextPrimary1"
+ app:tint="@color/colorOnPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -56,7 +56,7 @@
android:layout_marginTop="@dimen/spacing_small"
android:icon="@drawable/ic_risk_card_saved_risk"
android:text="@{state.getLastRiskState(context)}"
- android:textColor="@color/colorTextPrimary1"
+ android:textColor="@color/colorOnPrimary"
app:compatIconTint="@color/colorSemanticNeutralRisk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:icon="@drawable/ic_risk_card_time_fetched"
android:text="@{state.getTimeFetched(context)}"
- android:textColor="@color/colorTextPrimary1"
+ android:textColor="@color/colorOnPrimary"
app:compatIconTint="@color/colorSemanticNeutralRisk"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
index 25892b2a8..8ba816c12 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_progress_view.xml
@@ -29,27 +29,27 @@
app:layout_goneMarginEnd="0dp"
tools:text="Daten werden herunter geladen" />
- <ImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
android:layout_height="@dimen/icon_size_risk_card"
android:importantForAccessibility="no"
- app:srcCompat="@drawable/ic_forward"
- app:tint="@{state.getStableIconColor(context)}"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/ic_forward"
+ app:tint="@{state.getStableIconColor(context)}" />
- <ProgressBar
+ <com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progress_indicator"
- style="@style/progressBar"
android:layout_width="36dp"
android:layout_height="36dp"
android:indeterminate="true"
- android:indeterminateTint="@{state.getStableIconColor(context)}"
+ app:indicatorColor="@{state.getStableIconColor(context)}"
app:layout_constraintBottom_toBottomOf="@+id/body_text"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@+id/body_text" />
+ app:layout_constraintTop_toTopOf="@+id/body_text"
+ app:showAnimationBehavior="inward" />
<TextView
android:id="@+id/body_text"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_details_fragment_layout.xml b/Corona-Warn-App/src/main/res/layout/tracing_details_fragment_layout.xml
index a239f18d8..38afff240 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_details_fragment_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_details_fragment_layout.xml
@@ -42,7 +42,7 @@
android:id="@+id/risk_details_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
android:paddingStart="@dimen/spacing_normal"
android:paddingTop="@dimen/spacing_small"
android:paddingEnd="@dimen/spacing_normal"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_details_item_container_elevated_layout.xml b/Corona-Warn-App/src/main/res/layout/tracing_details_item_container_elevated_layout.xml
index fe1ac4bf3..e4e21bc91 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_details_item_container_elevated_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_details_item_container_elevated_layout.xml
@@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
android:clipToPadding="false"
android:id="@+id/box_container"
android:focusable="true"
diff --git a/Corona-Warn-App/src/main/res/layout/vaccination_consent_fragment.xml b/Corona-Warn-App/src/main/res/layout/vaccination_consent_fragment.xml
index 3cff980a6..c71aaa6b0 100644
--- a/Corona-Warn-App/src/main/res/layout/vaccination_consent_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/vaccination_consent_fragment.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/colorBackground"
+ android:background="@color/colorSurface"
tools:context="de.rki.coronawarnapp.covidcertificate.vaccination.ui.consent.VaccinationConsentFragment">
<com.google.android.material.appbar.MaterialToolbar
@@ -51,12 +51,11 @@
android:layout_marginTop="48dp"
android:layout_marginEnd="@dimen/spacing_normal"
android:text="@string/vaccination_consent_info_subtitle_text"
- android:textColorLink="@color/colorAccent"
+ android:textColorLink="@color/colorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vaccination_consent_info_graphic"
- tools:text="@string/vaccination_consent_info_subtitle_text"
- />
+ tools:text="@string/vaccination_consent_info_subtitle_text" />
<ImageView
android:id="@+id/vaccination_consent_info_icon"
diff --git a/Corona-Warn-App/src/main/res/layout/view_consent_status.xml b/Corona-Warn-App/src/main/res/layout/view_consent_status.xml
index 4bbcf160f..4f0d788bf 100644
--- a/Corona-Warn-App/src/main/res/layout/view_consent_status.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_consent_status.xml
@@ -11,7 +11,7 @@
android:id="@+id/test_result_illustration_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -52,7 +52,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="@dimen/spacing_small"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
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_country_list_entry_flag_container.xml b/Corona-Warn-App/src/main/res/layout/view_country_list_entry_flag_container.xml
index d29b2dd62..730d49049 100644
--- a/Corona-Warn-App/src/main/res/layout/view_country_list_entry_flag_container.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_country_list_entry_flag_container.xml
@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_marginBottom="@dimen/spacing_tiny"
- android:background="@color/colorHairline" />
+ android:background="@color/dividerColor" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/flagGrid"
@@ -27,5 +27,5 @@
<View
android:layout_width="match_parent"
android:layout_height="2dp"
- android:background="@color/colorHairline" />
+ android:background="@color/dividerColor" />
</LinearLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/view_more_information.xml b/Corona-Warn-App/src/main/res/layout/view_more_information.xml
index b5d13fa85..fa86e9310 100644
--- a/Corona-Warn-App/src/main/res/layout/view_more_information.xml
+++ b/Corona-Warn-App/src/main/res/layout/view_more_information.xml
@@ -10,7 +10,7 @@
android:id="@+id/top_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -50,7 +50,6 @@
android:layout_height="wrap_content"
android:checked="false"
android:importantForAccessibility="no"
- android:theme="@style/switchBase"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -62,7 +61,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/card_divider"
android:layout_marginTop="12dp"
- android:background="@color/colorHairline"
+ android:background="@color/dividerColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
diff --git a/Corona-Warn-App/src/main/res/menu/menu_trace_location_qr_code_poster.xml b/Corona-Warn-App/src/main/res/menu/menu_trace_location_qr_code_poster.xml
index 0158331ca..66f46f5af 100644
--- a/Corona-Warn-App/src/main/res/menu/menu_trace_location_qr_code_poster.xml
+++ b/Corona-Warn-App/src/main/res/menu/menu_trace_location_qr_code_poster.xml
@@ -6,12 +6,12 @@
android:id="@+id/action_print"
android:icon="@drawable/ic_print"
android:title="@string/trace_location_organiser_poster_print"
- app:iconTint="@color/colorTextPrimary1"
+ app:iconTint="@color/colorOnPrimary"
app:showAsAction="always" />
<item
android:id="@+id/action_share"
android:icon="@drawable/ic_share"
android:title="@string/trace_location_organiser_poster_share"
- app:iconTint="@color/colorTextPrimary1"
+ app:iconTint="@color/colorOnPrimary"
app:showAsAction="ifRoom" />
</menu>
\ No newline at end of file
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 f93484baf..930cd8d3a 100644
--- a/Corona-Warn-App/src/main/res/values-night/colors.xml
+++ b/Corona-Warn-App/src/main/res/values-night/colors.xml
@@ -2,21 +2,16 @@
<resources>
<!-- Brand Colors -->
- <color name="colorBrandPrimary">#D13F3F</color>
- <color name="colorBrandSecondary">#80CDEC</color>
- <color name="colorBrandTertiary">#994866</color>
-
- <!-- Backgrounds and Separators -->
- <color name="colorBackground">#000000</color>
+ <color name="colorSecondary">#80CDEC</color>
+ <color name="colorSurface">#000000</color>
<color name="colorSurface1">#232324</color>
<color name="colorSurface1Pressed">#39393A</color>
<color name="colorSurface2">#434445</color>
<color name="colorSurface2Pressed">#565757</color>
- <color name="colorHairline">#4DFFFFFF</color>
<color name="colorSystemUI">#000000</color>
<!-- Text -->
- <color name="colorTextPrimary1">#FFFFFF</color>
+ <color name="colorOnPrimary">#FFFFFF</color>
<color name="colorTextPrimary1Inverted">#17191A</color>
<color name="colorTextPrimary2">#99FFFFFF</color>
<color name="colorTextPrimary3">#4DFFFFFF</color>
@@ -38,7 +33,6 @@
<color name="colorSemanticUnknownRiskPressed">#39393A</color>
<!-- Accent -->
- <color name="colorAccentTintButton">#007FAD</color>
<color name="colorAccentTintButtonPressed">#1B4865</color>
<color name="colorAccentTintIcon">#83D2F2</color>
@@ -79,7 +73,7 @@
<color name="colorQrCodeScanMask">#BF000000</color>
<!-- Vaccination -->
- <color name="colorVaccinationCardBackground">#434445</color>
+ <color name="colorVaccinationCardBackground">@color/colorSurface2</color>
<color name="dividerColor">#4DFFFFFF</color>
</resources>
diff --git a/Corona-Warn-App/src/main/res/values-v28/styles.xml b/Corona-Warn-App/src/main/res/values-v28/styles.xml
index b3578fe41..65cd8390b 100644
--- a/Corona-Warn-App/src/main/res/values-v28/styles.xml
+++ b/Corona-Warn-App/src/main/res/values-v28/styles.xml
@@ -2,7 +2,7 @@
<resources>
<style name="subtitle" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
<item name="android:lineHeight">@dimen/line_height_normal</item>
</style>
@@ -17,12 +17,12 @@
</style>
<style name="body1" parent="@style/TextAppearance.MaterialComponents.Body1">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
<item name="android:lineHeight">@dimen/line_height_large</item>
</style>
<style name="body2" parent="@style/TextAppearance.MaterialComponents.Body2">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
<item name="android:lineHeight">@dimen/line_height_small</item>
</style>
diff --git a/Corona-Warn-App/src/main/res/values/colors.xml b/Corona-Warn-App/src/main/res/values/colors.xml
index 63fbabf5b..c27d7c2fd 100644
--- a/Corona-Warn-App/src/main/res/values/colors.xml
+++ b/Corona-Warn-App/src/main/res/values/colors.xml
@@ -2,26 +2,24 @@
<resources>
<!-- Brand Colors -->
- <color name="colorBrandPrimary">#BD1200</color>
- <color name="colorBrandSecondary">#80CDEC</color>
- <color name="colorBrandTertiary">#59112B</color>
-
- <!-- Backgrounds and Separators -->
- <color name="colorBackground">#FFFFFF</color>
+ <color name="colorSecondary">#007FAD</color>
+ <color name="colorPrimary">#007FAD</color>
+ <color name="colorSurface">#FFFFFF</color>
<color name="colorSurface1">#FFFFFF</color>
<color name="colorSurface1Pressed">#E7E8E8</color>
<color name="colorSurface2">#F5F5F5</color>
<color name="colorSurface2Pressed">#D7D7D7</color>
- <color name="colorHairline">#3317191A</color>
-
<color name="cwaGrayHighlight">#5D6F80</color>
<color name="colorSystemUI">#F5F5F5</color>
+ <color name="colorAccentTintButtonPressed">#02759E</color>
+ <color name="colorAccentTintIcon">@color/colorPrimary</color>
+
<!--Cards-->
<color name="colorCardBackgroundHighlightGray">@color/cwaGrayHighlight</color>
<!-- Text -->
- <color name="colorTextPrimary1">#17191A</color>
+ <color name="colorOnPrimary">#17191A</color>
<color name="colorTextPrimary1Inverted">#FFFFFF</color>
<color name="colorTextPrimary1Stable">#17191A</color>
<color name="colorTextPrimary1InvertedStable">#FFFFFF</color>
@@ -33,7 +31,7 @@
<color name="colorTextSemanticRed">#C00F2D</color>
<color name="colorTextSemanticGreen">#2E854B</color>
<color name="colorTextSemanticNeutral">@color/cwaGrayHighlight</color>
- <color name="colorTextTint">@color/colorAccent</color>
+ <color name="colorTextTint">@color/colorPrimary</color>
<!-- Semantic -->
<color name="colorSemanticHighRisk">#C00F2D</color>
@@ -45,12 +43,6 @@
<color name="colorSemanticUnknownRisk">#FFFFFF</color>
<color name="colorSemanticUnknownRiskPressed">#E7E8E8</color>
- <!-- Accent -->
- <color name="colorAccent">#007FAD</color>
- <color name="colorAccentTintButton">@color/colorAccent</color>
- <color name="colorAccentTintButtonPressed">#02759E</color>
- <color name="colorAccentTintIcon">@color/colorAccent</color>
-
<!-- Misc -->
<color name="colorTransparent">#00FFFFFF</color>
<color name="colorCrashReporter">@color/colorTextSemanticNeutral</color>
@@ -69,10 +61,10 @@
<color name="colorCalendarBackgroundSelected">@color/colorTextSemanticNeutral</color>
<color name="colorCalendarBackgroundUnselected">@color/colorSurface2</color>
<color name="colorCalendarTextSelected">@color/colorTextPrimary1Inverted</color>
- <color name="colorCalendarTextUnselected">@color/colorTextPrimary1</color>
+ <color name="colorCalendarTextUnselected">@color/colorOnPrimary</color>
<color name="colorCalendarSelectedDayBackground">@color/colorCalendarBackgroundSelected</color>
- <color name="colorCalendarTodayBorder">@color/colorAccent</color>
- <color name="colorCalendarTodayText">@color/colorAccent</color>
+ <color name="colorCalendarTodayBorder">@color/colorPrimary</color>
+ <color name="colorCalendarTodayText">@color/colorPrimary</color>
<color name="colorCalendarMonthText">#DE000000</color>
<!-- Contact Diary -->
@@ -90,7 +82,7 @@
<color name="colorStatisticsTrendNeutral">#5D6F80</color>
<!-- Bottom Nav bar-->
- <color name="navItemColorSelected">@color/colorAccent</color>
+ <color name="navItemColorSelected">@color/colorPrimary</color>
<color name="navItemColorNormal">#999999</color>
<!-- Trace location -->
@@ -106,9 +98,8 @@
<color name="swipeDeleteBackgroundColor">#EB4D3D</color>
<!-- Vaccination -->
- <color name="colorVaccinationCardBackground">#FFFFFF</color>
+ <color name="colorVaccinationCardBackground">@color/colorSurface</color>
<color name="whiteAlpha60">#99FFFFFF</color>
- <color name="greyAlpha60">#8ACCCCCC</color>
<color name="dividerColor">#DEDEDE</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 5577e4019..696545fd3 100644
--- a/Corona-Warn-App/src/main/res/values/styles.xml
+++ b/Corona-Warn-App/src/main/res/values/styles.xml
@@ -1,73 +1,42 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.Bridge">
- <item name="colorPrimary">@color/colorBrandSecondary</item>
- <item name="colorPrimaryDark">@color/colorStableDark</item>
- <item name="android:windowBackground">@color/colorBackground</item>
- <item name="alertDialogTheme">@style/DialogAlertTheme</item>
+ <style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+ <item name="colorPrimary">@color/colorPrimary</item>
<item name="android:actionOverflowButtonStyle">@style/CWAToolbar.Overflow</item>
-
- <item name="materialCalendarTheme">@style/ThemeOverlay.App.DatePicker</item>
- <item name="materialTimePickerTheme">@style/ThemeOverlay.App.TimePicker</item>
-
- <item name="buttonStyle">@style/Widget.AppCompat.Button.Borderless.Colored</item>
-
<item name="android:windowLightStatusBar">@bool/lightSystemUI</item>
<item name="android:statusBarColor">@color/colorSystemUI</item>
+ <item name="colorSurface">@color/colorSurface</item>
+ <item name="colorOnPrimary">@color/colorOnPrimary</item>
+ <item name="colorSecondary">@color/colorSecondary</item>
+ <item name="shapeAppearanceSmallComponent">@style/SmallComponent</item>
+ <item name="shapeAppearanceMediumComponent">@style/MediumComponent</item>
+ <item name="shapeAppearanceLargeComponent">@style/LargeComponent</item>
+ <item name="extendedFloatingActionButtonStyle">@style/ExtendedFloatingActionButton</item>
+ <item name="bottomNavigationStyle">@style/BottomNavigationViewStyle</item>
</style>
<style name="AppTheme" parent="BaseTheme" />
- <style name="ThemeOverlay.App.DatePicker" parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
- <item name="colorPrimary">@color/colorAccent</item>
- </style>
-
- <style name="ThemeOverlay.App.TimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
- <item name="colorPrimary">@color/colorAccent</item>
- </style>
-
- <style name="AppTheme.NoActionBar" parent="AppTheme">
- <item name="windowActionBar">false</item>
- <item name="windowNoTitle">true</item>
- <item name="dialogTheme">@style/DialogTheme</item>
- </style>
+ <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
- <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
- <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
- <style name="ThemeOverlay.App.ExtendedFloatingActionButton" parent="">
- <item name="colorSecondary">@color/colorAccentTintButton</item>
- <item name="colorOnSecondary">@color/colorTextEmphasizedButton</item>
- <item name="colorOnSurface">@color/colorAccentTintButtonPressed</item>
- </style>
-
- <style name="Widget.App.ExtendedFloatingActionButton" parent="Widget.MaterialComponents.ExtendedFloatingActionButton.Icon">
- <item name="materialThemeOverlay">
- @style/ThemeOverlay.App.ExtendedFloatingActionButton
- </item>
- </style>
+ <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
<!-- Launcher theme with background -->
- <style name="AppTheme.Launcher" parent="AppTheme.NoActionBar">
+ <style name="AppTheme.Launcher" parent="AppTheme">
<item name="android:windowBackground">@drawable/splash_screen</item>
</style>
<!-- Main Application -->
- <style name="AppTheme.Main" parent="AppTheme.NoActionBar" />
+ <style name="AppTheme.Main" parent="AppTheme" />
- <style name="CWAToolbar" parent="@style/ThemeOverlay.AppCompat.DayNight.ActionBar">
+ <style name="CWAToolbar" parent="@style/Widget.MaterialComponents.Toolbar">
<item name="colorPrimary">@color/colorSurface1</item>
<item name="android:background">@color/colorSurface1</item>
- <item name="android:textColor">@color/colorTextPrimary1</item>
- </style>
-
- <style name="CWAToolbar.Menu" parent="@style/Widget.AppCompat.PopupMenu">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="CWAToolbar.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
- <item name="android:tint">@color/colorTextPrimary1</item>
+ <item name="android:tint">@color/colorOnPrimary</item>
</style>
<style name="CWAToolbar.BackArrow">
@@ -88,36 +57,10 @@
<item name="android:background">@color/colorTransparent</item>
</style>
- <style name="CWAToolbar.Theme" parent="Widget.AppCompat.ActionBar">
- <item name="actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
- </style>
-
- <style name="OverflowButtonStyle" parent="Widget.AppCompat.Light.ActionButton.Overflow">
- <item name="android:tint">@android:color/white</item>
- </style>
-
- <!-- Dialog Theme-->
- <style name="DialogTheme" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
- <item name="buttonBarPositiveButtonStyle">@style/DialogButtonTheme</item>
- <item name="buttonBarNegativeButtonStyle">@style/DialogButtonTheme</item>
- </style>
-
- <style name="DialogButtonTheme" parent="Widget.MaterialComponents.Button.TextButton">
- <item name="android:textColor">@color/colorAccentTintButton</item>
- </style>
-
- <!-- Alert Dialog Theme-->
- <style name="DialogAlertTheme" parent="ThemeOverlay.AppCompat.Dialog.Alert">
- <item name="buttonBarPositiveButtonStyle">@style/dialogPositiveButtonStyle</item>
- <item name="buttonBarNegativeButtonStyle">@style/dialogNegativeButtonStyle</item>
- </style>
-
- <style name="dialogPositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
- <item name="android:textColor">@color/colorTextTint</item>
- </style>
-
- <style name="dialogNegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <style name="BottomNavigationViewStyle" parent="Widget.MaterialComponents.BottomNavigationView">
+ <item name="labelVisibilityMode">labeled</item>
+ <item name="itemTextColor">@color/nav_item_color</item>
+ <item name="itemIconTint">@color/nav_item_color</item>
</style>
<!-- ####################################
@@ -126,11 +69,13 @@
<style name="button">
<item name="android:paddingStart">@dimen/button_padding_start_end</item>
<item name="android:paddingEnd">@dimen/button_padding_start_end</item>
- <item name="android:background">@drawable/button</item>
+ <item name="android:paddingBottom">12dp</item>
+ <item name="android:paddingTop">12dp</item>
<item name="android:textColor">@color/button_text_color</item>
<item name="android:textSize">@dimen/font_button</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:letterSpacing">0.08</item>
+ <item name="android:stateListAnimator">@null</item>
</style>
<style name="buttonPrimary" parent="button">
@@ -150,7 +95,7 @@
<item name="textAllCaps">false</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textStyle">normal</item>
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
@@ -167,11 +112,11 @@
<style name="buttonTraceLocation" parent="button">
<item name="android:backgroundTint">@color/button_trace_location</item>
<item name="android:stateListAnimator">@null</item>
- <item name="android:textColor">@color/colorAccent</item>
+ <item name="android:textColor">@color/colorPrimary</item>
</style>
- <style name="materialTextButton" parent="Widget.MaterialComponents.Button.TextButton.Dialog.Flush">
- <item name="android:textColor">@color/colorAccent</item>
+ <style name="materialTextButton" parent="Widget.MaterialComponents.Button.TextButton">
+ <item name="android:textColor">@color/colorPrimary</item>
</style>
<style name="buttonIcon">
@@ -180,7 +125,7 @@
</style>
<style name="buttonTracing">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
<item name="android:background">@drawable/rectangle</item>
<item name="android:backgroundTint">@color/button_main_tracing</item>
<item name="android:paddingStart">@dimen/spacing_small</item>
@@ -189,9 +134,16 @@
<item name="android:paddingBottom">@dimen/spacing_tiny</item>
</style>
- <style name="switchBase" parent="Widget.AppCompat.CompoundButton.Switch">
- <item name="android:colorControlActivated">@color/colorAccentTintIcon</item>
- <item name="colorControlActivated">@color/colorAccentTintIcon</item>
+ <style name="ThemeOverlay.App.ExtendedFloatingActionButton" parent="">
+ <item name="colorSecondary">@color/colorPrimary</item>
+ <item name="colorOnSecondary">@color/colorTextEmphasizedButton</item>
+ <item name="colorOnSurface">@color/colorAccentTintButtonPressed</item>
+ </style>
+
+ <style name="ExtendedFloatingActionButton" parent="Widget.MaterialComponents.ExtendedFloatingActionButton.Icon">
+ <item name="materialThemeOverlay">
+ @style/ThemeOverlay.App.ExtendedFloatingActionButton
+ </item>
</style>
<!-- ####################################
@@ -204,7 +156,7 @@
<item name="android:paddingBottom">@dimen/button_padding_top_bottom</item>
<item name="android:textAllCaps">false</item>
<item name="android:background">?selectableItemBackground</item>
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="phoneNumber">
@@ -279,7 +231,7 @@
<item name="android:background">@drawable/card_dark</item>
</style>
- <style name="selectionButton" parent="@style/Widget.AppCompat.Button.Borderless">
+ <style name="selectionButton">
<item name="android:padding">@dimen/card_padding</item>
<item name="android:gravity">left</item>
<item name="android:background">@drawable/card</item>
@@ -313,7 +265,7 @@
###################################### -->
<style name="headline4" parent="@style/TextAppearance.MaterialComponents.Headline4">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="headline4Bold" parent="@style/headline4">
@@ -321,7 +273,7 @@
</style>
<style name="headline5" parent="@style/TextAppearance.MaterialComponents.Headline5">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="headline5Tint" parent="@style/headline5">
@@ -333,16 +285,16 @@
</style>
<style name="headline6" parent="@style/TextAppearance.MaterialComponents.Headline6">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="subtitle" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="materialSubtitleSixteen" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
<item name="android:textSize">16sp</item>
</style>
@@ -359,7 +311,7 @@
</style>
<style name="body1" parent="@style/TextAppearance.MaterialComponents.Body1">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="body1Medium" parent="@style/TextAppearance.MaterialComponents.Body1">
@@ -367,7 +319,7 @@
</style>
<style name="body2" parent="@style/TextAppearance.MaterialComponents.Body2">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="body2Medium" parent="@style/TextAppearance.MaterialComponents.Body2">
@@ -380,7 +332,7 @@
</style>
<style name="bodyButton" parent="@style/TextAppearance.MaterialComponents.Button">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="headline6Sixteen" parent="@style/TextAppearance.MaterialComponents.Headline6">
@@ -399,25 +351,17 @@
Icons
###################################### -->
<style name="icon">
- <item name="android:tint">@color/colorTextPrimary1</item>
+ <item name="android:tint">@color/colorOnPrimary</item>
</style>
<style name="iconStable">
<item name="android:tint">@color/colorStableLight</item>
</style>
- <!-- ####################################
- Progress Bar
- ###################################### -->
-
- <style name="progressBar" parent="Widget.AppCompat.ProgressBar">
- <item name="android:indeterminateTint">@color/colorStableLight</item>
- </style>
-
<!-- ####################################
Onboarding (ob)
###################################### -->
- <style name="AppTheme.Onboarding" parent="AppTheme.NoActionBar">
+ <style name="AppTheme.Onboarding" parent="AppTheme">
<item name="android:windowEnterAnimation">@android:anim/fade_in</item>
<item name="android:windowExitAnimation">@android:anim/fade_out</item>
</style>
@@ -496,7 +440,7 @@
Contact Diary
###################################### -->
<style name="contactDiaryListItem" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
<item name="android:textStyle">bold</item>
</style>
@@ -513,7 +457,7 @@
</style>
<style name="ContactDiaryCircumstancesTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense">
- <item name="boxBackgroundColor">@color/colorBackground</item>
+ <item name="boxBackgroundColor">@color/colorSurface</item>
<item name="android:textColorHint">@color/colorTextPrimary2</item>
<item name="android:textSize">@dimen/font_small</item>
<item name="hintTextColor">@color/colorTextPrimary2</item>
@@ -534,7 +478,7 @@
<item name="android:paddingTop">7dp</item>
<item name="android:paddingBottom">7dp</item>
<item name="android:contentDescription">@string/statistics_info_button</item>
- <item name="android:tint">@color/colorAccent</item>
+ <item name="android:tint">@color/colorPrimary</item>
</style>
<style name="StatisticsCardInfoButton" parent="buttonIcon">
@@ -561,9 +505,9 @@
<item name="android:textSize">@dimen/font_huge</item>
</style>
- <style name="StatisticsCardSecondaryValue" parent="TextAppearance.AppCompat.Body2">
+ <style name="StatisticsCardSecondaryValue" parent="TextAppearance.MaterialComponents.Body2">
<item name="android:textSize">@dimen/font_title</item>
- <item name="android:textColor">@color/colorTextPrimary1</item>
+ <item name="android:textColor">@color/colorOnPrimary</item>
</style>
<style name="TextInputLayoutTheme" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
@@ -579,7 +523,7 @@
</style>
<style name="DefaultNumberPickerTheme" parent="AppTheme">
- <item name="colorControlNormal">@color/colorAccent</item>
+ <item name="colorControlNormal">@color/colorPrimary</item>
</style>
<style name="CardOverFlowButton">
@@ -597,4 +541,19 @@
<style name="ShapeAppearanceOverlay">
<item name="cornerSize">3dp</item>
</style>
+
+ <style name="SmallComponent" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+ <item name="cornerFamily">rounded</item>
+ <item name="cornerSize">8dp</item>
+ </style>
+
+ <style name="MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
+ <item name="cornerFamily">rounded</item>
+ <item name="cornerSize">8dp</item>
+ </style>
+
+ <style name="LargeComponent" parent="ShapeAppearance.MaterialComponents.LargeComponent">
+ <item name="cornerFamily">rounded</item>
+ <item name="cornerSize">4dp</item>
+ </style>
</resources>
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt
index 281486f46..6d79b44ff 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/DataBindingAdaptersTest.kt
@@ -3,17 +3,18 @@ package de.rki.coronawarnapp.util
import android.content.Context
import android.content.res.Resources
import android.graphics.drawable.Drawable
-import android.widget.Switch
import com.airbnb.lottie.LottieAnimationView
import com.airbnb.lottie.LottieDrawable
+import com.google.android.material.switchmaterial.SwitchMaterial
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.util.ContextExtensions.getDrawableCompat
import io.mockk.MockKAnnotations
+import io.mockk.Runs
import io.mockk.every
import io.mockk.impl.annotations.MockK
+import io.mockk.just
import io.mockk.mockk
import io.mockk.mockkObject
-import io.mockk.spyk
import io.mockk.verify
import io.mockk.verifySequence
import org.junit.Before
@@ -21,10 +22,6 @@ import org.junit.Test
import testhelpers.BaseTest
class DataBindingAdaptersTest : BaseTest() {
-
- @MockK
- private lateinit var context: Context
-
@MockK
private lateinit var drawable: Drawable
@@ -35,7 +32,10 @@ class DataBindingAdaptersTest : BaseTest() {
}
private fun setChecked(status: Boolean?) {
- val switch = spyk(Switch(context))
+ val switch = mockk<SwitchMaterial>().apply {
+ every { tag = any() } just Runs
+ every { isChecked = any() } just Runs
+ }
setChecked(switch, status)
--
GitLab