Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 6bf1687

Browse files
schauersbergernschauersbergern
authored
Merge pull request #5729 from corona-warn-app/feature/14354_update_text_and_screens
Update text and screens (EXPOSUREAPP-14354)
2 parents 02a2e14 + 6904271 commit 6bf1687

17 files changed

+643
-109
lines changed

‎Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/mapping/SelfReportSubmissionConfigMapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SelfReportSubmissionConfigMapper @Inject constructor() : SelfReportSubmiss
4242
Timber.d("Faulty timeBetweenSubmissionsInDays -> set to default")
4343
SelfReportSubmissionCommonContainer.DEFAULT_DAYS
4444
} else {
45-
Duration.ofHours(common.timeBetweenSubmissionsInDays.toLong())
45+
Duration.ofDays(common.timeBetweenSubmissionsInDays.toLong())
4646
},
4747

4848
plausibleDeniabilityParameters = if (common.hasPlausibleDeniabilityParameters()) {

‎Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/consent/SrsSubmissionConsentFragment.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ class SrsSubmissionConsentFragment : Fragment(R.layout.fragment_srs_submission_c
5050
viewModel.submissionConsentAcceptButtonClicked()
5151
}
5252

53+
with(binding) {
54+
viewModel.timeBetweenSubmissionsInDays.observe2(this@SrsSubmissionConsentFragment) {
55+
srsSectionWarnInterval.text = getString(R.string.srs_section_warn_interval_text, it.toDays())
56+
}
57+
}
58+
5359
viewModel.showKeysRetrievalProgress.observe2(this) {
5460
Timber.i("SubmissionTestResult:showKeyRetrievalProgress:$it")
5561
keyRetrievalProgress.setState(it)

‎Corona-Warn-App/src/main/java/de/rki/coronawarnapp/srs/ui/consent/SrsSubmissionConsentFragmentViewModel.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.google.android.gms.nearby.exposurenotification.TemporaryExposureKey
66
import dagger.assisted.Assisted
77
import dagger.assisted.AssistedFactory
88
import dagger.assisted.AssistedInject
9+
import de.rki.coronawarnapp.appconfig.AppConfigProvider
910
import de.rki.coronawarnapp.exception.ExceptionCategory
1011
import de.rki.coronawarnapp.exception.reporting.report
1112
import de.rki.coronawarnapp.presencetracing.checkins.CheckInRepository
@@ -16,11 +17,13 @@ import de.rki.coronawarnapp.util.ui.SingleLiveEvent
1617
import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
1718
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
1819
import kotlinx.coroutines.flow.first
20+
import kotlinx.coroutines.flow.map
1921
import timber.log.Timber
2022

2123
class SrsSubmissionConsentFragmentViewModel @AssistedInject constructor(
2224
@Assisted private val openTypeSelection: Boolean,
2325
private val checkInRepository: CheckInRepository,
26+
appConfigProvider: AppConfigProvider,
2427
dispatcherProvider: DispatcherProvider,
2528
tekHistoryUpdaterFactory: TEKHistoryUpdater.Factory,
2629
) : CWAViewModel(dispatcherProvider) {
@@ -29,6 +32,9 @@ class SrsSubmissionConsentFragmentViewModel @AssistedInject constructor(
2932
val showTracingConsentDialog = SingleLiveEvent<(Boolean) -> Unit>()
3033
val showPermissionRequest = SingleLiveEvent<(Activity) -> Unit>()
3134
val event = SingleLiveEvent<SrsSubmissionConsentNavigationEvents>()
35+
val timeBetweenSubmissionsInDays = appConfigProvider.currentConfig.map {
36+
it.selfReportSubmission.common.timeBetweenSubmissionsInDays
37+
}.asLiveData2()
3238

3339
private val tekHistoryUpdater = tekHistoryUpdaterFactory.create(
3440
object : TEKHistoryUpdater.Callback {

‎Corona-Warn-App/src/main/res/layout/fragment_srs_submission_consent.xml

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -109,67 +109,10 @@
109109
android:layout_width="0dp"
110110
android:layout_height="wrap_content"
111111
android:layout_marginStart="10dp"
112-
android:text="@string/srs_section_warn_interval_text"
113112
app:layout_constraintEnd_toEndOf="@id/guideline_end"
114113
app:layout_constraintStart_toEndOf="@id/srs_section_warn_interval_image"
115-
app:layout_constraintTop_toTopOf="@id/srs_section_warn_interval_image" />
116-
117-
<ImageView
118-
android:id="@+id/srs_section_not_official_image"
119-
android:layout_width="wrap_content"
120-
android:layout_height="wrap_content"
121-
android:layout_marginTop="@dimen/spacing_normal"
122-
android:importantForAccessibility="no"
123-
app:layout_constraintStart_toStartOf="@id/guideline_start"
124-
app:layout_constraintTop_toBottomOf="@id/srs_section_warn_interval"
125-
app:srcCompat="@drawable/ic_srs_not_official" />
126-
127-
<TextView
128-
android:id="@+id/srs_section_not_official"
129-
style="@style/subtitle"
130-
android:layout_width="0dp"
131-
android:layout_height="wrap_content"
132-
android:layout_marginStart="10dp"
133-
android:text="@string/srs_section_not_official_text"
134-
app:layout_constraintEnd_toEndOf="@id/guideline_end"
135-
app:layout_constraintStart_toEndOf="@id/srs_section_not_official_image"
136-
app:layout_constraintTop_toTopOf="@id/srs_section_not_official_image" />
137-
138-
<TextView
139-
android:id="@+id/srs_help_others_headline"
140-
style="@style/headline6"
141-
android:layout_width="0dp"
142-
android:layout_height="wrap_content"
143-
android:layout_marginTop="@dimen/spacing_normal"
144-
android:focusable="true"
145-
android:text="@string/srs_help_others_headline_text"
146-
app:layout_constraintEnd_toEndOf="@id/guideline_end"
147-
app:layout_constraintStart_toStartOf="@id/guideline_start"
148-
app:layout_constraintTop_toBottomOf="@id/srs_section_not_official" />
149-
150-
<TextView
151-
android:id="@+id/srs_help_others_positive_test"
152-
style="@style/subtitle"
153-
android:layout_width="0dp"
154-
android:layout_height="wrap_content"
155-
android:layout_marginTop="@dimen/spacing_normal"
156-
android:focusable="true"
157-
android:text="@string/srs_help_others_positive_test_text"
158-
app:layout_constraintEnd_toEndOf="@id/guideline_end"
159-
app:layout_constraintStart_toStartOf="@id/guideline_start"
160-
app:layout_constraintTop_toBottomOf="@id/srs_help_others_headline" />
161-
162-
<TextView
163-
android:id="@+id/srs_help_others_warn_other_users"
164-
style="@style/subtitle"
165-
android:layout_width="0dp"
166-
android:layout_height="wrap_content"
167-
android:layout_marginTop="@dimen/spacing_small"
168-
android:focusable="true"
169-
android:text="@string/srs_help_others_warn_other_users_text"
170-
app:layout_constraintEnd_toEndOf="@id/guideline_end"
171-
app:layout_constraintStart_toStartOf="@id/guideline_start"
172-
app:layout_constraintTop_toBottomOf="@id/srs_help_others_positive_test" />
114+
app:layout_constraintTop_toTopOf="@id/srs_section_warn_interval_image"
115+
tools:text="@string/srs_section_warn_interval_text"/>
173116

174117

175118
<include
@@ -180,7 +123,7 @@
180123
android:layout_marginTop="@dimen/spacing_normal"
181124
app:layout_constraintEnd_toStartOf="@id/guideline_card_end"
182125
app:layout_constraintStart_toStartOf="@id/guideline_card_start"
183-
app:layout_constraintTop_toBottomOf="@id/srs_help_others_warn_other_users" />
126+
app:layout_constraintTop_toBottomOf="@id/srs_section_warn_interval" />
184127

185128
<TextView
186129
android:id="@+id/srs_next_step_submission"
@@ -205,7 +148,7 @@
205148
app:layout_constraintEnd_toEndOf="@id/guideline_end"
206149
app:layout_constraintStart_toStartOf="@id/guideline_start"
207150
app:layout_constraintTop_toBottomOf="@id/srs_next_step_submission"
208-
app:titleText="@string/srs_submission_consent_survey_button" />
151+
app:titleText="@string/srs_submission_consent_legal_link_text" />
209152

210153
<androidx.constraintlayout.widget.Guideline
211154
android:id="@+id/guideline_start"

‎Corona-Warn-App/src/main/res/layout/include_srs_privacy_card.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383

8484
<TextView
8585
android:id="@+id/second_bulletpoint_title"
86-
style="@style/boldSubtitle"
86+
style="@style/subtitle"
8787
android:layout_width="0dp"
8888
android:layout_height="wrap_content"
8989
android:layout_marginStart="@dimen/bullet_point_spacing_after"

‎Corona-Warn-App/src/main/res/values-bg/srs_submission_strings.xml

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<!-- Home screen register test card -->
5+
<!-- XHED: Register test card title -->
6+
<string name="register_test_card_title"></string>
7+
<!-- XTXT: Register test card subtitle -->
8+
<string name="register_test_card_subtitle"></string>
9+
<!-- XTXT: Register test card description -->
10+
<string name="register_test_card_description"></string>
11+
<!-- XTXT: Register test card button -->
12+
<string name="register_test_card_button"></string>
13+
14+
<!-- Dispatcher screen -->
15+
<!-- XHED: Test registration title -->
16+
<string name="dispatcher_test_registration_title"></string>
17+
18+
<!-- SRS self test card -->
19+
<!-- XHED: Self test title -->
20+
<string name="srs_self_test_title"></string>
21+
<!-- XTXT: Self test body -->
22+
<string name="srs_self_test_body"></string>
23+
24+
25+
<!-- SRS Positive test no answer card -->
26+
<!-- XHED: Positive test no answer title -->
27+
<string name="srs_positive_test_no_answer_title"></string>
28+
<!-- XTXT: Positive test no answer body -->
29+
<string name="srs_positive_test_no_answer_body"></string>
30+
31+
<!-- Submission Consent Screen -->
32+
<!-- XHED: Submission consent header -->
33+
<string name="srs_submission_consent_header"></string>
34+
<!-- XHED: Submission consent headline -->
35+
<string name="srs_submission_consent_headline_text"></string>
36+
<!-- XHED: Submission consent disclaimer sub headline -->
37+
<string name="srs_submission_consent_disclaimer_subheadline_text"></string>
38+
<!-- XTXT: Submission consent section warn consent -->
39+
<string name="srs_section_warn_consent_text"></string>
40+
<!-- XTXT: Submission consent section warn interval -->
41+
<string name="srs_section_warn_interval_text"></string>
42+
<!-- XTXT: Submission consent first bulletpoint -->
43+
<string name="srs_submission_consent_first_bulletpoint_text"></string>
44+
<!-- XTXT: Submission consent second bulletpoint -->
45+
<string name="srs_submission_consent_second_bulletpoint_text"></string>
46+
<!-- XTXT: Submission consent third bulletpoint -->
47+
<string name="srs_submission_consent_third_bulletpoint_text"></string>
48+
<!-- XTXT: Submission consent fourth bulletpoint -->
49+
<string name="srs_submission_consent_fourth_bulletpoint_text"></string>
50+
<!-- XTXT: Submission consent fifth bulletpoint -->
51+
<string name="srs_submission_consent_fifth_bulletpoint_text"></string>
52+
<!-- XTXT: Submission consent next step submission -->
53+
<string name="srs_next_step_submission_text"></string>
54+
<!-- XTXT: Contact journal submission entry title -->
55+
<string name="srs_contact_diary_submission_item_title"></string>
56+
<!-- XTXT: Submission consent legal link text -->
57+
<string name="srs_submission_consent_legal_link_text"></string>
58+
59+
<!-- Type Selection Screen -->
60+
<!-- XHED: Type selection header -->
61+
<string name="srs_type_selection_header"></string>
62+
<!-- XTXT: Type selection introduction -->
63+
<string name="srs_type_selection_introduction_text"></string>
64+
<!-- XTXT: Type selection button rat registered no result text -->
65+
<string name="srs_rat_registered_no_result_text"></string>
66+
<!-- XTXT: Type selection button rat not registered text -->
67+
<string name="srs_rat_not_registered_text"></string>
68+
<!-- XTXT: Type selection button pcr registered no result text -->
69+
<string name="srs_pcr_registered_no_result_text"></string>
70+
<!-- XTXT: Type selection button pcr not registered text -->
71+
<string name="srs_pcr_not_registered_text"></string>
72+
<!-- XTXT: Type selection button rapid pcr text -->
73+
<string name="srs_rapid_pcr_text"></string>
74+
<!-- XTXT: Type selection button other text -->
75+
<string name="srs_other_text"></string>
76+
<!-- XTXT: Type selection next button text -->
77+
<string name="type_selection_next_button_text"></string>
78+
79+
<!-- Srs Submission Cancel Dialog -->
80+
<!-- XHED: Cancel submission dialog title -->
81+
<string name="srs_cancel_dialog_title"></string>
82+
<!-- XTXT: Cancel submission dialog message -->
83+
<string name="srs_cancel_dialog_message"></string>
84+
<!-- XBUT: Continue warning button -->
85+
<string name="srs_cancel_dialog_continue"></string>
86+
<!-- XBUT: Don't warn button -->
87+
<string name="srs_cancel_dialog_cancel"></string>
88+
89+
<!-- Srs Submission Warning Dialog -->
90+
<!-- XHED: Submission warning dialog title -->
91+
<string name="srs_submission_warning_dialog_title"></string>
92+
<!-- XTXT: Submission warning dialog message -->
93+
<string name="srs_submission_warning_dialog_message"></string>
94+
<!-- XBUT: Submission warning positive button -->
95+
<string name="srs_submission_warning_dialog_positive_button"></string>
96+
<!-- XBUT: Submission warning negative button -->
97+
<string name="srs_submission_warning_dialog_negative_button"></string>
98+
<!-- Srs Errors-->
99+
<!-- XTXT: SRS error title -->
100+
<string name="srs_error_title"></string>
101+
<!-- XTXT: SRS CALL_HOTLINE error message -->
102+
<string name="srs_error_call_hotline"></string>
103+
<!-- XTXT: SRS CHANGE_DEVICE_TIME error message -->
104+
<string name="srs_error_device_time"></string>
105+
<!-- XTXT: SRS DEVICE_NOT_TRUSTED error message -->
106+
<string name="srs_error_device_not_trusted"></string>
107+
<!-- XTXT: SRS NO_NETWORK error message -->
108+
<string name="srs_error_no_network"></string>
109+
<!-- XTXT: SRS SUBMISSION_TOO_EARLY error message -->
110+
<string name="srs_error_submission_too_early"></string>
111+
<!-- XTXT: SRS TIME_SINCE_ONBOARDING_UNVERIFIED error message -->
112+
<string name="srs_error_time_since_onboarding_unverified"></string>
113+
<!-- XTXT: SRS TRY_AGAIN_LATER error message -->
114+
<string name="srs_error_try_again_later"></string>
115+
<!-- XTXT: SRS UPDATE_PLAY_SERVICES error message -->
116+
<string name="srs_error_update_play_services"></string>
117+
</resources>

‎Corona-Warn-App/src/main/res/values-de/legal_strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@
244244
<!-- XTXT: Submission consent privacy card subtitle -->
245245
<string name="srs_privacy_card_subtitle_text" translatable="false">Durch Antippen von „Einverstanden“ willigen Sie in folgende Schritte ein:</string>
246246
<!-- XTXT: Submission consent privacy card first bulletpoint -->
247-
<string name="srs_privacy_card_first_bulletpoint_text" translatable="false">Die App teilt Ihr positives Testergebnis, um Nutzer, denen Sie begegnet sind, zu warnen. Dies betrifft auch Nutzer der Corona-Warn-App, die zeitgleich am selben Event oder Ort wie Sie eingecheckt waren.</string>
247+
<string name="srs_privacy_card_first_bulletpoint_text" translatable="false"><b>Die App teilt Ihr positives Testergebnis, um andere Nutzer der Corona-Warn-App zu warnen, denen Sie begegnet sind oder die zeitgleich am selben Event oder Ort wie Sie eingecheckt waren.</b></string>
248248
<!-- XTXT: Submission consent privacy card second bulletpoint -->
249-
<string name="srs_privacy_card_second_bulletpoint_text" translatable="false">Ihre Angaben zur Art des Tests werden anonym statistisch ausgewertet.</string>
249+
<string name="srs_privacy_card_second_bulletpoint_text" translatable="false">Bevor das Testergebnis geteilt werden kann, wird die <b>Echtheit Ihrer App einmalig geprüft</b>. Dazu wird durch Ihr Smartphone eine eindeutige Kennung erzeugt und an Google in die USA oder andere Drittländer übermittelt, damit Google die Echtheit Ihrer App gegenüber dem RKI bestätigen kann. Die Kennung enthält Informationen über die Version Ihres Smartphones und der App. Google kann damit möglicherweise auf Ihre Identität schließen und nachvollziehen, dass die Echtheitsprüfung Ihres Smartphones stattgefunden hat. Weitere Angaben aus der App erhält Google hierbei nicht.</string>
250250
<!-- XTXT: Submission consent privacy card third bulletpoint -->
251-
<string name="srs_privacy_card_third_bulletpoint_text" translatable="false">Wenn Sie zusätzlich Angaben zum Beginn Ihrer Symptome machen, werden auch diese geteilt.</string>
251+
<string name="srs_privacy_card_third_bulletpoint_text" translatable="false"><b>Wenn Sie zusätzlich Angaben zum Beginn Ihrer Symptome machen, werden auch diese geteilt.</b></string>
252252
</resources>

0 commit comments

Comments
 (0)