diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-24 13:02:45 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-24 13:02:45 +0200 |
| commit | 089c55e7fbd26a045699c0f7c34ab02f5e58eeb8 (patch) | |
| tree | 968c6aaad18299216efc0414a73cbe06ad8962cd /android | |
| parent | fa72d730eeb7855841324239a775bb575d536e2d (diff) | |
| parent | ece9057444c87d85957b7032359e929a53e302c1 (diff) | |
| download | mullvadvpn-089c55e7fbd26a045699c0f7c34ab02f5e58eeb8.tar.xz mullvadvpn-089c55e7fbd26a045699c0f7c34ab02f5e58eeb8.zip | |
Merge branch 'information-dialogs-not-scrollable-droid-302'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt | 10 |
1 files changed, 10 insertions, 0 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 b88f0a86ba..ad12932405 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 @@ -5,6 +5,8 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialog import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -20,9 +22,11 @@ import androidx.compose.ui.window.DialogProperties import androidx.core.text.HtmlCompat import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.button.PrimaryButton +import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.lib.theme.Dimens +import net.mullvad.mullvadvpn.lib.theme.color.AlphaScrollbar @Preview @Composable @@ -50,7 +54,13 @@ fun InfoDialog(message: String, additionalInfo: String? = null, onDismiss: () -> ) }, text = { + val scrollState = rememberScrollState() Column( + Modifier.drawVerticalScrollbar( + scrollState, + MaterialTheme.colorScheme.onPrimary.copy(alpha = AlphaScrollbar) + ) + .verticalScroll(scrollState), horizontalAlignment = Alignment.CenterHorizontally, ) { Text( |