Make Divider -> VerticalDivider (#226)

alorma · Mar 1, 2024 · fde5d0a · fde5d0a
1 parent 4d451fd
commit fde5d0a
Showing 1 changed file with 61 additions and 62 deletions.
diff --git a/...-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/internal/SettingsTileScaffold.kt b/...-ui/src/commonMain/kotlin/com/alorma/compose/settings/ui/internal/SettingsTileScaffold.kt
@@ -5,76 +5,75 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material3.Divider
 import androidx.compose.material3.DividerDefaults
 import androidx.compose.material3.ListItem
+import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 
 @Composable
 internal fun SettingsTileScaffold(
-    enabled: Boolean = true,
-    title: @Composable () -> Unit,
-    subtitle: @Composable (() -> Unit)? = null,
-    icon: (@Composable () -> Unit)? = null,
-    action: (@Composable (Boolean) -> Unit)? = null,
-    actionDivider: Boolean = false,
+  enabled: Boolean = true,
+  title: @Composable () -> Unit,
+  subtitle: @Composable (() -> Unit)? = null,
+  icon: (@Composable () -> Unit)? = null,
+  action: (@Composable (Boolean) -> Unit)? = null,
+  actionDivider: Boolean = false,
 ) {
-    val minHeight = if (subtitle == null) 72.dp else 88.dp
-    ListItem(
-        modifier = Modifier
-            .defaultMinSize(minHeight = minHeight),
-        headlineContent = {
-            WrapContentColor(enabled = enabled) {
-                title()
-            }
-        },
-        supportingContent = if (subtitle == null) {
-            null
-        } else {
-            {
-                WrapContentColor(enabled = enabled) {
-                    subtitle()
-                }
-            }
-        },
-        leadingContent = if (icon == null) {
-            null
-        } else {
-            {
-                WrapContentColor(enabled = enabled) {
-                    icon()
-                }
-            }
-        },
-        trailingContent = if (action == null) {
-            null
-        } else {
-            {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    if (actionDivider) {
-                        val color = DividerDefaults.color.copy(
-                            alpha = if (enabled) {
-                                1f
-                            } else {
-                                0.6f
-                            },
-                        )
-                        Divider(
-                            color = color,
-                            modifier = Modifier
-                                .padding(vertical = 4.dp)
-                                .width(1.dp),
-                        )
-                        Spacer(modifier = Modifier.width(2.dp))
-                    }
-                    action(enabled)
-                }
-            }
-        },
-    )
+  val minHeight = if (subtitle == null) 72.dp else 88.dp
+  ListItem(
+    modifier = Modifier
+      .defaultMinSize(minHeight = minHeight),
+    headlineContent = {
+      WrapContentColor(enabled = enabled) {
+        title()
+      }
+    },
+    supportingContent = if (subtitle == null) {
+      null
+    } else {
+      {
+        WrapContentColor(enabled = enabled) {
+          subtitle()
+        }
+      }
+    },
+    leadingContent = if (icon == null) {
+      null
+    } else {
+      {
+        WrapContentColor(enabled = enabled) {
+          icon()
+        }
+      }
+    },
+    trailingContent = if (action == null) {
+      null
+    } else {
+      {
+        Row(
+          verticalAlignment = Alignment.CenterVertically,
+        ) {
+          if (actionDivider) {
+            val color = DividerDefaults.color.copy(
+              alpha = if (enabled) {
+                1f
+              } else {
+                0.6f
+              },
+            )
+            VerticalDivider(
+              color = color,
+              modifier = Modifier
+                .padding(vertical = 4.dp),
+            )
+            Spacer(modifier = Modifier.width(2.dp))
+          }
+          action(enabled)
+        }
+      }
+    },
+  )
 }