android/tv: remove avatar padding in userView (#606)

barnstar · web-flow · commit 817121e2134c · 2025-01-29T14:39:14.000-05:00
updates tailscale/corp#26199 Removes the avatar padding when the avatar is not focusable. Signed-off-by: Jonathan Nobels <jonathan@tailscale.com>
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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ fun Avatar(`
`51`	`51`	`modifier =`
`52`	`52`	`Modifier.conditional(AndroidTVUtil.isAndroidTV(), { padding(4.dp) })`
`53`	`53`	`.conditional(`
`54`		`- AndroidTVUtil.isAndroidTV(),`
	`54`	`+ AndroidTVUtil.isAndroidTV() && isFocusable,`
`55`	`55`	`{`
`56`	`56`	`size((size * 1.5f).dp) // Focusable area is larger than the avatar`
`57`	`57`	`})`