Migrate GLS profile to the new BLE library

2025-12-24 09:54:20 +01:00 · 2023-03-13 12:38:08 +01:00
parent e448d2c1a4
commit 3c3f1b2c8b
16 changed files with 22 additions and 23 deletions
--- a/profile_bps/src/main/java/no/nordicsemi/android/bps/data/BPSServiceData.kt
+++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/data/BPSServiceData.kt
@@ -1,8 +1,8 @@
 package no.nordicsemi.android.bps.data

 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.bps.BloodPressureMeasurementData
-import no.nordicsemi.android.kotlin.ble.profile.bps.IntermediateCuffPressureData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.BloodPressureMeasurementData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.IntermediateCuffPressureData

 data class BPSServiceData (
    val bloodPressureMeasurement: BloodPressureMeasurementData? = null,
--- a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSSensorsReadingView.kt
+++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSSensorsReadingView.kt
@@ -43,8 +43,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.bps.R
 import no.nordicsemi.android.bps.data.BPSServiceData
-import no.nordicsemi.android.kotlin.ble.profile.bps.BloodPressureMeasurementData
-import no.nordicsemi.android.kotlin.ble.profile.bps.IntermediateCuffPressureData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.BloodPressureMeasurementData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.IntermediateCuffPressureData
 import no.nordicsemi.android.ui.view.BatteryLevelView
 import no.nordicsemi.android.ui.view.KeyValueField
 import no.nordicsemi.android.ui.view.ScreenSection
--- a/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt
+++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/viewmodel/BPSViewModel.kt
@@ -59,9 +59,9 @@ import no.nordicsemi.android.kotlin.ble.core.client.callback.BleGattClient
 import no.nordicsemi.android.kotlin.ble.core.client.service.BleGattServices
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
 import no.nordicsemi.android.kotlin.ble.profile.battery.BatteryLevelParser
-import no.nordicsemi.android.kotlin.ble.profile.bps.BloodPressureMeasurementData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.BloodPressureMeasurementData
 import no.nordicsemi.android.kotlin.ble.profile.bps.BloodPressureMeasurementParser
-import no.nordicsemi.android.kotlin.ble.profile.bps.IntermediateCuffPressureData
+import no.nordicsemi.android.kotlin.ble.profile.bps.data.IntermediateCuffPressureData
 import no.nordicsemi.android.kotlin.ble.profile.bps.IntermediateCuffPressureParser
 import no.nordicsemi.android.toolbox.scanner.ScannerDestinationId
 import java.util.*
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/data/CSCServiceData.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/data/CSCServiceData.kt
@@ -1,7 +1,7 @@
 package no.nordicsemi.android.csc.data

 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData

 data class CSCServiceData(
    val data: CSCData = CSCData(),
--- 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
@@ -42,9 +42,9 @@ import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.csc.data.CSCServiceData
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
-import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize
-import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSizes
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.WheelSize
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.WheelSizes
 import no.nordicsemi.android.service.DisconnectAndStopEvent
 import no.nordicsemi.android.service.ServiceManager
 import javax.inject.Inject
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCContentView.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCContentView.kt
@@ -50,8 +50,8 @@ import androidx.compose.ui.unit.dp
 import no.nordicsemi.android.common.theme.view.RadioButtonGroup
 import no.nordicsemi.android.csc.R
 import no.nordicsemi.android.csc.data.CSCServiceData
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
-import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.WheelSize
 import no.nordicsemi.android.ui.view.ScreenSection
 import no.nordicsemi.android.ui.view.SectionTitle
 import no.nordicsemi.android.ui.view.dialog.FlowCanceled
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCMappers.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCMappers.kt
@@ -33,7 +33,7 @@ package no.nordicsemi.android.csc.view

 import no.nordicsemi.android.common.theme.view.RadioButtonItem
 import no.nordicsemi.android.common.theme.view.RadioGroupViewEntity
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData
 import java.util.*

 private const val DISPLAY_M_S = "m/s"
--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCViewEvent.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCViewEvent.kt
@@ -31,7 +31,7 @@

 package no.nordicsemi.android.csc.view

-import no.nordicsemi.android.kotlin.ble.profile.csc.WheelSize
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.WheelSize

 internal sealed class CSCViewEvent

--- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/WheelSizeView.kt
+++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/WheelSizeView.kt
@@ -47,7 +47,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import no.nordicsemi.android.csc.R
-import no.nordicsemi.android.kotlin.ble.profile.csc.CSCData
+import no.nordicsemi.android.kotlin.ble.profile.csc.data.CSCData

@Composable
 internal fun WheelSizeView(state: CSCData, onClick: () -> Unit) {
--- 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
@@ -153,8 +153,7 @@ internal class GLSManager(
        private suspend fun onNumberOfRecordsReceived(response: RecordAccessControlPointResponse) {
            if (response.numberOfRecords > 0) {
                if (data.value.records.isNotEmpty()) {
-                    val sequenceNumber = data.value.records
-                        .last().sequenceNumber + 1
+                    val sequenceNumber = data.value.records.last().sequenceNumber + 1
                    writeCharacteristic(
                        recordAccessControlPointCharacteristic,
                        RecordAccessControlPointData.reportStoredRecordsGreaterThenOrEqualTo(
--- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSServiceData.kt
+++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/data/HRSServiceData.kt
@@ -32,7 +32,7 @@
 package no.nordicsemi.android.hrs.data

 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.hrs.HRSData
+import no.nordicsemi.android.kotlin.ble.profile.hrs.data.HRSData

 internal data class HRSServiceData(
    val data: List<HRSData> = emptyList(),
--- 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
@@ -42,7 +42,7 @@ import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.hrs.data.HRSServiceData
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.hrs.HRSData
+import no.nordicsemi.android.kotlin.ble.profile.hrs.data.HRSData
 import no.nordicsemi.android.service.DisconnectAndStopEvent
 import no.nordicsemi.android.service.ServiceManager
 import javax.inject.Inject
--- a/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSServiceData.kt
+++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/data/HTSServiceData.kt
@@ -32,7 +32,7 @@
 package no.nordicsemi.android.hts.data

 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.hts.HTSData
+import no.nordicsemi.android.kotlin.ble.profile.hts.data.HTSData

 internal data class HTSServiceData(
    val data: HTSData = HTSData(),
--- 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
@@ -42,7 +42,7 @@ import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.hts.data.HTSServiceData
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.hts.HTSData
+import no.nordicsemi.android.kotlin.ble.profile.hts.data.HTSData
 import no.nordicsemi.android.service.DisconnectAndStopEvent
 import no.nordicsemi.android.service.ServiceManager
 import javax.inject.Inject
--- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSServiceData.kt
+++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/data/RSCSServiceData.kt
@@ -34,7 +34,7 @@ package no.nordicsemi.android.rscs.data
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.rscs.RSCSData
+import no.nordicsemi.android.kotlin.ble.profile.rscs.data.RSCSData
 import no.nordicsemi.android.rscs.R

 internal data class RSCSServiceData(
--- 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
@@ -41,7 +41,7 @@ import no.nordicsemi.android.common.core.simpleSharedFlow
 import no.nordicsemi.android.common.logger.NordicLogger
 import no.nordicsemi.android.kotlin.ble.core.ServerDevice
 import no.nordicsemi.android.kotlin.ble.core.data.GattConnectionState
-import no.nordicsemi.android.kotlin.ble.profile.rscs.RSCSData
+import no.nordicsemi.android.kotlin.ble.profile.rscs.data.RSCSData
 import no.nordicsemi.android.rscs.data.RSCSServiceData
 import no.nordicsemi.android.service.DisconnectAndStopEvent
 import no.nordicsemi.android.service.ServiceManager