Fix split tunneling view and scrollable menu bar

mullvad · Oct 6, 2023 · 7e28f78 · 7e28f78
1 parent f7db974
commit 7e28f78
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Scaffolding.kt
@@ -83,19 +83,17 @@ fun ScaffoldWithMediumTopBar(
 ) {
 
     val appBarState = rememberTopAppBarState()
+    val canScroll = lazyListState.canScrollForward || lazyListState.canScrollBackward
     val scrollBehavior =
-        TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
-            appBarState,
-            canScroll = { lazyListState.canScrollBackward || lazyListState.canScrollForward }
-        )
+        TopAppBarDefaults.exitUntilCollapsedScrollBehavior(appBarState, canScroll = { canScroll })
     Scaffold(
         modifier = modifier.fillMaxSize().nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             MullvadMediumTopBar(
                 title = appBarTitle,
                 navigationIcon = navigationIcon,
                 actions,
-                scrollBehavior = scrollBehavior
+                scrollBehavior = if (canScroll) scrollBehavior else null
             )
         },
         content = {
@@ -118,19 +116,22 @@ fun ScaffoldWithMediumTopBar(
 ) {
     val appBarState = rememberTopAppBarState()
     val scrollState = rememberScrollState()
+    val canScroll = scrollState.canScrollForward || scrollState.canScrollBackward
     val scrollBehavior =
-        TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
-            appBarState,
-            canScroll = { scrollState.canScrollBackward || scrollState.canScrollForward }
-        )
+        TopAppBarDefaults.exitUntilCollapsedScrollBehavior(appBarState, canScroll = { canScroll })
     Scaffold(
         modifier = modifier.fillMaxSize().nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             MullvadMediumTopBar(
                 title = appBarTitle,
                 navigationIcon = navigationIcon,
                 actions,
-                scrollBehavior = scrollBehavior
+                scrollBehavior =
+                    if (canScroll) {
+                        scrollBehavior
+                    } else {
+                        null
+                    }
             )
         },
         content = {

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
@@ -85,7 +85,6 @@ private fun PreviewNothingTopBar() {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MullvadTopBar(
     containerColor: Color,
@@ -189,7 +188,6 @@ private fun PreviewSlimMediumTopBar() {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun MullvadMediumTopBar(
     title: String,

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
@@ -87,8 +87,12 @@ fun SplitTunnelingScreen(
         modifier = Modifier.fillMaxSize(),
         appBarTitle = stringResource(id = R.string.split_tunneling),
         navigationIcon = { NavigateBackIconButton(onBackClick) }
-    ) { _, lazyListState ->
-        LazyColumn(horizontalAlignment = Alignment.CenterHorizontally, state = lazyListState) {
+    ) { modifier, lazyListState ->
+        LazyColumn(
+            modifier = modifier,
+            horizontalAlignment = Alignment.CenterHorizontally,
+            state = lazyListState
+        ) {
             item(key = CommonContentKey.DESCRIPTION, contentType = ContentType.DESCRIPTION) {
                 Box(modifier = Modifier.fillMaxWidth()) {
                     Text(