Commit c461dbf6 authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.9.x' into fix/merge-1.9.x-into-1.10.x

# Conflicts:
#	gradle.properties

parents 27cf9a16 3e51ced0

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/appconfig/sources/local/LocalAppConfigSource.kt 3 additions, 3 deletions

...nawarnapp/appconfig/sources/local/LocalAppConfigSource.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt 2 additions, 2 deletions

...pp/storage/interoperability/InteroperabilityRepository.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/submission/TransmissionRiskVectorDeterminator.kt 11 additions, 2 deletions

...awarnapp/submission/TransmissionRiskVectorDeterminator.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/SubmissionCardState.kt 1 addition, 1 deletion

.../de/rki/coronawarnapp/ui/main/home/SubmissionCardState.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarFragment.kt 5 additions, 12 deletions

...on/symptoms/calendar/SubmissionSymptomCalendarFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarViewModel.kt 30 additions, 13 deletions

...n/symptoms/calendar/SubmissionSymptomCalendarViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionFragment.kt 2 additions, 12 deletions

...oms/introduction/SubmissionSymptomIntroductionFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionViewModel.kt 19 additions, 14 deletions

...ms/introduction/SubmissionSymptomIntroductionViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentFragment.kt 12 additions, 12 deletions

...tresult/positive/SubmissionTestResultNoConsentFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/testresult/positive/SubmissionTestResultNoConsentViewModel.kt 3 additions, 23 deletions

...result/positive/SubmissionTestResultNoConsentViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/viewmodel/SubmissionNavigationEvents.kt 0 additions, 12 deletions

...app/ui/submission/viewmodel/SubmissionNavigationEvents.kt
Corona-Warn-App/src/main/res/layout/include_submission_done.xml 1 addition, 1 deletion

...-Warn-App/src/main/res/layout/include_submission_done.xml
Corona-Warn-App/src/main/res/layout/include_submission_status_card_done.xml 1 addition, 1 deletion

...c/main/res/layout/include_submission_status_card_done.xml
Corona-Warn-App/src/main/res/navigation/nav_graph.xml 3 additions, 0 deletions

Corona-Warn-App/src/main/res/navigation/nav_graph.xml
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/main/home/SubmissionCardStateTest.kt 7 additions, 4 deletions

...de/rki/coronawarnapp/main/home/SubmissionCardStateTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/symptoms/calendar/SubmissionSymptomCalendarViewModelTest.kt 114 additions, 0 deletions

...mptoms/calendar/SubmissionSymptomCalendarViewModelTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/submission/symptoms/introduction/SubmissionSymptomIntroductionViewModelTest.kt 124 additions, 0 deletions

...ntroduction/SubmissionSymptomIntroductionViewModelTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/update/UpdateCheckerTest.kt 0 additions, 1 deletion

...est/java/de/rki/coronawarnapp/update/UpdateCheckerTest.kt

with 338 additions and 113 deletions

Please register or to comment