Skip to content

Commit 815f1ec

Browse files
Merge pull request #178 from block/zachklipp/sample-cleanup
Cleanup some of the sample code.
2 parents b5cd14e + 6ddc981 commit 815f1ec

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

sample-compose/src/main/java/com/squareup/radiography/sample/compose/ComposeSampleApp.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import androidx.compose.ui.text.font.FontFamily
3838
import androidx.compose.ui.text.input.PasswordVisualTransformation
3939
import androidx.compose.ui.tooling.preview.Preview
4040
import androidx.compose.ui.unit.dp
41+
import androidx.compose.ui.unit.em
4142
import androidx.compose.ui.unit.sp
4243
import androidx.compose.ui.viewinterop.AndroidView
4344
import radiography.ExperimentalRadiographyComposeApi
@@ -123,6 +124,7 @@ internal const val LIVE_HIERARCHY_TEST_TAG = "live-hierarchy"
123124
liveHierarchy.value.orEmpty(),
124125
fontFamily = FontFamily.Monospace,
125126
fontSize = 6.sp,
127+
lineHeight = 1.2.em,
126128
modifier = Modifier.testTag(LIVE_HIERARCHY_TEST_TAG)
127129
)
128130
}

sample-compose/src/main/java/com/squareup/radiography/sample/compose/RadiographyLogo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import kotlin.math.roundToInt
3232
val innerImage = painterResource(R.drawable.logo_inner)
3333
val aspectRatio = outerImage.intrinsicSize.width / outerImage.intrinsicSize.height
3434

35-
Box(modifier.aspectRatio(aspectRatio)) {
35+
Box(modifier.aspectRatio(aspectRatio), propagateMinConstraints = true) {
3636
Image(outerImage, contentDescription = null)
3737
InfiniteMirror(
3838
centerOffsetFraction = Offset(.5f, .59f),

0 commit comments

Comments
 (0)