Skip to content
Snippets Groups Projects
Unverified Commit 8faf968a authored by Mohamed's avatar Mohamed Committed by GitHub
Browse files

Fix camera settings item blinking (EXPOSUREAPP-6337) (#2801)


* Typo

* One instance

* align padding with other cards

Co-authored-by: default avatarharambasicluka <64483219+harambasicluka@users.noreply.github.com>
parent 64be5287
No related branches found
No related tags found
Loading
...@@ -41,6 +41,7 @@ class CheckInsViewModel @AssistedInject constructor( ...@@ -41,6 +41,7 @@ class CheckInsViewModel @AssistedInject constructor(
val events = SingleLiveEvent<CheckInEvent>() val events = SingleLiveEvent<CheckInEvent>()
val errorEvent = SingleLiveEvent<Throwable>() val errorEvent = SingleLiveEvent<Throwable>()
private val cameraItem by lazy { cameraPermissionItem() }
init { init {
deepLink?.let { deepLink?.let {
...@@ -62,7 +63,7 @@ class CheckInsViewModel @AssistedInject constructor( ...@@ -62,7 +63,7 @@ class CheckInsViewModel @AssistedInject constructor(
mutableListOf<CheckInsItem>().apply { mutableListOf<CheckInsItem>().apply {
// Camera permission item // Camera permission item
if (denied) { if (denied) {
add(cameraPermissionItem()) add(cameraItem)
} }
// CheckIns items // CheckIns items
addAll(mapCheckIns(checkIns)) addAll(mapCheckIns(checkIns))
......
...@@ -44,7 +44,7 @@ class ActiveCheckInVH(parent: ViewGroup) : ...@@ -44,7 +44,7 @@ class ActiveCheckInVH(parent: ViewGroup) :
} else { } else {
currentDuration currentDuration
} }
highlightDurationForamtter.print(saneDuration.toPeriod()) highlightDurationFormatter.print(saneDuration.toPeriod())
} }
description.text = curItem.checkin.description description.text = curItem.checkin.description
...@@ -99,7 +99,7 @@ class ActiveCheckInVH(parent: ViewGroup) : ...@@ -99,7 +99,7 @@ class ActiveCheckInVH(parent: ViewGroup) :
} }
companion object { companion object {
private val highlightDurationForamtter = PeriodFormatterBuilder().apply { private val highlightDurationFormatter = PeriodFormatterBuilder().apply {
printZeroAlways() printZeroAlways()
minimumPrintedDigits(2) minimumPrintedDigits(2)
appendHours() appendHours()
......
...@@ -8,10 +8,7 @@ ...@@ -8,10 +8,7 @@
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginVertical="8dp" android:layout_marginVertical="8dp"
android:focusable="true" android:focusable="true"
android:paddingStart="24dp" android:padding="16dp">
android:paddingTop="32dp"
android:paddingEnd="24dp"
android:paddingBottom="24dp">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
...@@ -33,7 +30,7 @@ ...@@ -33,7 +30,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title" /> app:layout_constraintTop_toBottomOf="@id/title" />
<Button <Button
android:id="@+id/open_settings" android:id="@+id/open_settings"
style="@style/buttonPrimary" style="@style/buttonPrimary"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment