diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt b/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt index 85cb199..bde91b2 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt @@ -36,6 +36,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.platform.LocalInspectionMode +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.mob.utsmyanmar.ui.components.appbar.AppBar @@ -249,26 +250,27 @@ fun ReceiptPreview( .padding(20.dp), horizontalAlignment = Alignment.CenterHorizontally ) { - Text( - text = "MOB POS", - style = MaterialTheme.typography.headlineLarge - ) - Spacer(modifier = Modifier.height(8.dp)) Text( text = "Transaction Receipt", style = MaterialTheme.typography.bodyMedium ) Spacer(modifier = Modifier.height(4.dp)) Text( - text = copyLabel, + text = "MOB POS", + style = MaterialTheme.typography.headlineLarge + ) + Spacer(modifier = Modifier.height(8.dp)) + Text( + text = state.payDetail?.merchantName.toString(), style = MaterialTheme.typography.labelLarge, + textAlign = TextAlign.Center, color = Color.Gray ) +// Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(16.dp)) ReceiptDivider() ReceiptRow("Date", convertDateString(state.payDetail?.transDate.toString())) ReceiptRow("Time", state.payDetail?.transTime.toString()) - ReceiptRow("Merchant Name", state.payDetail?.merchantName.toString()) ReceiptRow("TID", state.payDetail?.terminalNo.toString()) ReceiptRow("Trace No", state.payDetail?.voucherNo.toString()) ReceiptRow("Ref No", state.payDetail?.referNo.toString()) @@ -283,13 +285,17 @@ fun ReceiptPreview( ReceiptRow("Status", if (isPreview) "SUCCESS" else state.payDetail?.let(::displayTransactionStatus).orEmpty()) ReceiptDivider() Spacer(modifier = Modifier.height(8.dp)) + Text( + text = copyLabel, + style = MaterialTheme.typography.labelLarge, + color = Color.Gray + ) + Spacer(modifier = Modifier.height(8.dp)) Text( text = "Thank You", style = MaterialTheme.typography.titleMedium ) - Spacer(modifier = Modifier.height(4.dp)) - Text( text = "Please keep this receipt", style = MaterialTheme.typography.bodySmall