Contact diary edit screens (EXPOSUREAPP-4161 EXPOSUREAPP-4162) (#1908)
* Merge branch 'feature/4152-contact-diary' of https://github.com/corona-warn-app/cwa-app-android into feature/4152-contact-diary # Conflicts: # Corona-Warn-App/schemas/de.rki.coronawarnapp.contactdiary.storage.ContactDiaryDatabase/1.json # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt * clean up DI * add recycler view * clean up * new texts * clean up * clean up * background, dialog * klint * klint * klint * review comments * review comments * review comments * Merge branch 'feature/4152-contact-diary' into feature/4161-4162-edit-person-location # Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
Showing
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragmentViewModel.kt 0 additions, 1 deletion...test/contactdiary/ui/ContactDiaryTestFragmentViewModel.kt
- Corona-Warn-App/src/main/AndroidManifest.xml 1 addition, 1 deletionCorona-Warn-App/src/main/AndroidManifest.xml
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/entity/ContactDiaryLocationEntity.kt 4 additions, 1 deletion...contactdiary/storage/entity/ContactDiaryLocationEntity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/entity/ContactDiaryPersonEntity.kt 4 additions, 1 deletion...p/contactdiary/storage/entity/ContactDiaryPersonEntity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/storage/repo/DefaultContactDiaryRepository.kt 1 addition, 1 deletion...ontactdiary/storage/repo/DefaultContactDiaryRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/ContactDiaryUIModule.kt 6 additions, 0 deletions...rki/coronawarnapp/contactdiary/ui/ContactDiaryUIModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogFragment.kt 45 additions, 4 deletions...location/ContactDiaryLocationBottomSheetDialogFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt 22 additions, 1 deletion...ocation/ContactDiaryLocationBottomSheetDialogViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogFragment.kt 45 additions, 4 deletions...ets/person/ContactDiaryPersonBottomSheetDialogFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt 22 additions, 1 deletion...ts/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsFragment.kt 113 additions, 0 deletions...contactdiary/ui/edit/ContactDiaryEditLocationsFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt 50 additions, 0 deletions...ontactdiary/ui/edit/ContactDiaryEditLocationsViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditModule.kt 32 additions, 0 deletions...onawarnapp/contactdiary/ui/edit/ContactDiaryEditModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsFragment.kt 113 additions, 0 deletions...p/contactdiary/ui/edit/ContactDiaryEditPersonsFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt 50 additions, 0 deletions.../contactdiary/ui/edit/ContactDiaryEditPersonsViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt 0 additions, 2 deletions...tactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewMenu.kt 24 additions, 6 deletions...napp/contactdiary/ui/overview/ContactDiaryOverviewMenu.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt 0 additions, 1 deletion...in/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
- Corona-Warn-App/src/main/res/drawable/ic_baseline_delete.xml 5 additions, 0 deletionsCorona-Warn-App/src/main/res/drawable/ic_baseline_delete.xml
- Corona-Warn-App/src/main/res/drawable/ic_baseline_edit_24.xml 10 additions, 0 deletions...na-Warn-App/src/main/res/drawable/ic_baseline_edit_24.xml
Loading
Please register or sign in to comment