Skip to content

Commit ff13fd0

Browse files
committed
Extract colors into RequestHomeSpaceIconButton parameters for better reuse
1 parent bef67d0 commit ff13fd0

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

core/xr/src/main/java/com/android/developers/androidify/xr/SpatialUiModes.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import androidx.compose.foundation.layout.fillMaxSize
1919
import androidx.compose.foundation.layout.padding
2020
import androidx.compose.material3.Icon
2121
import androidx.compose.material3.IconButton
22+
import androidx.compose.material3.IconButtonColors
2223
import androidx.compose.material3.IconButtonDefaults
23-
import androidx.compose.material3.MaterialTheme
2424
import androidx.compose.runtime.Composable
2525
import androidx.compose.ui.Modifier
2626
import androidx.compose.ui.graphics.vector.ImageVector
@@ -45,14 +45,15 @@ fun SpatialCapabilities.couldRequestHomeSpace(): Boolean {
4545

4646
/** Default styling for an IconButton with a home space button and behavior. */
4747
@Composable
48-
fun RequestHomeSpaceIconButton(modifier: Modifier = Modifier) {
48+
fun RequestHomeSpaceIconButton(
49+
modifier: Modifier = Modifier,
50+
colors: IconButtonColors = IconButtonDefaults.iconButtonColors(),
51+
) {
4952
val session = LocalSession.current ?: return
5053

5154
IconButton(
5255
modifier = modifier,
53-
colors = IconButtonDefaults.iconButtonColors(
54-
containerColor = MaterialTheme.colorScheme.secondaryContainer,
55-
),
56+
colors = colors,
5657
onClick = {
5758
session.scene.requestHomeSpaceMode()
5859
},

feature/home/src/main/java/com/android/developers/androidify/home/xr/HomeScreenSpatial.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import androidx.compose.foundation.layout.height
2323
import androidx.compose.foundation.layout.padding
2424
import androidx.compose.foundation.layout.size
2525
import androidx.compose.foundation.layout.width
26+
import androidx.compose.material3.IconButtonDefaults
27+
import androidx.compose.material3.MaterialTheme
2628
import androidx.compose.runtime.Composable
2729
import androidx.compose.runtime.getValue
2830
import androidx.compose.runtime.mutableStateOf
@@ -81,6 +83,9 @@ fun HomeScreenContentsSpatial(
8183
modifier = Modifier
8284
.size(64.dp, 64.dp)
8385
.padding(8.dp),
86+
colors = IconButtonDefaults.iconButtonColors(
87+
containerColor = MaterialTheme.colorScheme.secondaryContainer,
88+
),
8489
)
8590
}
8691
SpatialPanel(SubspaceModifier.fillMaxSize()) {

0 commit comments

Comments
 (0)