Skip to content
Snippets Groups Projects
Unverified Commit 063442b6 authored by Chilja Gossow's avatar Chilja Gossow Committed by GitHub
Browse files

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
parent 9fa167dc
No related branches found
No related tags found
No related merge requests found
Showing
with 547 additions and 24 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment