diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/utils/ShareImageUtils.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/utils/ShareImageUtils.kt index 86da089d44..045cf814a0 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/utils/ShareImageUtils.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/common/utils/ShareImageUtils.kt @@ -14,15 +14,19 @@ import androidx.core.content.ContextCompat.getColor import com.navi.bbps.R import com.navi.bbps.databinding.LayoutBbpsShareTransactionDetailsBinding import com.navi.bbps.databinding.LayoutShareTransactionDetailsNewBinding +import com.navi.bbps.feature.billhistorydetail.model.view.TransactionStatus import com.navi.bbps.feature.transactiondetails.model.view.ReceiptDetailsEntity import com.navi.common.screenshot.ShareBitmapImage import com.navi.common.utils.createBitmapFromView import com.navi.design.font.FontWeightEnum +import com.navi.design.textview.model.NaviSpan +import com.navi.design.textview.model.TextWithStyle import com.navi.design.utils.CornerRadius import com.navi.design.utils.DrawableShape import com.navi.design.utils.dpToPx import com.navi.design.utils.dpToPxInInt import com.navi.design.utils.getNaviDrawable +import com.navi.design.utils.setSpannableString import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -168,17 +172,27 @@ class ShareImageUtils @Inject constructor() { ) toInfo.apply { - key.apply { - setText("To: ") - setFont(FontWeightEnum.TT_MEDIUM.name) - textSize = 16f - } - keySecond.apply { - setText(receiptDetailsEntity.billerName) - setFont(FontWeightEnum.TT_SEMI_BOLD.name) - visibility = View.VISIBLE - textSize = 16f - } + val data = + TextWithStyle( + text = "To: " + receiptDetailsEntity.billerName, + style = + listOf( + NaviSpan( + startSpan = 0, + endSpan = 3, + fontName = FontWeightEnum.TT_MEDIUM.name, + fontSize = 16.0, + spanColor = "#191919" + ), + NaviSpan( + startSpan = 4, + fontName = FontWeightEnum.TT_SEMI_BOLD.name, + fontSize = 16.0, + spanColor = "#191919" + ) + ) + ) + key.setSpannableString(data) value.apply { setText(receiptDetailsEntity.displayableCustomerParams) setColor(R.color.navi_pay_charcol_gray) @@ -231,6 +245,11 @@ class ShareImageUtils @Inject constructor() { } } + bbpsBAssuredLogo.visibility = + if (receiptDetailsEntity.billTransactionStatus is TransactionStatus.Success) + View.VISIBLE + else View.GONE + executePendingBindings() } } diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetailsv2/ui/BbpsTransactionDetailsScreenV2.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetailsv2/ui/BbpsTransactionDetailsScreenV2.kt index 559cdcf5b2..ec3db5eeb3 100644 --- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetailsv2/ui/BbpsTransactionDetailsScreenV2.kt +++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetailsv2/ui/BbpsTransactionDetailsScreenV2.kt @@ -87,6 +87,7 @@ import com.navi.bbps.feature.transactiondetailsv2.BbpsTransactionDetailsViewMode import com.navi.bbps.feature.transactiondetailsv2.model.view.PaymentStatusWidgetProperties import com.navi.bbps.feature.transactiondetailsv2.model.view.RefundStatusWidgetProperties import com.navi.bbps.feature.transactiondetailsv2.model.view.TransactionHistoryDetailItemPropertyV2 +import com.navi.bbps.noRippleClickableWithDebounce import com.navi.common.utils.CommonUtils.capitalizeMeridiem import com.navi.common.utils.clickableDebounce import com.navi.common.utils.copyToClipboard @@ -667,7 +668,7 @@ private fun RefundStatusCard( Row( modifier = Modifier.fillMaxWidth() - .clickableDebounce { + .noRippleClickableWithDebounce { if (refundStatusWidgetProperties.isCopyIconVisible) { onCopyIconClicked?.invoke(refundStatusWidgetProperties.textToCopy) } else if (refundStatusWidgetProperties.isContactUsVisible) { diff --git a/android/navi-bbps/src/main/res/layout/navi_bbps_title_subtitle_view.xml b/android/navi-bbps/src/main/res/layout/navi_bbps_title_subtitle_view.xml index 524e9fb3d3..6c822d4951 100644 --- a/android/navi-bbps/src/main/res/layout/navi_bbps_title_subtitle_view.xml +++ b/android/navi-bbps/src/main/res/layout/navi_bbps_title_subtitle_view.xml @@ -29,8 +29,9 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_24" + android:layout_marginEnd="@dimen/dp_16" android:fontFamily="@font/tt_semi_bold" - android:maxLines="1" + android:maxLines="2" android:text="Key" android:textColor="#191919" android:textSize="16sp" />