Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Cwa App Android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

36462b98

Commit 36462b98 authored 3 years ago by Matthias Urhahn

Downloads
- Patches
- Plain Diff

Fix merge regression & conflicts (2.4.x -> 2.5.x)

parent 8c5ef2a6

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/person/ui/overview/PersonOverviewFragment.kt 24 additions, 6 deletions

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

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

...rson/ui/overview/items/CovidTestCertificatePendingCard.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/core/TestCertificateRepository.kt 1 addition, 1 deletion

...p/covidcertificate/test/core/TestCertificateRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/CertificatesViewModel.kt 1 addition, 16 deletions

...warnapp/covidcertificate/test/ui/CertificatesViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsFragment.kt 0 additions, 3 deletions

...ficate/test/ui/details/CovidCertificateDetailsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt 1 addition, 1 deletion

...rc/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt

with 56 additions and 33 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment