diff --git a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt
index 5d69b999..4c0115d1 100644
--- a/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt
+++ b/profile/src/main/java/no/nordicsemi/android/toolbox/profile/view/channelSounding/ChannelSoundingScreen.kt
@@ -166,11 +166,17 @@ private fun SessionClosed(
title = stringResource(R.string.channel_sounding),
)
}
- Text(
- stringResource(R.string.ranging_session_stopped),
- modifier = Modifier.padding(8.dp),
- textAlign = TextAlign.Center,
- )
+ Box(
+ modifier = Modifier
+ .fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ Text(
+ stringResource(R.string.ranging_session_stopped),
+ modifier = Modifier.padding(8.dp),
+ textAlign = TextAlign.Center,
+ )
+ }
}
Button(
modifier = Modifier.padding(16.dp),
@@ -206,14 +212,21 @@ private fun SessionError(
title = stringResource(R.string.channel_sounding),
)
}
- Text(
- text = stringResource(sessionData.reason.toUiString()),
- modifier = Modifier.padding(8.dp),
- textAlign = TextAlign.Center,
- )
+ Box(
+ modifier = Modifier
+ .fillMaxWidth(),
+ contentAlignment = Alignment.Center
+ ) {
+ Text(
+ text = stringResource(sessionData.reason.toUiString()),
+ modifier = Modifier.padding(8.dp),
+ textAlign = TextAlign.Center,
+ )
+ }
}
if (sessionData.reason != SessionClosedReason.NOT_SUPPORTED ||
- sessionData.reason != SessionClosedReason.RANGING_NOT_AVAILABLE) {
+ sessionData.reason != SessionClosedReason.RANGING_NOT_AVAILABLE
+ ) {
Button(
modifier = Modifier.padding(16.dp),
onClick = { onClickEvent(ChannelSoundingEvent.RestartRangingSession) },
@@ -224,38 +237,6 @@ private fun SessionError(
}
}
-@Composable
-private fun DistanceDashboard(measurement: Double) {
- Column(
- modifier = Modifier
- .fillMaxWidth()
- .padding(16.dp),
- horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.Center,
- ) {
- Text(
- text = stringResource(R.string.ranging_distance_m, measurement.toFloat()),
- fontWeight = FontWeight.Bold,
- color = MaterialTheme.colorScheme.primary,
- style = MaterialTheme.typography.displayLarge
- )
- Spacer(modifier = Modifier.height(8.dp))
- Text(
- text = stringResource(R.string.current_measurement),
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- style = MaterialTheme.typography.bodySmall
- )
- }
-}
-
-@Preview
-@Composable
-private fun DDistanceDashboard_Preview() {
- NordicTheme {
- DistanceDashboard(2.5)
- }
-}
-
@RequiresApi(Build.VERSION_CODES.BAKLAVA)
@Composable
private fun RangingContent(
@@ -288,6 +269,38 @@ private fun RangingContent(
}
}
+@Composable
+private fun DistanceDashboard(measurement: Double) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(16.dp),
+ horizontalAlignment = Alignment.CenterHorizontally,
+ verticalArrangement = Arrangement.Center,
+ ) {
+ Text(
+ text = stringResource(R.string.ranging_distance_m, measurement.toFloat()),
+ fontWeight = FontWeight.Bold,
+ color = MaterialTheme.colorScheme.primary,
+ style = MaterialTheme.typography.displayLarge
+ )
+ Spacer(modifier = Modifier.height(8.dp))
+ Text(
+ text = stringResource(R.string.current_measurement),
+ color = MaterialTheme.colorScheme.onSurfaceVariant,
+ style = MaterialTheme.typography.bodySmall
+ )
+ }
+}
+
+@Preview
+@Composable
+private fun DDistanceDashboard_Preview() {
+ NordicTheme {
+ DistanceDashboard(2.5)
+ }
+}
+
@Preview(showBackground = true)
@Composable
private fun DetailsCard(
diff --git a/profile/src/main/res/values/channelSoundingStrings.xml b/profile/src/main/res/values/channelSoundingStrings.xml
index 35d64f9d..54cd21a5 100644
--- a/profile/src/main/res/values/channelSoundingStrings.xml
+++ b/profile/src/main/res/values/channelSoundingStrings.xml
@@ -40,7 +40,7 @@
Missing permissions.
Ranging service not available.
Channel Sounding with required security level is not supported.
- Oops! Session just ghosted harder than your last Tinder date. Try reconnecting…
+ Oops! \nThat session disappeared faster than your last Tinder match. Try reconnecting…
Session terminated by local request.
Session terminated by remote peer.
Peer terminated the session.