@momo-kits/native-kits 0.165.2-beta.2-debug → 0.167.1-beta.3

package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputPhoneNumber.kt

@@ -1,223 +0,0 @@
-package vn.momo.kits.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.*
-import vn.momo.kits.const.getFontFamily
-import vn.momo.kits.modifier.conditional
-import vn.momo.kits.modifier.setAutomationId
-
-data class InputPhoneNumberSizeDetail(
-    val borderWidth: Dp,
-    val borderRadius: Dp,
-    val height: Dp,
-    val textStyle: TextStyle,
-    val dividerHeight: Dp,
-)
-
-enum class InputPhoneNumberSize(val values: InputPhoneNumberSizeDetail) {
-    SMALL(
-        InputPhoneNumberSizeDetail(
-            borderWidth = 1.dp,
-            borderRadius = Radius.S,
-            height = 48.dp,
-            textStyle = Typography.headerSSemibold,
-            dividerHeight = 24.dp
-        )
-    ),
-    LARGE(
-        InputPhoneNumberSizeDetail(
-            borderWidth = 1.dp,
-            borderRadius = Radius.S,
-            height = 56.dp,
-            textStyle = Typography.headerMBold,
-            dividerHeight = 32.dp
-        )
-    )
-}
-
-@Composable
-private fun getBorderColor(isFocused: Boolean, error: String): Color {
-    val theme = AppTheme.current
-    return remember(isFocused, error, theme) {
-        when {
-            error.isNotEmpty() -> theme.colors.error.primary
-            isFocused -> theme.colors.primary
-            else -> theme.colors.border.default
-        }
-    }
-}
-
-@Composable
-fun InputPhoneNumber(
-    text: MutableState<String> = remember { mutableStateOf("") },
-    placeholder: String = "0123456789",
-    size: InputPhoneNumberSize = InputPhoneNumberSize.SMALL,
-    onChangeText: (String) -> Unit = {},
-    hintText: String = "",
-    error: String = "",
-    errorSpacing: Boolean = false,
-    icon: String = "",
-    iconColor: Color = AppTheme.current.colors.text.default,
-    onRightIconPressed: () -> Unit = {},
-    onFocus: () -> Unit = {},
-    onBlur: () -> Unit = {},
-    loading: Boolean = false,
-    modifier: Modifier = Modifier,
-    inputModifier: Modifier = Modifier,
-) {
-    // Consolidated state management
-    var inputState by remember { mutableStateOf(InputState()) }
-
-    // Memoized color calculations
-    val theme = AppTheme.current
-    val colors = remember( theme) {
-            Triple(
-                theme.colors.text.default,      // textColor
-                theme.colors.text.hint,         // placeholderColor
-                iconColor                       // iconTintColor
-            )
-    }
-
-    val (textColor, placeholderColor, iconTintColor) = colors
-    val baseTextStyle = size.values.textStyle
-    val textStyle = scaleSize(
-        baseTextStyle.copy(
-            color = textColor,
-            fontFamily = getFontFamily(AppTheme.current.font, baseTextStyle.fontWeight)
-        )
-    )
-
-
-    Column(modifier = modifier
-        .conditional(IsShowBaseLineDebug) {
-            border(1.dp, Colors.blue_03)
-        }) {
-        BasicTextField(
-            singleLine = true,
-            value = text.value,
-            textStyle = textStyle,
-            keyboardOptions = KeyboardOptions.Default.copy(keyboardType = KeyboardType.Number),
-            cursorBrush = SolidColor(AppTheme.current.colors.primary),
-            modifier = inputModifier
-                .height(scaleSize(size.values.height.value).dp)
-                .onFocusChanged { focusState ->
-                    val wasFocused = inputState.isFocused
-                    inputState = inputState.copy(
-                        isFocused = focusState.isFocused,
-                        hasBeenBlurred = inputState.hasBeenBlurred || wasFocused
-                    )
-
-                    if (focusState.isFocused) {
-                        onFocus()
-                    } else if (inputState.hasBeenBlurred) {
-                        onBlur()
-                    }
-                },
-            onValueChange = onChangeText,
-            decorationBox = { innerTextField ->
-                // Input container
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .background(
-                            color = AppTheme.current.colors.background.surface,
-                            shape = RoundedCornerShape(size.values.borderRadius)
-                        )
-                        .border(
-                            if(inputState.isFocused) 1.5.dp else 1.dp,
-                            getBorderColor(inputState.isFocused, error),
-                            RoundedCornerShape(size.values.borderRadius)
-                        ),
-                    contentAlignment = Alignment.CenterStart
-                ) {
-                    Row(
-                        modifier = Modifier.padding(horizontal = Spacing.M),
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-                        // Leading icon
-                        Image(
-                            source = "https://static.momocdn.net/app/img/icon/ic-qrcode-package/ic_vn_flag.png",
-                            modifier = Modifier.size(24.dp).padding(end = Spacing.XS),
-                            options = Options(
-                                contentScale = ContentScale.Fit,
-                                alignment = Alignment.Center
-                            )
-                        )
-                        Text(
-                            "+84",
-                            color = textColor,
-                            style = size.values.textStyle.copy(color = textColor),
-                        )
-
-                        // Divider
-                        Box(modifier = Modifier.padding(horizontal = Spacing.M)) {
-                            Box(
-                                modifier = Modifier.width(1.dp)
-                                    .height(size.values.dividerHeight)
-                                    .background(Colors.black_04)
-                            )
-                        }
-
-
-                        Box(Modifier.weight(1f)) {
-                            if (text.value.isEmpty()) {
-                                Text(
-                                    text = placeholder,
-                                    style = size.values.textStyle.copy(color = placeholderColor),
-                                    color = placeholderColor,
-                                    modifier = Modifier.align(Alignment.CenterStart)
-                                )
-                            }
-                            innerTextField()
-                        }
-
-                        // Clear button
-                        if (inputState.isFocused && text.value.isNotEmpty()) {
-                            Row {
-                                Icon(
-                                    source = "24_navigation_close_circle_full",
-                                    size = 16.dp,
-                                    color = theme.colors.text.hint,
-                                    modifier = Modifier.clickable(
-                                        onClick = {
-                                            text.value = ""
-                                            onChangeText.invoke("")
-                                        },
-                                        interactionSource = remember { MutableInteractionSource() },
-                                        indication = null
-                                    )
-                                        .padding(horizontal = Spacing.S)
-                                        .setAutomationId("ic_clear")
-                                )
-                            }
-                        }
-
-                        // Right icon (password toggle or custom icon)
-                        RenderRightIcon(loading, icon, iconTintColor, onRightIconPressed)
-                    }
-                }
-            },
-        )
-        // Error/hint display
-        ErrorView(error, errorSpacing, hintText)
-    }
-}

