TP-83804 | compose bom (#561)

2024-09-26 15:49:32 +05:30
parent 8bd6ded5fc
commit ef81c8ee99
11 changed files with 49 additions and 70 deletions
--- a/app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/ui/SearchAndFilterToolBar.kt
+++ b/app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/ui/SearchAndFilterToolBar.kt
@@ -26,7 +26,6 @@ import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
@@ -48,7 +47,6 @@ import com.navi.uitron.demo.theme.GrayE3E5E5
 import com.navi.uitron.demo.theme.WhiteF5F5F5
 import com.navi.uitron.demo.theme.fontFamily

-@OptIn(ExperimentalComposeUiApi::class)
@Composable
 fun Toolbar(viewModel: DazzleViewModel) {

@@ -83,7 +81,8 @@ fun Toolbar(viewModel: DazzleViewModel) {
                    fontFamily = fontFamily,
                    fontWeight = FontWeight(400)
                ),
-            keyboardOptions = KeyboardOptions(autoCorrect = false, imeAction = ImeAction.Search),
+            keyboardOptions =
+                KeyboardOptions(autoCorrectEnabled = false, imeAction = ImeAction.Search),
            keyboardActions =
                KeyboardActions(
                    onSearch = {
--- a/app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/ui/WidgetItemView.kt
+++ b/app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/ui/WidgetItemView.kt
@@ -23,7 +23,6 @@ import androidx.compose.material.Divider
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
@@ -46,7 +45,6 @@ import com.navi.uitron.demo.theme.Purple1F002A
 import com.navi.uitron.demo.theme.fontFamily
 import com.navi.uitron.render.UiTronRenderer

-@OptIn(ExperimentalComposeUiApi::class)
@Composable
 fun WidgetItemView(widgetTemplate: WidgetTemplate?, viewModel: DazzleViewModel) {

--- a/app/src/main/java/com/navi/uitron/demo/designsystem/ui/DesignSystemRepoScreen.kt
+++ b/app/src/main/java/com/navi/uitron/demo/designsystem/ui/DesignSystemRepoScreen.kt
@@ -16,7 +16,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ClipboardManager
@@ -73,7 +72,6 @@ fun DesignSystemRepoScreen(
    }
 }

-@OptIn(ExperimentalComposeUiApi::class)
@Composable
 fun SearchField(modifier: Modifier, viewModel: DesignSystemVM) {
    val keyboardController = LocalSoftwareKeyboardController.current
@@ -115,7 +113,8 @@ fun SearchField(modifier: Modifier, viewModel: DesignSystemVM) {
                    fontFamily = fontFamily,
                    fontWeight = FontWeight.SemiBold
                ),
-            keyboardOptions = KeyboardOptions(autoCorrect = false, imeAction = ImeAction.Search),
+            keyboardOptions =
+                KeyboardOptions(autoCorrectEnabled = false, imeAction = ImeAction.Search),
            keyboardActions =
                KeyboardActions(
                    onSearch = {
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ androidx-test-espresso = "3.5.1"
 androidx-test-junit = "1.1.5"
 androidx-uiautomator = "2.2.0"
 coil = "2.5.0"
-compose-bom = "2024.02.02"
+compose-bom = "2024.09.02"
 compose-lib = "1.5.14"
 gson = "2.11.0"
 firebase-bom = "33.2.0"
--- a/navi-uitron/src/main/java/com/navi/uitron/render/CustomTextFieldRenderer.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/render/CustomTextFieldRenderer.kt
@@ -30,7 +30,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.focus.FocusRequester
@@ -105,7 +104,6 @@ class CustomTextFieldRenderer(private val uiTronRenderer: UiTronRenderer) :
    private val colorPurple = "#1F002A"
    private val alpha = 0.4f

-    @OptIn(ExperimentalComposeUiApi::class)
    @Composable
    override fun Render(
        property: CustomTextFieldProperty,
--- a/navi-uitron/src/main/java/com/navi/uitron/render/ImageRenderer.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/render/ImageRenderer.kt
@@ -23,7 +23,6 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
-import androidx.constraintlayout.compose.layoutId
 import coil.compose.AsyncImage
 import coil.compose.AsyncImagePainter
 import coil.request.ImageRequest
--- a/navi-uitron/src/main/java/com/navi/uitron/render/MultiSectionTextFieldRenderer.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/render/MultiSectionTextFieldRenderer.kt
@@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.runtime.*
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.focus.FocusRequester
@@ -70,9 +69,8 @@ import com.navi.uitron.utils.splitStringIntoUnequalParts
 import com.navi.uitron.utils.transformInput
 import com.navi.uitron.viewmodel.UiTronViewModel

-class MultiSectionTextFieldRenderer() : Renderer<MultiSectionTextFieldProperty> {
+class MultiSectionTextFieldRenderer : Renderer<MultiSectionTextFieldProperty> {

-    @OptIn(ExperimentalComposeUiApi::class)
    @Composable
    override fun Render(
        property: MultiSectionTextFieldProperty,
--- a/navi-uitron/src/main/java/com/navi/uitron/render/OtpBoxRenderer.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/render/OtpBoxRenderer.kt
@@ -25,7 +25,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.focus.FocusRequester
@@ -323,7 +322,6 @@ class OtpBoxRenderer : Renderer<OtpBoxProperty> {
        }
    }

-    @OptIn(ExperimentalComposeUiApi::class)
    @Composable
    fun InputView(
        inputValue: TextFieldValue,
@@ -345,7 +343,7 @@ class OtpBoxRenderer : Renderer<OtpBoxProperty> {
                            BorderStroke(
                                width =
                                    property.otpBoxRowProperty?.borderStrokeData?.width?.dp ?: 0.dp,
-                                color = borderColor?.hexToComposeColor ?: Color.Transparent
+                                color = borderColor?.hexToComposeColor ?: Transparent
                            ),
                        shape = ShapeUtil.getShape(property.otpBoxRowProperty?.shape)
                    ),
@@ -429,7 +427,7 @@ class OtpBoxRenderer : Renderer<OtpBoxProperty> {
                        singleLine = true,
                        enabled = property.isEnabled ?: true,
                        cursorBrush =
-                            SolidColor(property.cursorColor?.hexToComposeColor ?: Color.Transparent)
+                            SolidColor(property.cursorColor?.hexToComposeColor ?: Transparent)
                    )
                }
            }
--- a/navi-uitron/src/main/java/com/navi/uitron/render/OutlinedTextFieldRenderer.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/render/OutlinedTextFieldRenderer.kt
@@ -14,7 +14,6 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.OutlinedTextField
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.*
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.focus.onFocusChanged
@@ -59,7 +58,6 @@ class OutlinedTextFieldRenderer(
    private val uiTronRenderer: UiTronRenderer,
 ) : Renderer<OutlinedTextFieldProperty> {

-    @OptIn(ExperimentalComposeUiApi::class)
    @Composable
    override fun Render(
        property: OutlinedTextFieldProperty,
--- a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt
@@ -43,7 +43,7 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.ButtonElevation
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.material3.FloatingActionButtonDefaults
 import androidx.compose.material3.FloatingActionButtonElevation
 import androidx.compose.runtime.Composable
@@ -174,20 +174,20 @@ fun Modifier.setWidth(width: String?): Modifier =

 fun Modifier.setVerticalScroll(scrollData: ScrollData?): Modifier = composed {
    if (scrollData?.enabled == true) {
-        this.then(verticalScroll(state = rememberScrollState(), enabled = scrollData.enabled))
+        this.verticalScroll(state = rememberScrollState(), enabled = scrollData.enabled)
    } else this
 }

 fun Modifier.setHorizontalScroll(scrollData: ScrollData?): Modifier = composed {
    if (scrollData?.enabled == true) {
-        this.then(horizontalScroll(state = rememberScrollState(), enabled = scrollData.enabled))
+        this.horizontalScroll(state = rememberScrollState(), enabled = scrollData.enabled)
    } else this
 }

@SuppressLint("UnnecessaryComposedModifier")
 fun Modifier.setShimmerEffect(isShimmerEnabled: Boolean?): Modifier = composed {
    if (isShimmerEnabled == true) {
-        this.then(shimmer())
+        this.shimmer()
    } else this
 }

@@ -204,17 +204,15 @@ private fun Modifier.shimmer(): Modifier = composed {
            label = ""
        )

-    this.then(
-        background(
-                brush =
-                    Brush.linearGradient(
-                        colors = listOf(Color(0xFFF9F9FB), Color(0xFFE9E7F0), Color(0xFFF9F9FB)),
-                        start = Offset(startOffsetX, 0f),
-                        end = Offset(startOffsetX + size.width.toFloat(), size.height.toFloat())
-                    )
-            )
-            .onGloballyPositioned { size = it.size }
-    )
+    this.background(
+            brush =
+                Brush.linearGradient(
+                    colors = listOf(Color(0xFFF9F9FB), Color(0xFFE9E7F0), Color(0xFFF9F9FB)),
+                    start = Offset(startOffsetX, 0f),
+                    end = Offset(startOffsetX + size.width.toFloat(), size.height.toFloat())
+                )
+        )
+        .onGloballyPositioned { size = it.size }
 }

 fun ConstrainedLayoutReference.getHorizontalReference(
@@ -388,7 +386,7 @@ fun getInteractionType(interaction: UiTronInteraction?): Indication? {
    return when (interaction?.interactionType) {
        InteractionType.NONE -> null
        InteractionType.RIPPLE ->
-            rememberRipple(color = interaction.color?.hexToComposeColor ?: Color.Unspecified)
+            ripple(color = interaction.color?.hexToComposeColor ?: Color.Unspecified)
        else -> null
    }
 }
@@ -446,7 +444,7 @@ fun transformInput(
 }

 fun Modifier.clip(uiTronShape: UiTronShape?): Modifier = composed {
-    uiTronShape?.let { this.then(clip(shape = ShapeUtil.getShape(shape = uiTronShape))) } ?: this
+    uiTronShape?.let { this.clip(shape = ShapeUtil.getShape(shape = uiTronShape)) } ?: this
 }

 fun Modifier.setBackground(
@@ -455,28 +453,26 @@ fun Modifier.setBackground(
    brushData: BrushData?,
    animatedProperties: AnimatedProperties? = null
 ): Modifier = composed {
-    this.then(
-        if (brushData != null) {
-            background(
-                brush =
-                    UiTronBrush(brushData = brushData, animatedProperties = animatedProperties)
-                        .getBrush(),
-                shape = ShapeUtil.getShape(shape = uiTronShape)
-            )
-        } else if (backgroundColor.isNotNull()) {
-            background(
-                color =
-                    when (backgroundColor) {
-                        is String -> backgroundColor.hexToComposeColor
-                        is Color -> animatedProperties?.backgroundColor?.value ?: backgroundColor
-                        else -> Color.Transparent
-                    },
-                shape = ShapeUtil.getShape(shape = uiTronShape)
-            )
-        } else {
-            this
-        }
-    )
+    if (brushData != null) {
+        background(
+            brush =
+                UiTronBrush(brushData = brushData, animatedProperties = animatedProperties)
+                    .getBrush(),
+            shape = ShapeUtil.getShape(shape = uiTronShape)
+        )
+    } else if (backgroundColor.isNotNull()) {
+        this.background(
+            color =
+                when (backgroundColor) {
+                    is String -> backgroundColor.hexToComposeColor
+                    is Color -> animatedProperties?.backgroundColor?.value ?: backgroundColor
+                    else -> Color.Transparent
+                },
+            shape = ShapeUtil.getShape(shape = uiTronShape)
+        )
+    } else {
+        this
+    }
 }

 fun getTileMode(tileMode: String?): TileMode {
@@ -809,12 +805,10 @@ fun Modifier.setBorderStroke(
    borderStrokeData: BorderStrokeData?,
    animatedProperties: AnimatedProperties? = null
 ): Modifier = composed {
-    this.then(
-        border(
-            width = borderStrokeData?.width?.dp ?: 0.dp,
-            brush = getBorderStrokeBrushData(borderStrokeData, animatedProperties),
-            shape = ShapeUtil.getShape(shape = borderStrokeData?.shape)
-        )
+    this.border(
+        width = borderStrokeData?.width?.dp ?: 0.dp,
+        brush = getBorderStrokeBrushData(borderStrokeData, animatedProperties),
+        shape = ShapeUtil.getShape(shape = borderStrokeData?.shape)
    )
 }

@@ -894,7 +888,7 @@ fun Modifier.setTag(property: BaseProperty): Modifier {
    return this.conditional(
        property.viewType.isNotNullAndNotEmpty() && property.layoutId.isNotNullAndNotEmpty()
    ) {
-        this.then(testTag(property.viewType + "_" + property.layoutId))
+        this.testTag(property.viewType + "_" + property.layoutId)
    }
 }

--- a/navi-uitron/src/main/java/com/navi/uitron/utils/KeyboardUtil.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/utils/KeyboardUtil.kt
@@ -8,7 +8,6 @@
 import android.content.Context
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.platform.SoftwareKeyboardController
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
@@ -57,10 +56,9 @@ object KeyboardUtil {
        }
    }

-    @OptIn(ExperimentalComposeUiApi::class)
    fun hideKeyboard(
        context: Context,
-        view: android.view.View,
+        view: View,
        keyBoardController: SoftwareKeyboardController?,
    ) {
        context.getSystemService<InputMethodManager>()?.hideSoftInputFromWindow(view.windowToken, 0)