Merge pull request #502 from NordicSemiconductor/migration/scanner

Dependencies updated

Author: philips77

app/build.gradle.kts

@@ -14,7 +14,9 @@ android {
     namespace = "no.nordicsemi.android.dfu.app"
     defaultConfig {
         applicationId = "no.nordicsemi.android.dfu"
-        resourceConfigurations.add("en")
+    }
+    androidResources {
+        localeFilters += setOf("en")
     }
 }
 
@@ -23,8 +25,13 @@ dependencies {
     implementation(project(":lib:storage")) // Deep link support
     implementation(project(":profile:navigation"))
 
-    implementation(libs.nordic.theme)
-    implementation(libs.nordic.navigation)
+    implementation(nordic.theme)
+    implementation(nordic.navigation)
+
+    // Use native Android BLE client.
+    // This can be switched to mock client for testing purposes (not implemented yet).
+    // See CentralManagerModule.kt in :app module.
+    implementation(nordic.blek.client.android)
 
     implementation(libs.androidx.activity.compose)
 }

app/src/main/java/no/nordicsemi/android/dfu/app/di/CenrtralManagerModule.kt

@@ -0,0 +1,27 @@
+package no.nordicsemi.android.dfu.app.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 kotlinx.coroutines.CoroutineScope
+import no.nordicsemi.kotlin.ble.client.android.CentralManager
+import no.nordicsemi.kotlin.ble.client.android.native
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CentralManagerModule {
+
+    @Provides
+    @Singleton
+    fun provideCentralManager(
+        @ApplicationContext context: Context,
+        @Named("io") scope: CoroutineScope
+    ): CentralManager {
+        return CentralManager.Factory.native(context, scope)
+    }
+}

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

@@ -0,0 +1,19 @@
+package no.nordicsemi.android.dfu.app.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
+import javax.inject.Named
+
+@Module
+@InstallIn(SingletonComponent::class)
+class CoroutineScopeModule {
+
+    @Provides
+    @Named("io")
+    fun ioScope() = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+}

gradle/nordic.versions.toml

@@ -0,0 +1,21 @@
+# Versions of Nordic libraries used in this project.
+
+# This is a subset of the Version Catalog available at https://github.com/NordicSemiconductor/Android-Version-Catalog
+# The version catalog can be updated independently of this project after the release of this library.
+
+[versions]
+blek = "2.0.0-alpha09"
+common = "2.6.0"
+
+[libraries]
+# Native Android client for Bluetooth LE.
+blek-client-android = { group = "no.nordicsemi.kotlin.ble", name = "client-android", version.ref = "blek" }
+# Nordic common libraries for Android.
+core = { group = "no.nordicsemi.android.common", name = "core", version.ref = "common" }
+ui = { group = "no.nordicsemi.android.common", name = "ui", version.ref = "common" }
+theme = { group = "no.nordicsemi.android.common", name = "theme", version.ref = "common" }
+scanner-ble = { group = "no.nordicsemi.android.common", name = "scanner-ble", version.ref = "common" }
+analytics = { group = "no.nordicsemi.android.common", name = "analytics", version.ref = "common" }
+navigation = { group = "no.nordicsemi.android.common", name = "navigation", version.ref = "common" }
+logger = { group = "no.nordicsemi.android.common", name = "logger", version.ref = "common" }
+permissions-ble = { group = "no.nordicsemi.android.common", name = "permissions-ble", version.ref = "common" }

lib/analytics/build.gradle.kts

@@ -10,5 +10,5 @@ android {
 }
 
 dependencies {
-    implementation(libs.nordic.analytics)
+    implementation(nordic.analytics)
 }

lib/settings/src/main/java/no/nordicsemi/android/dfu/settings/repository/SettingsDataSource.kt

@@ -59,7 +59,7 @@ private val MTU = booleanPreferencesKey("requestMtu")
 
 @Singleton
 class SettingsDataSource @Inject constructor(
-    @ApplicationContext private val context: Context
+    @param:ApplicationContext private val context: Context
 ) {
     private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
 

lib/storage/src/main/java/no/nordicsemi/android/dfu/storage/ExternalFileDataSource.kt

@@ -36,10 +36,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.net.Uri
 import android.os.Build
 import android.os.Environment
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
@@ -48,7 +48,7 @@ import javax.inject.Singleton
 
 @Singleton
 class ExternalFileDataSource @Inject internal constructor(
-    @ApplicationContext private val context: Context,
+    @param:ApplicationContext private val context: Context,
     private val parser: FileNameParser
 ) {
     private val _fileResource = MutableStateFlow<FileResource?>(null)
@@ -85,7 +85,7 @@ class ExternalFileDataSource @Inject internal constructor(
         }
         _fileResource.value = LoadingFile
 
-        val request: DownloadManager.Request = DownloadManager.Request(Uri.parse(url))
+        val request: DownloadManager.Request = DownloadManager.Request(url.toUri())
         request.setTitle(parser.parseName(url))
         request.setDescription(context.getString(R.string.storage_notification_description))
 

profile/main/build.gradle.kts

@@ -17,13 +17,13 @@ dependencies {
     implementation(project(":profile:settings"))
     implementation(project(":profile:welcome"))
 
-    implementation(libs.nordic.ui)
-    implementation(libs.nordic.core)
-    implementation(libs.nordic.logger)
-    implementation(libs.nordic.analytics)
-    implementation(libs.nordic.permissions.ble)
-    implementation(libs.nordic.navigation)
+    implementation(nordic.ui)
+    implementation(nordic.core)
+    implementation(nordic.logger)
+    implementation(nordic.analytics)
+    implementation(nordic.permissions.ble)
+    implementation(nordic.navigation)
 
     // Extended Icons
-    implementation(libs.androidx.compose.material.iconsExtended)
+    implementation(libs.androidx.compose.material.icons.extended)
 }

profile/main/src/main/java/no/nordicsemi/android/dfu/profile/main/data/DFUFileManager.kt

@@ -40,7 +40,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 internal class DFUFileManager @Inject constructor(
-    @ApplicationContext private val context: Context
+    @param:ApplicationContext private val context: Context
 ) {
     companion object {
         private const val TAG = "DFUFileManager"
@@ -49,7 +49,7 @@ internal class DFUFileManager @Inject constructor(
     fun createFile(uri: Uri): ZipFile? {
         return try {
             createFromFile(uri)
-        } catch (e: Exception) {
+        } catch (_: Exception) {
             try {
                 createFromContentResolver(uri)
             } catch (e: Exception) {

profile/main/src/main/java/no/nordicsemi/android/dfu/profile/main/data/DFUManager.kt

@@ -45,7 +45,7 @@ import no.nordicsemi.android.log.Logger
 import javax.inject.Inject
 
 internal class DFUManager @Inject constructor(
-    @ApplicationContext private val context: Context,
+    @param:ApplicationContext private val context: Context,
 ) {
     private var session: LogSession? = null