Unverified Commit 8de85c01 authored 3 years ago by Matthias Urhahn Committed by GitHub 3 years ago

Merge pull request #3109 from corona-warn-app/dev/2.3-to-vaccination-main

2.3 to vaccination main (DEV)

parents 14419d25 068d0d16

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/deviceForTesters/res/layout/fragment_crashreporter_overview.xml 1 addition, 2 deletions

...ForTesters/res/layout/fragment_crashreporter_overview.xml
Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_keydownload.xml 1 addition, 1 deletion

...deviceForTesters/res/layout/fragment_test_keydownload.xml
Corona-Warn-App/src/deviceForTesters/res/layout/fragment_test_menu.xml 1 addition, 1 deletion

...pp/src/deviceForTesters/res/layout/fragment_test_menu.xml
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/datadonation/survey/consent/SurveyConsentFragment.kt 2 additions, 2 deletions

...napp/datadonation/survey/consent/SurveyConsentFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/TracingDetailsFragment.kt 2 additions, 5 deletions

...oronawarnapp/tracing/ui/details/TracingDetailsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/settings/SettingsTracingFragment.kt 25 additions, 38 deletions

...onawarnapp/tracing/ui/settings/SettingsTracingFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationAboutFragment.kt 2 additions, 2 deletions

.../coronawarnapp/ui/information/InformationAboutFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt 5 additions, 7 deletions

...oronawarnapp/ui/information/InformationContactFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt 4 additions, 4 deletions

...e/rki/coronawarnapp/ui/information/InformationFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationLegalFragment.kt 2 additions, 2 deletions

.../coronawarnapp/ui/information/InformationLegalFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTechnicalFragment.kt 2 additions, 2 deletions

...onawarnapp/ui/information/InformationTechnicalFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationTermsFragment.kt 2 additions, 2 deletions

.../coronawarnapp/ui/information/InformationTermsFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt 2 additions, 2 deletions

...interoperability/InteroperabilityConfigurationFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt 0 additions, 7 deletions

...rc/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt 9 additions, 5 deletions

...in/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeMenu.kt 0 additions, 49 deletions

...c/main/java/de/rki/coronawarnapp/ui/main/home/HomeMenu.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/overview/MainOverviewFragment.kt 2 additions, 2 deletions

...ki/coronawarnapp/ui/main/overview/MainOverviewFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/share/MainShareFragment.kt 4 additions, 4 deletions

...a/de/rki/coronawarnapp/ui/main/share/MainShareFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt 2 additions, 2 deletions

.../de/rki/coronawarnapp/ui/onboarding/OnboardingFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/poster/QrCodePosterFragment.kt 1 addition, 1 deletion

.../presencetracing/organizer/poster/QrCodePosterFragment.kt

with 69 additions and 140 deletions

Please register or to comment