Migration to new BLEK library

app/build.gradle.kts

@@ -31,6 +31,7 @@
 plugins {
     alias(libs.plugins.nordic.application.compose)
     alias(libs.plugins.nordic.hilt)
+    alias(libs.plugins.kotlin.parcelize)
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")) {
@@ -43,40 +44,33 @@ android {
 }
 
 dependencies {
-    //Hilt requires to implement every module in the main app module
-    //https://github.com/google/dagger/issues/2123
-    implementation(project(":profile_bps"))
-    implementation(project(":profile_csc"))
-    implementation(project(":profile_cgms"))
-    implementation(project(":profile_gls"))
-    implementation(project(":profile_hrs"))
-    implementation(project(":profile_hts"))
-    implementation(project(":profile_prx"))
-    implementation(project(":profile_rscs"))
-
-    implementation(project(":profile_uart"))
-
     implementation(project(":lib_analytics"))
-    implementation(project(":lib_ui"))
-    implementation(project(":lib_utils"))
+    implementation(project(":lib_profile"))
     implementation(project(":lib_service"))
-    implementation(project(":lib_scanner"))
+    implementation(project(":scanner"))
+    implementation(project(":profile"))
+    implementation(project(":lib_core"))
+    implementation(project(":lib_ui"))
 
-    implementation(libs.nordic.core)
-    implementation(libs.nordic.theme)
     implementation(libs.nordic.navigation)
-    implementation(libs.nordic.blek.uiscanner)
-    implementation(libs.nordic.uilogger)
-    implementation(libs.nordic.permissions.ble)
+    implementation(libs.nordic.theme)
+    implementation(libs.nordic.logger)
     implementation(libs.nordic.analytics)
-
-    implementation(libs.nordic.blek.client)
+    implementation(libs.nordic.ui)
+    implementation(libs.nordic.core)
+    implementation(libs.nordic.permissions.ble)
+    implementation(libs.nordic.permissions.notification)
 
     implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.compose.material3)
-    implementation(libs.androidx.compose.material.iconsExtended)
     implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.lifecycle.runtime.compose)
+    implementation(libs.androidx.compose.material.iconsExtended)
+    implementation(libs.androidx.compose.runtime)
 
     implementation(libs.androidx.hilt.navigation.compose)
+
+    // Timber & SLF4J
+    implementation (libs.slf4j.timber)
+
+    implementation("no.nordicsemi.kotlin.ble:client-android")
+    implementation("no.nordicsemi.kotlin:data")
 }

app/src/debug/java/no/nordicsemi/android/nrftoolbox/NrfToolboxApplication.kt

@@ -35,8 +35,7 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 import no.nordicsemi.android.analytics.AppAnalytics
 import no.nordicsemi.android.analytics.AppOpenEvent
-import no.nordicsemi.android.gls.GLSServer
-import no.nordicsemi.android.uart.UartServer
+import timber.log.Timber
 import javax.inject.Inject
 
 @HiltAndroidApp
@@ -45,18 +44,11 @@ class NrfToolboxApplication : Application() {
     @Inject
     lateinit var analytics: AppAnalytics
 
-    @Inject
-    lateinit var uartServer: UartServer
-
-    @Inject
-    lateinit var glsServer: GLSServer
-
     override fun onCreate() {
         super.onCreate()
 
         analytics.logEvent(AppOpenEvent)
 
-        uartServer.start(this)
-        glsServer.start(this)
+        Timber.plant(Timber.DebugTree())
     }
 }

app/src/main/AndroidManifest.xml

@@ -33,6 +33,13 @@
 <manifest xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
+
     <queries>
         <package android:name="no.nordicsemi.android.dfu" />
 

app/src/main/java/no/nordicsemi/android/nrftoolbox/AppDestination.kt

@@ -31,45 +31,10 @@
 
 package no.nordicsemi.android.nrftoolbox
 
-import no.nordicsemi.android.bps.view.BPSScreen
-import no.nordicsemi.android.cgms.view.CGMScreen
 import no.nordicsemi.android.common.navigation.createSimpleDestination
 import no.nordicsemi.android.common.navigation.defineDestination
