Skip to content

Commit c53d260

Browse files
authored
Merge pull request #166 from NordicSemiconductor/bugfix/scanner-bg
Option to customize scanned background
2 parents c094e80 + b397e6d commit c53d260

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

app/src/main/java/no/nordicsemi/android/common/test/simple/ScannerDestination.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@
3131

3232
package no.nordicsemi.android.common.test.simple
3333

34+
import androidx.compose.foundation.background
35+
import androidx.compose.material3.MaterialTheme
3436
import androidx.compose.runtime.getValue
3537
import androidx.compose.runtime.setValue
38+
import androidx.compose.ui.Modifier
3639
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
3740
import no.nordicsemi.android.common.navigation.createDestination
3841
import no.nordicsemi.android.common.navigation.defineDestination
@@ -109,6 +112,7 @@ val ScannerDestination = defineDestination(ScannerDestinationId) {
109112
)
110113

111114
ScannerView(
115+
modifier = Modifier.background(MaterialTheme.colorScheme.background),
112116
onScanResultSelected = {
113117
navigationVM.navigateUpWithResult(ScannerDestinationId, it)
114118
},

scanner-ble/src/main/java/no/nordicsemi/android/common/scanner/view/ScannerView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ import kotlin.uuid.ExperimentalUuidApi
9797
@Composable
9898
fun ScannerView(
9999
onScanResultSelected: (ScanResult) -> Unit,
100+
modifier: Modifier = Modifier,
100101
state: ScanFilterState = rememberFilterState(),
101102
timeout: Duration = Duration.INFINITE,
102103
onScanningStateChanged: (Boolean) -> Unit = {},
@@ -137,7 +138,7 @@ fun ScannerView(
137138
}
138139
},
139140
state = pullToRefreshState,
140-
modifier = Modifier.background(MaterialTheme.colorScheme.background)
141+
modifier = modifier,
141142
) {
142143
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
143144
DisposableEffect(uiState.isScanning) {

0 commit comments

Comments
 (0)