Commit 81a362a2 authored 4 years ago by Mohamed Metwalli

Merge branch 'release/1.11.x' into feature/2950-home-screenshots

parents ac364832 53f3faf3

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt 5 additions, 3 deletions

...warnapp/contactdiary/model/DefaultContactDiaryLocation.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt 5 additions, 3 deletions

...nawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/ContactDiaryDayFragment.kt 5 additions, 3 deletions

...onawarnapp/contactdiary/ui/day/ContactDiaryDayFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt 3 additions, 9 deletions

...y/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt 3 additions, 9 deletions

...diary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsFragment.kt 7 additions, 51 deletions

...contactdiary/ui/edit/ContactDiaryEditLocationsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt 2 additions, 2 deletions

...ontactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsFragment.kt 7 additions, 51 deletions

...p/contactdiary/ui/edit/ContactDiaryEditPersonsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt 2 additions, 2 deletions

.../contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/adapter/LocationEditAdapter.kt 40 additions, 0 deletions

...rnapp/contactdiary/ui/edit/adapter/LocationEditAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/adapter/PersonEditAdapter.kt 40 additions, 0 deletions

...warnapp/contactdiary/ui/edit/adapter/PersonEditAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt 34 additions, 4 deletions

.../contactdiary/ui/overview/ContactDiaryOverviewFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewMenu.kt 0 additions, 52 deletions

...napp/contactdiary/ui/overview/ContactDiaryOverviewMenu.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt 3 additions, 1 deletion

...contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewAdapter.kt 27 additions, 40 deletions

...tdiary/ui/overview/adapter/ContactDiaryOverviewAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt 22 additions, 18 deletions

.../ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt 0 additions, 2 deletions

...ocation/ContactDiaryLocationBottomSheetDialogViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt 0 additions, 2 deletions

...ts/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/util/AbstractAdapter.kt 15 additions, 0 deletions

...de/rki/coronawarnapp/contactdiary/util/AbstractAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/util/ContactDiaryExtensions.kt 5 additions, 0 deletions

...coronawarnapp/contactdiary/util/ContactDiaryExtensions.kt

with 225 additions and 252 deletions

Please register or to comment