Commit 21650732 authored 3 years ago by Matthias Urhahn

Merge branch 'release/2.4.x' into release/2.5.x

# Conflicts:
#	Corona-Warn-App/src/main/res/values-de/green_certificate_strings.xml
#	Corona-Warn-App/src/main/res/values-de/legal_strings.xml

parents 7f26cdac 88e8c750

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/build.gradle 0 additions, 1 deletion

Corona-Warn-App/build.gradle
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/details/VaccinationDetailsFragmentTest.kt 3 additions, 4 deletions

.../vaccination/ui/details/VaccinationDetailsFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragmentTest.kt 10 additions, 10 deletions

...ficate/vaccination/ui/list/VaccinationListFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt 3 additions, 3 deletions

...idTest/java/de/rki/coronawarnapp/ui/main/home/HomeData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/covidcertificate/RequestCovidCertificateFragmentTest.kt 116 additions, 0 deletions

...n/covidcertificate/RequestCovidCertificateFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/vaccination/VaccinationConsentFragmentTest.kt 3 additions, 3 deletions

...awarnapp/ui/vaccination/VaccinationConsentFragmentTest.kt
Corona-Warn-App/src/androidTest/java/testhelpers/FragmentTestModuleRegistrar.kt 5 additions, 3 deletions

...droidTest/java/testhelpers/FragmentTestModuleRegistrar.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt 18 additions, 7 deletions

...oronawarnapp/test/debugoptions/ui/DebugOptionsFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/debugoptions/ui/EnvironmentState.kt 2 additions, 0 deletions

...ki/coronawarnapp/test/debugoptions/ui/EnvironmentState.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt 1 addition, 1 deletion

...st/deltaonboarding/ui/DeltaOnboardingFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragment.kt 0 additions, 44 deletions

...app/test/greencertificate/GreenCertificateTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentModule.kt 0 additions, 18 deletions

...st/greencertificate/GreenCertificateTestFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/greencertificate/GreenCertificateTestFragmentViewModel.kt 0 additions, 15 deletions

...greencertificate/GreenCertificateTestFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt 0 additions, 4 deletions

...i/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt 0 additions, 10 deletions

...va/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt 0 additions, 54 deletions

...i/coronawarnapp/vaccination/ui/VaccinationTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentModule.kt 0 additions, 18 deletions

...nawarnapp/vaccination/ui/VaccinationTestFragmentModule.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/vaccination/ui/VaccinationTestFragmentViewModel.kt 0 additions, 15 deletions

...arnapp/vaccination/ui/VaccinationTestFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_debugoptions.xml 10 additions, 2 deletions

...eviceForTesters/res/layout/fragment_test_debugoptions.xml
Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_green_certificate.xml 0 additions, 27 deletions

...ForTesters/res/layout/fragment_test_green_certificate.xml

with 171 additions and 239 deletions

Please register or to comment