Unverified Commit 59de41bc authored 4 years ago by Matthias Urhahn Committed by GitHub 4 years ago

Merge branch 'release/2.0.x' into dev/merge-1.15-into-2.0

parents ac84b0cb ea4fec53

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/java/de/rki/coronawarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt 8 additions, 12 deletions

...awarnapp/test/contactdiary/ui/ContactDiaryTestFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListFragment.kt 10 additions, 16 deletions

.../ui/day/tabs/location/ContactDiaryLocationListFragment.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/DiaryLocationViewHolder.kt 1 addition, 1 deletion

...tactdiary/ui/day/tabs/location/DiaryLocationViewHolder.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/exporter/ContactDiaryExporter.kt 1 addition, 1 deletion

...awarnapp/contactdiary/ui/exporter/ContactDiaryExporter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/adapter/day/DayDataNestedAdapter.kt 1 addition, 1 deletion

...tactdiary/ui/overview/adapter/day/DayDataNestedAdapter.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelResult.kt 2 additions, 0 deletions

...rc/main/java/de/rki/coronawarnapp/risk/RiskLevelResult.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelResultExtensions.kt 4 additions, 0 deletions

...va/de/rki/coronawarnapp/risk/RiskLevelResultExtensions.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/RiskLevelTaskResult.kt 3 additions, 0 deletions

...ain/java/de/rki/coronawarnapp/risk/RiskLevelTaskResult.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/risk/TraceLocationCheckInRisk.kt 6 additions, 0 deletions

...ava/de/rki/coronawarnapp/risk/TraceLocationCheckInRisk.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/durationpicker/DurationExtension.kt 1 addition, 1 deletion

.../rki/coronawarnapp/ui/durationpicker/DurationExtension.kt
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/durationpicker/DurationPicker.kt 33 additions, 13 deletions

.../de/rki/coronawarnapp/ui/durationpicker/DurationPicker.kt
Corona-Warn-App/src/main/res/layout/duration_picker.xml 1 addition, 0 deletions

Corona-Warn-App/src/main/res/layout/duration_picker.xml
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/datadonation/analytics/modules/ExposureRiskMetadataDonorTest.kt 3 additions, 0 deletions

...nation/analytics/modules/ExposureRiskMetadataDonorTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelChangeDetectorTest.kt 2 additions, 0 deletions

.../de/rki/coronawarnapp/risk/RiskLevelChangeDetectorTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelResultExtensionsTest.kt 6 additions, 4 deletions

...e/rki/coronawarnapp/risk/RiskLevelResultExtensionsTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/risk/RiskLevelResultTest.kt 2 additions, 0 deletions

...est/java/de/rki/coronawarnapp/risk/RiskLevelResultTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/durationpicker/DurationExtensionKtTest.kt 1 addition, 1 deletion

...oronawarnapp/ui/durationpicker/DurationExtensionKtTest.kt
Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/durationpicker/DurationPickerTest.kt 43 additions, 0 deletions

...rki/coronawarnapp/ui/durationpicker/DurationPickerTest.kt

with 128 additions and 50 deletions

Please register or to comment