diff options
Diffstat (limited to 'android/app/src')
3 files changed, 16 insertions, 4 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt index 05862a5bc4..1c33420863 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt @@ -518,10 +518,10 @@ class ConnectScreenTest { onNodeWithText("In").assertExists() onNodeWithText("$inHost:$inPort UDP").assertExists() - onNodeWithText("Out Ipv4").assertExists() + onNodeWithText("Out IPv4").assertExists() onNodeWithText(outIpv4).assertExists() - onNodeWithText("Out Ipv6").assertExists() + onNodeWithText("Out IPv6").assertExists() onNodeWithText(outIpv6).assertExists() } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt index 5feffc83a9..3ec353bc96 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt @@ -17,6 +17,7 @@ import androidx.constraintlayout.compose.Dimension import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.screen.ConnectionDetails import net.mullvad.mullvadvpn.compose.test.LOCATION_INFO_CONNECTION_OUT_TEST_TAG +import net.mullvad.mullvadvpn.constant.SPACE_CHAR import net.mullvad.mullvadvpn.lib.model.TransportProtocol import net.mullvad.mullvadvpn.lib.model.TunnelEndpoint import net.mullvad.mullvadvpn.lib.theme.Dimens @@ -99,7 +100,12 @@ fun ConnectionDetails( if (outIPV4 != null) { Text( - text = stringResource(R.string.connection_details_out_ipv4), + text = + buildString { + append(stringResource(R.string.connection_details_out)) + append(SPACE_CHAR) + append(stringResource(R.string.connection_details_ipv4)) + }, color = MaterialTheme.colorScheme.onSurfaceVariant, style = MaterialTheme.typography.bodySmall, maxLines = 1, @@ -139,7 +145,12 @@ fun ConnectionDetails( if (outIPV6 != null) { Text( - text = stringResource(R.string.connection_details_out_ipv6), + text = + buildString { + append(stringResource(R.string.connection_details_out)) + append(SPACE_CHAR) + append(stringResource(R.string.connection_details_ipv6)) + }, color = MaterialTheme.colorScheme.onSurfaceVariant, style = MaterialTheme.typography.bodySmall, maxLines = 1, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt index 23f4189feb..90e6897be0 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt @@ -1,5 +1,6 @@ package net.mullvad.mullvadvpn.constant const val EMPTY_STRING = "" +const val SPACE_CHAR = ' ' const val NEWLINE_STRING = "\n" const val HTML_NEWLINE_STRING = "<br/>" |