package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputSearch.kt

@@ -1,264 +0,0 @@
-package vn.momo.kits.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.takeOrElse
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Colors
-import vn.momo.kits.const.Radius
-import vn.momo.kits.const.Spacing
-import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.Typography
-import vn.momo.kits.const.getFontFamily
-import vn.momo.kits.const.scaleSize
-import vn.momo.kits.modifier.conditional
-import vn.momo.kits.utils.ifTrue
-
-@Composable
-internal fun RenderRightIconSearch(
-    loading: Boolean,
-    icon: String,
-    color: Color?,
-    onClick: () -> Unit,
-    iconModifier: Modifier = Modifier
-) {
-    if (loading) {
-        Box(Modifier.padding(horizontal = Spacing.S)) {
-            CircularProgressIndicator(
-                modifier = Modifier.size(16.dp),
-                color = color ?: AppTheme.current.colors.text.default,
-                trackColor = Color.Transparent,
-                strokeWidth = 2.dp
-            )
-        }
-    }
-    if (icon.isNotEmpty()) {
-        Spacer(
-            Modifier.padding(start = Spacing.S, top = Spacing.S, bottom = Spacing.S).width(1.dp).fillMaxHeight()
-                .background(AppTheme.current.colors.primary)
-        )
-        Icon(
-            source = icon,
-            color = color,
-            size = 24.dp,
-            modifier = iconModifier.padding(start = Spacing.S, end = 0.dp).clickable(
-                onClick = onClick,
-                interactionSource = remember { MutableInteractionSource() },
-                indication = null
-            )
-        )
-    }
-}
-
-data class InputSearchProps(
-    val text: MutableState<String>,
-    val buttonText: String = "",
-    val showButtonText: Boolean = false,
-    val placeholder: String = "",
-    val onChangeText: (String) -> Unit = {},
-    val onPressButtonText: () -> Unit = {},
-    val disabled: Boolean = false,
-    val icon: String = "",
-    val iconColor: Color? = Color.Unspecified,
-    val onRightIconPressed: () -> Unit = {},
-    val onFocus: () -> Unit = {},
-    val onBlur: () -> Unit = {},
-    val loading: Boolean = false,
-    val fontWeight: InputFontWeight = InputFontWeight.REGULAR,
-    val keyboardType: KeyboardType = KeyboardType.Text,
-    val backgroundColor: Color = Colors.black_01,
-    val clearCondition: (() -> Boolean)? = null,
-    val keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
-    val keyboardActions: KeyboardActions = KeyboardActions.Default,
-    val modifier: Modifier = Modifier,
-    val iconModifier: Modifier = Modifier,
-    val onClearPress: () -> Unit = {},
-    val leftPosition: Dp? = null,
-    val placeholderCustomRender: (@Composable () -> Unit)? = null,
-    val searchIcon: (@Composable () -> Unit)? = null
-)
-
-@Composable
-fun InputSearch(
-    inputSearchProps: InputSearchProps = InputSearchProps(
-        text = remember { mutableStateOf("") },
-    ),
-) {
-    var isFocused by remember { mutableStateOf(false) }
-    var isBlurred = false
-    val disabledColor = AppTheme.current.colors.text.disable
-    var textColor = AppTheme.current.colors.text.default
-    var placeholderColor = AppTheme.current.colors.text.hint
-    var iconTintColor = inputSearchProps.iconColor?.takeOrElse { AppTheme.current.colors.text.default }
-
-    if (inputSearchProps.disabled) {
-        textColor = disabledColor
-        placeholderColor = disabledColor
-        iconTintColor = disabledColor
-    }
-    val fontSize = 14.sp
-    val scaleFontSize = scaleSize(fontSize)
-
-    val fontFamily = getFontFamily(AppTheme.current.font, inputSearchProps.fontWeight.value)
-
-    val textStyle = remember(textColor, inputSearchProps.fontWeight.value, fontFamily) {
-        TextStyle(
-            color = textColor,
-            fontSize = scaleFontSize,
-            fontWeight = inputSearchProps.fontWeight.value,
-            fontFamily = fontFamily
-        )
-    }
-
-    val placeHolderStyle = remember(textColor, inputSearchProps.fontWeight.value, fontFamily) {
-        TextStyle(
-            color = textColor,
-            fontSize = fontSize,
-            fontWeight = inputSearchProps.fontWeight.value,
-            fontFamily = fontFamily
-        )
-    }
-
-    Row(
-        verticalAlignment = Alignment.CenterVertically, modifier = Modifier
-            .fillMaxWidth()
-            .height(36.dp)
-            .conditional(IsShowBaseLineDebug) {
-                border(1.dp, Colors.blue_03)
-            }
-    ) {
-        BasicTextField(
-            enabled = !inputSearchProps.disabled,
-            singleLine = true,
-            value = inputSearchProps.text.value,
-            textStyle = textStyle,
-            keyboardOptions = inputSearchProps.keyboardOptions.copy(keyboardType = inputSearchProps.keyboardType),
-            keyboardActions = inputSearchProps.keyboardActions,
-            modifier = inputSearchProps.modifier.weight(1f).fillMaxHeight().onFocusChanged {
-                isFocused = it.isFocused
-                if (it.isFocused) {
-                    inputSearchProps.onFocus()
-                }
-                if (!it.isFocused && isBlurred) inputSearchProps.onBlur()
-                if (it.isFocused && !isBlurred) isBlurred = true
-            },
-            onValueChange = inputSearchProps.onChangeText,
-            decorationBox = { innerTextField ->
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Row(
-                        modifier = Modifier.weight(
-                            inputSearchProps.showButtonText.ifTrue(
-                                8f,
-                                1f
-                            )
-                        ).fillMaxHeight()
-                            .background(
-                                inputSearchProps.backgroundColor,
-                                RoundedCornerShape(Radius.XL)
-                            ),
-                        horizontalArrangement = Arrangement.Start,
-                        verticalAlignment = Alignment.CenterVertically
-                    ) {
-
-                        Row(
-                            modifier = Modifier.padding(
-                                horizontal = Spacing.M
-                            ),
-                            verticalAlignment = Alignment.CenterVertically
-                        ) {
-                            inputSearchProps.searchIcon?.invoke() ?: Icon(
-                                source = "navigation_search",
-                                modifier = Modifier.padding(end = Spacing.XS),
-                                size = 24.dp,
-                                color = AppTheme.current.colors.text.hint
-                            )
-                            Box(Modifier.weight(1f)) {
-                                if (inputSearchProps.text.value.isEmpty()) {
-                                    inputSearchProps.placeholderCustomRender?.invoke()
-                                        ?: Text(
-                                            text = inputSearchProps.placeholder,
-                                            style = placeHolderStyle,
-                                            maxLines = 1,
-                                            color = placeholderColor,
-                                            overflow = TextOverflow.Ellipsis
-                                        )
-                                }
-                                innerTextField()
-                            }
-                            if (inputSearchProps.clearCondition?.invoke() == true || (isFocused && inputSearchProps.text.value.isNotEmpty())) {
-                                Row {
-                                    Spacer(Modifier.width(Spacing.XS))
-                                    Icon(
-                                        source = "24_navigation_close_circle_full",
-                                        size = 16.dp,
-                                        color = AppTheme.current.colors.text.hint,
-                                        modifier = Modifier.clickable(
-                                            onClick = {
-                                                inputSearchProps.text.value = ""
-                                                inputSearchProps.onClearPress.invoke()
-                                            },
-                                            interactionSource = remember { MutableInteractionSource() },
-                                            indication = null
-                                        )
-                                    )
-                                }
-                            }
-                            RenderRightIconSearch(
-                                inputSearchProps.loading,
-                                inputSearchProps.icon,
-                                iconTintColor,
-                                inputSearchProps.onRightIconPressed,
-                                iconModifier = inputSearchProps.iconModifier
-                            )
-                        }
-                    }
-                }
-            },
-        )
-        if (inputSearchProps.showButtonText) {
-            Text(
-                text = inputSearchProps.buttonText,
-                style = Typography.actionDefaultBold,
-                color = AppTheme.current.colors.text.default,
-                modifier = Modifier.padding(start = Spacing.L).clickable(
-                    interactionSource = remember { MutableInteractionSource() },
-                    indication = null,
-                    onClick = inputSearchProps.onPressButtonText
-                )
-            )
-        }
-    }
-}

