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 7f82081f..0dfdbd22 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 @@ -21,7 +21,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import no.nordicsemi.android.nrftoolbox.R -import no.nordicsemi.android.theme.view.ScreenSection +import no.nordicsemi.android.material.you.ScreenSection @Composable fun FeatureButton( diff --git a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/BatteryLevelView.kt b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/BatteryLevelView.kt index 7b2603ee..9cb828fb 100644 --- a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/BatteryLevelView.kt +++ b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/BatteryLevelView.kt @@ -2,6 +2,7 @@ package no.nordicsemi.android.theme.view import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.R @Composable diff --git a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/SensorRecordCard.kt b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/SensorRecordCard.kt deleted file mode 100644 index 08d5e384..00000000 --- a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/SensorRecordCard.kt +++ /dev/null @@ -1,41 +0,0 @@ -package no.nordicsemi.android.theme.view - -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import no.nordicsemi.android.material.you.Card - -@Composable -fun ScreenSection(onClick: (() -> Unit)? = null, content: @Composable () -> Unit) { - Card( - backgroundColor = MaterialTheme.colorScheme.secondaryContainer, - shape = RoundedCornerShape(16.dp), - elevation = 0.dp, - ) { - - val modifier = if (onClick != null) { - Modifier - .clickable { onClick.invoke() } - .fillMaxWidth() - .padding(16.dp) - } else { - Modifier - .fillMaxWidth() - .padding(16.dp) - } - - Column( - modifier = modifier, - horizontalAlignment = Alignment.CenterHorizontally - ) { - content() - } - } -} diff --git a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/DeviceConnectingView.kt b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/DeviceConnectingView.kt deleted file mode 100644 index c83e2a98..00000000 --- a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/DeviceConnectingView.kt +++ /dev/null @@ -1,83 +0,0 @@ -package no.nordicsemi.android.theme.view.scanner - -import androidx.compose.foundation.background -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.HourglassTop -import androidx.compose.material3.Button -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import no.nordicsemi.android.theme.R -import no.nordicsemi.android.theme.view.ScreenSection - -@Composable -fun DeviceConnectingView(navigateUp: () -> Unit) { - Column( - modifier = Modifier - .fillMaxSize() - .padding(16.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { - ScreenSection { - Icon( - imageVector = Icons.Default.HourglassTop, - contentDescription = null, - tint = MaterialTheme.colorScheme.onSecondary, - modifier = Modifier - .background( - color = MaterialTheme.colorScheme.secondary, - shape = CircleShape - ) - .padding(8.dp) - ) - - Spacer(modifier = Modifier.size(16.dp)) - - Text( - text = stringResource(id = R.string.device_connecting), - style = MaterialTheme.typography.titleMedium - ) - - Spacer(modifier = Modifier.size(16.dp)) - - Text( - text = stringResource(id = R.string.device_explanation), - textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium - ) - - Spacer(modifier = Modifier.size(16.dp)) - - Text( - text = stringResource(id = R.string.device_please_wait), - textAlign = TextAlign.Center, - style = MaterialTheme.typography.titleLarge - ) - } - - Spacer(modifier = Modifier.size(16.dp)) - - Button(onClick = { navigateUp() }) { - Text(text = stringResource(id = R.string.disconnect)) - } - } -} - -@Preview -@Composable -fun DeviceConnectingView_Preview() { - DeviceConnectingView { } -} diff --git a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/DeviceDisconnectedView.kt b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/DeviceDisconnectedView.kt deleted file mode 100644 index fd38db6f..00000000 --- a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/DeviceDisconnectedView.kt +++ /dev/null @@ -1,82 +0,0 @@ -package no.nordicsemi.android.theme.view.scanner - -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* -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.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import no.nordicsemi.android.theme.R -import no.nordicsemi.android.theme.view.ScreenSection - -enum class Reason { - USER, UNKNOWN, LINK_LOSS, MISSING_SERVICE -} - -@Composable -fun DeviceDisconnectedView(reason: Reason, navigateUp: () -> Unit) { - Column( - modifier = Modifier - .fillMaxSize() - .padding(16.dp), - horizontalAlignment = Alignment.CenterHorizontally - ) { - ScreenSection { - Icon( - imageVector = Icons.Default.HighlightOff, - contentDescription = null, - tint = MaterialTheme.colorScheme.onSecondary, - modifier = Modifier - .background( - color = MaterialTheme.colorScheme.secondary, - shape = CircleShape - ) - .padding(8.dp) - ) - - Spacer(modifier = Modifier.size(16.dp)) - - Text( - text = stringResource(id = R.string.device_disconnected), - style = MaterialTheme.typography.titleMedium - ) - - Spacer(modifier = Modifier.size(16.dp)) - - val text = when (reason) { - Reason.USER -> stringResource(id = R.string.device_reason_user) - Reason.LINK_LOSS -> stringResource(id = R.string.device_reason_link_loss) - Reason.MISSING_SERVICE -> stringResource(id = R.string.device_reason_missing_service) - Reason.UNKNOWN -> stringResource(id = R.string.device_reason_unknown) - } - - Text( - text = text, - textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium - ) - } - - Spacer(modifier = Modifier.size(16.dp)) - - Button(onClick = { navigateUp() }) { - Text(text = stringResource(id = R.string.go_up)) - } - } -} - -@Preview -@Composable -fun DeviceDisconnectedView_Preview() { - DeviceConnectingView { } -} diff --git a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/NoDeviceView.kt b/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/NoDeviceView.kt deleted file mode 100644 index cd027073..00000000 --- a/lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/NoDeviceView.kt +++ /dev/null @@ -1,74 +0,0 @@ -package no.nordicsemi.android.theme.view.scanner - -import androidx.compose.foundation.background -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.HourglassTop -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import no.nordicsemi.android.theme.R -import no.nordicsemi.android.theme.view.ScreenSection - -@Composable -fun NoDeviceView() { - Column( - modifier = Modifier - .fillMaxSize() - .padding(16.dp) - ) { - ScreenSection { - Icon( - imageVector = Icons.Default.HourglassTop, - contentDescription = null, - tint = MaterialTheme.colorScheme.onSecondary, - modifier = Modifier - .background( - color = MaterialTheme.colorScheme.secondary, - shape = CircleShape - ) - .padding(8.dp) - ) - - Spacer(modifier = Modifier.size(16.dp)) - - Text( - text = stringResource(id = R.string.device_connecting), - style = MaterialTheme.typography.titleMedium - ) - - Spacer(modifier = Modifier.size(16.dp)) - - Text( - text = stringResource(id = R.string.device_explanation), - textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium - ) - - Spacer(modifier = Modifier.size(16.dp)) - - Text( - text = stringResource(id = R.string.device_please_wait), - textAlign = TextAlign.Center, - style = MaterialTheme.typography.titleLarge - ) - } - } -} - -@Preview -@Composable -fun NoDeviceView_Preview() { - DeviceConnectingView { } -} diff --git a/lib_theme/src/main/res/values/strings.xml b/lib_theme/src/main/res/values/strings.xml index a0d9108e..76cb2c68 100644 --- a/lib_theme/src/main/res/values/strings.xml +++ b/lib_theme/src/main/res/values/strings.xml @@ -12,14 +12,4 @@ Disconnect Battery - - Disconnected - Device disconnected successfully. - Device disconnected with unknown reason. - Device signal has been lost. - Device was disconnected, because required services are missing. - - Connecting... - The mobile is trying to connect to peripheral device. - Please wait... \ No newline at end of file diff --git a/profile_bps/build.gradle b/profile_bps/build.gradle index ce45a593..45260992 100644 --- a/profile_bps/build.gradle +++ b/profile_bps/build.gradle @@ -9,6 +9,7 @@ dependencies { implementation libs.nordic.ble.common implementation libs.nordic.ble.ktx implementation libs.nordic.navigation + implementation libs.nordic.theme implementation libs.nordic.log implementation libs.nordic.ui.scanner diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt index f72bc486..32e3eeb7 100644 --- a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt +++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt @@ -12,11 +12,11 @@ import no.nordicsemi.android.bps.R import no.nordicsemi.android.bps.viewmodel.BPSViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun BPSScreen() { diff --git 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 index eb00ded7..a0342b8e 100644 --- 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 @@ -10,9 +10,9 @@ 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.BPSData +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.view.BatteryLevelView import no.nordicsemi.android.theme.view.KeyValueField -import no.nordicsemi.android.theme.view.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle @Composable diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt index 8d8091fe..779b2f8d 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt @@ -18,7 +18,7 @@ import no.nordicsemi.android.cgms.data.CGMRecord import no.nordicsemi.android.cgms.data.CGMServiceCommand import no.nordicsemi.android.cgms.data.RequestStatus import no.nordicsemi.android.theme.view.BatteryLevelView -import no.nordicsemi.android.theme.view.ScreenSection +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle import androidx.compose.material3.CircularProgressIndicator diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt index 87541fea..6c4ad27f 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt @@ -12,11 +12,11 @@ import no.nordicsemi.android.cgms.R import no.nordicsemi.android.cgms.viewmodel.CGMScreenViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun CGMScreen() { 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 54ebf9e7..ed946056 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 @@ -21,7 +21,7 @@ import no.nordicsemi.android.csc.R import no.nordicsemi.android.csc.data.CSCData import no.nordicsemi.android.csc.data.WheelSize import no.nordicsemi.android.material.you.RadioButtonGroup -import no.nordicsemi.android.theme.view.ScreenSection +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle import no.nordicsemi.android.theme.view.dialog.FlowCanceled import no.nordicsemi.android.theme.view.dialog.ItemSelectedResult diff --git a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt index d281992e..2c5f489a 100644 --- a/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt +++ b/profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt @@ -12,11 +12,11 @@ import no.nordicsemi.android.csc.R import no.nordicsemi.android.csc.viewmodel.CSCViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun CSCScreen() { 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 9551eebf..25c04b64 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 @@ -12,7 +12,7 @@ import no.nordicsemi.android.csc.R import no.nordicsemi.android.csc.data.CSCData import no.nordicsemi.android.theme.view.BatteryLevelView import no.nordicsemi.android.theme.view.KeyValueField -import no.nordicsemi.android.theme.view.ScreenSection +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle @Composable diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsContentView.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsContentView.kt index ee2f72da..e5eb97ed 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsContentView.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsContentView.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp import no.nordicsemi.android.gls.R import no.nordicsemi.android.gls.data.GLSRecord import no.nordicsemi.android.gls.main.view.toDisplayString -import no.nordicsemi.android.theme.view.ScreenSection +import no.nordicsemi.android.material.you.ScreenSection @Composable internal fun GLSDetailsContentView(record: GLSRecord) { 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 b0e6048b..612ae004 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 @@ -24,7 +24,7 @@ import no.nordicsemi.android.gls.data.WorkingMode import no.nordicsemi.android.gls.main.viewmodel.GLSViewModel import androidx.compose.material3.CircularProgressIndicator import no.nordicsemi.android.theme.view.BatteryLevelView -import no.nordicsemi.android.theme.view.ScreenSection +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle @Composable diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt index 14cd619c..8b52e5b7 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/view/GLSScreen.kt @@ -12,11 +12,11 @@ import no.nordicsemi.android.gls.R import no.nordicsemi.android.gls.main.viewmodel.GLSViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun GLSScreen() { diff --git a/profile_hrs/build.gradle b/profile_hrs/build.gradle index bc0e2727..84d45e31 100644 --- a/profile_hrs/build.gradle +++ b/profile_hrs/build.gradle @@ -8,6 +8,7 @@ dependencies { implementation libs.chart + implementation libs.nordic.theme implementation libs.nordic.ble.common implementation libs.nordic.ble.ktx implementation libs.nordic.navigation 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 ab5a0f51..981687e5 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 @@ -14,8 +14,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import no.nordicsemi.android.hrs.R import no.nordicsemi.android.hrs.data.HRSData +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.view.BatteryLevelView -import no.nordicsemi.android.theme.view.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle @Composable diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt index e9b59190..207be2fc 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt @@ -12,11 +12,11 @@ import no.nordicsemi.android.hrs.R import no.nordicsemi.android.hrs.viewmodel.HRSViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun HRSScreen() { 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 5801b9e9..ad845c61 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 @@ -14,7 +14,7 @@ import no.nordicsemi.android.hts.data.HTSData import no.nordicsemi.android.material.you.RadioButtonGroup import no.nordicsemi.android.theme.view.BatteryLevelView import no.nordicsemi.android.theme.view.KeyValueField -import no.nordicsemi.android.theme.view.ScreenSection +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle @Composable diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt index 0139a260..deaddf43 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt @@ -12,11 +12,11 @@ import no.nordicsemi.android.hts.R import no.nordicsemi.android.hts.viewmodel.HTSViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun HTSScreen() { diff --git a/profile_prx/build.gradle b/profile_prx/build.gradle index 2aeedf8a..20e406b3 100644 --- a/profile_prx/build.gradle +++ b/profile_prx/build.gradle @@ -9,6 +9,7 @@ dependencies { implementation libs.nordic.ble.common implementation libs.nordic.ble.ktx + implementation libs.nordic.theme implementation libs.nordic.log implementation libs.nordic.ui.scanner implementation libs.nordic.navigation 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 17e5ce2e..621b9d27 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 @@ -13,11 +13,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.prx.R import no.nordicsemi.android.prx.data.PRXData import no.nordicsemi.android.theme.view.BatteryLevelView import no.nordicsemi.android.theme.view.KeyValueField -import no.nordicsemi.android.theme.view.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle @Composable 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 5d8af23d..72ea8000 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 @@ -16,8 +16,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import no.nordicsemi.android.prx.R import no.nordicsemi.android.theme.R as themeR -import no.nordicsemi.android.theme.view.ScreenSection import androidx.compose.material.icons.filled.HighlightOff +import no.nordicsemi.android.material.you.ScreenSection @Composable fun DeviceOutOfRangeView(navigateUp: () -> Unit) { diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt index 11d699e5..57eb2b26 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt @@ -13,11 +13,11 @@ import no.nordicsemi.android.prx.R import no.nordicsemi.android.prx.viewmodel.PRXViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun PRXScreen() { diff --git a/profile_rscs/build.gradle b/profile_rscs/build.gradle index d669dc22..9bf5ddae 100644 --- a/profile_rscs/build.gradle +++ b/profile_rscs/build.gradle @@ -9,6 +9,7 @@ dependencies { implementation libs.nordic.ble.common implementation libs.nordic.ble.ktx + implementation libs.nordic.theme implementation libs.nordic.log implementation libs.nordic.ui.scanner implementation libs.nordic.navigation diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt index 1dcbbe62..a04d4d0d 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt @@ -12,11 +12,11 @@ import no.nordicsemi.android.rscs.R import no.nordicsemi.android.rscs.viewmodel.RSCSViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun RSCSScreen() { diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/SensorsReadingView.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/SensorsReadingView.kt index e517bc67..7335c972 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/SensorsReadingView.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/SensorsReadingView.kt @@ -7,10 +7,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.rscs.R import no.nordicsemi.android.rscs.data.RSCSData import no.nordicsemi.android.theme.view.KeyValueField -import no.nordicsemi.android.theme.view.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle @Composable 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 98dad69e..47c55bcc 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 @@ -4,7 +4,6 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add -import androidx.compose.material.icons.filled.Clear import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Edit import androidx.compose.material3.* @@ -16,7 +15,7 @@ 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.theme.view.ScreenSection +import no.nordicsemi.android.material.you.ScreenSection import no.nordicsemi.android.theme.view.SectionTitle import no.nordicsemi.android.uart.R import no.nordicsemi.android.uart.data.UARTData diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt index 40a0c95f..d44035ce 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt @@ -5,20 +5,18 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.service.* import no.nordicsemi.android.theme.view.BackIconAppBar -import no.nordicsemi.android.theme.view.scanner.DeviceConnectingView -import no.nordicsemi.android.theme.view.scanner.DeviceDisconnectedView -import no.nordicsemi.android.theme.view.scanner.NoDeviceView -import no.nordicsemi.android.theme.view.scanner.Reason +import no.nordicsemi.ui.scanner.ui.DeviceConnectingView +import no.nordicsemi.ui.scanner.ui.NoDeviceView import no.nordicsemi.android.uart.R import no.nordicsemi.android.uart.viewmodel.UARTViewModel import no.nordicsemi.android.utils.exhaustive +import no.nordicsemi.ui.scanner.ui.DeviceDisconnectedView +import no.nordicsemi.ui.scanner.ui.Reason @Composable fun UARTScreen() {