Merge pull request #209 from android/wear-tlc-16

Updates WFP and Wear Compose

Author: riggaroo

wear/src/main/java/com/android/developers/androidify/ui/CallToActionButton.kt

@@ -21,17 +21,27 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.wear.compose.foundation.lazy.TransformingLazyColumnItemScope
+import androidx.wear.compose.material3.ButtonDefaults
 import androidx.wear.compose.material3.FilledTonalButton
+import androidx.wear.compose.material3.SurfaceTransformation
 import androidx.wear.compose.material3.Text
+import androidx.wear.compose.material3.lazy.rememberTransformationSpec
+import androidx.wear.compose.material3.lazy.transformedHeight
 
 @Composable
-fun CallToActionButton(
+fun TransformingLazyColumnItemScope.CallToActionButton(
     modifier: Modifier = Modifier,
     buttonText: String,
     onClick: () -> Unit,
 ) {
+    val transformationSpec = rememberTransformationSpec()
     FilledTonalButton(
-        modifier = Modifier.fillMaxWidth(0.85f),
+        modifier = Modifier
+            .fillMaxWidth(0.85f)
+            .transformedHeight(this, transformationSpec)
+            .minimumVerticalContentPadding(ButtonDefaults.minimumVerticalListContentPadding),
+        transformation = SurfaceTransformation(transformationSpec),
         onClick = onClick,
     ) {
         Text(

wear/src/main/java/com/android/developers/androidify/ui/CallToActionScreen.kt

@@ -26,9 +26,11 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.wear.compose.foundation.lazy.TransformingLazyColumn
 import androidx.wear.compose.foundation.lazy.rememberTransformingLazyColumnState
+import androidx.wear.compose.material3.IconButtonDefaults
 import androidx.wear.compose.material3.MaterialTheme
 import androidx.wear.compose.material3.ScreenScaffold
 import androidx.wear.compose.material3.Text
+import androidx.wear.compose.material3.lazy.rememberTransformationSpec
 import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
 import com.android.developers.androidify.R
 import com.android.developers.androidify.ui.theme.AndroidifyWearTheme
@@ -49,7 +51,9 @@ fun CallToActionScreen(
         ) {
             item {
                 Image(
-                    modifier = Modifier.fillMaxWidth(0.3f),
+                    modifier = Modifier
+                        .minimumVerticalContentPadding(IconButtonDefaults.minimumVerticalListContentPadding)
+                        .fillMaxWidth(0.3f),
                     painter = painterResource(id = R.drawable.logo),
                     contentDescription = stringResource(R.string.logo_description),
                 )

wear/src/main/java/com/android/developers/androidify/ui/TransmissionScreen.kt

@@ -40,6 +40,7 @@ import androidx.compose.ui.unit.dp
 import androidx.wear.compose.foundation.lazy.TransformingLazyColumn
 import androidx.wear.compose.foundation.lazy.rememberTransformingLazyColumnState
 import androidx.wear.compose.material3.CircularProgressIndicator
+import androidx.wear.compose.material3.IconButtonDefaults
 import androidx.wear.compose.material3.MaterialTheme
 import androidx.wear.compose.material3.ProgressIndicatorDefaults
 import androidx.wear.compose.material3.ScreenScaffold
@@ -66,7 +67,9 @@ fun TransmissionScreen(modifier: Modifier = Modifier) {
         ) {
             item {
                 Image(
-                    modifier = Modifier.fillMaxWidth(0.3f),
+                    modifier = Modifier
+                        .minimumVerticalContentPadding(IconButtonDefaults.minimumVerticalListContentPadding)
+                        .fillMaxWidth(0.3f),
                     painter = painterResource(id = R.drawable.logo),
                     contentDescription = stringResource(R.string.logo_description),
                 )