Skip to content

Updates WFP and Wear Compose #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
riggaroo merged 3 commits into from
May 29, 2026
Merged

Updates WFP and Wear Compose #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f75a98
Updates WFP and Wear Compose
garanj May 5, 2026
8c5c58d
Fixes feedback
garanj May 5, 2026
6e3f7de
Merge branch 'main' into wear-tlc-16
riggaroo May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions wear/src/main/java/com/android/developers/androidify/ui/CallToActionButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
garanj marked this conversation as resolved.

@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(
Expand Down
6 changes: 5 additions & 1 deletion wear/src/main/java/com/android/developers/androidify/ui/CallToActionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
garanj marked this conversation as resolved.
import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
import com.android.developers.androidify.R
import com.android.developers.androidify.ui.theme.AndroidifyWearTheme
Expand All @@ -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),
)
Expand Down
5 changes: 4 additions & 1 deletion wear/src/main/java/com/android/developers/androidify/ui/TransmissionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -66,7 +67,9 @@ fun TransmissionScreen(modifier: Modifier = Modifier) {
) {
item {
Image(
modifier = Modifier.fillMaxWidth(0.3f),
modifier = Modifier
.minimumVerticalContentPadding(IconButtonDefaults.minimumVerticalListContentPadding)
.fillMaxWidth(0.3f),
Comment thread
garanj marked this conversation as resolved.
painter = painterResource(id = R.drawable.logo),
contentDescription = stringResource(R.string.logo_description),
)
Expand Down
Loading