package/compose/src/commonMain/kotlin/vn/momo/kits/components/InputTextArea.kt

@@ -1,185 +0,0 @@
-package vn.momo.kits.components
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.zIndex
-import vn.momo.kits.application.IsShowBaseLineDebug
-import vn.momo.kits.const.*
-import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.getFontFamily
-import vn.momo.kits.modifier.InternalApi
-import vn.momo.kits.modifier.conditional
-
-@InternalApi
-const val MAX_LENGTH = 300
-internal val DEFAULT_HEIGHT = 104.dp
-
-@Composable
-fun InputTextArea(
-    text: MutableState<String> = remember { mutableStateOf("") },
-    maxLength: Int = MAX_LENGTH,
-    height: Dp = DEFAULT_HEIGHT,
-    floatingValue: String = "",
-    floatingValueColor: Color = AppTheme.current.colors.text.hint,
-    floatingIcon: String = "",
-    floatingIconColor: Color = AppTheme.current.colors.text.default,
-    placeholder: String = "",
-    size: InputSize = InputSize.SMALL,
-    onChangeText: (String) -> Unit = {},
-    error: String = "",
-    errorSpacing: Boolean = false,
-    disabled: Boolean = false,
-    icon: String = "",
-    iconColor: Color = AppTheme.current.colors.text.default,
-    onRightIconPressed: () -> Unit = {},
-    onFocus: () -> Unit = {},
-    onBlur: () -> Unit = {},
-    loading: Boolean = false,
-    required: Boolean = false,
-    fontWeight: InputFontWeight = InputFontWeight.REGULAR,
-    keyboardType: KeyboardType = KeyboardType.Text,
-) {
-    var isFocused by remember { mutableStateOf(false) }
-    var isBlurred = false
-    val (textColor, placeholderColor, iconTintColor, floatingTitleColor, floatingIconTintColor) =
-        getInputColors(disabled, iconColor, floatingValueColor, floatingIconColor)
-
-    val fontSize = 16.sp
-    val lineHeight = 24.sp
-    val scaleFontSize = scaleSize(16.sp)
-    val scaleLineHeight = scaleSize(24.sp)
-    val scaleHeight = scaleSize(height)
-
-    Column(modifier = Modifier.conditional(IsShowBaseLineDebug) {
-        border(1.dp, Colors.blue_03)
-    }) {
-        BasicTextField(
-            enabled = !disabled,
-            singleLine = false,
-            value = text.value,
-            textStyle = TextStyle(
-                color = textColor,
-                fontSize = scaleFontSize,
-                lineHeight = scaleLineHeight,
-                fontWeight = fontWeight.value,
-                fontFamily = getFontFamily(AppTheme.current.font, fontWeight.value)
-            ),
-            keyboardOptions = KeyboardOptions.Default.copy(keyboardType = keyboardType),
-            modifier = Modifier.height(scaleHeight).onFocusChanged {
-                isFocused = it.isFocused
-                if (it.isFocused) {
-                    onFocus()
-                }
-                if (!it.isFocused && isBlurred) onBlur()
-                if (it.isFocused && !isBlurred) isBlurred = true
-            },
-            onValueChange = {
-                if (it.length <= maxLength) {
-                    onChangeText(it)
-                }
-            },
-            decorationBox = { innerTextField ->
-                // Floating Icon
-                FloatingLabel(
-                    floatingValue = floatingValue,
-                    floatingIcon = floatingIcon,
-                    titleColor = floatingTitleColor,
-                    iconColor = floatingIconTintColor,
-                    offsetY = -scaleHeight / 2,
-                    required = required,
-                )
-                //input box wrapper
-                Box(
-                    modifier = Modifier.fillMaxWidth()
-                        .background(
-                            AppTheme.current.colors.background.surface,
-                            RoundedCornerShape(size.values.borderRadius)
-                        )
-                        .border(
-                            1.dp,
-                            getBorderColor(isFocused, error, disabled),
-                            RoundedCornerShape(size.values.borderRadius)
-                        ),
-                    contentAlignment = Alignment.TopStart
-                ) {
-                    Column {
-                        Row(
-                            modifier = Modifier.weight(1f).padding(
-                                start = Spacing.M,
-                                end = Spacing.M,
-                                top = Spacing.M
-                            ),
-                            verticalAlignment = Alignment.Top
-                        ) {
-                            Box(Modifier.weight(1f)) {
-                                if (text.value.isEmpty()) {
-                                    Text(
-                                        text = placeholder,
-                                        style = TextStyle(
-                                            fontSize = fontSize,
-                                            lineHeight = lineHeight,
-                                            fontWeight = fontWeight.value
-                                        ),
-                                        color = placeholderColor
-                                    )
-                                }
-                                innerTextField()
-                            }
-                            if (isFocused && text.value.isNotEmpty()) {
-                                Row {
-                                    Spacer(Modifier.width(Spacing.XS))
-                                    Icon(
-                                        source = "24_navigation_close_circle_full",
-                                        size = 16.dp,
-                                        color = AppTheme.current.colors.text.hint,
-                                        modifier = Modifier.clickable(
-                                            onClick = {
-                                                text.value = ""
-                                                onChangeText.invoke("")
-                                            },
-                                            interactionSource = remember { MutableInteractionSource() },
-                                            indication = null
-                                        )
-                                    )
-                                }
-                            }
-                            RenderRightIcon(loading, icon, iconTintColor, onRightIconPressed)
-                        }
-
-                        Box(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(end = Spacing.M),
-                            contentAlignment = Alignment.CenterEnd
-                        ) {
-                            Text(
-                                "${text.value.length}/$maxLength",
-                                style = Typography.descriptionXsRegular,
-                                color = AppTheme.current.colors.text.hint
-                            )
-                        }
-                        Spacer(Modifier.height(Spacing.M))
-                    }
-                }
-            },
-        )
-        // show error
-        ErrorView(error, errorSpacing, "")
-    }
-}