Commit 8d3a2fc8 authored 3 years ago by Matthias Urhahn

Merge remote-tracking branch 'origin/release/2.5.x' into release/2.5.x

parents 3fdb9211 6049f4d8

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 8 additions, 2 deletions

Corona-Warn-App/build.gradle
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/covidcertificate/test/ui/CovidCertificateDetailsFragmentTest.kt 8 additions, 8 deletions

...ertificate/test/ui/CovidCertificateDetailsFragmentTest.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/DigitalCovidCertificateUIModule.kt 8 additions, 1 deletion

...rnapp/covidcertificate/DigitalCovidCertificateUIModule.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/common/scan/DccQrCodeScanFragment.kt 37 additions, 36 deletions

...app/covidcertificate/common/scan/DccQrCodeScanFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/common/scan/DccQrCodeScanModule.kt 5 additions, 5 deletions

...rnapp/covidcertificate/common/scan/DccQrCodeScanModule.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/common/scan/DccQrCodeScanViewModel.kt 77 additions, 0 deletions

...pp/covidcertificate/common/scan/DccQrCodeScanViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/person/ui/overview/PersonOverviewFragment.kt 4 additions, 7 deletions

...dcertificate/person/ui/overview/PersonOverviewFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/person/ui/overview/PersonOverviewViewModel.kt 2 additions, 1 deletion

...certificate/person/ui/overview/PersonOverviewViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/TestCertificateUIModule.kt 2 additions, 2 deletions

...rnapp/covidcertificate/test/ui/TestCertificateUIModule.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/TestCertificateDetailsFragment.kt 9 additions, 9 deletions

...ificate/test/ui/details/TestCertificateDetailsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/VaccinationCertificateUIModule.kt 0 additions, 5 deletions

...tificate/vaccination/ui/VaccinationCertificateUIModule.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListFragment.kt 3 additions, 3 deletions

...ertificate/vaccination/ui/list/VaccinationListFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/vaccination/ui/list/VaccinationListViewModel.kt 2 additions, 2 deletions

...rtificate/vaccination/ui/list/VaccinationListViewModel.kt
Corona-Warn-App/src/main/res/layout/fragment_test_certificate_details.xml 0 additions, 0 deletions

...src/main/res/layout/fragment_test_certificate_details.xml
Corona-Warn-App/src/main/res/navigation/certificate_graph.xml 22 additions, 15 deletions

...na-Warn-App/src/main/res/navigation/certificate_graph.xml
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/person/ui/overview/PersonCertificatesData.kt 71 additions, 0 deletions

...dcertificate/person/ui/overview/PersonCertificatesData.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/covidcertificate/person/ui/overview/PersonOverviewViewModelTest.kt 149 additions, 0 deletions

...ificate/person/ui/overview/PersonOverviewViewModelTest.kt

with 407 additions and 96 deletions

Please register or to comment