Skip to content

Commit f51d48c

Browse files
authored
Fix ComposeModifierMissing lint warnings (#6324)
1 parent b21a963 commit f51d48c

File tree

57 files changed

+835
-2650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+835
-2650
lines changed

app/lint-baseline.xml

Lines changed: 206 additions & 1229 deletions
Large diffs are not rendered by default.

app/src/debug/kotlin/io/homeassistant/companion/android/developer/catalog/HAComposeCatalogScreen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private sealed class CatalogScreen(val title: String, val icon: ImageVector) {
4949
}
5050

5151
@Composable
52-
fun HAComposeCatalogScreen() {
52+
fun HAComposeCatalogScreen(modifier: Modifier = Modifier) {
5353
val screens = listOf(
5454
CatalogScreen.ButtonsAndIndicators,
5555
CatalogScreen.UserInput,
@@ -83,6 +83,7 @@ fun HAComposeCatalogScreen() {
8383
}
8484
}
8585
},
86+
modifier = modifier,
8687
) { scaffoldPadding ->
8788
val layoutDirection = LocalLayoutDirection.current
8889
LazyColumn(
@@ -106,7 +107,7 @@ fun HAComposeCatalogScreen() {
106107
}
107108

108109
@Composable
109-
private fun VariantDropdownMenu(onVariantClick: (ButtonVariant) -> Unit, modifier: Modifier) {
110+
private fun VariantDropdownMenu(onVariantClick: (ButtonVariant) -> Unit, modifier: Modifier = Modifier) {
110111
var expanded by remember { mutableStateOf(false) }
111112

112113
Box(modifier = modifier.padding(HADimens.SPACE4)) {

app/src/debug/kotlin/io/homeassistant/companion/android/developer/catalog/Shared.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import io.homeassistant.companion.android.common.compose.theme.HADimens
1111
import io.homeassistant.companion.android.common.compose.theme.HATextStyle
1212

1313
@Composable
14-
fun CatalogRow(content: @Composable () -> Unit) {
14+
fun CatalogRow(modifier: Modifier = Modifier, content: @Composable () -> Unit) {
1515
FlowRow(
16+
modifier = modifier,
1617
horizontalArrangement = Arrangement.spacedBy(HADimens.SPACE4),
1718
verticalArrangement = Arrangement.spacedBy(HADimens.SPACE4),
1819
) {

app/src/full/kotlin/io/homeassistant/companion/android/matter/views/MatterCommissioningView.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ fun MatterCommissioningView(
5555
onConfirmCommissioning: () -> Unit,
5656
onClose: () -> Unit,
5757
onContinue: () -> Unit,
58+
modifier: Modifier = Modifier,
5859
) {
5960
if (step == CommissioningFlowStep.NotStarted) return
6061

@@ -66,7 +67,7 @@ fun MatterCommissioningView(
6667
)
6768

6869
Box(
69-
modifier = Modifier
70+
modifier = modifier
7071
.fillMaxWidth()
7172
.verticalScroll(rememberScrollState()),
7273
) {
@@ -208,8 +209,8 @@ fun MatterCommissioningView(
208209
}
209210

210211
@Composable
211-
fun MatterCommissioningViewHeader() {
212-
Column(modifier = Modifier.fillMaxWidth()) {
212+
fun MatterCommissioningViewHeader(modifier: Modifier = Modifier) {
213+
Column(modifier = modifier.fillMaxWidth()) {
213214
Spacer(modifier = Modifier.height(32.dp))
214215
Image(
215216
imageVector = ImageVector.vectorResource(R.drawable.ic_matter),
@@ -231,7 +232,7 @@ fun MatterCommissioningViewHeader() {
231232

232233
@Preview
233234
@Composable
234-
fun PreviewMatterCommissioningView(
235+
private fun PreviewMatterCommissioningView(
235236
@PreviewParameter(MatterCommissioningViewPreviewStates::class) step: CommissioningFlowStep,
236237
) {
237238
HomeAssistantAppTheme {

app/src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearFavoritesView.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ fun LoadWearFavoritesSettings(
4343
settingsWearViewModel: SettingsWearViewModel,
4444
onBackClicked: () -> Unit,
4545
events: SharedFlow<String>,
46+
modifier: Modifier = Modifier,
4647
) {
4748
val lazyListState = rememberLazyListState()
4849
val reorderState = rememberReorderableLazyListState(lazyListState) { from, to ->
@@ -73,6 +74,7 @@ fun LoadWearFavoritesSettings(
7374
}
7475

7576
Scaffold(
77+
modifier = modifier,
7678
scaffoldState = scaffoldState,
7779
snackbarHost = {
7880
SnackbarHost(

app/src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearHomeView.kt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,15 @@ fun LoadSettingsHomeView(
3333
deviceName: String,
3434
loginWearOs: () -> Unit,
3535
onStartBackClicked: () -> Unit,
36+
modifier: Modifier = Modifier,
3637
) {
3738
HomeAssistantAppTheme {
3839
val navController = rememberNavController()
39-
NavHost(navController = navController, startDestination = SettingsWearMainView.LANDING) {
40+
NavHost(
41+
navController = navController,
42+
startDestination = SettingsWearMainView.LANDING,
43+
modifier = modifier,
44+
) {
4045
composable(SettingsWearMainView.FAVORITES) {
4146
LoadWearFavoritesSettings(
4247
settingsWearViewModel = settingsWearViewModel,
@@ -102,11 +107,16 @@ fun LoadSettingsHomeView(
102107
}
103108

104109
@Composable
105-
fun SettingsWearTopAppBar(title: @Composable () -> Unit, onBackClicked: () -> Unit, docsLink: String? = null) {
110+
fun SettingsWearTopAppBar(
111+
title: @Composable () -> Unit,
112+
onBackClicked: () -> Unit,
113+
modifier: Modifier = Modifier,
114+
docsLink: String? = null,
115+
) {
106116
val context = LocalContext.current
107117
TopAppBar(
108118
title = title,
109-
modifier = Modifier.windowInsetsPadding(safeTopWindowInsets()),
119+
modifier = modifier.windowInsetsPadding(safeTopWindowInsets()),
110120
navigationIcon = {
111121
IconButton(onClick = onBackClicked) {
112122
Image(

app/src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearLandingView.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ fun SettingWearLandingView(
4444
loginWearOs: () -> Unit,
4545
onBackClicked: () -> Unit,
4646
events: Flow<String>,
47+
modifier: Modifier = Modifier,
4748
) {
4849
val scaffoldState = rememberScaffoldState()
4950
LaunchedEffect("snackbar") {
@@ -53,6 +54,7 @@ fun SettingWearLandingView(
5354
}
5455

5556
Scaffold(
57+
modifier = modifier,
5658
scaffoldState = scaffoldState,
5759
snackbarHost = {
5860
SnackbarHost(

app/src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearMainView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ class SettingsWearMainView : AppCompatActivity() {
5151
settingsWearViewModel,
5252
currentNodes.firstOrNull()?.displayName ?: "unknown",
5353
this::loginWearOs,
54-
) { onBackPressedDispatcher.onBackPressed() }
54+
onStartBackClicked = { onBackPressedDispatcher.onBackPressed() },
55+
)
5556
}
5657

5758
if (registerUrl != null) {

app/src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearTemplateTile.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ fun SettingsWearTemplateTile(
5555
onContentChanged: (String) -> Unit,
5656
onRefreshIntervalChanged: (Int) -> Unit,
5757
onBackClicked: () -> Unit,
58+
modifier: Modifier = Modifier,
5859
) {
5960
Scaffold(
61+
modifier = modifier,
6062
topBar = {
6163
SettingsWearTopAppBar(
6264
title = { Text(stringResource(commonR.string.template_tile)) },

app/src/full/kotlin/io/homeassistant/companion/android/settings/wear/views/SettingsWearTemplateTileList.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ fun SettingsWearTemplateTileList(
2727
templateTiles: Map<Int, TemplateTileConfig>,
2828
onTemplateTileClicked: (tileId: Int) -> Unit,
2929
onBackClicked: () -> Unit,
30+
modifier: Modifier = Modifier,
3031
) {
3132
Scaffold(
33+
modifier = modifier,
3234
topBar = {
3335
SettingsWearTopAppBar(
3436
title = { Text(stringResource(commonR.string.template_tiles)) },

0 commit comments

Comments
 (0)