添加 BasicBottomSheetDialog ，废弃 ColumnBottomSheetDialog

Moriafly · Mar 19, 2024 · 32bf119 · 32bf119
1 parent 353eacb
commit 32bf119
Showing 1 changed file with 62 additions and 29 deletions.
diff --git a/ui/src/main/java/com/moriafly/salt/ui/dialog/Dialog.kt b/ui/src/main/java/com/moriafly/salt/ui/dialog/Dialog.kt
@@ -49,35 +49,6 @@ import com.moriafly.salt.ui.SaltTheme
 import com.moriafly.salt.ui.TextButton
 import com.moriafly.salt.ui.UnstableSaltApi
 
-@UnstableSaltApi
-@Composable
-fun ColumnBottomSheetDialog(
-    onDismissRequest: () -> Unit,
-    content: @Composable () -> Unit
-) {
-    BottomSheetDialog(
-        onDismissRequest = onDismissRequest,
-        properties = BottomSheetDialogProperties(
-            enableEdgeToEdge = true,
-            behaviorProperties = BottomSheetBehaviorProperties(
-                state = BottomSheetBehaviorProperties.State.HalfExpanded,
-                skipCollapsed = true,
-                halfExpandedRatio = 0.66f
-            )
-        ),
-        content = {
-            Column(
-                modifier = Modifier
-                    .padding(top = 6.dp)
-                    .clip(RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp))
-                    .background(color = SaltTheme.colors.background)
-            ) {
-                content()
-            }
-        }
-    )
-}
-
 /**
  * YesDialog
  */
@@ -251,6 +222,68 @@ fun BasicDialog(
     }
 }
 
+/**
+ * The basic bottom sheet dialog has default corner background and vertical padding
+ */
+@UnstableSaltApi
+@Composable
+fun BasicBottomSheetDialog(
+    onDismissRequest: () -> Unit,
+    content: @Composable () -> Unit
+) {
+    BottomSheetDialog(
+        onDismissRequest = onDismissRequest,
+        properties = BottomSheetDialogProperties(
+            enableEdgeToEdge = true,
+            behaviorProperties = BottomSheetBehaviorProperties(
+                state = BottomSheetBehaviorProperties.State.HalfExpanded,
+                skipCollapsed = true,
+                halfExpandedRatio = 0.66f
+            )
+        ),
+        content = {
+            Column(
+                modifier = Modifier
+                    .padding(top = 6.dp)
+                    .clip(RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp))
+                    .background(color = SaltTheme.colors.background)
+            ) {
+                content()
+            }
+        }
+    )
+}
+
+@Deprecated("Use BasicBottomSheetDialog", replaceWith = ReplaceWith("BasicBottomSheetDialog"))
+@UnstableSaltApi
+@Composable
+fun ColumnBottomSheetDialog(
+    onDismissRequest: () -> Unit,
+    content: @Composable () -> Unit
+) {
+    BottomSheetDialog(
+        onDismissRequest = onDismissRequest,
+        properties = BottomSheetDialogProperties(
+            enableEdgeToEdge = true,
+            behaviorProperties = BottomSheetBehaviorProperties(
+                state = BottomSheetBehaviorProperties.State.HalfExpanded,
+                skipCollapsed = true,
+                halfExpandedRatio = 0.66f
+            )
+        ),
+        content = {
+            Column(
+                modifier = Modifier
+                    .padding(top = 6.dp)
+                    .clip(RoundedCornerShape(topStart = 20.dp, topEnd = 20.dp))
+                    .background(color = SaltTheme.colors.background)
+            ) {
+                content()
+            }
+        }
+    )
+}
+
 @Composable
 fun DialogTitle(
     text: String