Skip to content
Snippets Groups Projects
  • Chilja Gossow's avatar
    063442b6
    Contact diary edit screens (EXPOSUREAPP-4161 EXPOSUREAPP-4162) (#1908) · 063442b6
    Chilja Gossow authored
    * 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
    063442b6
    History
    Contact diary edit screens (EXPOSUREAPP-4161 EXPOSUREAPP-4162) (#1908)
    Chilja Gossow authored
    * 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
Code owners
Assign users and groups as approvers for specific file changes. Learn more.