Create new BLE scanner

app/build.gradle.kts

@@ -50,6 +50,9 @@ dependencies {
     implementation(project(":permissions-wifi"))
     implementation(project(":permissions-internet"))
     implementation(project(":permissions-notification"))
+    implementation(project(":scanner"))
+
+    implementation(libs.nordic.blek.client.android)
 
     implementation(libs.androidx.compose.material.iconsExtended)
 

scanner/src/main/java/no/nordicsemi/android/kotlin/ble/ui/scanner/HiltModule.kt → app/src/main/java/no/nordicsemi/android/common/test/main/di/CentralManagerModule.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Nordic Semiconductor
+ * Copyright (c) 2025, Nordic Semiconductor
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
@@ -29,25 +29,27 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package no.nordicsemi.android.kotlin.ble.ui.scanner
+package no.nordicsemi.android.common.test.main.di
 
 import android.content.Context
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import no.nordicsemi.android.kotlin.ble.scanner.BleScanner
+import kotlinx.coroutines.CoroutineScope
+import no.nordicsemi.kotlin.ble.client.android.CentralManager
+import no.nordicsemi.kotlin.ble.client.android.native
 
 @Module
 @InstallIn(SingletonComponent::class)
-internal class HiltModule {
+object CentralManagerModule {
 
     @Provides
-    fun providesScanner(
-        @ApplicationContext
-        context: Context
+    fun provideCentralManager(
+        @ApplicationContext context: Context,
+        scope: CoroutineScope
     ): CentralManager {
-        return BleScanner(context)
+        return CentralManager.Factory.native(context, scope)
     }
 }

app/src/main/java/no/nordicsemi/android/common/test/main/di/CoroutineScopeModule.kt

@@ -0,0 +1,17 @@
+package no.nordicsemi.android.common.test.main.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+
+@Module
+@InstallIn(SingletonComponent::class)
+class CoroutineScopeModule {
+
+    @Provides
+    fun applicationScope() = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+}

app/src/main/java/no/nordicsemi/android/common/test/main/page/BasicViewsPage.kt

@@ -68,6 +68,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import no.nordicsemi.android.common.navigation.Navigator
 import no.nordicsemi.android.common.test.R
 import no.nordicsemi.android.common.test.simple.Hello
+import no.nordicsemi.android.common.test.simple.ScannerDestinationId
 import no.nordicsemi.android.common.theme.NordicTheme
 import no.nordicsemi.android.common.ui.view.NordicSliderDefaults
 import no.nordicsemi.android.common.ui.view.PagerViewItem
@@ -76,7 +77,13 @@ import javax.inject.Inject
 val BasicsPage = PagerViewItem("Basics") {
     val vm = hiltViewModel<BasicPageViewModel>()
 
-    BasicViewsScreen(onOpenSimple = { vm.openSimple() },)
+    BasicViewsScreen(
+        onOpenSimple = { vm.openSimple() },
+        onOpenScanner = {
+            // Navigate to the scanner destination
+            vm.openScanner()
+        },
+    )
 }
 
 @HiltViewModel
@@ -88,11 +95,17 @@ class BasicPageViewModel @Inject constructor(
     fun openSimple() {
         navigator.navigateTo(Hello, 1)
     }
+
+    fun openScanner() {
+        // Navigate to the scanner destination
+        navigator.navigateTo(ScannerDestinationId)
+    }
 }
 
 @Composable
 private fun BasicViewsScreen(
     onOpenSimple: () -> Unit,
+    onOpenScanner: () -> Unit,
 ) {
     Column(
         modifier = Modifier
@@ -107,6 +120,10 @@ private fun BasicViewsScreen(
             ) {
                 Text(text = stringResource(id = R.string.action_simple))
             }
+
+            Button(onClick = { onOpenScanner() }) {
+                Text(text = stringResource(id = R.string.action_scanner))
+            }
         }
 
         BasicViewsScreen()
@@ -256,6 +273,7 @@ private fun ContentPreview() {
     NordicTheme {
         BasicViewsScreen(
             onOpenSimple = {},
+            onOpenScanner = {},
         )
     }
 }

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

@@ -106,7 +106,7 @@ private val HelloDialogDestination = defineDialogDestination(HelloDialog) {
     )
 }
 
-val HelloDestinations = HelloDestination + HelloDialogDestination
+val HelloDestinations = HelloDestination + HelloDialogDestination + ScannerDestination
 
 @Composable
 private fun HelloScreen(

scanner/src/main/java/no/nordicsemi/android/kotlin/ble/ui/scanner/repository/ScanningState.kt → app/src/main/java/no/nordicsemi/android/common/test/simple/ScannerDestination.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, Nordic Semiconductor
+ * Copyright (c) 2025, Nordic Semiconductor
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
@@ -29,27 +29,36 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package no.nordicsemi.android.kotlin.ble.ui.scanner.repository
+package no.nordicsemi.android.common.test.simple
 
-import no.nordicsemi.android.kotlin.ble.core.scanner.BleScanResults
+import androidx.hilt.navigation.compose.hiltViewModel
+import no.nordicsemi.android.common.navigation.createDestination
+import no.nordicsemi.android.common.navigation.defineDestination
+import no.nordicsemi.android.common.navigation.viewmodel.SimpleNavigationViewModel
+import no.nordicsemi.android.common.scanner.DeviceSelected
+import no.nordicsemi.android.common.scanner.ScannerScreen
+import no.nordicsemi.android.common.scanner.ScanningCancelled
+import no.nordicsemi.kotlin.ble.client.android.ScanResult
 
-sealed class ScanningState {
+val ScannerDestinationId = createDestination<Unit, ScanResult>("ble-scanner")
 
-    data object Loading : ScanningState()
+val ScannerDestination = defineDestination(ScannerDestinationId) {
+    val navigationVM = hiltViewModel<SimpleNavigationViewModel>()
 
-    data class Error(val errorCode: Int) : ScanningState()
+    ScannerScreen(
+        cancellable = true,
+        onResultSelected = {
+            when (it) {
+                is DeviceSelected -> {
+                    navigationVM.navigateUpWithResult(ScannerDestinationId, it.scanResult)
+                    println("Device selected: ${it.scanResult}")
+                }
 
-    data class DevicesDiscovered(val devices: List<BleScanResults>) : ScanningState() {
-        val bonded: List<BleScanResults> = devices.filter { it.device.isBonded }
-
-        val notBonded: List<BleScanResults> = devices.filter { !it.device.isBonded }
-
-        fun size(): Int = bonded.size + notBonded.size
-
-        fun isEmpty(): Boolean = devices.isEmpty()
-    }
-
-    fun isRunning(): Boolean {
-        return this is Loading || this is DevicesDiscovered
-    }
+                ScanningCancelled -> {
+                    navigationVM.navigateUp()
+                    println("Scanning cancelled")
+                }
+            }
+        }
+    )
 }

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 accompanist = "0.37.0"
-androidGradlePlugin = "8.7.3"
+androidGradlePlugin = "8.10.1"
 androidxActivity = "1.9.3"
 androidxComposeBom = "2024.12.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping
 androidxCore = "1.15.0"
@@ -21,7 +21,8 @@ publishPlugin = "1.3.0"
 leakcanary = "2.14"
 
 nordic-log = "2.5.0"
-nordicPlugins = "2.6.1"
+nordic-blek = "2.0.0-alpha02"
+nordicPlugins = "2.7"
 dokkaPlugin = "2.0.0"
 googleServicesPlugins = "4.4.2"
 
@@ -58,6 +59,7 @@ leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", v
 
 # Nordic
 nordic-log = { group = "no.nordicsemi.android", name = "log", version.ref = "nordic-log" }
+nordic-blek-client-android = { group = "no.nordicsemi.kotlin.ble", name = "client-android", version.ref = "nordic-blek" }
 
 [plugins]
 nordic-application = { id = "no.nordicsemi.android.plugin.application", version.ref = "nordicPlugins" }

scanner/build.gradle.kts

@@ -32,33 +32,29 @@
 plugins {
     alias(libs.plugins.nordic.feature)
     alias(libs.plugins.nordic.nexus.android)
-    alias(libs.plugins.kotlin.parcelize)
 }
 
 group = "no.nordicsemi.android.common"
 
 nordicNexusPublishing {
     POM_ARTIFACT_ID = "scanner"
-    POM_NAME = "Nordic Kotlin library for BLE server side."
+    POM_NAME = "Nordic library for BLE scanner."
 
-    POM_DESCRIPTION = "Nordic Android Kotlin BLE library"
-    POM_URL = "https://github.com/NordicPlayground/Kotlin-BLE-Library"
-    POM_SCM_URL = "https://github.com/NordicPlayground/Kotlin-BLE-Library"
-    POM_SCM_CONNECTION = "scm:[email protected]:NordicPlayground/Kotlin-BLE-Library.git"
-    POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Kotlin-BLE-Library.git"
+    POM_DESCRIPTION = "Nordic Android Common Libraries"
+    POM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries"
+    POM_SCM_URL = "https://github.com/NordicPlayground/Android-Common-Libraries"
+    POM_SCM_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
+    POM_SCM_DEV_CONNECTION = "scm:[email protected]:NordicPlayground/Android-Common-Libraries.git"
 }
 
 android {
     namespace = "no.nordicsemi.android.common.scanner"
 }
 
 dependencies {
-    implementation(project(":theme"))
-    implementation(project(":core"))
     implementation(project(":permissions-ble"))
-
-    api(libs.nordic.blek.client.android)
-
-    implementation(libs.androidx.compose.material3)
+    implementation(project(":ui"))
+    implementation(libs.nordic.blek.client.android)
     implementation(libs.androidx.compose.material.iconsExtended)
+
 }

scanner/src/main/java/no/nordicsemi/android/common/scanner/ScannerScreen.kt

@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2025, Nordic Semiconductor
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package no.nordicsemi.android.common.scanner
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import no.nordicsemi.android.common.scanner.data.Filter
+import no.nordicsemi.android.common.scanner.data.GroupByName
+import no.nordicsemi.android.common.scanner.data.OnlyBonded
+import no.nordicsemi.android.common.scanner.data.OnlyNearby
+import no.nordicsemi.android.common.scanner.data.OnlyWithNames
+import no.nordicsemi.android.common.scanner.data.SortBy
+import no.nordicsemi.android.common.scanner.view.DeviceListItem
+import no.nordicsemi.android.common.scanner.view.ScannerAppBar
+import no.nordicsemi.android.common.scanner.view.ScannerView
+import no.nordicsemi.android.common.scanner.viewmodel.ScannerViewModel
+import no.nordicsemi.kotlin.ble.client.android.ScanResult
+
+val Default_Filters = listOf(
+    OnlyWithNames(),
+    OnlyNearby(),
+    OnlyBonded(),
+    SortBy(),
+    GroupByName(),
+
+    )
+
+@Composable
+fun ScannerScreen(
+    title: @Composable () -> Unit = { Text(stringResource(id = R.string.scanner_screen)) },
+    cancellable: Boolean,
+    availableFilters: List<Filter> = Default_Filters,
+    filters: List<Filter> = emptyList(),
+    onResultSelected: (ScannerScreenResult) -> Unit,
+    deviceItem: @Composable (ScanResult) -> Unit = { scanResult ->
+        DeviceListItem(scanResult)
+    }
+) {
+    val viewModel = hiltViewModel<ScannerViewModel>()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
+    // If filters to be passed to the view model.
+    LaunchedEffect(filters.isNotEmpty()) {
+        viewModel.setFilters(filters)
+    }
+
+    Column(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        if (cancellable) {
+            ScannerAppBar(
+                title = title,
+                uiState = uiState,
+                availableFilters = availableFilters,
+                onFilterSelected = viewModel::onClick,
+            ) { onResultSelected(ScanningCancelled) }
+        } else {
+            ScannerAppBar(
+                title = title,
+                uiState = uiState,
+                availableFilters = availableFilters,
+                onFilterSelected = viewModel::onClick,
+            )
+        }
+
+        ScannerView(
+            uiState = uiState,
+            startScanning = viewModel::startScanning,
+            onEvent = viewModel::onClick,
+            onScanResultSelected = { onResultSelected(DeviceSelected(it)) },
+            deviceItem = deviceItem,
+        )
+    }
+}