diff --git a/app/build.gradle b/app/build.gradle
index 4b91de2b..1ab5aeb9 100644
--- 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
deleted file mode 100644
index 40887f1e..00000000
--- a/lib_log/build.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-apply from: rootProject.file("library.gradle")
-
-android {
- namespace 'no.nordicsemi.android.logger'
-}
-
-dependencies {
- implementation libs.nordic.log
-}
diff --git a/lib_log/src/main/AndroidManifest.xml b/lib_log/src/main/AndroidManifest.xml
deleted file mode 100644
index 1afac85e..00000000
--- a/lib_log/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
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
deleted file mode 100644
index 32083b43..00000000
--- a/lib_log/src/main/java/no/nordicsemi/android/logger/LoggerAppRunner.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package no.nordicsemi.android.logger
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-
-private const val LOGGER_PACKAGE_NAME = "no.nordicsemi.android.log"
-private const val LOGGER_LINK = "https://play.google.com/store/apps/details?id=no.nordicsemi.android.log"
-
-class LoggerAppRunner @Inject constructor(
- @ApplicationContext
- private val context: Context
-) {
-
- fun runLogger() {
- val packageManger = context.packageManager
-
- val intent = packageManger.getLaunchIntentForPackage(LOGGER_PACKAGE_NAME)
- if (intent != null) {
- intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
- context.startActivity(intent)
- } else {
- val launchIntent = Intent(Intent.ACTION_VIEW, Uri.parse(LOGGER_LINK))
- launchIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
- context.startActivity(launchIntent)
- }
- }
-
- fun runLogger(uri: Uri?) {
- val packageManger = context.packageManager
-
- val intent = packageManger.getLaunchIntentForPackage(LOGGER_PACKAGE_NAME)
-
- val targetUri = if (intent != null && uri != null) {
- uri
- } else {
- Uri.parse(LOGGER_LINK)
- }
- val launchIntent = Intent(Intent.ACTION_VIEW, targetUri)
- launchIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
- context.startActivity(launchIntent)
- }
-}
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
deleted file mode 100644
index 1354b732..00000000
--- a/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLogger.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package no.nordicsemi.android.logger
-
-import android.content.Context
-import android.util.Log
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import dagger.hilt.android.qualifiers.ApplicationContext
-import no.nordicsemi.android.log.LogContract
-import no.nordicsemi.android.log.LogSession
-import no.nordicsemi.android.log.Logger
-import no.nordicsemi.android.log.annotation.LogLevel
-
-internal const val LOG_TAG = "nRF Toolbox"
-
-class ToolboxLogger @AssistedInject constructor(
- @ApplicationContext
- private val context: Context,
- private val appRunner: LoggerAppRunner,
- @Assisted("profile")
- private val profile: String,
- @Assisted("key")
- private val key: String,
-) {
-
- private var logSession: LogSession? = null
-
- fun log(@LogLevel level: Int, message: String) {
- val logSession = getLogger()
- if (logSession != null) {
- Logger.log(logSession, LogContract.Log.Level.fromPriority(level), message)
- }
- val logPriority = if (level <= Log.ASSERT) level else Log.INFO
- Log.println(logPriority, LOG_TAG, message)
- }
-
- fun openLogger() {
- appRunner.runLogger(logSession?.sessionUri)
- }
-
- private fun getLogger(): LogSession? {
- logSession = logSession ?: Logger.newSession(context, profile, key, LOG_TAG)
- logSession?.sessionsUri
- return logSession
- }
-}
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
deleted file mode 100644
index 68057b1f..00000000
--- a/lib_log/src/main/java/no/nordicsemi/android/logger/ToolboxLoggerFactory.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package no.nordicsemi.android.logger
-
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-
-@AssistedFactory
-interface ToolboxLoggerFactory {
-
- fun create(@Assisted("profile") profile: String, @Assisted("key") key: String): ToolboxLogger
-}
diff --git a/lib_log/src/main/res/drawable/ic_logger.xml b/lib_log/src/main/res/drawable/ic_logger.xml
deleted file mode 100644
index 49cc4bb2..00000000
--- a/lib_log/src/main/res/drawable/ic_logger.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/lib_theme/build.gradle b/lib_theme/build.gradle
index 39b5a7c3..d4a65f35 100644
--- 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
new file mode 100644
index 00000000..279a6095
--- /dev/null
+++ 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
index 7d90a59b..22b04bc3 100644
--- 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
index 0b4d02e5..2814c24a 100644
--- 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
index 7cca817c..48fef598 100644
--- 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,9 +13,10 @@ 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
@@ -23,13 +24,14 @@ import javax.inject.Inject
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> = 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
index 1fa9270c..8aaa5d2a 100644
--- 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
index cb17db14..4a543d46 100644
--- 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
index c21cbcfe..e61478cd 100644
--- 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>(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
index 95e5bcf2..9718d4be 100644
--- 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
index 520fa5fa..5b971a92 100644
--- 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
index 2bf9a576..2cb8d8fc 100644
--- 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>(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
index 8382e92d..f23e9c3c 100644
--- 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
diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSManager.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSManager.kt
index c6b99e46..87edfc7d 100644
--- a/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSManager.kt
+++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSManager.kt
@@ -25,7 +25,6 @@ import android.bluetooth.BluetoothGatt
import android.bluetooth.BluetoothGattCharacteristic
import android.content.Context
import android.util.Log
-import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.launchIn
@@ -39,11 +38,10 @@ import no.nordicsemi.android.ble.common.callback.glucose.GlucoseMeasurementRespo
import no.nordicsemi.android.ble.common.data.RecordAccessControlPointData
import no.nordicsemi.android.ble.ktx.asValidResponseFlow
import no.nordicsemi.android.ble.ktx.suspend
-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.*
-import javax.inject.Inject
val GLS_SERVICE_UUID: UUID = UUID.fromString("00001808-0000-1000-8000-00805f9b34fb")
@@ -59,7 +57,7 @@ private val BATTERY_LEVEL_CHARACTERISTIC_UUID =
internal class GLSManager(
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_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt
index 7e0fc3c2..3a2271b2 100644
--- a/profile_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt
+++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/repository/GLSRepository.kt
@@ -14,9 +14,10 @@ import no.nordicsemi.android.ble.ktx.suspend
import no.nordicsemi.android.gls.data.GLSData
import no.nordicsemi.android.gls.data.GLSManager
import no.nordicsemi.android.gls.data.WorkingMode
-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.android.utils.exhaustive
import no.nordicsemi.ui.scanner.DiscoveredBluetoothDevice
import javax.inject.Inject
@@ -25,14 +26,15 @@ import javax.inject.Inject
internal class GLSRepository @Inject constructor(
@ApplicationContext
private val context: Context,
- private val toolboxLoggerFactory: ToolboxLoggerFactory
+ private val loggerFactory: NordicLoggerFactory,
+ private val stringConst: StringConst
) {
private var manager: GLSManager? = null
- private var logger: ToolboxLogger? = null
+ private var logger: NordicLogger? = null
fun downloadData(scope: CoroutineScope, device: DiscoveredBluetoothDevice): Flow> = callbackFlow {
- val createdLogger = toolboxLoggerFactory.create("GLS", device.address()).also {
+ val createdLogger = loggerFactory.create(stringConst.APP_NAME, "GLS", device.address()).also {
logger = it
}
val managerInstance = manager ?: GLSManager(context, scope, createdLogger)
diff --git a/profile_hrs/build.gradle b/profile_hrs/build.gradle
index 6cc0298d..83614425 100644
--- a/profile_hrs/build.gradle
+++ b/profile_hrs/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.ble.ktx
implementation libs.nordic.navigation
implementation libs.nordic.ui.scanner
+ implementation libs.nordic.ui.logger
implementation libs.bundles.compose
implementation libs.androidx.core
diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSManager.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSManager.kt
index c1095d9a..934ef7e0 100644
--- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSManager.kt
+++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSManager.kt
@@ -35,7 +35,7 @@ import no.nordicsemi.android.ble.common.callback.hr.BodySensorLocationResponse
import no.nordicsemi.android.ble.common.callback.hr.HeartRateMeasurementResponse
import no.nordicsemi.android.ble.ktx.asValidResponseFlow
import no.nordicsemi.android.ble.ktx.suspendForValidResponse
-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.*
@@ -50,7 +50,7 @@ private val BATTERY_LEVEL_CHARACTERISTIC_UUID = UUID.fromString("00002A19-0000-1
internal class HRSManager(
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_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt
index 7c0a207d..6aace80a 100644
--- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt
+++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/service/HRSRepository.kt
@@ -1,6 +1,5 @@
package no.nordicsemi.android.hrs.service
-import android.bluetooth.BluetoothDevice
import android.content.Context
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineScope
@@ -9,12 +8,12 @@ import kotlinx.coroutines.launch
import no.nordicsemi.android.ble.ktx.suspend
import no.nordicsemi.android.hrs.data.HRSData
import no.nordicsemi.android.hrs.data.HRSManager
-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
@@ -24,10 +23,11 @@ class HRSRepository @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: HRSManager? = null
- private var logger: ToolboxLogger? = null
+ private var logger: NordicLogger? = null
private val _data = MutableStateFlow>(IdleResult())
internal val data = _data.asStateFlow()
@@ -40,7 +40,7 @@ class HRSRepository @Inject constructor(
}
fun start(device: DiscoveredBluetoothDevice, scope: CoroutineScope) {
- val createdLogger = toolboxLoggerFactory.create("HRS", device.address()).also {
+ val createdLogger = loggerFactory.create(stringConst.APP_NAME, "HRS", device.address()).also {
logger = it
}
val manager = HRSManager(context, scope, createdLogger)
diff --git a/profile_hts/build.gradle b/profile_hts/build.gradle
index db875eaf..0d3eb126 100644
--- a/profile_hts/build.gradle
+++ b/profile_hts/build.gradle
@@ -6,7 +6,6 @@ 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
@@ -14,6 +13,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
diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSManager.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSManager.kt
index 7be575f3..4bee98ef 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSManager.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSManager.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.ht.TemperatureMeasurementResponse
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 HTSManager internal constructor(
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_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
index 4b629df3..ab779d0a 100644
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/repository/HTSRepository.kt
@@ -1,6 +1,5 @@
package no.nordicsemi.android.hts.repository
-import android.bluetooth.BluetoothDevice
import android.content.Context
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineScope
@@ -9,12 +8,12 @@ import kotlinx.coroutines.launch
import no.nordicsemi.android.ble.ktx.suspend
import no.nordicsemi.android.hts.data.HTSData
import no.nordicsemi.android.hts.data.HTSManager
-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
@@ -24,10 +23,11 @@ class HTSRepository @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: HTSManager? = null
- private var logger: ToolboxLogger? = null
+ private var logger: NordicLogger? = null
private val _data = MutableStateFlow>(IdleResult())
internal val data = _data.asStateFlow()
@@ -40,7 +40,7 @@ class HTSRepository @Inject constructor(
}
fun start(device: DiscoveredBluetoothDevice, scope: CoroutineScope) {
- val createdLogger = toolboxLoggerFactory.create("HTS", device.address()).also {
+ val createdLogger = loggerFactory.create(stringConst.APP_NAME, "HTS", device.address()).also {
logger = it
}
val manager = HTSManager(context, scope, createdLogger)
diff --git a/profile_prx/build.gradle b/profile_prx/build.gradle
index 040d27f4..9f058b8b 100644
--- a/profile_prx/build.gradle
+++ b/profile_prx/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.nordic.ble.common
implementation libs.nordic.ble.ktx
@@ -18,6 +17,7 @@ dependencies {
implementation libs.nordic.theme
implementation libs.nordic.ui.scanner
implementation libs.nordic.navigation
+ implementation libs.nordic.ui.logger
implementation libs.bundles.icons
implementation libs.bundles.compose
diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/data/PRXManager.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/data/PRXManager.kt
index db10b09c..5e440a0e 100644
--- a/profile_prx/src/main/java/no/nordicsemi/android/prx/data/PRXManager.kt
+++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/data/PRXManager.kt
@@ -37,7 +37,7 @@ import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelResponse
import no.nordicsemi.android.ble.common.data.alert.AlertLevelData
import no.nordicsemi.android.ble.ktx.asValidResponseFlow
import no.nordicsemi.android.ble.ktx.suspend
-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.*
@@ -52,7 +52,7 @@ private val BATTERY_LEVEL_CHARACTERISTIC_UUID = UUID.fromString("00002A19-0000-1
internal class PRXManager(
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_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt
index 4054236f..5052a436 100644
--- a/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt
+++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/repository/PRXRepository.kt
@@ -4,13 +4,14 @@ import android.content.Context
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.*
-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.prx.data.AlarmLevel
import no.nordicsemi.android.prx.data.PRXData
import no.nordicsemi.android.prx.data.PRXManager
import no.nordicsemi.android.prx.data.ProximityServerManager
import no.nordicsemi.android.service.*
+import no.nordicsemi.android.theme.view.StringConst
import no.nordicsemi.ui.scanner.DiscoveredBluetoothDevice
import javax.inject.Inject
import javax.inject.Singleton
@@ -22,11 +23,12 @@ class PRXRepository @Inject internal constructor(
private val serviceManager: ServiceManager,
private val proximityServerManager: ProximityServerManager,
private val alarmHandler: AlarmHandler,
- private val toolboxLoggerFactory: ToolboxLoggerFactory
+ private val loggerFactory: NordicLoggerFactory,
+ private val stringConst: StringConst
) {
private var manager: PRXManager? = null
- private var logger: ToolboxLogger? = null
+ private var logger: NordicLogger? = null
private val _data = MutableStateFlow>(IdleResult())
internal val data = _data.asStateFlow()
@@ -40,7 +42,7 @@ class PRXRepository @Inject internal constructor(
}
fun start(device: DiscoveredBluetoothDevice, scope: CoroutineScope) {
- val createdLogger = toolboxLoggerFactory.create("PRX", device.address()).also {
+ val createdLogger = loggerFactory.create(stringConst.APP_NAME, "PRX", device.address()).also {
logger = it
}
val manager = PRXManager(context, scope, createdLogger)
diff --git a/profile_rscs/build.gradle b/profile_rscs/build.gradle
index 4562a695..7559df9a 100644
--- a/profile_rscs/build.gradle
+++ b/profile_rscs/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.nordic.ble.common
implementation libs.nordic.ble.ktx
@@ -18,6 +17,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
diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSManager.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSManager.kt
index cc8ed938..f5b7f0f6 100644
--- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSManager.kt
+++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSManager.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.rsc.RunningSpeedAndCadenceMeasurementResponse
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 RSCSManager internal constructor(
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_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt
index b41bc83c..6c3dbebf 100644
--- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt
+++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSRepository.kt
@@ -6,13 +6,14 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch
import no.nordicsemi.android.ble.ktx.suspend
-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.rscs.data.RSCSData
import no.nordicsemi.android.rscs.data.RSCSManager
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 RSCSRepository @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: RSCSManager? = null
- private var logger: ToolboxLogger? = null
+ private var logger: NordicLogger? = null
private val _data = MutableStateFlow>(IdleResult())
internal val data = _data.asStateFlow()
@@ -38,7 +40,7 @@ class RSCSRepository @Inject constructor(
}
fun start(device: DiscoveredBluetoothDevice, scope: CoroutineScope) {
- val createdLogger = toolboxLoggerFactory.create("RSCS", device.address()).also {
+ val createdLogger = loggerFactory.create(stringConst.APP_NAME, "RSCS", device.address()).also {
logger = it
}
val manager = RSCSManager(context, scope, createdLogger)
diff --git a/profile_uart/build.gradle b/profile_uart/build.gradle
index 41d41506..1ff901f4 100644
--- a/profile_uart/build.gradle
+++ b/profile_uart/build.gradle
@@ -27,7 +27,6 @@ dependencies {
implementation project(":lib_service")
implementation project(":lib_theme")
implementation project(":lib_utils")
- implementation project(":lib_log")
implementation libs.room.runtime
implementation libs.room.ktx
@@ -39,6 +38,7 @@ dependencies {
implementation libs.nordic.theme
implementation libs.nordic.ui.scanner
implementation libs.nordic.navigation
+ implementation libs.nordic.ui.logger
implementation libs.bundles.datastore
implementation libs.bundles.compose
diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt
index c3ce714f..470b9f94 100644
--- a/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt
+++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTManager.kt
@@ -38,7 +38,7 @@ import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelResponse
import no.nordicsemi.android.ble.ktx.asFlow
import no.nordicsemi.android.ble.ktx.asValidResponseFlow
import no.nordicsemi.android.ble.ktx.suspend
-import no.nordicsemi.android.logger.ToolboxLogger
+import no.nordicsemi.android.logger.NordicLogger
import no.nordicsemi.android.service.ConnectionObserverAdapter
import no.nordicsemi.android.utils.EMPTY
import no.nordicsemi.android.utils.launchWithCatch
@@ -55,7 +55,7 @@ private val BATTERY_LEVEL_CHARACTERISTIC_UUID =
internal class UARTManager(
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_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt
index 010904d2..8babe1c0 100644
--- a/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt
+++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/repository/UARTRepository.kt
@@ -6,11 +6,12 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch
import no.nordicsemi.android.ble.ktx.suspend
-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.android.uart.data.*
import no.nordicsemi.android.utils.EMPTY
import no.nordicsemi.ui.scanner.DiscoveredBluetoothDevice
@@ -23,10 +24,11 @@ class UARTRepository @Inject internal constructor(
private val context: Context,
private val serviceManager: ServiceManager,
private val configurationDataSource: ConfigurationDataSource,
- private val toolboxLoggerFactory: ToolboxLoggerFactory,
+ private val loggerFactory: NordicLoggerFactory,
+ private val stringConst: StringConst
) {
private var manager: UARTManager? = null
- private var logger: ToolboxLogger? = null
+ private var logger: NordicLogger? = null
private val _data = MutableStateFlow>(IdleResult())
internal val data = _data.asStateFlow()
@@ -41,7 +43,7 @@ class UARTRepository @Inject internal constructor(
}
fun start(device: DiscoveredBluetoothDevice, scope: CoroutineScope) {
- val createdLogger = toolboxLoggerFactory.create("UART", device.address()).also {
+ val createdLogger = loggerFactory.create(stringConst.APP_NAME, "UART", device.address()).also {
logger = it
}
val manager = UARTManager(context, scope, createdLogger)
diff --git a/settings.gradle b/settings.gradle
index 49145f25..087be52c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,10 +15,11 @@ dependencyResolutionManagement {
library('nordic-log', 'no.nordicsemi.android:log:2.3.0')
- version('commonlibraries', '1.0.7')
+ version('commonlibraries', '1.0.8')
library('nordic-ui-scanner', 'no.nordicsemi.android.common', 'uiscanner').versionRef('commonlibraries')
library('nordic-navigation', 'no.nordicsemi.android.common', 'navigation').versionRef('commonlibraries')
library('nordic-theme', 'no.nordicsemi.android.common', 'theme').versionRef('commonlibraries')
+ library('nordic-ui-logger', 'no.nordicsemi.android.common', 'uilogger').versionRef('commonlibraries')
library('localbroadcastmanager', 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0')
library('material', 'com.google.android.material:material:1.6.0-rc01')
@@ -98,7 +99,6 @@ include ':lib_analytics'
include ':lib_service'
include ':lib_theme'
include ':lib_utils'
-include ':lib_log'
if (file('../Android-Common-Libraries').exists()) {
includeBuild('../Android-Common-Libraries')