Merge "style: address tv material design feedback" into androidx-main

JetBrains · Mar 19, 2024 · 6994324 · 6994324
2 parents 4bb101b + 69cb216
commit 6994324
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/tv/samples/src/main/java/androidx/tv/samples/TabRowSamples.kt b/tv/samples/src/main/java/androidx/tv/samples/TabRowSamples.kt
@@ -19,10 +19,8 @@ package androidx.tv.samples
 import androidx.annotation.Sampled
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -57,7 +55,6 @@ fun PillIndicatorTabRow() {
 
   TabRow(
     selectedTabIndex = selectedTabIndex,
-    separator = { Spacer(modifier = Modifier.width(12.dp)) },
     modifier = Modifier.focusRestorer()
   ) {
     tabs.forEachIndexed { index, tab ->
@@ -89,7 +86,6 @@ fun UnderlinedIndicatorTabRow() {
 
   TabRow(
     selectedTabIndex = selectedTabIndex,
-    separator = { Spacer(modifier = Modifier.width(12.dp)) },
     indicator = { tabPositions, doesTabRowHaveFocus ->
       TabRowDefaults.UnderlinedIndicator(
         currentTabPosition = tabPositions[selectedTabIndex],
@@ -108,7 +104,7 @@ fun UnderlinedIndicatorTabRow() {
           Text(
             text = tab,
             fontSize = 12.sp,
-            modifier = Modifier.padding(bottom = 4.dp)
+            modifier = Modifier.padding(horizontal = 16.dp, vertical = 6.dp)
           )
         }
       }
@@ -137,7 +133,6 @@ fun TabRowWithDebounce() {
 
   TabRow(
     selectedTabIndex = selectedTabIndex,
-    separator = { Spacer(modifier = Modifier.width(12.dp)) },
     modifier = Modifier.focusRestorer()
   ) {
     tabs.forEachIndexed { index, tab ->

diff --git a/tv/tv-material/src/androidTest/java/androidx/tv/material3/IconTest.kt b/tv/tv-material/src/androidTest/java/androidx/tv/material3/IconTest.kt
@@ -148,8 +148,8 @@ class IconTest {
 
     @Test
     fun painter_noIntrinsicSize_dimensions() {
-        val width = 24.dp
-        val height = 24.dp
+        val width = 20.dp
+        val height = 20.dp
         val painter = ColorPainter(Color.Red)
         val testTag = "testTag"
 

diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/ButtonDefaults.kt b/tv/tv-material/src/main/java/androidx/tv/material3/ButtonDefaults.kt
@@ -53,7 +53,7 @@ object ButtonDefaults {
     )
 
     /** The default size of the icon when used inside any button. */
-    val IconSize = 18.dp
+    val IconSize = 20.dp
 
     /**
      * The default size of the spacing between an icon and a text when they used inside any button.
@@ -209,7 +209,7 @@ object OutlinedButtonDefaults {
     )
 
     /** The default size of the icon when used inside any button. */
-    val IconSize = 18.dp
+    val IconSize = 20.dp
 
     /**
      * The default size of the spacing between an icon and a text when they used inside any button.

diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/Icon.kt b/tv/tv-material/src/main/java/androidx/tv/material3/Icon.kt
@@ -36,7 +36,6 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.unit.dp
 
 /**
  * A Material Design icon component that draws [imageVector] using [tint], with a default value
@@ -169,5 +168,4 @@ private fun Modifier.defaultSizeFor(painter: Painter) =
 private fun Size.isInfinite() = width.isInfinite() && height.isInfinite()
 
 // Default icon size, for icons with no intrinsic size information
-// TODO(rvighnesh): change this to IconButtonTokens.IconSize when we introduce IconButton
-private val DefaultIconSizeModifier = Modifier.size(24.dp)
+private val DefaultIconSizeModifier = Modifier.size(IconButtonDefaults.MediumIconSize)
diff --git a/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypeScaleTokens.kt b/tv/tv-material/src/main/java/androidx/tv/material3/tokens/TypeScaleTokens.kt
@@ -34,7 +34,7 @@ internal object TypeScaleTokens {
     val BodySmallFont = TypefaceTokens.Plain
     val BodySmallLineHeight = 16.0.sp
     val BodySmallSize = 12.sp
-    val BodySmallTracking = 0.4.sp
+    val BodySmallTracking = 0.2.sp
     val BodySmallWeight = TypefaceTokens.WeightRegular
     val DisplayLargeFont = TypefaceTokens.Brand
     val DisplayLargeLineHeight = 64.0.sp