Update common libraries version

NordicSemiconductor · May 23, 2022 · 83a5123 · 83a5123
1 parent 79eeca4
commit 83a5123
Show file tree

Hide file tree

Showing 37 changed files with 108 additions and 208 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -86,12 +86,12 @@ dependencies {
     implementation project(":lib_theme")
     implementation project(":lib_utils")
     implementation project(":lib_service")
-    implementation project(":lib_log")
 
     implementation libs.nordic.theme
     implementation libs.nordic.ble.common
     implementation libs.nordic.ui.scanner
     implementation libs.nordic.navigation
+    implementation libs.nordic.ui.logger
 
     implementation libs.bundles.hilt
     kapt libs.bundles.hiltkapt

diff --git a/lib_log/build.gradle b/lib_log/build.gradle
diff --git a/lib_log/src/main/AndroidManifest.xml b/lib_log/src/main/AndroidManifest.xml
diff --git a/lib_log/src/main/java/no/nordicsemi/android/logger/LoggerAppRunner.kt b/lib_log/src/main/java/no/nordicsemi/android/logger/LoggerAppRunner.kt
diff --git a/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLogger.kt b/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLogger.kt
diff --git a/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLoggerFactory.kt b/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLoggerFactory.kt
diff --git a/lib_log/src/main/res/drawable/ic_logger.xml b/lib_log/src/main/res/drawable/ic_logger.xml
diff --git a/lib_theme/build.gradle b/lib_theme/build.gradle
@@ -5,7 +5,7 @@ android {
 }
 
 dependencies {
-    implementation project(":lib_log")
+    implementation libs.nordic.ui.logger
 
     implementation libs.material
 

diff --git a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/StringConst.kt b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/StringConst.kt
@@ -0,0 +1,14 @@
+package no.nordicsemi.android.theme.view
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import no.nordicsemi.android.theme.R
+import javax.inject.Inject
+
+class StringConst @Inject constructor(
+    @ApplicationContext
+    private val context: Context
+) {
+
+    val APP_NAME = context.getString(R.string.app_name)
+}
diff --git a/profile_bps/build.gradle b/profile_bps/build.gradle
@@ -6,12 +6,12 @@ dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")
     implementation project(":lib_utils")
-    implementation project(":lib_log")
 
     implementation libs.nordic.ble.common
     implementation libs.nordic.ble.ktx
     implementation libs.nordic.navigation
     implementation libs.nordic.theme
+    implementation libs.nordic.ui.logger
 
     implementation libs.nordic.ui.scanner
 

diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/data/BPSManager.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/data/BPSManager.kt
@@ -36,7 +36,7 @@ import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelResponse
 import no.nordicsemi.android.ble.common.callback.bps.BloodPressureMeasurementResponse
 import no.nordicsemi.android.ble.common.callback.bps.IntermediateCuffPressureResponse
 import no.nordicsemi.android.ble.ktx.asValidResponseFlow
-import no.nordicsemi.android.logger.ToolboxLogger
+import no.nordicsemi.android.logger.NordicLogger
 import no.nordicsemi.android.service.ConnectionObserverAdapter
 import java.util.*
 
@@ -50,7 +50,7 @@ private val BATTERY_LEVEL_CHARACTERISTIC_UUID = UUID.fromString("00002A19-0000-1
 internal class BPSManager(
     @ApplicationContext context: Context,
     private val scope: CoroutineScope,
-    private val logger: ToolboxLogger
+    private val logger: NordicLogger
 ) : BleManager(context) {
 
     private var batteryLevelCharacteristic: BluetoothGattCharacteristic? = null

diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/repository/BPSRepository.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/repository/BPSRepository.kt
@@ -13,23 +13,25 @@ import kotlinx.coroutines.launch
 import no.nordicsemi.android.ble.ktx.suspend
 import no.nordicsemi.android.bps.data.BPSData
 import no.nordicsemi.android.bps.data.BPSManager
-import no.nordicsemi.android.logger.ToolboxLogger
-import no.nordicsemi.android.logger.ToolboxLoggerFactory
+import no.nordicsemi.android.logger.NordicLogger
+import no.nordicsemi.android.logger.NordicLoggerFactory
 import no.nordicsemi.android.service.BleManagerResult
+import no.nordicsemi.android.theme.view.StringConst
 import no.nordicsemi.ui.scanner.DiscoveredBluetoothDevice
 import javax.inject.Inject
 
 @ViewModelScoped
 internal class BPSRepository @Inject constructor(
     @ApplicationContext
     private val context: Context,
-    private val toolboxLoggerFactory: ToolboxLoggerFactory
+    private val loggerFactory: NordicLoggerFactory,
+    private val stringConst: StringConst
 ) {
 
-    private var logger: ToolboxLogger? = null
+    private var logger: NordicLogger? = null
 
     fun downloadData(scope: CoroutineScope, device: DiscoveredBluetoothDevice): Flow<BleManagerResult<BPSData>> = callbackFlow {
-        val createdLogger = toolboxLoggerFactory.create("BPS", device.address()).also {
+        val createdLogger = loggerFactory.create(stringConst.APP_NAME, "BPS", device.address()).also {
             logger = it
         }
         val manager = BPSManager(context, scope, createdLogger)

diff --git a/profile_cgms/build.gradle b/profile_cgms/build.gradle
@@ -10,10 +10,10 @@ dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")
     implementation project(":lib_utils")
-    implementation project(":lib_log")
 
     implementation libs.nordic.ble.common
     implementation libs.nordic.ble.ktx
+    implementation libs.nordic.ui.logger
 
     implementation libs.nordic.theme
     implementation libs.nordic.ui.scanner

diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/data/CGMManager.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/data/CGMManager.kt
@@ -45,7 +45,7 @@ import no.nordicsemi.android.ble.ktx.asValidResponseFlow
 import no.nordicsemi.android.ble.ktx.suspend
 import no.nordicsemi.android.ble.ktx.suspendForValidResponse
 import no.nordicsemi.android.cgms.repository.toList
-import no.nordicsemi.android.logger.ToolboxLogger
+import no.nordicsemi.android.logger.NordicLogger
 import no.nordicsemi.android.service.ConnectionObserverAdapter
 import no.nordicsemi.android.utils.launchWithCatch
 import java.util.*
@@ -64,7 +64,7 @@ private val BATTERY_LEVEL_CHARACTERISTIC_UUID = UUID.fromString("00002A19-0000-1
 internal class CGMManager(
     context: Context,
     private val scope: CoroutineScope,
-    private val logger: ToolboxLogger
+    private val logger: NordicLogger
 ) : BleManager(context) {
 
     private var cgmStatusCharacteristic: BluetoothGattCharacteristic? = null

diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/repository/CGMRepository.kt
@@ -8,11 +8,12 @@ import kotlinx.coroutines.launch
 import no.nordicsemi.android.ble.ktx.suspend
 import no.nordicsemi.android.cgms.data.CGMData
 import no.nordicsemi.android.cgms.data.CGMManager
-import no.nordicsemi.android.logger.ToolboxLogger
-import no.nordicsemi.android.logger.ToolboxLoggerFactory
+import no.nordicsemi.android.logger.NordicLogger
+import no.nordicsemi.android.logger.NordicLoggerFactory
 import no.nordicsemi.android.service.BleManagerResult
 import no.nordicsemi.android.service.IdleResult
 import no.nordicsemi.android.service.ServiceManager
+import no.nordicsemi.android.theme.view.StringConst
 import no.nordicsemi.ui.scanner.DiscoveredBluetoothDevice
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -22,10 +23,11 @@ class CGMRepository @Inject constructor(
     @ApplicationContext
     private val context: Context,
     private val serviceManager: ServiceManager,
-    private val toolboxLoggerFactory: ToolboxLoggerFactory
+    private val loggerFactory: NordicLoggerFactory,
+    private val stringConst: StringConst
 ) {
     private var manager: CGMManager? = null
-    private var logger: ToolboxLogger? = null
+    private var logger: NordicLogger? = null
 
     private val _data = MutableStateFlow<BleManagerResult<CGMData>>(IdleResult())
     internal val data = _data.asStateFlow()
@@ -38,7 +40,7 @@ class CGMRepository @Inject constructor(
     }
 
     fun start(device: DiscoveredBluetoothDevice, scope: CoroutineScope) {
-        val createdLogger = toolboxLoggerFactory.create("CGMS", device.address()).also {
+        val createdLogger = loggerFactory.create(stringConst.APP_NAME, "CGMS", device.address()).also {
             logger = it
         }
         val manager = CGMManager(context, scope, createdLogger)

diff --git a/profile_csc/build.gradle b/profile_csc/build.gradle
@@ -6,10 +6,10 @@ dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")
     implementation project(":lib_utils")
-    implementation project(":lib_log")
 
     implementation libs.nordic.ble.common
     implementation libs.nordic.ble.ktx
+    implementation libs.nordic.ui.logger
 
     implementation libs.nordic.theme
     implementation libs.nordic.navigation

diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/data/CSCManager.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/data/CSCManager.kt
@@ -33,7 +33,7 @@ import no.nordicsemi.android.ble.BleManager
 import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelResponse
 import no.nordicsemi.android.ble.common.callback.csc.CyclingSpeedAndCadenceMeasurementResponse
 import no.nordicsemi.android.ble.ktx.asValidResponseFlow
-import no.nordicsemi.android.logger.ToolboxLogger
+import no.nordicsemi.android.logger.NordicLogger
 import no.nordicsemi.android.service.ConnectionObserverAdapter
 import java.util.*
 
@@ -46,7 +46,7 @@ private val BATTERY_LEVEL_CHARACTERISTIC_UUID = UUID.fromString("00002A19-0000-1
 internal class CSCManager(
     context: Context,
     private val scope: CoroutineScope,
-    private val logger: ToolboxLogger
+    private val logger: NordicLogger
 ) : BleManager(context) {
 
     private var batteryLevelCharacteristic: BluetoothGattCharacteristic? = null

diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt
@@ -1,6 +1,5 @@
 package no.nordicsemi.android.csc.repository
 
-import android.bluetooth.BluetoothDevice
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineScope
@@ -10,12 +9,12 @@ import no.nordicsemi.android.ble.ktx.suspend
 import no.nordicsemi.android.csc.data.CSCData
 import no.nordicsemi.android.csc.data.CSCManager
 import no.nordicsemi.android.csc.data.WheelSize
-import no.nordicsemi.android.logger.ToolboxLogger
-import no.nordicsemi.android.logger.ToolboxLoggerFactory
+import no.nordicsemi.android.logger.NordicLogger
+import no.nordicsemi.android.logger.NordicLoggerFactory
 import no.nordicsemi.android.service.BleManagerResult
-import no.nordicsemi.android.service.ConnectingResult
 import no.nordicsemi.android.service.IdleResult
 import no.nordicsemi.android.service.ServiceManager
+import no.nordicsemi.android.theme.view.StringConst
 import no.nordicsemi.ui.scanner.DiscoveredBluetoothDevice
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -25,10 +24,11 @@ class CSCRepository @Inject constructor(
     @ApplicationContext
     private val context: Context,
     private val serviceManager: ServiceManager,
-    private val toolboxLoggerFactory: ToolboxLoggerFactory
+    private val loggerFactory: NordicLoggerFactory,
+    private val stringConst: StringConst
 ) {
     private var manager: CSCManager? = null
-    private var logger: ToolboxLogger? = null
+    private var logger: NordicLogger? = null
 
     private val _data = MutableStateFlow<BleManagerResult<CSCData>>(IdleResult())
     internal val data = _data.asStateFlow()
@@ -41,7 +41,7 @@ class CSCRepository @Inject constructor(
     }
 
     fun start(device: DiscoveredBluetoothDevice, scope: CoroutineScope) {
-        val createdLogger = toolboxLoggerFactory.create("CSC", device.address()).also {
+        val createdLogger = loggerFactory.create(stringConst.APP_NAME, "CSC", device.address()).also {
             logger = it
         }
         val manager = CSCManager(context, scope, createdLogger)

diff --git a/profile_gls/build.gradle b/profile_gls/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     implementation project(":lib_service")
     implementation project(":lib_theme")
     implementation project(":lib_utils")
-    implementation project(":lib_log")
 
     implementation libs.chart
 
@@ -19,6 +18,7 @@ dependencies {
     implementation libs.nordic.theme
     implementation libs.nordic.ui.scanner
     implementation libs.nordic.navigation
+    implementation libs.nordic.ui.logger
 
     implementation libs.bundles.compose
     implementation libs.androidx.core