diff options
| author | saber safavi <saber.safavi@codic.se> | 2023-07-31 16:12:17 +0200 |
|---|---|---|
| committer | saber safavi <saber.safavi@codic.se> | 2023-07-31 16:26:20 +0200 |
| commit | 9abca15aa67b1072d9568e3fd17258d8f47452b2 (patch) | |
| tree | 3daff84cfcc0f6b203741f535ff88769b39ac656 /android | |
| parent | 1626b0ffbd45460c45dab7f1e37b096d49761aac (diff) | |
| download | mullvadvpn-9abca15aa67b1072d9568e3fd17258d8f47452b2.tar.xz mullvadvpn-9abca15aa67b1072d9568e3fd17258d8f47452b2.zip | |
Add scroll to connect view to support split view
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt index 8ff8cc5ee6..50c0005a96 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt @@ -1,17 +1,16 @@ package net.mullvad.mullvadvpn.compose.screen import androidx.compose.foundation.background -import androidx.compose.foundation.gestures.Orientation -import androidx.compose.foundation.gestures.scrollable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -60,9 +59,9 @@ fun ConnectScreen( horizontalAlignment = Alignment.Start, modifier = Modifier.background(color = MaterialTheme.colorScheme.primary) - .fillMaxHeight() + .height(IntrinsicSize.Max) .padding(horizontal = Dimens.sideMargin, vertical = Dimens.screenVerticalMargin) - .scrollable(scrollState, Orientation.Vertical) + .verticalScroll(scrollState) ) { if ( uiState.tunnelRealState is TunnelState.Connecting || |