diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-10-12 13:50:10 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-13 09:14:45 +0200 |
| commit | 1cc76d81f65300fd0f0a4c2f4ef8b5eeafc28fde (patch) | |
| tree | e79364218bce279f1bd16842f5f6e46dae1183ce /android | |
| parent | c56ccac47cb49fdd5d3a6f5bedf41fbcd9207653 (diff) | |
| download | mullvadvpn-1cc76d81f65300fd0f0a4c2f4ef8b5eeafc28fde.tar.xz mullvadvpn-1cc76d81f65300fd0f0a4c2f4ef8b5eeafc28fde.zip | |
Add scrollbar to SelectLocationScreen
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt index fec20ceb18..078e6c9b78 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SelectLocationScreen.kt @@ -8,11 +8,13 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize 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.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -40,6 +42,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.cell.RelayLocationCell +import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar import net.mullvad.mullvadvpn.compose.component.textResource import net.mullvad.mullvadvpn.compose.constant.ContentType import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString @@ -132,8 +135,13 @@ fun SelectLocationScreen( onSearchTermInput.invoke(searchString) } Spacer(modifier = Modifier.height(height = Dimens.verticalSpace)) + val lazyListState = rememberLazyListState() LazyColumn( - modifier = Modifier.focusRequester(listFocus).fillMaxWidth().fillMaxHeight(), + modifier = + Modifier.focusRequester(listFocus) + .fillMaxSize() + .drawVerticalScrollbar(lazyListState), + state = lazyListState, horizontalAlignment = Alignment.CenterHorizontally ) { when (uiState) { |