Merge pull request #3205 from element-hq/feature/bma/fixPinCrash

Fix crash when Pin code screen is displayed
element-hq · Jul 16, 2024 · de62c12 · de62c12
2 parents 9e7d938 + 83a366a
commit de62c12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...pl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypad.kt b/...pl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/keypad/PinKeypad.kt
@@ -37,7 +37,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.coerceAtMost
+import androidx.compose.ui.unit.coerceIn
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.times
@@ -50,6 +50,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
 private val spaceBetweenPinKey = 16.dp
+private val minSizePinKey = 16.dp
 private val maxSizePinKey = 80.dp
 
 @Composable
@@ -61,8 +62,8 @@ fun PinKeypad(
     verticalAlignment: Alignment.Vertical = Alignment.Top,
     horizontalAlignment: Alignment.Horizontal = Alignment.Start,
 ) {
-    val pinKeyMaxWidth = ((maxWidth - 2 * spaceBetweenPinKey) / 3).coerceAtMost(maxSizePinKey)
-    val pinKeyMaxHeight = ((maxHeight - 3 * spaceBetweenPinKey) / 4).coerceAtMost(maxSizePinKey)
+    val pinKeyMaxWidth = ((maxWidth - 2 * spaceBetweenPinKey) / 3).coerceIn(minSizePinKey, maxSizePinKey)
+    val pinKeyMaxHeight = ((maxHeight - 3 * spaceBetweenPinKey) / 4).coerceIn(minSizePinKey, maxSizePinKey)
     val pinKeySize = if (pinKeyMaxWidth < pinKeyMaxHeight) pinKeyMaxWidth else pinKeyMaxHeight
 
     val horizontalArrangement = spacedBy(spaceBetweenPinKey, Alignment.CenterHorizontally)
@@ -129,7 +130,7 @@ private fun PinKeypadRow(
                     )
                 }
                 is PinKeypadModel.Number -> {
-                    PinKeyBadDigitButton(
+                    PinKeypadDigitButton(
                         size = pinKeySize,
                         modifier = commonModifier,
                         digit = model.number.toString(),
@@ -158,7 +159,7 @@ private fun PinKeypadButton(
 }
 
 @Composable
-private fun PinKeyBadDigitButton(
+private fun PinKeypadDigitButton(
     digit: String,
     size: Dp,
     onClick: (String) -> Unit,

diff --git a/...t/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt b/...t/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
@@ -545,7 +545,7 @@ class RoomListPresenterTest {
             clearMessagesForRoomLambda.assertions().isCalledOnce()
                 .with(value(A_SESSION_ID), value(A_ROOM_ID))
             initialState.eventSink.invoke(RoomListEvents.MarkAsUnread(A_ROOM_ID_2))
-            assertThat(room2.markAsReadCalls).isEqualTo(emptyList<ReceiptType>())
+            assertThat(room2.markAsReadCalls).isEmpty()
             assertThat(room2.setUnreadFlagCalls).isEqualTo(listOf(true))
             // Test again with private read receipts
             sessionPreferencesStore.setSendPublicReadReceipts(false)