BetterAndroid/FlexiUI
5
0
Fork 0
mirror of https://github.com/BetterAndroid/FlexiUI.git synced 2025-09-08 11:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add default properties in Dialog

Browse Source
This commit is contained in:
fankesyooni
2024-01-16 17:43:51 +08:00
parent b921cbaf8b
commit 8d8fc14356
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/window/Dialog.kt
View File

@@ -120,7 +120,7 @@ data class FlexiDialogStyle(
* @param colors the colors of dialog, default is [FlexiDialogDefaults.colors]. * @param colors the colors of dialog, default is [FlexiDialogDefaults.colors].
* @param style the style of dialog, default is [FlexiDialogDefaults.style]. * @param style the style of dialog, default is [FlexiDialogDefaults.style].
* @param contentAlignment the alignment of dialog content, default is [Alignment.TopStart]. * @param contentAlignment the alignment of dialog content, default is [Alignment.TopStart].
* @param properties the properties of dialog, default is [DefaultDialogProperties]. * @param properties the properties of dialog, default is [FlexiDialogDefaults.properties].
* @param title the title of the [FlexiDialog], should typically be [Icon] or [Text]. * @param title the title of the [FlexiDialog], should typically be [Icon] or [Text].
* @param content the content of the [FlexiDialog]. * @param content the content of the [FlexiDialog].
* @param confirmButton the confirm button of the [FlexiDialog], should typically be [Button]. * @param confirmButton the confirm button of the [FlexiDialog], should typically be [Button].
@@ -136,7 +136,7 @@ fun FlexiDialog(
colors: FlexiDialogColors = FlexiDialogDefaults.colors(), colors: FlexiDialogColors = FlexiDialogDefaults.colors(),
style: FlexiDialogStyle = FlexiDialogDefaults.style(), style: FlexiDialogStyle = FlexiDialogDefaults.style(),
contentAlignment: Alignment = Alignment.TopStart, contentAlignment: Alignment = Alignment.TopStart,
properties: DialogPropertiesWrapper = DefaultDialogProperties, properties: DialogPropertiesWrapper = FlexiDialogDefaults.properties(),
title: (@Composable RowScope.() -> Unit)? = null, title: (@Composable RowScope.() -> Unit)? = null,
content: @Composable () -> Unit, content: @Composable () -> Unit,
confirmButton: @Composable (() -> Unit)? = null, confirmButton: @Composable (() -> Unit)? = null,
@@ -173,7 +173,7 @@ fun FlexiDialog(
* @param colors the colors of dialog, default is [FlexiDialogDefaults.colors]. * @param colors the colors of dialog, default is [FlexiDialogDefaults.colors].
* @param style the style of dialog, default is [FlexiDialogDefaults.style]. * @param style the style of dialog, default is [FlexiDialogDefaults.style].
* @param contentAlignment the alignment of dialog content, default is [Alignment.TopStart]. * @param contentAlignment the alignment of dialog content, default is [Alignment.TopStart].
* @param properties the properties of dialog, default is [DefaultDialogProperties]. * @param properties the properties of dialog, default is [FlexiDialogDefaults.properties].
* @param title the title of the [FlexiDialog], should typically be [Icon] or [Text]. * @param title the title of the [FlexiDialog], should typically be [Icon] or [Text].
* @param content the content of the [FlexiDialog]. * @param content the content of the [FlexiDialog].
* @param confirmButton the confirm button of the [FlexiDialog], should typically be [Button]. * @param confirmButton the confirm button of the [FlexiDialog], should typically be [Button].
@@ -191,7 +191,7 @@ fun FlexiDialog(
colors: FlexiDialogColors = FlexiDialogDefaults.colors(), colors: FlexiDialogColors = FlexiDialogDefaults.colors(),
style: FlexiDialogStyle = FlexiDialogDefaults.style(), style: FlexiDialogStyle = FlexiDialogDefaults.style(),
contentAlignment: Alignment = Alignment.TopStart, contentAlignment: Alignment = Alignment.TopStart,
properties: DialogPropertiesWrapper = DefaultDialogProperties, properties: DialogPropertiesWrapper = FlexiDialogDefaults.properties(),
title: (@Composable RowScope.() -> Unit)? = null, title: (@Composable RowScope.() -> Unit)? = null,
content: @Composable () -> Unit, content: @Composable () -> Unit,
confirmButton: @Composable (() -> Unit)? = null, confirmButton: @Composable (() -> Unit)? = null,
@@ -343,6 +343,26 @@ private fun BasicFlexiDialog(
*/ */
object FlexiDialogDefaults { object FlexiDialogDefaults {
/**
* Creates a [DialogPropertiesWrapper] with the default values.
* @see DialogPropertiesWrapper
* @return [DialogPropertiesWrapper]
*/
@Stable
fun properties(
dismissOnClickOutside: Boolean = true,
dismissOnBackPress: Boolean = true,
usePlatformDefaultWidth: Boolean = false,
usePlatformInsets: Boolean = true,
scrimColor: Color = DefaultScrimColor
) = DialogPropertiesWrapper(
dismissOnClickOutside = dismissOnClickOutside,
dismissOnBackPress = dismissOnBackPress,
usePlatformDefaultWidth = usePlatformDefaultWidth,
usePlatformInsets = usePlatformInsets,
scrimColor = scrimColor
)
/** /**
* Creates a [FlexiDialogColors] with the default values. * Creates a [FlexiDialogColors] with the default values.
* @param backgroundColor the background color. * @param backgroundColor the background color.
@@ -439,7 +459,6 @@ private const val AnimationMinmumScale = 0.8f
private const val DefaultScrimOpacity = 0.35f private const val DefaultScrimOpacity = 0.35f
private val DefaultScrimColor = Color.Black.copy(alpha = DefaultScrimOpacity) private val DefaultScrimColor = Color.Black.copy(alpha = DefaultScrimOpacity)
private val DefaultDialogProperties = DialogPropertiesWrapper(usePlatformDefaultWidth = false, scrimColor = DefaultScrimColor)
/** /**
* The scrim animation effect of Flexi UI dialog is still in experimental function, * The scrim animation effect of Flexi UI dialog is still in experimental function,