From 1125bc41d7e4b09727d124a3e7429ce246fd4207 Mon Sep 17 00:00:00 2001 From: Sylwester Zielinski Date: Mon, 23 Jan 2023 14:38:42 +0100 Subject: [PATCH] Optimize imports --- .../android/nrftoolbox/MainActivity.kt | 4 ---- .../android/nrftoolbox/view/FeatureButton.kt | 8 +++++++- .../nrftoolbox/viewmodel/HomeViewModel.kt | 2 +- .../scanner/ExampleInstrumentedTest.kt | 6 ++---- lib_scanner/src/main/AndroidManifest.xml | 2 +- .../toolbox/scanner/ExampleUnitTest.kt | 3 +-- .../android/ui/view/ScreenSection.kt | 4 ++-- .../android/ui/view/SectionTitle.kt | 7 ++++++- .../android/cgms/repository/CGMRepository.kt | 6 +++++- .../android/csc/repository/CSCRepository.kt | 6 +++++- .../android/csc/view/CSCContentView.kt | 1 - .../android/csc/view/SensorsReadingView.kt | 1 - .../android/csc/viewmodel/CSCViewModel.kt | 16 ++++++++++++++-- .../nordicsemi/android/gls/data/GLSRecord.kt | 6 +++++- .../gls/details/view/GLSDetailsMappers.kt | 6 +++++- .../android/gls/main/view/GLSContentView.kt | 11 +++++++++-- .../gls/main/viewmodel/GLSViewModel.kt | 9 ++++++++- .../android/hrs/view/HRSContentView.kt | 1 - .../android/hts/view/HTSContentView.kt | 7 +++++-- .../android/prx/repository/PRXRepository.kt | 12 ++++++++++-- .../android/prx/view/PRXContentView.kt | 1 - .../android/prx/view/PRXLinkLossView.kt | 7 +++++-- .../android/prx/viewmodel/PRXViewModel.kt | 16 ++++++++++++++-- .../uart/data/UARTPersistentDataSource.kt | 6 +++++- .../android/uart/view/InputSection.kt | 2 +- .../android/uart/view/MacroSection.kt | 19 ++++++++++++++++--- .../android/uart/view/OutputSection.kt | 12 ++++++++++-- .../uart/view/UARTConfigurationPicker.kt | 7 ++++++- .../android/uart/view/UARTContentView.kt | 7 ++++++- .../android/uart/view/UARTMacroView.kt | 8 +++++++- 30 files changed, 156 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt index 2f0118ee..e5a8682b 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt @@ -33,12 +33,8 @@ package no.nordicsemi.android.nrftoolbox import android.os.Bundle import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.ui.Modifier import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt index 034b9379..3708b895 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt @@ -36,7 +36,13 @@ import androidx.annotation.StringRes import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedCard diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt index 03322ab9..c156e5c0 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt @@ -45,10 +45,10 @@ import no.nordicsemi.android.analytics.ProfileOpenEvent import no.nordicsemi.android.cgms.repository.CGMRepository import no.nordicsemi.android.common.logger.NordicLogger import no.nordicsemi.android.common.navigation.DestinationId +import no.nordicsemi.android.common.navigation.Navigator import no.nordicsemi.android.csc.repository.CSCRepository import no.nordicsemi.android.hrs.service.HRSRepository import no.nordicsemi.android.hts.repository.HTSRepository -import no.nordicsemi.android.common.navigation.Navigator import no.nordicsemi.android.nrftoolbox.repository.ActivitySignals import no.nordicsemi.android.nrftoolbox.view.HomeViewState import no.nordicsemi.android.prx.repository.PRXRepository diff --git a/lib_scanner/src/androidTest/java/no/nordicsemi/android/toolbox/scanner/ExampleInstrumentedTest.kt b/lib_scanner/src/androidTest/java/no/nordicsemi/android/toolbox/scanner/ExampleInstrumentedTest.kt index b0a898f8..9f3317ee 100644 --- a/lib_scanner/src/androidTest/java/no/nordicsemi/android/toolbox/scanner/ExampleInstrumentedTest.kt +++ b/lib_scanner/src/androidTest/java/no/nordicsemi/android/toolbox/scanner/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package no.nordicsemi.android.toolbox.scanner -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * diff --git a/lib_scanner/src/main/AndroidManifest.xml b/lib_scanner/src/main/AndroidManifest.xml index a5918e68..44008a43 100644 --- a/lib_scanner/src/main/AndroidManifest.xml +++ b/lib_scanner/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/lib_scanner/src/test/java/no/nordicsemi/android/toolbox/scanner/ExampleUnitTest.kt b/lib_scanner/src/test/java/no/nordicsemi/android/toolbox/scanner/ExampleUnitTest.kt index b79161ad..f3df530f 100644 --- a/lib_scanner/src/test/java/no/nordicsemi/android/toolbox/scanner/ExampleUnitTest.kt +++ b/lib_scanner/src/test/java/no/nordicsemi/android/toolbox/scanner/ExampleUnitTest.kt @@ -1,8 +1,7 @@ package no.nordicsemi.android.toolbox.scanner -import org.junit.Test - import org.junit.Assert.* +import org.junit.Test /** * Example local unit test, which will execute on the development machine (host). diff --git a/lib_ui/src/main/java/no/nordicsemi/android/ui/view/ScreenSection.kt b/lib_ui/src/main/java/no/nordicsemi/android/ui/view/ScreenSection.kt index 6dc8cb9a..b4c7e5ff 100644 --- a/lib_ui/src/main/java/no/nordicsemi/android/ui/view/ScreenSection.kt +++ b/lib_ui/src/main/java/no/nordicsemi/android/ui/view/ScreenSection.kt @@ -1,6 +1,6 @@ package no.nordicsemi.android.ui.view -import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.material3.OutlinedCard import androidx.compose.runtime.Composable @@ -10,7 +10,7 @@ import androidx.compose.ui.unit.dp @Composable fun ScreenSection(content: @Composable () -> Unit) { OutlinedCard { - Box(modifier = Modifier.padding(16.dp)) { + Column(modifier = Modifier.padding(16.dp)) { content() } } diff --git a/lib_ui/src/main/java/no/nordicsemi/android/ui/view/SectionTitle.kt b/lib_ui/src/main/java/no/nordicsemi/android/ui/view/SectionTitle.kt index 98f75d2b..757b64f0 100644 --- a/lib_ui/src/main/java/no/nordicsemi/android/ui/view/SectionTitle.kt +++ b/lib_ui/src/main/java/no/nordicsemi/android/ui/view/SectionTitle.kt @@ -34,7 +34,12 @@ package no.nordicsemi.android.ui.view import androidx.annotation.DrawableRes import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme 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 7ce30d1b..43b179eb 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 @@ -34,7 +34,11 @@ package no.nordicsemi.android.cgms.repository import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import no.nordicsemi.android.ble.ktx.suspend import no.nordicsemi.android.cgms.data.CGMData 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 b51e2cd1..3d7bd006 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 @@ -34,7 +34,11 @@ package no.nordicsemi.android.csc.repository import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import no.nordicsemi.android.ble.ktx.suspend import no.nordicsemi.android.common.logger.NordicLogger diff --git 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 index ed2fe990..754f641d 100644 --- 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 @@ -38,7 +38,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.Button -import androidx.compose.material3.OutlinedCard import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/SensorsReadingView.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/SensorsReadingView.kt index 8975b0b4..123af1c8 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/SensorsReadingView.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/SensorsReadingView.kt @@ -34,7 +34,6 @@ package no.nordicsemi.android.csc.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height -import androidx.compose.material3.OutlinedCard import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/viewmodel/CSCViewModel.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/viewmodel/CSCViewModel.kt index d072426c..8f5d333b 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/viewmodel/CSCViewModel.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/viewmodel/CSCViewModel.kt @@ -35,7 +35,11 @@ import android.os.ParcelUuid import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.firstOrNull +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import no.nordicsemi.android.analytics.AppAnalytics import no.nordicsemi.android.analytics.Profile @@ -45,7 +49,15 @@ import no.nordicsemi.android.common.navigation.Navigator import no.nordicsemi.android.common.ui.scanner.model.DiscoveredBluetoothDevice import no.nordicsemi.android.csc.data.CSC_SERVICE_UUID import no.nordicsemi.android.csc.repository.CSCRepository -import no.nordicsemi.android.csc.view.* +import no.nordicsemi.android.csc.view.CSCViewEvent +import no.nordicsemi.android.csc.view.CSCViewState +import no.nordicsemi.android.csc.view.NavigateUp +import no.nordicsemi.android.csc.view.OnDisconnectButtonClick +import no.nordicsemi.android.csc.view.OnSelectedSpeedUnitSelected +import no.nordicsemi.android.csc.view.OnWheelSizeSelected +import no.nordicsemi.android.csc.view.OpenLogger +import no.nordicsemi.android.csc.view.SpeedUnit +import no.nordicsemi.android.csc.view.WorkingState import no.nordicsemi.android.service.ConnectedResult import no.nordicsemi.android.toolbox.scanner.ScannerDestinationId import javax.inject.Inject diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSRecord.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSRecord.kt index e2228660..cc4ec51c 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSRecord.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/data/GLSRecord.kt @@ -31,7 +31,11 @@ package no.nordicsemi.android.gls.data import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementCallback.GlucoseStatus -import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.* +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Carbohydrate +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Health +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Meal +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Medication +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Tester import java.util.* internal data class GLSRecord( diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsMappers.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsMappers.kt index fa25efa1..9d3401ca 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsMappers.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsMappers.kt @@ -33,7 +33,11 @@ package no.nordicsemi.android.gls.details.view import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.* +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Carbohydrate +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Health +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Meal +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Medication +import no.nordicsemi.android.ble.common.profile.glucose.GlucoseMeasurementContextCallback.Tester import no.nordicsemi.android.gls.R import no.nordicsemi.android.gls.data.ConcentrationUnit import no.nordicsemi.android.gls.data.MedicationUnit diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSContentView.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSContentView.kt index 08c2cac8..0b1fd571 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSContentView.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSContentView.kt @@ -32,7 +32,15 @@ package no.nordicsemi.android.gls.main.view import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Search @@ -40,7 +48,6 @@ import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedCard import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt index 7a3b57fc..9471d28a 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt @@ -47,7 +47,14 @@ import no.nordicsemi.android.common.navigation.Navigator import no.nordicsemi.android.common.ui.scanner.model.DiscoveredBluetoothDevice import no.nordicsemi.android.gls.GlsDetailsDestinationId import no.nordicsemi.android.gls.data.GLS_SERVICE_UUID -import no.nordicsemi.android.gls.main.view.* +import no.nordicsemi.android.gls.main.view.DisconnectEvent +import no.nordicsemi.android.gls.main.view.GLSScreenViewEvent +import no.nordicsemi.android.gls.main.view.GLSViewState +import no.nordicsemi.android.gls.main.view.NoDeviceState +import no.nordicsemi.android.gls.main.view.OnGLSRecordClick +import no.nordicsemi.android.gls.main.view.OnWorkingModeSelected +import no.nordicsemi.android.gls.main.view.OpenLoggerEvent +import no.nordicsemi.android.gls.main.view.WorkingState import no.nordicsemi.android.gls.repository.GLSRepository import no.nordicsemi.android.service.ConnectedResult import no.nordicsemi.android.toolbox.scanner.ScannerDestinationId diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt index 5e79bea8..c4409428 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt @@ -38,7 +38,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.OutlinedCard import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt index 1f24e742..ac13df05 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt @@ -31,9 +31,12 @@ package no.nordicsemi.android.hts.view -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.material3.Button -import androidx.compose.material3.OutlinedCard import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment 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 82ef910e..9a9c42b6 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 @@ -34,7 +34,11 @@ package no.nordicsemi.android.prx.repository import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.onEach import no.nordicsemi.android.common.logger.NordicLogger import no.nordicsemi.android.common.logger.NordicLoggerFactory import no.nordicsemi.android.common.ui.scanner.model.DiscoveredBluetoothDevice @@ -42,7 +46,11 @@ 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.service.BleManagerResult +import no.nordicsemi.android.service.IdleResult +import no.nordicsemi.android.service.LinkLossResult +import no.nordicsemi.android.service.ServiceManager +import no.nordicsemi.android.service.SuccessResult import no.nordicsemi.android.ui.view.StringConst import javax.inject.Inject import javax.inject.Singleton diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXContentView.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXContentView.kt index 43aa7e13..c3e5afd9 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXContentView.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXContentView.kt @@ -38,7 +38,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.Button -import androidx.compose.material3.OutlinedCard import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXLinkLossView.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXLinkLossView.kt index 0e01ed36..741e7dde 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXLinkLossView.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXLinkLossView.kt @@ -32,14 +32,17 @@ package no.nordicsemi.android.prx.view import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.HighlightOff import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedCard import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt index 37fe9a69..2143bfee 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/viewmodel/PRXViewModel.kt @@ -35,7 +35,11 @@ import android.os.ParcelUuid import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.firstOrNull +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import no.nordicsemi.android.analytics.AppAnalytics import no.nordicsemi.android.analytics.Profile @@ -45,7 +49,15 @@ import no.nordicsemi.android.common.navigation.Navigator import no.nordicsemi.android.common.ui.scanner.model.DiscoveredBluetoothDevice import no.nordicsemi.android.prx.data.PRX_SERVICE_UUID import no.nordicsemi.android.prx.repository.PRXRepository -import no.nordicsemi.android.prx.view.* +import no.nordicsemi.android.prx.view.DisconnectEvent +import no.nordicsemi.android.prx.view.NavigateUpEvent +import no.nordicsemi.android.prx.view.NoDeviceState +import no.nordicsemi.android.prx.view.OpenLoggerEvent +import no.nordicsemi.android.prx.view.PRXScreenViewEvent +import no.nordicsemi.android.prx.view.PRXViewState +import no.nordicsemi.android.prx.view.TurnOffAlert +import no.nordicsemi.android.prx.view.TurnOnAlert +import no.nordicsemi.android.prx.view.WorkingState import no.nordicsemi.android.service.ConnectedResult import no.nordicsemi.android.toolbox.scanner.ScannerDestinationId import javax.inject.Inject diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTPersistentDataSource.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTPersistentDataSource.kt index 545ddd35..b84325fc 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTPersistentDataSource.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/data/UARTPersistentDataSource.kt @@ -33,7 +33,11 @@ package no.nordicsemi.android.uart.data import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import no.nordicsemi.android.uart.db.* +import no.nordicsemi.android.uart.db.CommentVisitor +import no.nordicsemi.android.uart.db.Configuration +import no.nordicsemi.android.uart.db.ConfigurationsDao +import no.nordicsemi.android.uart.db.XmlConfiguration +import no.nordicsemi.android.uart.db.XmlMacro import org.simpleframework.xml.Serializer import org.simpleframework.xml.core.Persister import org.simpleframework.xml.strategy.Strategy diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/InputSection.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/InputSection.kt index eee8bf65..597cca6c 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/InputSection.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/InputSection.kt @@ -48,10 +48,10 @@ import kotlinx.coroutines.launch import no.nordicsemi.android.common.theme.view.RadioButtonGroup import no.nordicsemi.android.common.theme.view.RadioButtonItem import no.nordicsemi.android.common.theme.view.RadioGroupViewEntity -import no.nordicsemi.android.ui.view.SectionTitle import no.nordicsemi.android.uart.R import no.nordicsemi.android.uart.data.MacroEol import no.nordicsemi.android.ui.view.ScreenSection +import no.nordicsemi.android.ui.view.SectionTitle import no.nordicsemi.android.utils.EMPTY @OptIn(ExperimentalMaterial3Api::class) diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/MacroSection.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/MacroSection.kt index f2298112..04b59c9f 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/MacroSection.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/MacroSection.kt @@ -31,13 +31,26 @@ package no.nordicsemi.android.uart.view -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Edit -import androidx.compose.material3.* +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable @@ -46,9 +59,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import no.nordicsemi.android.ui.view.SectionTitle import no.nordicsemi.android.uart.R import no.nordicsemi.android.ui.view.ScreenSection +import no.nordicsemi.android.ui.view.SectionTitle @Composable internal fun MacroSection(viewState: UARTViewState, onEvent: (UARTViewEvent) -> Unit) { diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/OutputSection.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/OutputSection.kt index 4697b26b..a8fb21d2 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/OutputSection.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/OutputSection.kt @@ -32,7 +32,15 @@ package no.nordicsemi.android.uart.view import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState @@ -53,10 +61,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import no.nordicsemi.android.ui.view.SectionTitle import no.nordicsemi.android.uart.R import no.nordicsemi.android.uart.data.UARTRecord import no.nordicsemi.android.uart.data.UARTRecordType +import no.nordicsemi.android.ui.view.SectionTitle import java.text.SimpleDateFormat import java.util.* diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTConfigurationPicker.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTConfigurationPicker.kt index 586d6b76..e4f3bfc1 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTConfigurationPicker.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTConfigurationPicker.kt @@ -47,9 +47,14 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import no.nordicsemi.android.ui.view.dialog.* import no.nordicsemi.android.uart.R import no.nordicsemi.android.uart.data.UARTConfiguration +import no.nordicsemi.android.ui.view.dialog.FlowCanceled +import no.nordicsemi.android.ui.view.dialog.ItemSelectedResult +import no.nordicsemi.android.ui.view.dialog.StringListDialog +import no.nordicsemi.android.ui.view.dialog.StringListDialogConfig +import no.nordicsemi.android.ui.view.dialog.StringListDialogResult +import no.nordicsemi.android.ui.view.dialog.toAnnotatedString @Composable internal fun UARTConfigurationPicker(state: UARTViewState, onEvent: (UARTViewEvent) -> Unit) { diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt index 61087f04..32b036e1 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTContentView.kt @@ -31,7 +31,12 @@ package no.nordicsemi.android.uart.view -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.material3.Card import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTMacroView.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTMacroView.kt index d8c901b7..ebb24275 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTMacroView.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTMacroView.kt @@ -34,7 +34,13 @@ package no.nordicsemi.android.uart.view import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable