From 8faf968aa1967e33a51952baf87cc7c93f798018 Mon Sep 17 00:00:00 2001
From: Mohamed <mohamed.metwalli@sap.com>
Date: Mon, 12 Apr 2021 16:30:31 +0200
Subject: [PATCH] Fix camera settings item blinking (EXPOSUREAPP-6337) (#2801)
* Typo
* One instance
* align padding with other cards
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
---
.../attendee/checkins/CheckInsViewModel.kt | 3 ++-
.../attendee/checkins/items/ActiveCheckInVH.kt | 4 ++--
.../trace_location_attendee_checkins_item_camera.xml | 7 ++-----
3 files changed, 6 insertions(+), 8 deletions(-)
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 ccd616166..cad63ea57 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 d3600779a..04cd25540 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 35b62a8bd..955e46ce2 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"
--
GitLab