From a4dd07aa14075a323001dea304eb941cf7e45162 Mon Sep 17 00:00:00 2001
From: Oliver Zimmerman <oezimmerman@gmail.com>
Date: Thu, 26 Nov 2020 14:51:40 +0000
Subject: [PATCH] Forgot to convert implementation to section rather than card,
updated accessibility event call
---
.../testresult/SubmissionTestResultFragment.kt | 3 +--
.../res/layout/include_submission_test_result.xml | 12 ++++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultFragment.kt
index 0af9186ec..8e153530d 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/SubmissionTestResultFragment.kt
@@ -149,8 +149,7 @@ class SubmissionTestResultFragment : Fragment(R.layout.fragment_submission_test_
private fun setButtonOnClickListener() {
binding.submissionTestResultButtonPendingRefresh.setOnClickListener {
SubmissionRepository.refreshDeviceUIState()
- binding.submissionTestResultContent.submissionTestResultCard
- .sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
+ binding.submissionTestResultContent.submissionTestResultSection.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
binding.submissionTestResultButtonPendingRemoveTest.setOnClickListener {
diff --git a/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml b/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
index 119554708..3ec9c5349 100644
--- a/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_submission_test_result.xml
@@ -18,17 +18,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <de.rki.coronawarnapp.ui.view.TestResultCard
- android:id="@+id/submission_test_result_card"
+ <de.rki.coronawarnapp.ui.view.TestResultSection
+ android:id="@+id/submission_test_result_section"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:focusable="true"
android:importantForAccessibility="yes"
- app:test_result_card_headline="@string/test_result_card_headline"
- app:test_result_card_content="@{FormatterSubmissionHelper.formatTestResultCardContent(uiState.deviceUiState)}"
- app:test_result_card_status_icon="@{FormatterSubmissionHelper.formatTestStatusIcon(uiState.deviceUiState)}"
- app:test_result_card_registered_at_text="@{FormatterSubmissionHelper.formatTestResultRegisteredAtText(uiState.testResultReceivedDate)}"
+ app:test_result_section_headline="@string/test_result_card_headline"
+ app:test_result_section_content="@{FormatterSubmissionHelper.formatTestResultCardContent(uiState.deviceUiState)}"
+ app:test_result_section_status_icon="@{FormatterSubmissionHelper.formatTestStatusIcon(uiState.deviceUiState)}"
+ app:test_result_section_registered_at_text="@{FormatterSubmissionHelper.formatTestResultRegisteredAtText(uiState.testResultReceivedDate)}"
app:layout_constraintEnd_toEndOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toTopOf="parent"/>
--
GitLab