Merge branch 'release/1.5.x' into feature/interoperability
# Conflicts: # .idea/codeStyles/Project.xml # Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt # Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionQRCodeScanFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionResultPositiveOtherWarningFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionTanFragment.kt # Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/di/ApplicationComponent.kt
No related branches found
No related tags found
Showing
- .idea/codeStyles/Project.xml 5 additions, 1 deletion.idea/codeStyles/Project.xml
- Corona-Warn-App/build.gradle 13 additions, 0 deletionsCorona-Warn-App/build.gradle
- Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt 9 additions, 0 deletions...va/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
- Corona-Warn-App/src/device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt 6 additions, 21 deletions.../device/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt 0 additions, 356 deletions...ki/coronawarnapp/test/TestRiskLevelCalculationFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt 24 additions, 28 deletions...va/de/rki/coronawarnapp/test/api/ui/TestForAPIFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForApiFragmentModule.kt 16 additions, 0 deletions...rki/coronawarnapp/test/api/ui/TestForApiFragmentModule.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForApiFragmentViewModel.kt 20 additions, 0 deletions.../coronawarnapp/test/api/ui/TestForApiFragmentViewModel.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragment.kt 125 additions, 0 deletions...app/test/risklevel/ui/TestRiskLevelCalculationFragment.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt 296 additions, 0 deletions...klevel/ui/TestRiskLevelCalculationFragmentCWAViewModel.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/test/risklevel/ui/TestRiskLevelCalculationFragmentModule.kt 16 additions, 0 deletions...st/risklevel/ui/TestRiskLevelCalculationFragmentModule.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt 18 additions, 0 deletions...va/de/rki/coronawarnapp/ui/main/MainActivityTestModule.kt
- Corona-Warn-App/src/deviceForTesters/java/de/rki/coronawarnapp/ui/main/MainFragment.kt 9 additions, 22 deletions...Testers/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
- Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml 8 additions, 3 deletions...arn-App/src/deviceForTesters/res/navigation/nav_graph.xml
- Corona-Warn-App/src/main/assets/technical_de.html 8 additions, 0 deletionsCorona-Warn-App/src/main/assets/technical_de.html
- Corona-Warn-App/src/main/assets/technical_en.html 8 additions, 0 deletionsCorona-Warn-App/src/main/assets/technical_en.html
- Corona-Warn-App/src/main/assets/technical_tr.html 8 additions, 0 deletionsCorona-Warn-App/src/main/assets/technical_tr.html
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt 3 additions, 5 deletions...c/main/java/de/rki/coronawarnapp/CoronaWarnApplication.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/NearbyModule.kt 18 additions, 0 deletions...src/main/java/de/rki/coronawarnapp/nearby/NearbyModule.kt
- Corona-Warn-App/src/main/java/de/rki/coronawarnapp/timer/TimerHelper.kt 0 additions, 1 deletion...p/src/main/java/de/rki/coronawarnapp/timer/TimerHelper.kt
Loading
Please register or sign in to comment