diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-06 13:44:57 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-06 13:44:57 +0200 |
| commit | cb8e525fe5263a136f6e6eada688fbc76f40c5f8 (patch) | |
| tree | 00fd977d519de2470fbb8420606006bd02bb5d88 | |
| parent | 80a4088f36c528626914dc2938e8d8bca4359831 (diff) | |
| parent | 8c585087252a3235e6d44107685a7f9950f45b62 (diff) | |
| download | mullvadvpn-cb8e525fe5263a136f6e6eada688fbc76f40c5f8.tar.xz mullvadvpn-cb8e525fe5263a136f6e6eada688fbc76f40c5f8.zip | |
Merge branch 'too-much-spacing-between-text-and-button-in-local-network-droid-391'
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt index b11ef59630..48599da15a 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt @@ -63,8 +63,11 @@ fun InfoDialog(message: String, additionalInfo: String? = null, onDismiss: () -> Spacer(modifier = Modifier.height(Dimens.verticalSpace)) val htmlFormattedString = HtmlCompat.fromHtml(additionalInfo, HtmlCompat.FROM_HTML_MODE_COMPACT) + val annotated = htmlFormattedString.toAnnotatedString() + // fromHtml may add a trailing newline when using HTML tags, so we remove it + val trimmed = annotated.substring(0, annotated.trimEnd().length) Text( - text = htmlFormattedString.toAnnotatedString(), + text = trimmed, color = MaterialTheme.colorScheme.onBackground, style = MaterialTheme.typography.bodySmall, modifier = Modifier.fillMaxWidth() |