Add `itemWithDivier` compose extension

Co-authored-by: saber safavi <saber.safavi@codic.se>

2 files changed, 17 insertions, 6 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/extensions/LazyListExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/extensions/LazyListExtensions.kt
new file mode 100644
index 0000000000..5fe6a6d509
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/extensions/LazyListExtensions.kt
@@ -0,0 +1,13 @@
+package net.mullvad.mullvadvpn.compose.extensions
+
+import androidx.compose.foundation.lazy.LazyItemScope
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.material.Divider
+import androidx.compose.runtime.Composable
+
+inline fun LazyListScope.itemWithDivider(
+    crossinline itemContent: @Composable LazyItemScope.() -> Unit
+) = item {
+    itemContent()
+    Divider()
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt
index bd115447d6..1b50558705 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AdvancedSettingScreen.kt
@@ -35,6 +35,7 @@ import net.mullvad.mullvadvpn.compose.component.CollapsingTopBar
 import net.mullvad.mullvadvpn.compose.component.drawVerticalScrollbar
 import net.mullvad.mullvadvpn.compose.dialog.DnsDialog
 import net.mullvad.mullvadvpn.compose.dialog.MtuDialog
+import net.mullvad.mullvadvpn.compose.extensions.itemWithDivider
 import net.mullvad.mullvadvpn.compose.state.AdvancedSettingsUiState
 import net.mullvad.mullvadvpn.compose.theme.CollapsingToolbarTheme
 import net.mullvad.mullvadvpn.compose.theme.MullvadBlue20
@@ -155,20 +156,18 @@ fun AdvancedSettingScreen(
             ) {
                 item { MtuComposeCell(mtuValue = uiState.mtu, onEditMtu = { onMtuCellClick() }) }
 
-                item {
+                itemWithDivider {
                     NavigationComposeCell(
                         title = stringResource(id = R.string.split_tunneling),
                         onClick = { onSplitTunnelingNavigationClick.invoke() }
                     )
-                    Divider()
                 }
 
-                item {
+                itemWithDivider {
                     CustomDnsComposeCell(
                         checkboxDefaultState = uiState.isCustomDnsEnabled,
                         onToggle = { newValue -> onToggleDnsClick(newValue) }
                     )
-                    Divider()
                 }
 
                 if (uiState.isCustomDnsEnabled) {
@@ -183,7 +182,7 @@ fun AdvancedSettingScreen(
                         Divider()
                     }
 
-                    item {
+                    itemWithDivider {
                         BaseCell(
                             onCellClicked = { onDnsClick(null) },
                             title = {
@@ -197,7 +196,6 @@ fun AdvancedSettingScreen(
                             background = MullvadBlue20,
                             startPadding = biggerPadding
                         )
-                        Divider()
                     }
                 }