diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/FloatingButtonOverlay.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/FloatingButtonOverlay.kt index 8916cffedf..58757132e3 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/FloatingButtonOverlay.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/FloatingButtonOverlay.kt @@ -29,6 +29,7 @@ import com.navi.base.model.CtaData import com.navi.naviwidgets.callbacks.WidgetCallback import com.navi.naviwidgets.models.response.FloatingButtonData import com.navi.uitron.utils.EMPTY +import com.navi.uitron.utils.setBorderStroke @Composable fun FloatingButtonOverlay( @@ -75,12 +76,14 @@ fun FloatingButtonOverlay( top = animatedMargins[1], end = animatedMargins[2], bottom = animatedMargins[3] - ), + ) + .setBorderStroke(data.border) + .getBackground(data.background), contentAlignment = Alignment.TopStart ) { Row( modifier = - Modifier.padding(start = 2.dp, top = 4.dp) + Modifier.padding(end = 2.dp, bottom = 3.dp) .wrapContentSize() .getBackground(data.buttonData?.backgroundData) .clickable( @@ -92,7 +95,7 @@ fun FloatingButtonOverlay( } } ) - .padding(8.dp), + .padding(6.dp), verticalAlignment = Alignment.CenterVertically ) { data.buttonData?.fabIcon?.let { diff --git a/android/navi-widgets/src/main/java/com/navi/naviwidgets/models/response/FloatingButtonData.kt b/android/navi-widgets/src/main/java/com/navi/naviwidgets/models/response/FloatingButtonData.kt index fa5bbb1f54..fe9fecee50 100644 --- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/models/response/FloatingButtonData.kt +++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/models/response/FloatingButtonData.kt @@ -13,6 +13,7 @@ import com.navi.base.model.CtaData import com.navi.design.utils.BackgroundDrawableData import com.navi.naviwidgets.models.LottieFieldData import com.navi.naviwidgets.models.WidgetLayoutParams +import com.navi.uitron.model.ui.BorderStrokeData data class FloatingButtonData( @SerializedName("alignment") val alignment: String? = null, @@ -20,6 +21,8 @@ data class FloatingButtonData( @SerializedName("updatedWidgetLayoutParams") val updatedWidgetLayoutParams: WidgetLayoutParams? = null, @SerializedName("buttonData") val buttonData: ActionButtonData? = null, + @SerializedName("border") val border: BorderStrokeData? = null, + @SerializedName("background") val background: BackgroundDrawableData? = null, @SerializedName("cta") val cta: CtaData? = null, @SerializedName("metaData") val metaData: PageMetaData? = null )