Skip to content
Snippets Groups Projects
Unverified Commit 3f376a95 authored by Chilja Gossow's avatar Chilja Gossow Committed by GitHub
Browse files

Add conditional text "Ihr Testergebnis wird Ihnen anschliessend angezeigt."...

Add conditional text "Ihr Testergebnis wird Ihnen anschliessend angezeigt." (EXPOSUREAPP-4122) (#1834)

* Use different texts depending on where the user comes from

* klint

Co-authored-by: default avatarRalf Gehrer <ralfgehrer@users.noreply.github.com>
parent 80a76683
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,9 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor( ...@@ -72,7 +72,9 @@ class SubmissionTestResultAvailableViewModel @AssistedInject constructor(
fun goConsent() { fun goConsent() {
routeToScreen.postValue( routeToScreen.postValue(
SubmissionTestResultAvailableFragmentDirections SubmissionTestResultAvailableFragmentDirections
.actionSubmissionTestResultAvailableFragmentToSubmissionYourConsentFragment() .actionSubmissionTestResultAvailableFragmentToSubmissionYourConsentFragment(
isTestResultAvailable = true
)
) )
} }
......
...@@ -4,6 +4,7 @@ import android.os.Bundle ...@@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.View import android.view.View
import android.view.accessibility.AccessibilityEvent import android.view.accessibility.AccessibilityEvent
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.navigation.fragment.navArgs
import de.rki.coronawarnapp.R import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.FragmentSubmissionYourConsentBinding import de.rki.coronawarnapp.databinding.FragmentSubmissionYourConsentBinding
import de.rki.coronawarnapp.ui.main.MainActivity import de.rki.coronawarnapp.ui.main.MainActivity
...@@ -24,6 +25,7 @@ class SubmissionYourConsentFragment : Fragment(R.layout.fragment_submission_your ...@@ -24,6 +25,7 @@ class SubmissionYourConsentFragment : Fragment(R.layout.fragment_submission_your
@Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory @Inject lateinit var viewModelFactory: CWAViewModelFactoryProvider.Factory
private val vm: SubmissionYourConsentViewModel by cwaViewModels { viewModelFactory } private val vm: SubmissionYourConsentViewModel by cwaViewModels { viewModelFactory }
private val binding: FragmentSubmissionYourConsentBinding by viewBindingLazy() private val binding: FragmentSubmissionYourConsentBinding by viewBindingLazy()
private val navArgs: SubmissionYourConsentFragmentArgs by navArgs()
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
...@@ -61,6 +63,14 @@ class SubmissionYourConsentFragment : Fragment(R.layout.fragment_submission_your ...@@ -61,6 +63,14 @@ class SubmissionYourConsentFragment : Fragment(R.layout.fragment_submission_your
} }
submissionYourConsentSwitch.settingsSwitchRow.setOnClickListener { vm.switchConsent() } submissionYourConsentSwitch.settingsSwitchRow.setOnClickListener { vm.switchConsent() }
submissionYourConsentAgreementDetailsText.setOnClickListener { vm.goLegal() } submissionYourConsentAgreementDetailsText.setOnClickListener { vm.goLegal() }
submissionYourConsentAgreementShareSymptomsText.setText(
if (navArgs.isTestResultAvailable) {
R.string.submission_your_consent_agreement_share_symptoms_2
} else {
R.string.submission_your_consent_agreement_share_symptoms
}
)
} }
} }
......
...@@ -416,6 +416,10 @@ ...@@ -416,6 +416,10 @@
android:id="@+id/submissionYourConsentFragment" android:id="@+id/submissionYourConsentFragment"
android:name="de.rki.coronawarnapp.ui.submission.yourconsent.SubmissionYourConsentFragment" android:name="de.rki.coronawarnapp.ui.submission.yourconsent.SubmissionYourConsentFragment"
android:label="SubmissionYourConsentFragment"> android:label="SubmissionYourConsentFragment">
<argument
android:name="isTestResultAvailable"
android:defaultValue="false"
app:argType="boolean" />
<action <action
android:id="@+id/action_submissionYourConsentFragment_to_informationPrivacyFragment" android:id="@+id/action_submissionYourConsentFragment_to_informationPrivacyFragment"
app:destination="@id/informationPrivacyFragment" /> app:destination="@id/informationPrivacyFragment" />
......
...@@ -80,7 +80,7 @@ class SubmissionTestResultAvailableViewModelTest : BaseTest() { ...@@ -80,7 +80,7 @@ class SubmissionTestResultAvailableViewModelTest : BaseTest() {
viewModel.goConsent() viewModel.goConsent()
viewModel.routeToScreen.value shouldBe SubmissionTestResultAvailableFragmentDirections viewModel.routeToScreen.value shouldBe SubmissionTestResultAvailableFragmentDirections
.actionSubmissionTestResultAvailableFragmentToSubmissionYourConsentFragment() .actionSubmissionTestResultAvailableFragmentToSubmissionYourConsentFragment(true)
} }
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment