diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModel.kt index ccd61616637c85b19fc82c408cecacf3a732dd36..cad63ea577b336f62629b952f6668ac15b133842 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModel.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/CheckInsViewModel.kt @@ -41,6 +41,7 @@ class CheckInsViewModel @AssistedInject constructor( val events = SingleLiveEvent<CheckInEvent>() val errorEvent = SingleLiveEvent<Throwable>() + private val cameraItem by lazy { cameraPermissionItem() } init { deepLink?.let { @@ -62,7 +63,7 @@ class CheckInsViewModel @AssistedInject constructor( mutableListOf<CheckInsItem>().apply { // Camera permission item if (denied) { - add(cameraPermissionItem()) + add(cameraItem) } // CheckIns items addAll(mapCheckIns(checkIns)) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt index d3600779ad9b3827e27b0fc13f8617d9404c6288..04cd2554055ef02f7bd38d20e965eb36da51678e 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/eventregistration/attendee/checkins/items/ActiveCheckInVH.kt @@ -44,7 +44,7 @@ class ActiveCheckInVH(parent: ViewGroup) : } else { currentDuration } - highlightDurationForamtter.print(saneDuration.toPeriod()) + highlightDurationFormatter.print(saneDuration.toPeriod()) } description.text = curItem.checkin.description @@ -99,7 +99,7 @@ class ActiveCheckInVH(parent: ViewGroup) : } companion object { - private val highlightDurationForamtter = PeriodFormatterBuilder().apply { + private val highlightDurationFormatter = PeriodFormatterBuilder().apply { printZeroAlways() minimumPrintedDigits(2) appendHours() diff --git a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_camera.xml b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_camera.xml index 35b62a8bd4b8fcdc11117edfdb277bb9800574b5..955e46ce2a15b69e5df49207f30728cde5a1e351 100644 --- a/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_camera.xml +++ b/Corona-Warn-App/src/main/res/layout/trace_location_attendee_checkins_item_camera.xml @@ -8,10 +8,7 @@ android:layout_marginHorizontal="16dp" android:layout_marginVertical="8dp" android:focusable="true" - android:paddingStart="24dp" - android:paddingTop="32dp" - android:paddingEnd="24dp" - android:paddingBottom="24dp"> + android:padding="16dp"> <TextView android:id="@+id/title" @@ -33,7 +30,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title" /> - + <Button android:id="@+id/open_settings" style="@style/buttonPrimary"