Commit 44b42eb8 authored 4 years ago by Matthias Urhahn

Merge branch 'release/1.15.x' into feature/5062-event-registration-main

# Conflicts:
#	Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
#	Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml

parents e4cb0432 9b2c87c1

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 0 additions, 1 deletion

.circleci/config.yml
Corona-Warn-App/build.gradle 1 addition, 0 deletions

Corona-Warn-App/build.gradle
Corona-Warn-App/schemas/de.rki.coronawarnapp.datadonation.analytics.modules.exposurewindows.AnalyticsExposureWindowDatabase/1.json 140 additions, 0 deletions

...es.exposurewindows.AnalyticsExposureWindowDatabase/1.json
Corona-Warn-App/schemas/de.rki.coronawarnapp.datadonation.analytics.modules.exposurewindows.ExposureWindowContributionDao/1.json 140 additions, 0 deletions

...ules.exposurewindows.ExposureWindowContributionDao/1.json
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/datadonation/analytics/modules/exposurewindows/AnalyticsExposureWindowsDatabaseTest.kt 75 additions, 0 deletions

...s/exposurewindows/AnalyticsExposureWindowsDatabaseTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryDayFragmentTest.kt 4 additions, 1 deletion

...onawarnapp/ui/contactdiary/ContactDiaryDayFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt 7 additions, 1 deletion

...rnapp/ui/contactdiary/ContactDiaryOverviewFragmentTest.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt 6 additions, 3 deletions

...st/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/main/MainActivityTest.kt 6 additions, 1 deletion

...est/java/de/rki/coronawarnapp/ui/main/MainActivityTest.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryCommentInfoTestFragment.kt 0 additions, 31 deletions

...st/contactdiary/ui/ContactDiaryCommentInfoTestFragment.kt
Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt 0 additions, 2 deletions

...i/coronawarnapp/test/menu/ui/TestMenuFragmentViewModel.kt
Corona-Warn-App/src/deviceForTesters/res/navigation/test_nav_graph.xml 0 additions, 9 deletions

...pp/src/deviceForTesters/res/navigation/test_nav_graph.xml
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/common/DiaryCircumstancesTextView.kt 15 additions, 3 deletions

...actdiary/ui/day/tabs/common/DiaryCircumstancesTextView.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListFragment.kt 31 additions, 1 deletion

.../ui/day/tabs/location/ContactDiaryLocationListFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListViewModel.kt 35 additions, 5 deletions

...ui/day/tabs/location/ContactDiaryLocationListViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/DiaryLocationListItem.kt 2 additions, 1 deletion

...ontactdiary/ui/day/tabs/location/DiaryLocationListItem.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/DiaryLocationViewHolder.kt 19 additions, 0 deletions

...tactdiary/ui/day/tabs/location/DiaryLocationViewHolder.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListFragment.kt 9 additions, 0 deletions

...iary/ui/day/tabs/person/ContactDiaryPersonListFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt 20 additions, 7 deletions

...ary/ui/day/tabs/person/ContactDiaryPersonListViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/durationpicker/ContactDiaryDurationPickerFragment.kt 5 additions, 3 deletions

...y/ui/durationpicker/ContactDiaryDurationPickerFragment.kt

with 515 additions and 69 deletions

Please register or to comment