From 2ec92a09c1c3b146e0071169e252d129d00ef11f Mon Sep 17 00:00:00 2001
From: Mohamed <mohamed.metwalli@sap.com>
Date: Thu, 6 May 2021 20:03:12 +0200
Subject: [PATCH] All material (DEV) (#3096)
* All MD widgets
* MaterialSwitch
---
.../fragment_crashreporter_overview.xml | 3 +--
.../res/layout/fragment_test_keydownload.xml | 2 +-
.../res/layout/fragment_test_menu.xml | 2 +-
.../analytics_ppa_userinfo_input_fragment.xml | 2 +-
.../contact_diary_comment_info_fragment.xml | 7 +++----
.../res/layout/contact_diary_day_fragment.xml | 2 +-
.../contact_diary_edit_locations_fragment.xml | 2 +-
.../contact_diary_edit_persons_fragment.xml | 2 +-
.../contact_diary_homescreen_card_include.xml | 2 +-
.../contact_diary_location_list_fragment.xml | 2 +-
.../contact_diary_onboarding_fragment.xml | 2 +-
.../contact_diary_overview_fragment.xml | 2 +-
.../contact_diary_person_list_fragment.xml | 2 +-
.../main/res/layout/fragment_onboarding.xml | 2 +-
.../layout/fragment_onboarding_delta_ppa.xml | 6 +++---
.../res/layout/fragment_onboarding_ppa.xml | 6 +++---
.../res/layout/fragment_ppa_more_info.xml | 2 +-
..._settings_privacy_preserving_analytics.xml | 8 ++++----
.../res/layout/fragment_settings_tracing.xml | 6 +++---
.../fragment_statistics_explanation.xml | 8 ++++----
.../fragment_submission_deletion_warning.xml | 4 ++--
.../res/layout/fragment_submission_done.xml | 2 +-
...sion_no_consent_positive_other_warning.xml | 2 +-
...ssion_test_result_positive_keys_shared.xml | 2 +-
.../fragment_test_home_test_cards_layout.xml | 20 +++++++++----------
.../home_create_trace_location_card.xml | 2 +-
...home_statistics_cards_incidence_layout.xml | 2 +-
...ome_statistics_cards_infections_layout.xml | 2 +-
...statistics_cards_keysubmissions_layout.xml | 2 +-
...statistics_cards_sevendayrvalue_layout.xml | 2 +-
.../home_submission_pcr_status_card_error.xml | 2 +-
...ome_submission_pcr_status_card_invalid.xml | 2 +-
...me_submission_pcr_status_card_negative.xml | 2 +-
...ome_submission_pcr_status_card_pending.xml | 2 +-
...on_pcr_status_card_positive_not_shared.xml | 8 ++++----
...ission_pcr_status_card_positive_shared.xml | 6 +++---
.../home_submission_pcr_status_card_ready.xml | 2 +-
...ome_submission_rapid_status_card_error.xml | 2 +-
...e_submission_rapid_status_card_invalid.xml | 2 +-
..._submission_rapid_status_card_negative.xml | 2 +-
..._submission_rapid_status_card_outdated.xml | 2 +-
...e_submission_rapid_status_card_pending.xml | 2 +-
..._rapid_status_card_positive_not_shared.xml | 10 +++++-----
...sion_rapid_status_card_positive_shared.xml | 8 ++++----
...ome_submission_rapid_status_card_ready.xml | 2 +-
...me_submission_status_card_unregistered.xml | 2 +-
.../include_submission_behaviour_row.xml | 2 +-
.../new_release_info_screen_fragment.xml | 2 +-
.../res/layout/survey_consent_fragment.xml | 2 +-
...rganizer_trace_locations_list_fragment.xml | 2 +-
.../layout/tracing_content_disabled_view.xml | 2 +-
.../layout/tracing_content_failed_view.xml | 2 +-
.../layout/tracing_content_increased_view.xml | 2 +-
.../res/layout/tracing_content_low_view.xml | 2 +-
.../layout/tracing_content_progress_view.xml | 2 +-
.../tracing_details_access_survey_card.xml | 2 +-
.../tracing_details_fragment_layout.xml | 2 +-
57 files changed, 93 insertions(+), 95 deletions(-)
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_crashreporter_overview.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_crashreporter_overview.xml
index 66f38d075..64f0d33f6 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_crashreporter_overview.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_crashreporter_overview.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
tools:context=".ui.main.MainActivity">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbarErrorReport"
style="@style/Widget.AppCompat.Toolbar"
android:layout_width="match_parent"
@@ -70,5 +70,4 @@
tools:context="SettingsCrashReporterFragment"
tools:listitem="@layout/view_crashreport_list_item" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml
index 8140fa2cb..c05c8054e 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml
@@ -32,7 +32,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <Switch
+ <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/fake_metered_connection_toggle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml
index 807e881a7..4e8e908b1 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml
@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/Widget.AppCompat.Toolbar"
android:layout_width="match_parent"
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 a729a715d..a4edac6db 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
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_comment_info_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_comment_info_fragment.xml
index b2d7b3114..0a0d9d9b1 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_comment_info_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_comment_info_fragment.xml
@@ -5,13 +5,12 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
- style="@style/CWAToolbar"
+ style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:navigationIcon="@drawable/ic_close" />
+ android:layout_marginStart="8dp" />
<ScrollView
android:layout_width="match_parent"
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 101c40867..5e28a5a9d 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
@@ -9,7 +9,7 @@
android:layout_height="match_parent"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/contact_diary_day_header"
style="@style/CWAToolbar.BackArrow"
android:layout_width="0dp"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
index 72bfa1700..9006453c6 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml
@@ -9,7 +9,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/contact_diary_edit_locations_title">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="0dp"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
index e58bf18b2..bb23fa72b 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml
@@ -9,7 +9,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/contact_diary_edit_persons_title">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_homescreen_card_include.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_homescreen_card_include.xml
index 390d2b13c..b7f33780b 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_homescreen_card_include.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_homescreen_card_include.xml
@@ -34,7 +34,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contact_diary_card_homescreen_title" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_diary_card_homescreen_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
index ea59fb9e0..4a5fcd861 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml
@@ -27,7 +27,7 @@
android:visibility="gone"
app:constraint_referenced_ids="contact_diary_location_list_no_items_image,contact_diary_location_list_no_items_title,contact_diary_location_list_no_items_subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_diary_location_list_no_items_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
index e726b8d0c..e13817189 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
@@ -12,7 +12,7 @@
android:contentDescription="@string/contact_diary_title"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
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 503bc98d7..b66cdd2c0 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
@@ -9,7 +9,7 @@
android:background="@color/colorBackground"
android:orientation="vertical">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
index 37cf73437..42d76704e 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml
@@ -27,7 +27,7 @@
android:visibility="gone"
app:constraint_referenced_ids="contact_diary_person_list_no_items_image,contact_diary_person_list_no_items_title,contact_diary_person_list_no_items_subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_diary_person_list_no_items_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
index a34da0c94..7723129e1 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:paddingBottom="@dimen/spacing_medium">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/onboarding_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_delta_ppa.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_delta_ppa.xml
index 464d8c50f..945b64ea8 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_delta_ppa.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_delta_ppa.xml
@@ -280,7 +280,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_consent"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -303,7 +303,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_consent" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_identity"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -326,7 +326,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_identity" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_sixteen"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_ppa.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_ppa.xml
index bd4f247b1..fddc1bafe 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_ppa.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_ppa.xml
@@ -286,7 +286,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_consent"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -309,7 +309,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_consent" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_identity"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -332,7 +332,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_identity" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/bullet_point_sixteen"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml b/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
index 4acd20f2b..02379b9dd 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
@@ -597,7 +597,7 @@
<TableRow
android:layout_marginTop="@dimen/spacing_small">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/other_info_point_1"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml b/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
index eec2f2509..cfba7139f 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_settings_privacy_preserving_analytics.xml
@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/onboarding_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@id/bullet_point_consent"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -191,7 +191,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@+id/legal_point_consent" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@id/bullet_point_identity"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
@@ -214,7 +214,7 @@
app:layout_constraintStart_toStartOf="@id/bullet_point_consent"
app:layout_constraintTop_toBottomOf="@id/legal_point_identity" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@id/bullet_point_sixteen"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
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 906b8f3dd..fe996c6bc 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
@@ -23,7 +23,7 @@
android:contentDescription="@string/settings_tracing_title"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
@@ -108,7 +108,7 @@
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/switch_row">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/flag_eu"
android:layout_width="26dp"
android:layout_height="26dp"
@@ -127,7 +127,7 @@
app:layout_constraintStart_toEndOf="@id/flag_eu"
app:layout_constraintTop_toTopOf="@id/flag_eu" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/flag_ch"
android:layout_width="0dp"
android:layout_height="22dp"
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 082aa18e1..fa6a203d8 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
@@ -108,7 +108,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/interoperability_illustration"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -346,7 +346,7 @@
android:layout_marginTop="25dp"
android:layout_marginEnd="@dimen/guideline_end">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/statistics_explanation_trend_increasing_arrow"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -371,7 +371,7 @@
app:layout_constraintStart_toEndOf="@+id/statistics_explanation_trend_increasing_arrow"
app:layout_constraintTop_toTopOf="@+id/statistics_explanation_trend_increasing_arrow" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/statistics_explanation_trend_decreasing_arrow"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -397,7 +397,7 @@
app:layout_constraintStart_toEndOf="@+id/statistics_explanation_trend_decreasing_arrow"
app:layout_constraintTop_toTopOf="@+id/statistics_explanation_trend_decreasing_arrow" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/statistics_explanation_trend_stable_arrow"
android:layout_width="0dp"
android:layout_height="wrap_content"
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 5b89dec0d..5d0f28070 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
@@ -8,7 +8,7 @@
android:contentDescription="@string/submission_deletion_warning_title"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/deletion_warning_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
index 25844017a..b4ed1f9ee 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
@@ -11,7 +11,7 @@
android:fillViewport="true"
tools:context=".ui.submission.fragment.SubmissionDoneFragment">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
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 07ef45ea1..c73df8d50 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
@@ -18,7 +18,7 @@
android:fillViewport="true"
tools:context=".ui.submission.warnothers.SubmissionResultPositiveOtherWarningNoConsentFragment">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_keys_shared.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_keys_shared.xml
index 7f2636694..ece322a33 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_keys_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_test_result_positive_keys_shared.xml
@@ -9,7 +9,7 @@
android:accessibilityLiveRegion="assertive"
android:contentDescription="@string/submission_test_result_headline">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
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 03465872a..696c625e8 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
@@ -18,11 +18,11 @@
android:orientation="vertical"
tools:context=".ui.main.MainActivity">
- <Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
+ style="@style/CWAToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/CWAToolbar"
app:popupTheme="@style/CWAToolbar.Menu">
<ImageView
android:id="@+id/main_header_logo"
@@ -34,7 +34,7 @@
android:src="@drawable/ic_main_header"
bind:cwaContentDescription="@{@string/accessibility_logo}"
tools:ignore="ContentDescription" />
- </Toolbar>
+ </com.google.android.material.appbar.MaterialToolbar>
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
@@ -42,16 +42,16 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
- android:theme="@style/CWAToolbar"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:theme="@style/CWAToolbar">
- <Toolbar
+ <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:elevation="8dp"
- style="@style/CWAToolbar"
- android:id="@+id/main_tracing"
android:clickable="true"
+ android:elevation="8dp"
android:focusable="true"
android:foreground="?selectableItemBackground"
app:layout_scrollFlags="scroll|snap|enterAlways">
@@ -78,7 +78,7 @@
app:animation="@{tracingHeader.getTracingAnimation(context)}"
app:animation_tint="@{tracingHeader.getTracingTint(context)}" />
- </Toolbar>
+ </com.google.android.material.appbar.MaterialToolbar>
</com.google.android.material.appbar.AppBarLayout>
diff --git a/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml b/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
index ff2b328fa..bf6780e5a 100644
--- a/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_create_trace_location_card.xml
@@ -31,7 +31,7 @@
app:layout_constraintTop_toBottomOf="@id/create_trace_location_card_headline"
tools:text="@string/create_trace_location_card_subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/create_trace_location_card_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
index 7eee9560c..d1969a13b 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_incidence_layout.xml
@@ -12,7 +12,7 @@
android:id="@+id/incidence_container"
tools:showIn="@layout/home_statistics_cards_basecard_layout">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/background_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
index 1d54ca078..31410db6e 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_infections_layout.xml
@@ -12,7 +12,7 @@
android:id="@+id/infections_container"
tools:showIn="@layout/home_statistics_cards_basecard_layout">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/background_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
index 1d486842a..0b6467769 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_keysubmissions_layout.xml
@@ -12,7 +12,7 @@
android:id="@+id/keysubmissions_container"
tools:showIn="@layout/home_statistics_cards_basecard_layout">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/background_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
index 57f7e8247..07640dab4 100644
--- a/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_statistics_cards_sevendayrvalue_layout.xml
@@ -12,7 +12,7 @@
android:id="@+id/seven_day_r_value_container"
tools:showIn="@layout/home_statistics_cards_basecard_layout">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/background_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_error.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_error.xml
index c49ecb6fb..ec8c361b3 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_error.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_error.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_invalid.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_invalid.xml
index 6c03a7358..9b5813b17 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_invalid.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_invalid.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_negative.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_negative.xml
index 6b2302397..ccdbe8ace 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_negative.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_negative.xml
@@ -91,7 +91,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_pending.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_pending.xml
index da6cb6b82..6c0fcf602 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_pending.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_pending.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_not_shared.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_not_shared.xml
index 65812e9d4..f69b2b263 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_not_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_not_shared.xml
@@ -84,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -143,7 +143,7 @@
app:layout_constraintStart_toEndOf="@+id/contact_icon"
app:layout_constraintTop_toTopOf="@+id/contact_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contagious_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -171,7 +171,7 @@
app:layout_constraintStart_toEndOf="@+id/contagious_icon"
app:layout_constraintTop_toTopOf="@+id/contagious_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/share_icon"
style="@style/icon"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_shared.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_shared.xml
index bc0dd85a6..80b89358a 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_positive_shared.xml
@@ -84,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -143,7 +143,7 @@
app:layout_constraintStart_toEndOf="@+id/contact_icon"
app:layout_constraintTop_toTopOf="@+id/contact_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contagious_icon"
style="@style/icon"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_ready.xml b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_ready.xml
index b4d9ecbbc..28ff61c8a 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_ready.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_pcr_status_card_ready.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_error.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_error.xml
index eec3d36c7..007dcea8d 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_error.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_error.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_invalid.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_invalid.xml
index 5ee0fdbae..8527df765 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_invalid.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_invalid.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_negative.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_negative.xml
index c08d9fef1..dd1da1efc 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_negative.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_negative.xml
@@ -91,7 +91,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_outdated.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_outdated.xml
index 8ba510968..906c9dc73 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_outdated.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_outdated.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_pending.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_pending.xml
index 5c9eb6e55..3522c0bd3 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_pending.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_pending.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_not_shared.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_not_shared.xml
index 33bf2d3e7..380fce89b 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_not_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_not_shared.xml
@@ -84,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/prc_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
app:layout_constraintStart_toEndOf="@+id/prc_icon"
app:layout_constraintTop_toTopOf="@+id/prc_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -172,7 +172,7 @@
app:layout_constraintStart_toEndOf="@+id/contact_icon"
app:layout_constraintTop_toTopOf="@+id/contact_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contagious_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -200,7 +200,7 @@
app:layout_constraintStart_toEndOf="@+id/contagious_icon"
app:layout_constraintTop_toTopOf="@+id/contagious_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/share_icon"
style="@style/icon"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_shared.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_shared.xml
index 9ecf98e12..0b0c503b0 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_shared.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_positive_shared.xml
@@ -84,7 +84,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/body" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/prc_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -144,7 +144,7 @@
app:layout_constraintStart_toEndOf="@+id/prc_icon"
app:layout_constraintTop_toTopOf="@+id/prc_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contact_icon"
style="@style/icon"
android:layout_width="wrap_content"
@@ -172,7 +172,7 @@
app:layout_constraintStart_toEndOf="@+id/contact_icon"
app:layout_constraintTop_toTopOf="@+id/contact_icon" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/contagious_icon"
style="@style/icon"
android:layout_width="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_ready.xml b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_ready.xml
index 26747ccb9..1211238ff 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_ready.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_rapid_status_card_ready.xml
@@ -48,7 +48,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/subtitle" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/home_submission_status_card_unregistered.xml b/Corona-Warn-App/src/main/res/layout/home_submission_status_card_unregistered.xml
index 4004baa2d..edf3afd3b 100644
--- a/Corona-Warn-App/src/main/res/layout/home_submission_status_card_unregistered.xml
+++ b/Corona-Warn-App/src/main/res/layout/home_submission_status_card_unregistered.xml
@@ -37,7 +37,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml b/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
index 046b5250d..f88e80dbe 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_behaviour_row.xml
@@ -27,7 +27,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
style="@style/icon"
android:layout_width="@dimen/icon_size_risk_details_behavior"
android:layout_height="@dimen/icon_size_risk_details_behavior"
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 9761fcdcf..27abf1496 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
@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="0dp"
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 fe1c3c7ef..ede7afa13 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
@@ -10,7 +10,7 @@
android:background="@drawable/contact_diary_onboarding_background"
android:focusable="true">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.BackArrow"
android:layout_width="0dp"
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 7cc778f51..255ed0fa8 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
@@ -42,7 +42,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" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/qr_codes__list_no_items_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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 b5ab40269..527c1a7f5 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
@@ -28,7 +28,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="0dp" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
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 31da80670..874f5f839 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
@@ -27,7 +27,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/risk_card_header_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
index 79688669a..0fe181f52 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_increased_view.xml
@@ -29,7 +29,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="0dp" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
index 0c569562d..8d6e9e726 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_content_low_view.xml
@@ -31,7 +31,7 @@
tools:text="@string/risk_card_low_risk_headline"
tools:textColor="@color/colorStableLight" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
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 10154cbf3..25892b2a8 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,7 +29,7 @@
app:layout_goneMarginEnd="0dp"
tools:text="Daten werden herunter geladen" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/details_icon"
gone="@{state.isInDetailsMode}"
android:layout_width="@dimen/icon_size_risk_card"
diff --git a/Corona-Warn-App/src/main/res/layout/tracing_details_access_survey_card.xml b/Corona-Warn-App/src/main/res/layout/tracing_details_access_survey_card.xml
index 69635c8f1..bdfb816c9 100644
--- a/Corona-Warn-App/src/main/res/layout/tracing_details_access_survey_card.xml
+++ b/Corona-Warn-App/src/main/res/layout/tracing_details_access_survey_card.xml
@@ -42,7 +42,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tracing_details_survey_card_title" />
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/tracing_details_survey_card_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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 d6ff95745..a239f18d8 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
@@ -16,7 +16,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/risk_details_accessibility_title">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/CWAToolbar.Close"
android:layout_width="match_parent"
--
GitLab