From 817121e2134cf6386dfe8cb2ed01dcc0f25030e5 Mon Sep 17 00:00:00 2001 From: Jonathan Nobels Date: Wed, 29 Jan 2025 14:39:14 -0500 Subject: [PATCH] android/tv: remove avatar padding in userView (#606) updates tailscale/corp#26199 Removes the avatar padding when the avatar is not focusable. Signed-off-by: Jonathan Nobels --- android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt | 2 +- android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt b/android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt index be06272e1a..54adf27480 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/Avatar.kt @@ -51,7 +51,7 @@ fun Avatar( modifier = Modifier.conditional(AndroidTVUtil.isAndroidTV(), { padding(4.dp) }) .conditional( - AndroidTVUtil.isAndroidTV(), + AndroidTVUtil.isAndroidTV() && isFocusable, { size((size * 1.5f).dp) // Focusable area is larger than the avatar }) diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt index 0c2a3dc49b..e8e486fa7a 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt @@ -52,7 +52,7 @@ fun UserView( ListItem( modifier = modifier, colors = colors, - leadingContent = { Avatar(profile = profile, size = 36) }, + leadingContent = { Avatar(profile = profile, size = 36, isFocusable = false) }, headlineContent = { AutoResizingText( text = profile.UserProfile.LoginName,