Skip to content
Snippets Groups Projects
Unverified Commit 2b87f798 authored by Fabian-K's avatar Fabian-K Committed by GitHub
Browse files

Translation Tags and Submission UI (#337) 

* - missing translation tags for preference keys added
- unused string removed

* - include_submission_contact.xml layout fixed :exploding_head:



* - unused submission strings removed

* submission:
- unnecessary scroll views removed
- unify scroll behavior and xml layout / content inclusion

Co-authored-by: default avatarharambasicluka <64483219+harambasicluka@users.noreply.github.com>
parent 8cbf5f04
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 470 additions and 485 deletions
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragment.kt
+ 2
− 2
View file @ 2b87f798
......@@ -43,12 +43,12 @@ class SubmissionContactFragment : Fragment() {
override fun onStart() {
super.onStart()
binding.submissionContactScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
binding.submissionContactRoot.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
override fun onResume() {
super.onResume()
binding.submissionContactScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
binding.submissionContactRoot.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
private fun setButtonOnClickListener() {
......
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt
+ 5
− 5
View file @ 2b87f798
......@@ -44,28 +44,28 @@ class SubmissionDispatcherFragment : Fragment() {
override fun onStart() {
super.onStart()
binding.submissionDispatcherScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
binding.submissionDispatcherRoot.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
override fun onResume() {
super.onResume()
binding.submissionDispatcherScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
binding.submissionDispatcherRoot.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
private fun setButtonOnClickListener() {
binding.submissionDispatcherHeader.headerButtonBack.buttonIcon.setOnClickListener {
(activity as MainActivity).goBack()
}
binding.submissionDispatcherQr.dispatcherCard.setOnClickListener {
binding.submissionDispatcherContent.submissionDispatcherQr.dispatcherCard.setOnClickListener {
checkForDataPrivacyPermission()
}
binding.submissionDispatcherTanCode.dispatcherCard.setOnClickListener {
binding.submissionDispatcherContent.submissionDispatcherTanCode.dispatcherCard.setOnClickListener {
findNavController().doNavigate(
SubmissionDispatcherFragmentDirections
.actionSubmissionDispatcherFragmentToSubmissionTanFragment()
)
}
binding.submissionDispatcherTanTele.dispatcherCard.setOnClickListener {
binding.submissionDispatcherContent.submissionDispatcherTanTele.dispatcherCard.setOnClickListener {
findNavController().doNavigate(
SubmissionDispatcherFragmentDirections
.actionSubmissionDispatcherFragmentToSubmissionContactFragment()
......
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionIntroFragment.kt
+ 2
− 2
View file @ 2b87f798
......@@ -40,12 +40,12 @@ class SubmissionIntroFragment : Fragment() {
override fun onStart() {
super.onStart()
binding.submissionIntroScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
binding.submissionIntroRoot.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
override fun onResume() {
super.onResume()
binding.submissionIntroScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
binding.submissionIntroRoot.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
private fun setButtonOnClickListener() {
......
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt
+ 3
− 3
View file @ 2b87f798
......@@ -96,7 +96,7 @@ class SubmissionTanFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.submissionTanInput.listener = { tan -> viewModel.tan.value = tan }
binding.submissionTanContent.submissionTanInput.listener = { tan -> viewModel.tan.value = tan }
binding.submissionTanButtonEnter.setOnClickListener { storeTanAndContinue() }
binding.submissionTanHeader.headerButtonBack.buttonIcon.setOnClickListener { navigateToDispatchScreen() }
......@@ -115,12 +115,12 @@ class SubmissionTanFragment : Fragment() {
override fun onStart() {
super.onStart()
binding.submissionTanScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
binding.submissionTanRoot.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
override fun onResume() {
super.onResume()
binding.submissionTanScrollview.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
binding.submissionTanRoot.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED)
}
private fun navigateToDispatchScreen() =
......
Corona-Warn-App/src/main/res/layout/fragment_submission_contact.xml
+ 50
− 55
View file @ 2b87f798
......@@ -3,72 +3,67 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<ScrollView
android:id="@+id/submission_contact_scrollview"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/submission_contact_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/submission_contact_accessibility_title"
android:fillViewport="true"
tools:context=".ui.submission.SubmissionContactFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/submission_contact_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_back}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_contact_title}" />
<include
android:id="@+id/submission_contact_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_back}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_contact_title}" />
<include
layout="@layout/include_submission_contact"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toTopOf="@id/guideline_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_contact_header" />
<include
layout="@layout/include_submission_contact"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toTopOf="@id/guideline_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_contact_header" />
<Button
android:id="@+id/submission_contact_button_call"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_contact_button_call"
android:textAllCaps="true"
app:layout_constraintBottom_toTopOf="@+id/submission_contact_button_enter"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/guideline_bottom" />
<Button
android:id="@+id/submission_contact_button_call"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_contact_button_call"
android:textAllCaps="true"
app:layout_constraintBottom_toTopOf="@+id/submission_contact_button_enter"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/guideline_bottom" />
<Button
android:id="@+id/submission_contact_button_enter"
style="@style/buttonLight"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_contact_button_enter"
android:textAllCaps="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_contact_button_call" />
<Button
android:id="@+id/submission_contact_button_enter"
style="@style/buttonLight"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_contact_button_enter"
android:textAllCaps="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_contact_button_call" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action_large" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action_large" />
<include layout="@layout/merge_guidelines_side" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml
+ 24
− 76
View file @ 2b87f798
......@@ -3,87 +3,35 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<ScrollView
android:id="@+id/submission_dispatcher_scrollview"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/submission_dispatcher_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/submission_dispatcher_accessibility_title"
android:fillViewport="true"
tools:context=".ui.submission.SubmissionDispatcherFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/submission_dispatcher_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_back}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_dispatcher_headline}" />
<include
android:id="@+id/submission_dispatcher_content"
layout="@layout/include_submission_dispatcher"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_header" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include
android:id="@+id/submission_dispatcher_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_back}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_dispatcher_headline}" />
<TextView
android:id="@+id/submission_dispatcher_text"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_dispatcher_subheadline"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_header" />
<include
android:id="@+id/submission_dispatcher_qr"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_qr_card_text}"
app:headline="@{@string/submission_dispatcher_card_qr}"
app:illustration="@{@drawable/ic_submission_illustration_qr_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_text" />
<include
android:id="@+id/submission_dispatcher_tan_code"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
app:body="@{@string/submission_dispatcher_tan_code_card_text}"
app:headline="@{@string/submission_dispatcher_card_tan_code}"
app:illustration="@{@drawable/ic_submission_illustration_tan_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_qr" />
<include
android:id="@+id/submission_dispatcher_tan_tele"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
app:body="@{@string/submission_dispatcher_tan_tele_card_text}"
app:headline="@{@string/submission_dispatcher_card_tan_tele}"
app:illustration="@{@drawable/ic_submission_illustration_tan_hotline_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_tan_code" />
<include layout="@layout/merge_guidelines_side" />
<include layout="@layout/merge_guidelines_card" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/layout/fragment_submission_done.xml
+ 43
− 63
View file @ 2b87f798
......@@ -3,73 +3,53 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<ScrollView
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
tools:context=".ui.submission.SubmissionDoneFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/submission_done_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_close}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<include
android:id="@+id/submission_done_content"
layout="@layout/include_submission_done"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toBottomOf="@id/guideline_action"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_done_header" />
<Button
android:id="@+id/submission_done_button_done"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginVertical="@dimen/spacing_normal"
android:text="@string/submission_done_button_done"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/guideline_action" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include
android:id="@+id/submission_done_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_close}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/submission_done_hero_illustration"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:contentDescription="@string/submission_done_illustration_description"
android:importantForAccessibility="no"
android:src="@drawable/ic_submission_illustration_thanks"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/submission_done_header" />
<TextView
android:id="@+id/submission_done_headline"
style="@style/headline4"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_done_title"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_done_hero_illustration" />
<include
android:id="@+id/submission_done_content"
layout="@layout/include_submission_done_content"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
app:illustrationDescription="@{@string/submission_done_illustration_description}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_done_headline" />
<Button
android:id="@+id/submission_done_button_done"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginVertical="@dimen/spacing_normal"
android:text="@string/submission_done_button_done"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_done_content" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/layout/fragment_submission_intro.xml
+ 45
− 50
View file @ 2b87f798
......@@ -3,60 +3,55 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<ScrollView
android:id="@+id/submission_intro_scrollview"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/submission_intro_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/submission_intro_accessibility_title"
android:fillViewport="true"
tools:context=".ui.submission.SubmissionIntroFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/submission_intro_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_close}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_intro_title}" />
<include
layout="@layout/include_submission_intro"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toTopOf="@+id/guideline_action"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_intro_header" />
<Button
android:id="@+id/submission_intro_button_next"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_intro_button_next"
android:textAllCaps="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/guideline_action" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<include
android:id="@+id/submission_intro_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_close}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_intro_title}" />
<include
layout="@layout/include_submission_intro"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toTopOf="@+id/guideline_action"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_intro_header" />
<Button
android:id="@+id/submission_intro_button_next"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_intro_button_next"
android:textAllCaps="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/guideline_action" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml
+ 44
− 49
View file @ 2b87f798
......@@ -3,58 +3,53 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<ScrollView
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
tools:context=".ui.submission.SubmissionResultPositiveOtherWarningFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include
android:id="@+id/submission_positive_other_warning_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_back}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_positive_other_warning_title}" />
<include
layout="@layout/include_submission_positive_other_warning"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toTopOf="@+id/guideline_action"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_header" />
<Button
android:id="@+id/submission_positive_other_warning_button_next"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_positive_other_warning_button"
android:textAllCaps="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/guideline_action" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<include
android:id="@+id/submission_positive_other_warning_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_back}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_positive_other_warning_title}" />
<include
layout="@layout/include_submission_positive_other_warning"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toTopOf="@+id/guideline_action"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_positive_other_warning_header" />
<Button
android:id="@+id/submission_positive_other_warning_button_next"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:text="@string/submission_positive_other_warning_button"
android:textAllCaps="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/guideline_action" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/layout/fragment_submission_tan.xml
+ 45
− 93
View file @ 2b87f798
......@@ -5,112 +5,64 @@
<data>
<import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" />
<import type="de.rki.coronawarnapp.util.formatter.FormatterSubmissionHelper" />
<variable
name="viewmodel"
type="de.rki.coronawarnapp.ui.submission.SubmissionTanViewModel" />
</data>
<ScrollView
android:id="@+id/submission_tan_scrollview"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/submission_tan_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/submission_tan_accessibility_title"
android:fillViewport="true"
tools:context=".ui.submission.SubmissionTanFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
<include
android:id="@+id/submission_tan_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:focusable="true">
<include
android:id="@+id/submission_tan_header"
layout="@layout/include_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:focusable="false"
app:icon="@{@drawable/ic_close}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_tan_title}" />
<TextView
android:id="@+id/submission_tan_body"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:focusable="false"
android:text="@string/submission_tan_body"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_tan_header" />
<de.rki.coronawarnapp.ui.submission.TanInput
android:id="@+id/submission_tan_input"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_tan_body" />
<TextView
android:id="@+id/submission_tan_character_error"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:text="@string/submission_tan_character_error"
android:textColor="@color/colorTextSemanticRed"
android:visibility="@{FormatterSubmissionHelper.formatShowTanCharacterError(viewmodel.tanCharactersValid, viewmodel.tanChecksumValid)}"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_tan_input" />
<TextView
android:id="@+id/submission_tan_error"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:text="@string/submission_tan_error"
android:textColor="@color/colorTextSemanticRed"
android:visibility="@{FormatterHelper.formatVisibility(!viewmodel.tanChecksumValid)}"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_tan_input" />
<Button
android:id="@+id/submission_tan_button_enter"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:enabled="@{viewmodel.isValidTanFormat}"
android:text="@string/submission_tan_button_text"
android:textAllCaps="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/guideline_action" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action" />
android:focusable="false"
app:icon="@{@drawable/ic_close}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/submission_tan_title}" />
<include
android:id="@+id/submission_tan_content"
layout="@layout/include_submission_tan"
android:layout_width="@dimen/match_constraint"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toTopOf="@id/guideline_action"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_tan_header"
app:viewmodel="@{viewmodel}" />
<Button
android:id="@+id/submission_tan_button_enter"
style="@style/buttonPrimary"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:enabled="@{viewmodel.isValidTanFormat}"
android:text="@string/submission_tan_button_text"
android:textAllCaps="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/guideline_action" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_end="@dimen/guideline_action" />
<include layout="@layout/merge_guidelines_side" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/layout/include_submission_contact.xml
+ 1
− 1
View file @ 2b87f798
......@@ -102,12 +102,12 @@
android:id="@+id/submission_contact_step_2"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:contentDescription="@string/submission_contact_step_2_content"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_contact_step_1"
app:step_entry_final="true"
app:step_entry_icon="@drawable/ic_main_overview_2">
android:contentDescription="@string/submission_contact_step_2_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
......
Corona-Warn-App/src/main/res/layout/include_submission_dispatcher.xml 0 → 100644
+ 74
− 0
View file @ 2b87f798
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:paddingBottom="@dimen/spacing_normal">
<TextView
android:id="@+id/submission_dispatcher_text"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_dispatcher_subheadline"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toTopOf="parent" />
<include
android:id="@+id/submission_dispatcher_qr"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_qr_card_text}"
app:headline="@{@string/submission_dispatcher_card_qr}"
app:illustration="@{@drawable/ic_submission_illustration_qr_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_text" />
<include
android:id="@+id/submission_dispatcher_tan_code"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
app:body="@{@string/submission_dispatcher_tan_code_card_text}"
app:headline="@{@string/submission_dispatcher_card_tan_code}"
app:illustration="@{@drawable/ic_submission_illustration_tan_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_qr" />
<include
android:id="@+id/submission_dispatcher_tan_tele"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
app:body="@{@string/submission_dispatcher_tan_tele_card_text}"
app:headline="@{@string/submission_dispatcher_card_tan_tele}"
app:illustration="@{@drawable/ic_submission_illustration_tan_hotline_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_tan_code" />
<include layout="@layout/merge_guidelines_side" />
<include layout="@layout/merge_guidelines_card" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/layout/include_submission_done.xml 0 → 100644
+ 52
− 0
View file @ 2b87f798
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true">
<ImageView
android:id="@+id/submission_done_hero_illustration"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:contentDescription="@string/submission_done_illustration_description"
android:importantForAccessibility="no"
android:src="@drawable/ic_submission_illustration_thanks"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/submission_done_headline"
style="@style/headline4"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_done_title"
app:layout_constraintEnd_toEndOf="@id/guideline_end"
app:layout_constraintStart_toStartOf="@id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_done_hero_illustration" />
<include
android:id="@+id/submission_done_content"
layout="@layout/include_submission_done_content"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
app:illustrationDescription="@{@string/submission_done_illustration_description}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_done_headline" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/layout/include_submission_tan.xml 0 → 100644
+ 77
− 0
View file @ 2b87f798
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="de.rki.coronawarnapp.util.formatter.FormatterHelper" />
<import type="de.rki.coronawarnapp.util.formatter.FormatterSubmissionHelper" />
<variable
name="viewmodel"
type="de.rki.coronawarnapp.ui.submission.SubmissionTanViewModel" />
</data>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true">
<TextView
android:id="@+id/submission_tan_body"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:focusable="false"
android:text="@string/submission_tan_body"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toTopOf="parent" />
<de.rki.coronawarnapp.ui.submission.TanInput
android:id="@+id/submission_tan_input"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_tan_body" />
<TextView
android:id="@+id/submission_tan_character_error"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:text="@string/submission_tan_character_error"
android:textColor="@color/colorTextSemanticRed"
android:visibility="@{FormatterSubmissionHelper.formatShowTanCharacterError(viewmodel.tanCharactersValid, viewmodel.tanChecksumValid)}"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_tan_input" />
<TextView
android:id="@+id/submission_tan_error"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:text="@string/submission_tan_error"
android:textColor="@color/colorTextSemanticRed"
android:visibility="@{FormatterHelper.formatVisibility(!viewmodel.tanChecksumValid)}"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@id/submission_tan_input" />
<include layout="@layout/merge_guidelines_side" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/values-de/strings.xml
+ 0
− 28
View file @ 2b87f798
......@@ -311,7 +311,6 @@
Onboarding
###################################### -->
<string name="onboarding_image_description">"IS MISSING"</string>
<!-- XBUT: onboarding - forward and deny -->
<string name="onboarding_button_disable">"Nicht aktivieren"</string>
<!-- XBUT: onboarding - forward and allow -->
......@@ -634,8 +633,6 @@
<string name="submission_test_result_headline">"Test-Ergebnis"</string>
<!-- XHED: Page subheadline for test result -->
<string name="submission_test_result_subtitle">"Info zum Ablauf:"</string>
<!-- XBUT: test result submission - finish button -->
<string name="submission_test_result_button_finish">"Abschließen"</string>
<!-- XHED: Page headline for results next steps -->
<string name="submission_test_result_steps_added_heading">"Test erfolgreich hinzugefügt"</string>
<!-- YTXT: Body text for for results next steps -->
......@@ -723,13 +720,6 @@
<!-- XACT: Submission Intro page title -->
<string name="submission_intro_accessibility_title">"Wurden Sie getestet? So funktioniert das Corona-Warn-System"</string>
<!-- Notification -->
<!-- XHED: Dialog headline for result dialog -->
<string name="submission_result_dialog_headline">"Danke für die Mithilfe!"</string>
<!-- YTXT: Body text for result dialog -->
<string name="submission_result_dialog_body">"Ihr verifizierter Befund wurde anonym übertragen."</string>
<!-- Dispatcher -->
<!-- XHED: Page headline for dispatcher menu -->
<string name="submission_dispatcher_headline">"Auswahl"</string>
......@@ -770,14 +760,6 @@
<string name="submission_positive_other_warning_privacy_body">"Durch Antippen von „Weiter“ willigen Sie ein, dass die App Ihr positives Testergebnis zusammen mit Ihren Zufalls-IDs der letzten 14 Tage an das Serversystem der App übermittelt, damit andere App-Nutzer mit aktivierter Risiko-Ermittlung automatisch informiert werden können, dass sie möglicherweise einem Infektionsrisiko ausgesetzt waren. Die übermittelten Zufalls-IDs enthalten keine Angaben, die Rückschlüsse auf Ihre Identität oder Ihre Person zulassen.\n\nDie Übermittlung Ihres Testergebnisses per App ist freiwillig. Wenn Sie Ihr Testergebnis nicht übermitteln, entstehen Ihnen keine Nachteile. Da weder nachvollzogen noch kontrolliert werden kann, ob und wie Sie die App verwenden, erfährt außer Ihnen niemand, ob Sie eine Infektion übermittelt haben.\n\nSie können Ihre Einwilligung jederzeit widerrufen, indem Sie die App löschen. Durch den Widerruf der Einwilligung wird die Rechtmäßigkeit der aufgrund der Einwilligung bis zum Widerruf erfolgten Verarbeitung nicht berührt. Weitere Informationen finden Sie unter dem Menüpunkt „Datenschutzinformation“."</string>
<!-- XBUT: other warning continue button -->
<string name="submission_positive_other_warning_button">"Weiter"</string>
<!-- XHED: Dialog title for positive other warning dialog -->
<string name="submission_positive_dialog_confirmation_title">"Zufallscodes mit der Corona-Warn-App teilen?"</string>
<!-- YTXT: Body text for the positive result confirmation dialog-->
<string name="submission_positive_dialog_confirmation_body">"Ihre Zufallscodes der letzten 14 Tage werden dazu genutzt, andere darüber zu informieren, dass Sie in ihrer Nähe gewesen sind und sie daher möglicherweise in Kontakt mit COVID-19 gekommen sind."</string>
<!-- XBUT: submission(positive other warning) - positive button (right) -->
<string name="submission_positive_dialog_confirmation_positive">"Erlauben"</string>
<!-- XBUT: submission(positive other warning) - negative button (left) -->
<string name="submission_positive_dialog_confirmation_negative">"Nicht erlauben"</string>
<!-- XACT: other warning - illustration description, explanation image -->
<string name="submission_positive_other_illustration_description">"Ein Smartphone übermittelt einen positiven Testbefund verschlüsselt ins System."</string>
......@@ -785,8 +767,6 @@
<!-- Submission Done -->
<!-- XHED: Page title for completed submission page -->
<string name="submission_done_title">"Vielen Dank!"</string>
<!-- XHED: Page subheadline for completed submission page -->
<string name="submission_done_headline">"Sie haben einen wichtigen Beitrag geleistet!"</string>
<!-- YTXT: Body text for completed submission page -->
<string name="submission_done_body">"Sie haben einen wichtigen Beitrag geleistet! Dank Ihrer Mithilfe können Andere gewarnt werden und entsprechend reagieren."</string>
<!-- XHED: Page subtitle for completed submission page -->
......@@ -869,12 +849,8 @@
<string name="submission_status_card_button_unregistered">"Informieren &amp; mitmachen"</string>
<!-- XBUT: submission status card show results button -->
<string name="submission_status_card_button_show_results">"Test anzeigen"</string>
<!-- XHED: submission status card positive result title -->
<string name="submission_status_card_positive_result_title">"Positives Ergebnis"</string>
<!-- XHED: submission status card positive result subtitle -->
<string name="submission_status_card_positive_result_subtitle">"Bitte beachten Sie:"</string>
<!-- XBUT: submission status card show positive result button -->
<string name="submission_status_card_positive_result_show_button">"Testergebnis anzeigen"</string>
<!-- YTXT: text for contagious card -->
<string name="submission_status_card_positive_result_contagious">"Sie sind ansteckend. Isolieren Sie sich von anderen Personen."</string>
<!-- YTXT: text for contact card -->
......@@ -905,10 +881,6 @@
<item>"Gehen Sie nicht krank zur Arbeit, um andere Personen nicht zu gefährden. Falls sich Ihre Symptome verschlechtern, kann die Notwendigkeit eines weiteren SARS-CoV-2-Tests bestehen."</item>
</string-array>
<!-- XBUT: submission result dialog close button -->
<string name="submission_result_button_dialog_close">"Ok"</string>
<!-- ####################################
Button Tooltips for Accessibility
###################################### -->
......
Corona-Warn-App/src/main/res/values-en/strings.xml
+ 0
− 28
View file @ 2b87f798
......@@ -311,7 +311,6 @@
Onboarding
###################################### -->
<string name="onboarding_image_description">"IS MISSING"</string>
<!-- XBUT: onboarding - forward and deny -->
<string name="onboarding_button_disable">"Do Not Activate"</string>
<!-- XBUT: onboarding - forward and allow -->
......@@ -634,8 +633,6 @@
<string name="submission_test_result_headline">"Test result"</string>
<!-- XHED: Page subheadline for test result -->
<string name="submission_test_result_subtitle">"How this works:"</string>
<!-- XBUT: test result submission - finish button -->
<string name="submission_test_result_button_finish">"Finish"</string>
<!-- XHED: Page headline for results next steps -->
<string name="submission_test_result_steps_added_heading">"Test added successfully"</string>
<!-- YTXT: Body text for for results next steps -->
......@@ -723,13 +720,6 @@
<!-- XACT: Submission Intro page title -->
<string name="submission_intro_accessibility_title">"Have you been tested? This is how the Corona-Warn-App works"</string>
<!-- Notification -->
<!-- XHED: Dialog headline for result dialog -->
<string name="submission_result_dialog_headline">"Thank you for your support."</string>
<!-- YTXT: Body text for result dialog -->
<string name="submission_result_dialog_body">"Your verified test diagnosis was transmitted anonymously."</string>
<!-- Dispatcher -->
<!-- XHED: Page headline for dispatcher menu -->
<string name="submission_dispatcher_headline">"Selection"</string>
......@@ -771,14 +761,6 @@
<string name="submission_positive_other_warning_privacy_body">"By tapping on “Accept”, you consent to the App sending your positive test result to the App’s server system along with your random IDs from the last 14 days, so that other App users who have enabled the risk identification feature can be automatically notified that they may have been exposed to a risk of infection. The random IDs transmitted for this purpose do not contain any information that would allow conclusions to be drawn about your identity or your person. \n\nTransmitting your test result via the App is voluntary. You will not be penalised if you do not transmit your test result. Since it is not possible to trace or check whether and how you use the App, nobody but you will know whether you have transmitted the information that you are infected.\n\nYou can withdraw your consent at any time by deleting the App. This withdrawal of your consent will not affect the lawfulness of the processing carried out on the basis of the consent prior to the withdrawal. Further information can be found in the menu under “Data Privacy Information”.\n"</string>
<!-- XBUT: other warning continue button -->
<string name="submission_positive_other_warning_button">"Next"</string>
<!-- XHED: Dialog title for positive other warning dialog -->
<string name="submission_positive_dialog_confirmation_title">"Share random IDs with the Corona-Warn-App?"</string>
<!-- YTXT: Body text for the positive result confirmation dialog-->
<string name="submission_positive_dialog_confirmation_body">"Your random IDs over the last 14 days are used to notify others that you were in close proximity to them, and therefore that you may have been exposed to COVID-19."</string>
<!-- XBUT: submission(positive other warning) - positive button (right) -->
<string name="submission_positive_dialog_confirmation_positive">"Allow"</string>
<!-- XBUT: submission(positive other warning) - negative button (left) -->
<string name="submission_positive_dialog_confirmation_negative">"Do Not Allow"</string>
<!-- XACT: other warning - illustration description, explanation image -->
<string name="submission_positive_other_illustration_description">"A device is transmitting an encrypted positive test diagnosis to the system."</string>
......@@ -786,8 +768,6 @@
<!-- Submission Done -->
<!-- XHED: Page title for completed submission page -->
<string name="submission_done_title">"Thank you"</string>
<!-- XHED: Page subheadline for completed submission page -->
<string name="submission_done_headline">"You have made a valuable contribution."</string>
<!-- YTXT: Body text for completed submission page -->
<string name="submission_done_body">"You have made a valuable contribution. Thanks to your support, other people can now be warned and can react appropriately."</string>
<!-- XHED: Page subtitle for completed submission page -->
......@@ -870,12 +850,8 @@
<string name="submission_status_card_button_unregistered">"Notify and Help"</string>
<!-- XBUT: submission status card show results button -->
<string name="submission_status_card_button_show_results">"Display Test"</string>
<!-- XHED: submission status card positive result title -->
<string name="submission_status_card_positive_result_title">"Positive Result"</string>
<!-- XHED: submission status card positive result subtitle -->
<string name="submission_status_card_positive_result_subtitle">"Please note:"</string>
<!-- XBUT: submission status card show positive result button -->
<string name="submission_status_card_positive_result_show_button">"Display Test Result"</string>
<!-- YTXT: text for contagious card -->
<string name="submission_status_card_positive_result_contagious">"You are infectious. Isolate yourself from other people."</string>
<!-- YTXT: text for contact card -->
......@@ -906,10 +882,6 @@
<item>"Do not go to work if you feel unwell to ensure you do not put other people at risk. If your symptoms worsen, you might need a further SARS-CoV-2 test."</item>
</string-array>
<!-- XBUT: submission result dialog close button -->
<string name="submission_result_button_dialog_close">"OK"</string>
<!-- ####################################
Button Tooltips for Accessibility
###################################### -->
......
Corona-Warn-App/src/main/res/values/strings.xml
+ 3
− 30
View file @ 2b87f798
......@@ -66,6 +66,7 @@
<string name="preference_registration_token">
<xliff:g id="preference">preference_registration_token</xliff:g>
</string>
<!-- NOTR -->
<string name="preference_device_pairing_successful_time">
<xliff:g id="preference">preference_device_pairing_successful_time</xliff:g>
</string>
......@@ -125,11 +126,11 @@
<string name="preference_last_three_hours_from_server">
<xliff:g id="preference">preference_last_three_hours_from_server</xliff:g>
</string>
<!-- NOTR -->
<string name="preference_polling_test_result_started">
<xliff:g id="preference">preference_polling_test_result_started</xliff:g>
</string>
<!-- NOTR -->
<string name="preference_test_result_notification">
<xliff:g id="preference">preference_test_result_notification</xliff:g>
</string>
......@@ -385,7 +386,6 @@
Onboarding
###################################### -->
<string name="onboarding_image_description">IS MISSING</string>
<!-- XBUT: onboarding - forward and deny -->
<string name="onboarding_button_disable">Nicht aktivieren</string>
<!-- XBUT: onboarding - forward and allow -->
......@@ -709,8 +709,6 @@
<string name="submission_test_result_headline">Test-Ergebnis</string>
<!-- XHED: Page subheadline for test result -->
<string name="submission_test_result_subtitle">Info zum Ablauf:</string>
<!-- XBUT: test result submission - finish button -->
<string name="submission_test_result_button_finish">Abschließen</string>
<!-- XHED: Page headline for results next steps -->
<string name="submission_test_result_steps_added_heading">Test erfolgreich hinzugefügt</string>
<!-- YTXT: Body text for for results next steps -->
......@@ -798,13 +796,6 @@
<!-- XACT: Submission Intro page title -->
<string name="submission_intro_accessibility_title">Wurden Sie getestet? So funktioniert das Corona-Warn-System</string>
<!-- Notification -->
<!-- XHED: Dialog headline for result dialog -->
<string name="submission_result_dialog_headline">Danke für die Mithilfe!</string>
<!-- YTXT: Body text for result dialog -->
<string name="submission_result_dialog_body">Ihr verifizierter Befund wurde anonym übertragen.</string>
<!-- Dispatcher -->
<!-- XHED: Page headline for dispatcher menu -->
<string name="submission_dispatcher_headline">Auswahl</string>
......@@ -846,14 +837,6 @@
<string name="submission_positive_other_warning_privacy_body">Durch Antippen von „Weiter“ willigen Sie ein, dass die App Ihr positives Testergebnis zusammen mit Ihren Zufalls-IDs der letzten 14 Tage an das Serversystem der App übermittelt, damit andere App-Nutzer mit aktivierter Risiko-Ermittlung automatisch informiert werden können, dass sie möglicherweise einem Infektionsrisiko ausgesetzt waren. Die übermittelten Zufalls-IDs enthalten keine Angaben, die Rückschlüsse auf Ihre Identität oder Ihre Person zulassen.\n\nDie Übermittlung Ihres Testergebnisses per App ist freiwillig. Wenn Sie Ihr Testergebnis nicht übermitteln, entstehen Ihnen keine Nachteile. Da weder nachvollzogen noch kontrolliert werden kann, ob und wie Sie die App verwenden, erfährt außer Ihnen niemand, ob Sie eine Infektion übermittelt haben.\n\nSie können Ihre Einwilligung jederzeit widerrufen, indem Sie die App löschen. Durch den Widerruf der Einwilligung wird die Rechtmäßigkeit der aufgrund der Einwilligung bis zum Widerruf erfolgten Verarbeitung nicht berührt. Weitere Informationen finden Sie unter dem Menüpunkt „Datenschutzinformation“.</string>
<!-- XBUT: other warning continue button -->
<string name="submission_positive_other_warning_button">Weiter</string>
<!-- XHED: Dialog title for positive other warning dialog -->
<string name="submission_positive_dialog_confirmation_title">Zufalls-IDs mit der App "Corona-Warn" teilen?</string>
<!-- YTXT: Body text for the positive result confirmation dialog-->
<string name="submission_positive_dialog_confirmation_body">Deine zufälligen IDs der letzten 14 Tage werden dazu genutzt, andere darüber zu informieren, dass du in ihrer Nähe gewesen bist und sie daher möglicherweise in Kontakt mit COVID-19 gekommen sind.</string>
<!-- XBUT: submission(positive other warning) - positive button (right) -->
<string name="submission_positive_dialog_confirmation_positive">Erlauben</string>
<!-- XBUT: submission(positive other warning) - negative button (left) -->
<string name="submission_positive_dialog_confirmation_negative">Nicht erlauben</string>
<!-- XACT: other warning - illustration description, explanation image -->
<string name="submission_positive_other_illustration_description">Ein Smartphone übermittelt einen positiven Testbefund verschlüsselt ins System.</string>
......@@ -861,8 +844,6 @@
<!-- Submission Done -->
<!-- XHED: Page title for completed submission page -->
<string name="submission_done_title">Vielen Dank!</string>
<!-- XHED: Page subheadline for completed submission page -->
<string name="submission_done_headline">Sie haben einen wichtigen Beitrag geleistet!</string>
<!-- YTXT: Body text for completed submission page -->
<string name="submission_done_body">Sie haben einen wichtigen Beitrag geleistet! Dank Ihrer Mithilfe können Andere gewarnt werden und entsprechend reagieren.</string>
<!-- XHED: Page subtitle for completed submission page -->
......@@ -945,12 +926,8 @@
<string name="submission_status_card_button_unregistered">Informieren &amp; mitmachen</string>
<!-- XBUT: submission status card show results button -->
<string name="submission_status_card_button_show_results">Test anzeigen</string>
<!-- XHED: submission status card positive result title -->
<string name="submission_status_card_positive_result_title">Positives Ergebnis</string>
<!-- XHED: submission status card positive result subtitle -->
<string name="submission_status_card_positive_result_subtitle">Bitte beachten Sie:</string>
<!-- XBUT: submission status card show positive result button -->
<string name="submission_status_card_positive_result_show_button">Test-Ergebnis anzeigen</string>
<!-- YTXT: text for contagious card -->
<string name="submission_status_card_positive_result_contagious">Sie sind ansteckend. Isolieren Sie sich von anderen Personen.</string>
<!-- YTXT: text for contact card -->
......@@ -981,10 +958,6 @@
<item>Gehen Sie nicht krank zur Arbeit, um andere Personen nicht zu gefährden. Falls sich Ihre Symptome verschlechtern, kann die Notwendigkeit eines weiteren SARS-CoV-2-Tests bestehen.</item>
</string-array>
<!-- XBUT: submission result dialog close button -->
<string name="submission_result_button_dialog_close">OK</string>
<!-- ####################################
Button Tooltips for Accessibility
###################################### -->
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment