Merge branch 'release/1.5.x' into fix/1.4.x-into-1.5.x
# Conflicts: # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt # Corona-Warn-App/src/main/res/navigation/nav_graph.xml # Corona-Warn-App/src/main/res/values/strings.xml
No related branches found
No related tags found
Showing
- Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt 14 additions, 2 deletions.../device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainFragment.kt 18 additions, 4 deletions...Testers/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
- Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml 23 additions, 1 deletion...arn-App/src/deviceForTesters/res/navigation/nav_graph.xml
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/service/applicationconfiguration/ApplicationConfigurationService.kt 2 additions, 2 deletions...plicationconfiguration/ApplicationConfigurationService.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt 20 additions, 0 deletions...p/src/main/java/de/rki/coronawarnapp/storage/LocalData.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt 28 additions, 0 deletions...pp/storage/interoperability/InteroperabilityRepository.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt 43 additions, 0 deletions...interoperability/InteroperabilityConfigurationFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentModule.kt 18 additions, 0 deletions...perability/InteroperabilityConfigurationFragmentModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModel.kt 27 additions, 0 deletions...ability/InteroperabilityConfigurationFragmentViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivityModule.kt 8 additions, 1 deletion...n/java/de/rki/coronawarnapp/ui/main/MainActivityModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivity.kt 8 additions, 1 deletion.../de/rki/coronawarnapp/ui/onboarding/OnboardingActivity.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingActivityModule.kt 4 additions, 0 deletions...i/coronawarnapp/ui/onboarding/OnboardingActivityModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragment.kt 44 additions, 0 deletions.../ui/onboarding/OnboardingDeltaInteroperabilityFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragmentViewModel.kt 27 additions, 0 deletions...rding/OnboardingDeltaInteroperabilityFragmentViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityModule.kt 23 additions, 0 deletions...pp/ui/onboarding/OnboardingDeltaInteroperabilityModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt 15 additions, 32 deletions.../coronawarnapp/ui/onboarding/OnboardingTracingFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt 50 additions, 0 deletions...rnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingModule.kt 23 additions, 0 deletions...ki/coronawarnapp/ui/onboarding/OnboardingTracingModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsNotificationFragment.kt 4 additions, 5 deletions...coronawarnapp/ui/settings/SettingsNotificationFragment.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt 26 additions, 3 deletions.../rki/coronawarnapp/ui/settings/SettingsTracingFragment.kt
Loading
Please register or sign in to comment