-import no.nordicsemi.android.csc.view.CSCScreen
-import no.nordicsemi.android.gls.main.view.GLSScreen
-import no.nordicsemi.android.hrs.view.HRSScreen
-import no.nordicsemi.android.hts.view.HTSScreen
-import no.nordicsemi.android.nrftoolbox.view.HomeScreen
-import no.nordicsemi.android.prx.view.PRXScreen
-import no.nordicsemi.android.rscs.view.RSCSScreen
-import no.nordicsemi.android.toolbox.scanner.ScannerDestination
-import no.nordicsemi.android.uart.view.UARTScreen
+import no.nordicsemi.android.nrftoolbox.view.HomeView
 
 val HomeDestinationId = createSimpleDestination("home-destination")
 
-val HomeDestinations = listOf(
-    defineDestination(HomeDestinationId) { HomeScreen() },
-    ScannerDestination
-)
-
-val CSCDestinationId = createSimpleDestination("csc-destination")
-val HRSDestinationId = createSimpleDestination("hrs-destination")
-val HTSDestinationId = createSimpleDestination("hts-destination")
-val GLSDestinationId = createSimpleDestination("gls-destination")
-val BPSDestinationId = createSimpleDestination("bps-destination")
-val PRXDestinationId = createSimpleDestination("prx-destination")
-val RSCSDestinationId = createSimpleDestination("rscs-destination")
-val CGMSDestinationId = createSimpleDestination("cgms-destination")
-val UARTDestinationId = createSimpleDestination("uart-destination")
-
-val ProfileDestinations = listOf(
-    defineDestination(CSCDestinationId) { CSCScreen() },
-    defineDestination(HRSDestinationId) { HRSScreen() },
-    defineDestination(HTSDestinationId) { HTSScreen() },
-    defineDestination(GLSDestinationId) { GLSScreen() },
-    defineDestination(BPSDestinationId) { BPSScreen() },
-    defineDestination(PRXDestinationId) { PRXScreen() },
-    defineDestination(RSCSDestinationId) { RSCSScreen() },
-    defineDestination(CGMSDestinationId) { CGMScreen() },
-    defineDestination(UARTDestinationId) { UARTScreen() },
-)
+val HomeDestinations = defineDestination(HomeDestinationId) { HomeView() }

app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt

@@ -42,17 +42,12 @@ import no.nordicsemi.android.common.analytics.view.AnalyticsPermissionRequestDia
 import no.nordicsemi.android.common.navigation.NavigationView
 import no.nordicsemi.android.common.theme.NordicActivity
 import no.nordicsemi.android.common.theme.NordicTheme
-import no.nordicsemi.android.gls.GLSDestination
-import no.nordicsemi.android.nrftoolbox.repository.ActivitySignals
+import no.nordicsemi.android.toolbox.profile.DeviceConnectionDestination
 import no.nordicsemi.android.toolbox.scanner.ScannerDestination
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : NordicActivity() {
 
-    @Inject
-    lateinit var activitySignals: ActivitySignals
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -62,16 +57,12 @@ class MainActivity : NordicActivity() {
                     color = MaterialTheme.colorScheme.surface,
                     modifier = Modifier.fillMaxSize()
                 ) {
-                    NavigationView(HomeDestinations + ProfileDestinations + ScannerDestination + GLSDestination)
+                    NavigationView(HomeDestinations + ScannerDestination + DeviceConnectionDestination)
                 }
 
                 AnalyticsPermissionRequestDialog()
             }
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        activitySignals.onResume()
-    }
 }

app/src/main/java/no/nordicsemi/android/nrftoolbox/ApplicationScopeModule.kt → app/src/main/java/no/nordicsemi/android/nrftoolbox/di/ApplicationScopeModule.kt

@@ -1,16 +1,17 @@
-package no.nordicsemi.android.nrftoolbox
+package no.nordicsemi.android.nrftoolbox.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 ApplicationScopeModule {
 
     @Provides
-    fun applicationScope() = CoroutineScope(SupervisorJob())
+    fun applicationScope() = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 }

app/src/main/java/no/nordicsemi/android/nrftoolbox/di/CentralManagerModule.kt

@@ -0,0 +1,24 @@
+package no.nordicsemi.android.nrftoolbox.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
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CentralManagerModule {
+
+    @Provides
+    fun provideCentralManager(
+        @ApplicationContext context: Context,
+        scope: CoroutineScope
+    ): CentralManager {
+        return CentralManager.Factory.native(context, scope)
+    }
+}