From e857bd77090d02f421ff158a8f8a2c5139f5b7c6 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 19 Aug 2025 09:58:31 +0200 Subject: [PATCH] Rename val to improve code readability --- .../libraries/matrix/ui/components/SelectedRoom.kt | 12 ++++++------ .../libraries/matrix/ui/components/SelectedUser.kt | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt index 1ec997ae59..b013d862ec 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt @@ -81,8 +81,8 @@ fun SelectedRoom( horizontalAlignment = Alignment.CenterHorizontally, ) { val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl - val closeRadius = 12.dp.toPx() - val closeOffset = 10.dp.toPx() + val closeIconRadius = 12.dp.toPx() + val closeIconOffset = 10.dp.toPx() Avatar( modifier = Modifier .graphicsLayer { @@ -91,17 +91,17 @@ fun SelectedRoom( .drawWithContent { drawContent() val xOffset = if (isRtl) { - closeOffset + closeIconOffset } else { - size.width - closeOffset + size.width - closeIconOffset } drawCircle( color = Color.Black, center = Offset( x = xOffset, - y = closeOffset, + y = closeIconOffset, ), - radius = closeRadius, + radius = closeIconRadius, blendMode = BlendMode.Clear, ) }, diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt index 1238bd04a8..28591c5eca 100644 --- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt +++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt @@ -86,8 +86,8 @@ fun SelectedUser( horizontalAlignment = Alignment.CenterHorizontally, ) { val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl - val closeRadius = 12.dp.toPx() - val closeOffset = 10.dp.toPx() + val closeIconRadius = 12.dp.toPx() + val closeIconOffset = 10.dp.toPx() Avatar( avatarData = matrixUser.getAvatarData(size = AvatarSize.SelectedUser), avatarType = AvatarType.User, @@ -99,17 +99,17 @@ fun SelectedUser( drawContent() if (canRemove) { val xOffset = if (isRtl) { - closeOffset + closeIconOffset } else { - size.width - closeOffset + size.width - closeIconOffset } drawCircle( color = Color.Black, center = Offset( x = xOffset, - y = closeOffset, + y = closeIconOffset, ), - radius = closeRadius, + radius = closeIconRadius, blendMode = BlendMode.Clear, ) }