Merge remote-tracking branch...
Merge remote-tracking branch 'origin/feature/4741-contact-journal-extension-main' into feature/4741-contact-journal-extension-main # Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt
Showing
- Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt 30 additions, 3 deletions...st/java/de/rki/coronawarnapp/ui/contactdiary/DiaryData.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt 27 additions, 1 deletion...contactdiary/ui/overview/ContactDiaryOverviewViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt 18 additions, 8 deletions.../ui/overview/adapter/ContactDiaryOverviewNestedAdapter.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/ListItem.kt 5 additions, 1 deletion...oronawarnapp/contactdiary/ui/overview/adapter/ListItem.kt
- Corona-Warn-App/src/main/res/layout/contact_diary_overview_nested_list_item.xml 36 additions, 36 deletions...in/res/layout/contact_diary_overview_nested_list_item.xml
Loading
Please register or sign in to comment