Kyaw_Min_Khant/mob_pos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Material Typo applied

Browse Source
This commit is contained in:
moon 2026-06-30 14:31:22 +06:30
parent 4c23e53983
commit 0ecfa8f06e
25 changed files with 213 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/mob/utsmyanmar/ui/cardwaiting/CardWaitingScreen.kt
View File

@ -26,6 +26,7 @@ import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -38,7 +39,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.alpha
import androidx.compose.ui.draw.rotate import androidx.compose.ui.draw.rotate
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
@ -134,8 +134,7 @@ private fun CardWaitingScreenContent(
Text( Text(
text = "AMOUNT TO PAY", text = "AMOUNT TO PAY",
color = Color.Black, color = Color.Black,
fontSize = 10.sp, style = MaterialTheme.typography.labelSmall
fontWeight = FontWeight.Medium
) )
Spacer(modifier = Modifier.height(6.dp)) Spacer(modifier = Modifier.height(6.dp))
@ -144,8 +143,7 @@ private fun CardWaitingScreenContent(
Text( Text(
text = amount, text = amount,
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 30.sp, style = MaterialTheme.typography.displayMedium
fontWeight = FontWeight.Bold
) )
Spacer(modifier = Modifier.width(6.dp)) Spacer(modifier = Modifier.width(6.dp))
@ -153,8 +151,7 @@ private fun CardWaitingScreenContent(
Text( Text(
text = "MMK", text = "MMK",
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 10.sp, style = MaterialTheme.typography.labelSmall,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(bottom = 6.dp) modifier = Modifier.padding(bottom = 6.dp)
) )
} }
@ -172,8 +169,7 @@ private fun CardWaitingScreenContent(
else -> "Tap Your Card" else -> "Tap Your Card"
}, },
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 13.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.Bold
) )
Text( Text(
@ -183,7 +179,7 @@ private fun CardWaitingScreenContent(
"Hold your card near the reader" "Hold your card near the reader"
}, },
color = Color.Black, color = Color.Black,
fontSize = 9.sp style = MaterialTheme.typography.labelSmall.copy(fontSize = 9.sp)
) )
Spacer(modifier = Modifier.height(14.dp)) Spacer(modifier = Modifier.height(14.dp))
@ -201,7 +197,7 @@ private fun CardWaitingScreenContent(
text = "OR", text = "OR",
modifier = Modifier.padding(horizontal = 12.dp), modifier = Modifier.padding(horizontal = 12.dp),
color = Color.Gray, color = Color.Gray,
fontSize = 10.sp style = MaterialTheme.typography.labelSmall
) )
HorizontalDivider( HorizontalDivider(
@ -219,7 +215,7 @@ private fun CardWaitingScreenContent(
Text( Text(
text = uiState.alertMessage, text = uiState.alertMessage,
color = Color.Black, color = Color.Black,
fontSize = 11.sp, style = MaterialTheme.typography.labelSmall,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
lineHeight = 16.sp lineHeight = 16.sp
) )
@ -315,13 +311,12 @@ private fun InsertCardRow(onMockClick: ()->Unit) {
Text( Text(
text = "Insert Your Card", text = "Insert Your Card",
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 11.sp, style = MaterialTheme.typography.labelSmall
fontWeight = FontWeight.Bold
) )
Text( Text(
text = "Chip facing up", text = "Chip facing up",
color = Color.Black, color = Color.Black,
fontSize = 9.sp style = MaterialTheme.typography.labelSmall.copy(fontSize = 9.sp)
) )
} }
} }
@ -348,8 +343,7 @@ private fun StatusPanel(uiState: CardWaitingUiState) {
else -> "Ready for card" else -> "Ready for card"
}, },
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 12.sp, style = MaterialTheme.typography.labelMedium
fontWeight = FontWeight.Bold
) )
Text( Text(
@ -359,7 +353,7 @@ private fun StatusPanel(uiState: CardWaitingUiState) {
else -> "Waiting" else -> "Waiting"
}, },
color = Color.Gray, color = Color.Gray,
fontSize = 11.sp style = MaterialTheme.typography.labelSmall
) )
} }
} }
@ -383,8 +377,7 @@ private fun ManualEntryAction(onManualEntryClick: () -> Unit) {
Text( Text(
text = "Manual Entry", text = "Manual Entry",
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 14.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.Bold
) )
} }
} }
@ -405,10 +398,10 @@ private fun CardLogoRow() {
horizontalArrangement = Arrangement.SpaceBetween, horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Text("VISA", fontSize = 22.sp, fontWeight = FontWeight.Bold) Text("VISA", style = MaterialTheme.typography.titleLarge)
Text("MC", fontSize = 18.sp, fontWeight = FontWeight.Bold) Text("MC", style = MaterialTheme.typography.titleMedium)
Text("MPU", fontSize = 20.sp, fontWeight = FontWeight.Bold) Text("MPU", style = MaterialTheme.typography.titleLarge)
Text("UnionPay", fontSize = 12.sp, fontWeight = FontWeight.Bold) Text("UnionPay", style = MaterialTheme.typography.labelMedium)
} }
} }
} }
@ -419,7 +412,7 @@ private fun PoweredByMob() {
Text( Text(
text = "Powered by", text = "Powered by",
color = Color.Gray, color = Color.Gray,
fontSize = 8.sp style = MaterialTheme.typography.labelSmall.copy(fontSize = 8.sp)
) )
Spacer(modifier = Modifier.width(4.dp)) Spacer(modifier = Modifier.width(4.dp))
@ -427,8 +420,7 @@ private fun PoweredByMob() {
Text( Text(
text = "MOB", text = "MOB",
color = Color.Gray, color = Color.Gray,
fontSize = 9.sp, style = MaterialTheme.typography.labelSmall.copy(fontSize = 9.sp)
fontWeight = FontWeight.Bold
) )
} }
} }

19
app/src/main/java/com/mob/utsmyanmar/ui/components/NumericEntryScreen.kt
View File

@ -22,6 +22,7 @@ import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
@ -30,7 +31,6 @@ import androidx.compose.ui.draw.shadow
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
@Composable @Composable
@ -72,7 +72,7 @@ fun NumericEntryScreen(
Text( Text(
text = prompt, text = prompt,
color = Color.Gray, color = Color.Gray,
fontSize = 11.sp, style = MaterialTheme.typography.labelSmall,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
@ -86,17 +86,14 @@ fun NumericEntryScreen(
Text( Text(
text = prefixLabel, text = prefixLabel,
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Medium),
fontWeight = FontWeight.Medium,
modifier = Modifier.padding(end = 10.dp, bottom = 6.dp) modifier = Modifier.padding(end = 10.dp, bottom = 6.dp)
) )
} }
Text( Text(
text = displayValue, text = displayValue,
color = Color.LegacyRed, style = MaterialTheme.typography.displayLarge.copy(color = Color.LegacyRed)
fontSize = 32.sp,
fontWeight = FontWeight.Bold
) )
} }
@ -105,7 +102,7 @@ fun NumericEntryScreen(
Text( Text(
text = supportingText, text = supportingText,
color = if (errorMessage == null) Color.Gray else Color.Error, color = if (errorMessage == null) Color.Gray else Color.Error,
fontSize = 11.sp, style = MaterialTheme.typography.labelSmall,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
@ -152,8 +149,7 @@ fun NumericEntryScreen(
) { ) {
Text( Text(
text = confirmText, text = confirmText,
fontSize = 14.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.Medium
) )
} }
} }
@ -234,8 +230,7 @@ private fun KeyPadButton(
Text( Text(
text = text, text = text,
color = if (enabled) Color.LegacyRed else Color.White, color = if (enabled) Color.LegacyRed else Color.White,
fontSize = 24.sp, style = MaterialTheme.typography.headlineLarge,
fontWeight = FontWeight.Normal,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
} }

5
app/src/main/java/com/mob/utsmyanmar/ui/components/SquareButton.kt
View File

@ -10,11 +10,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.theme.MOBPOSTheme import com.mob.utsmyanmar.ui.theme.MOBPOSTheme
import com.mob.utsmyanmar.ui.theme.Primary import com.mob.utsmyanmar.ui.theme.Primary
import com.mob.utsmyanmar.ui.theme.White import com.mob.utsmyanmar.ui.theme.White
@ -66,8 +64,7 @@ fun SquareButton(
Text( Text(
text = title, text = title,
fontSize = 24.sp, style = MaterialTheme.typography.headlineLarge,
fontWeight = FontWeight.SemiBold,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
maxLines = 1 maxLines = 1
) )

4
app/src/main/java/com/mob/utsmyanmar/ui/components/appbar/AppBar.kt
View File

@ -9,7 +9,7 @@ import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.text.font.FontWeight import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
import com.mob.utsmyanmar.ui.theme.Primary import com.mob.utsmyanmar.ui.theme.Primary
@ -28,7 +28,7 @@ fun AppBar(
Text( Text(
text = title, text = title,
color = White, color = White,
fontWeight = FontWeight.SemiBold style = MaterialTheme.typography.titleMedium
) )
}, },

43
app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen.kt
View File

@ -87,7 +87,6 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import coil3.compose.AsyncImage import coil3.compose.AsyncImage
import com.mob.utsmyanmar.R import com.mob.utsmyanmar.R
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
@ -266,20 +265,17 @@ fun DashboardScreen2(
Text( Text(
text = "MOB Merchant", text = "MOB Merchant",
color = Color.CrimsonRed, color = Color.CrimsonRed,
fontSize = 12.sp, style = MaterialTheme.typography.labelMedium
fontWeight = FontWeight.Bold
) )
Text( Text(
text = "S/N:${deviceInfo.serialNumber}", text = "S/N:${deviceInfo.serialNumber}",
color = Color.Black, color = Color.Black,
fontSize = 12.sp, style = MaterialTheme.typography.labelMedium
fontWeight = FontWeight.Bold
) )
Text( Text(
text = if (isOnline) "Online" else "Offline", text = if (isOnline) "Online" else "Offline",
color = if (isOnline) Color.Success else Color.Error, color = if (isOnline) Color.Success else Color.Error,
fontSize = 12.sp, style = MaterialTheme.typography.labelMedium
fontWeight = FontWeight.Bold
) )
} }
} }
@ -591,7 +587,7 @@ private fun SummaryCard(
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Text( Text(
text = "Last Sync", fontSize = 12.sp text = "Last Sync", style = MaterialTheme.typography.bodySmall
) )
Box( Box(
modifier = Modifier modifier = Modifier
@ -622,9 +618,8 @@ private fun SummaryCard(
Text( Text(
text = formatRelativeTime(lastSyncTime, now), text = formatRelativeTime(lastSyncTime, now),
fontSize = 18.sp, style = MaterialTheme.typography.titleMedium,
color = Color.LegacyRed, color = Color.LegacyRed
fontWeight = FontWeight.SemiBold
) )
} }
} }
@ -643,11 +638,11 @@ private fun SummaryItem(
verticalAlignment = Alignment.Top, modifier = Modifier.padding(6.dp) verticalAlignment = Alignment.Top, modifier = Modifier.padding(6.dp)
) { ) {
Column(modifier = Modifier.weight(1f)) { Column(modifier = Modifier.weight(1f)) {
Text(title, fontSize = 12.sp) Text(title, style = MaterialTheme.typography.bodySmall)
Text( Text(
value, fontSize = 14.sp, color = Color.LegacyRed, fontWeight = FontWeight.Bold value, style = MaterialTheme.typography.titleSmall, color = Color.LegacyRed
) )
Text(subtitle, fontSize = 12.sp) Text(subtitle, style = MaterialTheme.typography.bodySmall)
} }
IconCircle(icon, iconBg) IconCircle(icon, iconBg)
} }
@ -909,7 +904,7 @@ private fun MenuCard(
) { ) {
Text( Text(
text = title, text = title,
fontSize = 12.sp, style = MaterialTheme.typography.bodySmall,
color = Color.Black, color = Color.Black,
overflow = TextOverflow.Ellipsis, overflow = TextOverflow.Ellipsis,
maxLines = 1, maxLines = 1,
@ -937,8 +932,7 @@ private fun LazyListScope.recentTransactionsItems(transactions: List<TrnxRecord>
) { ) {
Text( Text(
text = "Recent Transactions", text = "Recent Transactions",
fontWeight = FontWeight.SemiBold, style = MaterialTheme.typography.titleSmall
fontSize = 14.sp
) )
} }
HorizontalDivider( HorizontalDivider(
@ -951,7 +945,7 @@ private fun LazyListScope.recentTransactionsItems(transactions: List<TrnxRecord>
Text( Text(
text = "No recent transactions", text = "No recent transactions",
color = Color.Gray, color = Color.Gray,
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
@ -985,8 +979,7 @@ private fun TrnxRow(record: TrnxRecord) {
Text( Text(
text = record.typeLabel.take(1), text = record.typeLabel.take(1),
color = Color.LegacyRed, color = Color.LegacyRed,
fontWeight = FontWeight.Bold, style = MaterialTheme.typography.bodyLarge
fontSize = 15.sp
) )
} }
@ -995,13 +988,12 @@ private fun TrnxRow(record: TrnxRecord) {
Column(modifier = Modifier.weight(1f)) { Column(modifier = Modifier.weight(1f)) {
Text( Text(
text =record.typeLabel, text =record.typeLabel,
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
fontWeight = FontWeight.SemiBold,
color = Color.Black color = Color.Black
) )
Text( Text(
text = record.maskedCard, text = record.maskedCard,
fontSize = 11.sp, style = MaterialTheme.typography.labelSmall,
color = Color.Gray color = Color.Gray
) )
} }
@ -1009,13 +1001,12 @@ private fun TrnxRow(record: TrnxRecord) {
Column(horizontalAlignment = Alignment.End) { Column(horizontalAlignment = Alignment.End) {
Text( Text(
text = record.amountDisplay, text = record.amountDisplay,
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.Bold),
fontWeight = FontWeight.Bold,
color = if (record.isVoided) Color.Gray else Color.LegacyRed color = if (record.isVoided) Color.Gray else Color.LegacyRed
) )
Text( Text(
text = record.dateTime, text = record.dateTime,
fontSize = 10.sp, style = MaterialTheme.typography.labelSmall,
color = Color.Gray color = Color.Gray
) )
} }

6
app/src/main/java/com/mob/utsmyanmar/ui/dashboard/SeeMoreScreen.kt
View File

@ -26,16 +26,15 @@ import androidx.compose.material.icons.filled.Undo
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
import com.mob.utsmyanmar.ui.preview.P2Preview import com.mob.utsmyanmar.ui.preview.P2Preview
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
@ -121,8 +120,7 @@ private fun MoreMenuCard(
Text( Text(
text = title, text = title,
color = Color.Black, color = Color.Black,
fontSize = 14.sp, style = MaterialTheme.typography.titleSmall,
fontWeight = FontWeight.SemiBold,
textAlign = TextAlign.Start textAlign = TextAlign.Start
) )
} }

24
app/src/main/java/com/mob/utsmyanmar/ui/disable/DisableScreen.kt
View File

@ -22,6 +22,7 @@ import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
@ -32,10 +33,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.R import com.mob.utsmyanmar.R
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
@ -53,8 +52,7 @@ fun DisableScreen(
Text( Text(
text = "Terminal Disabled", text = "Terminal Disabled",
color = Color.White, color = Color.White,
fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium
fontSize = 18.sp
) )
}, },
colors = TopAppBarDefaults.centerAlignedTopAppBarColors( colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
@ -108,8 +106,7 @@ fun DisableScreen(
Text( Text(
text = "This terminal is disabled", text = "This terminal is disabled",
fontSize = 22.sp, style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.Bold,
color = Color.LegacyRed, color = Color.LegacyRed,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
@ -118,7 +115,7 @@ fun DisableScreen(
Text( Text(
text = "You won't be able to process any\ntransactions until the terminal is enabled.", text = "You won't be able to process any\ntransactions until the terminal is enabled.",
fontSize = 14.sp, style = MaterialTheme.typography.bodyMedium,
color = Color.Gray, color = Color.Gray,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = 32.dp) modifier = Modifier.padding(horizontal = 32.dp)
@ -161,15 +158,14 @@ fun DisableScreen(
Column(modifier = Modifier.weight(1f)) { Column(modifier = Modifier.weight(1f)) {
Text( Text(
text = "Why is this terminal disabled?", text = "Why is this terminal disabled?",
fontWeight = FontWeight.SemiBold, style = MaterialTheme.typography.titleSmall
fontSize = 14.sp
) )
Spacer(Modifier.height(4.dp)) Spacer(Modifier.height(4.dp))
Text( Text(
text = message.ifBlank { text = message.ifBlank {
"The terminal may be disabled by an administrator due to security, compliance or configuration changes." "The terminal may be disabled by an administrator due to security, compliance or configuration changes."
}, },
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium,
color = Color.Gray color = Color.Gray
) )
} }
@ -206,13 +202,12 @@ fun DisableScreen(
Column(modifier = Modifier.weight(1f)) { Column(modifier = Modifier.weight(1f)) {
Text( Text(
text = "Need help?", text = "Need help?",
fontWeight = FontWeight.SemiBold, style = MaterialTheme.typography.titleSmall
fontSize = 14.sp
) )
Spacer(Modifier.height(4.dp)) Spacer(Modifier.height(4.dp))
Text( Text(
text = "Contact your system administrator or support team.", text = "Contact your system administrator or support team.",
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium,
color = Color.Gray color = Color.Gray
) )
} }
@ -241,8 +236,7 @@ fun DisableScreen(
Text( Text(
text = "Retry", text = "Retry",
color = Color.White, color = Color.White,
fontSize = 16.sp, style = MaterialTheme.typography.titleMedium
fontWeight = FontWeight.SemiBold
) )
} }

4
app/src/main/java/com/mob/utsmyanmar/ui/functions/FunctionsScreen.kt
View File

@ -57,7 +57,7 @@ fun FunctionsScreen(
.padding(16.dp).verticalScroll(rememberScrollState()), .padding(16.dp).verticalScroll(rememberScrollState()),
verticalArrangement = Arrangement.spacedBy(12.dp) verticalArrangement = Arrangement.spacedBy(12.dp)
) { ) {
Text(text = "General Settings") Text(text = "General Settings", style = MaterialTheme.typography.titleMedium)
FunctionButton( FunctionButton(
onClick = {}, onClick = {},
title = "App Version", title = "App Version",
@ -93,7 +93,7 @@ fun FunctionsScreen(
} }
) )
Text(text = "System Configuration") Text(text = "System Configuration", style = MaterialTheme.typography.titleMedium)
FunctionButton( FunctionButton(
onClick = {}, onClick = {},

27
app/src/main/java/com/mob/utsmyanmar/ui/history_functions/HistoryComponents.kt
View File

@ -16,13 +16,12 @@ import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
import com.utsmyanmar.paylibs.model.PayDetail import com.utsmyanmar.paylibs.model.PayDetail
import com.utsmyanmar.paylibs.utils.POSUtil import com.utsmyanmar.paylibs.utils.POSUtil
@ -52,21 +51,19 @@ internal fun HistoryTransactionCard(
Text( Text(
text = payDetail.transType.ifBlank { "UNKNOWN" }, text = payDetail.transType.ifBlank { "UNKNOWN" },
color = Color.LegacyRed, color = Color.LegacyRed,
fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleSmall
fontSize = 14.sp
) )
Text( Text(
text = POSUtil.getInstance().formatAmount(payDetail.amount), text = POSUtil.getInstance().formatAmount(payDetail.amount),
fontWeight = FontWeight.SemiBold, style = MaterialTheme.typography.titleSmall
fontSize = 14.sp
) )
} }
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
Text("Trace ${payDetail.voucherNo.ifBlank { "-" }}", fontSize = 12.sp) Text("Trace ${payDetail.voucherNo.ifBlank { "-" }}", style = MaterialTheme.typography.bodySmall)
Text("RRN ${payDetail.referNo.ifBlank { "-" }}", fontSize = 12.sp, color = Color.Gray) Text("RRN ${payDetail.referNo.ifBlank { "-" }}", style = MaterialTheme.typography.bodySmall, color = Color.Gray)
Text( Text(
"${payDetail.transDate} ${payDetail.transTime}", "${payDetail.transDate} ${payDetail.transTime}",
fontSize = 12.sp, style = MaterialTheme.typography.bodySmall,
color = Color.Gray color = Color.Gray
) )
} }
@ -86,8 +83,7 @@ internal fun HistoryTransactionDetailCard(payDetail: PayDetail) {
Text( Text(
text = payDetail.transType.ifBlank { "Transaction" }, text = payDetail.transType.ifBlank { "Transaction" },
color = Color.LegacyRed, color = Color.LegacyRed,
fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium
fontSize = 16.sp
) )
SummaryLine("Trace", payDetail.voucherNo) SummaryLine("Trace", payDetail.voucherNo)
SummaryLine("Amount", POSUtil.getInstance().formatAmount(payDetail.amount)) SummaryLine("Amount", POSUtil.getInstance().formatAmount(payDetail.amount))
@ -107,11 +103,10 @@ internal fun SummaryLine(label: String, value: String) {
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
) { ) {
Text(label, color = Color.Gray, fontSize = 13.sp) Text(label, color = Color.Gray, style = MaterialTheme.typography.bodyMedium)
Text( Text(
value.ifBlank { "-" }, value.ifBlank { "-" },
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium
fontWeight = FontWeight.Medium
) )
} }
} }
@ -135,7 +130,7 @@ internal fun SummaryPickerRow(
horizontalArrangement = Arrangement.SpaceBetween, horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Text(label, fontWeight = FontWeight.Medium) Text(label, style = MaterialTheme.typography.titleSmall)
Text(value, color = Color.Gray) Text(value, color = Color.Gray)
} }
} }
@ -181,7 +176,7 @@ internal fun HistoryNumericKeypad(
if (key == "⌫") { if (key == "⌫") {
Icon(Icons.Rounded.Backspace, contentDescription = "Backspace") Icon(Icons.Rounded.Backspace, contentDescription = "Backspace")
} else { } else {
Text(key, fontSize = 20.sp, fontWeight = FontWeight.Bold) Text(key, style = MaterialTheme.typography.headlineMedium)
} }
} }
} }

7
app/src/main/java/com/mob/utsmyanmar/ui/history_functions/ReviewTraceScreen.kt
View File

@ -24,7 +24,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight import androidx.compose.material3.MaterialTheme
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
@ -88,7 +88,7 @@ fun ReviewTraceScreen(
} else { } else {
Color.Black Color.Black
}, },
fontSize = 14.sp style = MaterialTheme.typography.bodyMedium
) )
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
@ -103,8 +103,7 @@ fun ReviewTraceScreen(
.fillMaxWidth() .fillMaxWidth()
.padding(24.dp), .padding(24.dp),
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
fontSize = 28.sp, style = MaterialTheme.typography.displayMedium.copy(fontSize = 28.sp)
fontWeight = FontWeight.Bold
) )
} }

5
app/src/main/java/com/mob/utsmyanmar/ui/history_functions/SelectHostScreen.kt
View File

@ -12,6 +12,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.AlertDialog import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.ElevatedButton import androidx.compose.material3.ElevatedButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
@ -21,9 +22,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation import com.utsmyanmar.paylibs.utils.core_utils.SystemParamsOperation
@ -94,6 +93,6 @@ private fun HostButton(
.fillMaxWidth() .fillMaxWidth()
.height(64.dp) .height(64.dp)
) { ) {
Text(label, fontSize = 16.sp, fontWeight = FontWeight.SemiBold) Text(label, style = MaterialTheme.typography.titleMedium)
} }
} }

4
app/src/main/java/com/mob/utsmyanmar/ui/history_functions/TransactionNotFoundScreen.kt
View File

@ -5,12 +5,12 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
@ -35,7 +35,7 @@ fun TransactionNotFoundScreen(onBack: () -> Unit) {
Text( Text(
text = "Transaction not found.", text = "Transaction not found.",
color = Color.Gray, color = Color.Gray,
fontSize = 16.sp style = MaterialTheme.typography.bodyLarge
) )
} }
} }

21
app/src/main/java/com/mob/utsmyanmar/ui/input_amount/InputAmountScreen.kt
View File

@ -19,6 +19,7 @@ import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -30,7 +31,6 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.components.NumericKeypad import com.mob.utsmyanmar.ui.components.NumericKeypad
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
import com.mob.utsmyanmar.ui.preview.P2Preview import com.mob.utsmyanmar.ui.preview.P2Preview
@ -97,7 +97,7 @@ fun InputAmount(
Text( Text(
text = "Enter Amount", text = "Enter Amount",
color = Color.Gray, color = Color.Gray,
fontSize = 18.sp, style = MaterialTheme.typography.titleMedium,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
@ -110,8 +110,7 @@ fun InputAmount(
Text( Text(
text = prefixLabel, text = prefixLabel,
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 16.sp, style = MaterialTheme.typography.titleMedium.copy(fontWeight = FontWeight.Medium),
fontWeight = FontWeight.Medium,
modifier = Modifier.padding(end = 10.dp, bottom = 6.dp) modifier = Modifier.padding(end = 10.dp, bottom = 6.dp)
) )
} }
@ -119,8 +118,7 @@ fun InputAmount(
Text( Text(
text = formatAmount(amount.ifEmpty { "0" }), text = formatAmount(amount.ifEmpty { "0" }),
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 32.sp, style = MaterialTheme.typography.displayLarge
fontWeight = FontWeight.Bold
) )
} }
@ -129,7 +127,7 @@ fun InputAmount(
Text( Text(
text = supportingText, text = supportingText,
color = Color.Gray, color = Color.Gray,
fontSize = 14.sp, style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
} }
@ -193,11 +191,10 @@ fun InputAmount(
disabledContentColor = Color.White disabledContentColor = Color.White
) )
) { ) {
Text( Text(
text = "Next", text = "Next",
fontSize = 14.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.Medium )
)
} }
} }
} }

4
app/src/main/java/com/mob/utsmyanmar/ui/manual_entry/ManualEntryRoute.kt
View File

@ -40,7 +40,6 @@ import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.TextFieldValue
@ -339,8 +338,7 @@ private fun ManualCardEntryScreen(
) { ) {
Text( Text(
text = "Confirm", text = "Confirm",
fontSize = 14.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.Medium
) )
} }
} }

9
app/src/main/java/com/mob/utsmyanmar/ui/notification/NotificationDetailScreen.kt
View File

@ -17,12 +17,12 @@ import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
@ -87,8 +87,7 @@ fun NotificationDetailScreen(
Text( Text(
text = notification.title, text = notification.title,
fontSize = 18.sp, style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
color = Color.Black color = Color.Black
) )
@ -96,7 +95,7 @@ fun NotificationDetailScreen(
Text( Text(
text = notification.timestamp, text = notification.timestamp,
fontSize = 12.sp, style = MaterialTheme.typography.bodySmall,
color = Color.Gray color = Color.Gray
) )
@ -104,8 +103,8 @@ fun NotificationDetailScreen(
Text( Text(
text = notification.message, text = notification.message,
fontSize = 14.sp,
color = Color.Black, color = Color.Black,
style = MaterialTheme.typography.bodyMedium,
lineHeight = 22.sp lineHeight = 22.sp
) )
} }

14
app/src/main/java/com/mob/utsmyanmar/ui/notification/NotificationListScreen.kt
View File

@ -21,6 +21,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Notifications import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
@ -33,7 +34,6 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow 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 com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
@ -55,7 +55,7 @@ fun NotificationListScreen(
actions = { actions = {
if (notifications.any { !it.isRead }) { if (notifications.any { !it.isRead }) {
TextButton(onClick = { viewModel.markAllAsRead() }) { TextButton(onClick = { viewModel.markAllAsRead() }) {
Text(text = "Mark all read", color = Color.White, fontSize = 12.sp) Text(text = "Mark all read", color = Color.White, style = MaterialTheme.typography.bodySmall)
} }
} }
} }
@ -76,7 +76,7 @@ fun NotificationListScreen(
tint = Color.Gray, tint = Color.Gray,
modifier = Modifier.size(64.dp) modifier = Modifier.size(64.dp)
) )
Text(text = "No notifications", color = Color.Gray, fontSize = 14.sp) Text(text = "No notifications", color = Color.Gray, style = MaterialTheme.typography.bodyMedium)
} }
} }
} else { } else {
@ -142,8 +142,8 @@ private fun NotificationItem(
) { ) {
Text( Text(
text = notification.title, text = notification.title,
fontSize = 13.sp, style = if (notification.isRead) MaterialTheme.typography.bodyMedium
fontWeight = if (notification.isRead) FontWeight.Normal else FontWeight.SemiBold, else MaterialTheme.typography.bodyMedium.copy(fontWeight = FontWeight.SemiBold),
color = if (notification.isRead) Color.Gray else Color.Black, color = if (notification.isRead) Color.Gray else Color.Black,
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
maxLines = 1, maxLines = 1,
@ -159,14 +159,14 @@ private fun NotificationItem(
} }
Text( Text(
text = notification.message, text = notification.message,
fontSize = 12.sp, style = MaterialTheme.typography.bodySmall,
color = Color.Gray, color = Color.Gray,
maxLines = 1, maxLines = 1,
overflow = TextOverflow.Ellipsis overflow = TextOverflow.Ellipsis
) )
Text( Text(
text = notification.timestamp, text = notification.timestamp,
fontSize = 11.sp, style = MaterialTheme.typography.labelSmall,
color = Color.Gray.copy(alpha = 0.7f) color = Color.Gray.copy(alpha = 0.7f)
) )
} }

17
app/src/main/java/com/mob/utsmyanmar/ui/pinpad/PinPadScreen.kt
View File

@ -14,6 +14,7 @@ import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
@ -26,7 +27,6 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
@ -64,8 +64,7 @@ fun PinPadScreen(
Text( Text(
text = "PIN ENTRY", text = "PIN ENTRY",
color = White, color = White,
fontSize = 16.sp, style = MaterialTheme.typography.titleMedium
fontWeight = FontWeight.SemiBold
) )
}, },
navigationIcon = { navigationIcon = {
@ -108,8 +107,7 @@ fun PinPadScreen(
Text( Text(
text = "Please Input PIN", text = "Please Input PIN",
color = White, color = White,
fontSize = 22.sp, style = MaterialTheme.typography.titleLarge
fontWeight = FontWeight.Bold
) )
Spacer(modifier = Modifier.height(14.dp)) Spacer(modifier = Modifier.height(14.dp))
@ -117,8 +115,7 @@ fun PinPadScreen(
Text( Text(
text = if (pinText.isBlank()) "------" else pinText, text = if (pinText.isBlank()) "------" else pinText,
color = White, color = White,
fontSize = 30.sp, style = MaterialTheme.typography.displayMedium,
fontWeight = FontWeight.Bold,
letterSpacing = 4.sp letterSpacing = 4.sp
) )
@ -127,7 +124,7 @@ fun PinPadScreen(
Text( Text(
text = alertMessage, text = alertMessage,
color = White, color = White,
fontSize = 15.sp, style = MaterialTheme.typography.bodyLarge,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
} }
@ -139,7 +136,7 @@ fun PinPadScreen(
Text( Text(
text = "Enter your PIN on the secured keypad below.", text = "Enter your PIN on the secured keypad below.",
color = Black, color = Black,
fontSize = 16.sp, style = MaterialTheme.typography.bodyLarge,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
@ -172,7 +169,7 @@ fun PinPadScreen(
"Cancel on device to exit." "Cancel on device to exit."
}, },
color = Black, color = Black,
fontSize = 14.sp, style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
} }

47
app/src/main/java/com/mob/utsmyanmar/ui/print_receipt/PrintReceiptScreen.kt
View File

@ -27,10 +27,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
@ -101,10 +99,7 @@ fun PrintReceiptScreen(
) { ) {
Text( Text(
text = "Cancel", text = "Cancel",
style = MaterialTheme.typography.bodyLarge.copy( style = MaterialTheme.typography.titleMedium
fontSize = 16.sp,
fontWeight = FontWeight.SemiBold
)
) )
} }
@ -153,10 +148,7 @@ fun PrintReceiptScreen(
) { ) {
Text( Text(
text = "Print", text = "Print",
style = MaterialTheme.typography.bodyLarge.copy( style = MaterialTheme.typography.titleMedium
fontSize = 16.sp,
fontWeight = FontWeight.SemiBold
)
) )
} }
} }
@ -186,15 +178,12 @@ fun ReceiptPreview(
) { ) {
Text( Text(
text = "MOB POS", text = "MOB POS",
fontSize = 24.sp, style = MaterialTheme.typography.headlineLarge.copy(fontFamily = FontFamily.Monospace)
fontWeight = FontWeight.Bold,
fontFamily = FontFamily.Monospace
) )
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
Text( Text(
text = "Transaction Receipt", text = "Transaction Receipt",
fontSize = 14.sp, style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace)
fontFamily = FontFamily.Monospace
) )
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
ReceiptDivider() ReceiptDivider()
@ -213,17 +202,14 @@ fun ReceiptPreview(
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
Text( Text(
text = "Thank You", text = "Thank You",
fontSize = 16.sp, style = MaterialTheme.typography.titleMedium.copy(fontFamily = FontFamily.Monospace)
fontWeight = FontWeight.SemiBold,
fontFamily = FontFamily.Monospace
) )
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(4.dp))
Text( Text(
text = "Please keep this receipt", text = "Please keep this receipt",
fontSize = 12.sp, style = MaterialTheme.typography.bodySmall.copy(fontFamily = FontFamily.Monospace)
fontFamily = FontFamily.Monospace
) )
} }
} }
@ -239,19 +225,16 @@ fun ReceiptRow(
.padding(vertical = 6.dp), .padding(vertical = 6.dp),
horizontalArrangement = Arrangement.SpaceBetween horizontalArrangement = Arrangement.SpaceBetween
) { ) {
Text( Text(
text = label, text = label,
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium.copy(fontFamily = FontFamily.Monospace),
fontFamily = FontFamily.Monospace, color = Color.Gray
color = Color.Gray )
)
Text( Text(
text = value, text = value,
fontSize = 13.sp, style = MaterialTheme.typography.titleSmall.copy(fontFamily = FontFamily.Monospace)
fontWeight = FontWeight.SemiBold, )
fontFamily = FontFamily.Monospace
)
} }
} }

16
app/src/main/java/com/mob/utsmyanmar/ui/sale_void/VoidTraceScreen.kt
View File

@ -20,6 +20,7 @@ import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -33,9 +34,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.shadow import androidx.compose.ui.draw.shadow
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
@ -144,7 +144,7 @@ fun VoidTraceScreen(
Text( Text(
text = headerMessage, text = headerMessage,
color = headerColor, color = headerColor,
fontSize = 14.sp style = MaterialTheme.typography.bodyMedium
) )
Spacer(modifier = Modifier.height(28.dp)) Spacer(modifier = Modifier.height(28.dp))
@ -152,7 +152,7 @@ fun VoidTraceScreen(
Text( Text(
text = "Trace Number", text = "Trace Number",
color = Color.Gray, color = Color.Gray,
fontSize = 11.sp, style = MaterialTheme.typography.labelSmall,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
@ -161,8 +161,7 @@ fun VoidTraceScreen(
Text( Text(
text = displayTraceNumber, text = displayTraceNumber,
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 32.sp, style = MaterialTheme.typography.displayLarge,
fontWeight = FontWeight.Bold,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
@ -171,7 +170,7 @@ fun VoidTraceScreen(
Text( Text(
text = "Enter 6-digit trace number", text = "Enter 6-digit trace number",
color = Color.Gray, color = Color.Gray,
fontSize = 11.sp, style = MaterialTheme.typography.labelSmall,
modifier = Modifier.align(Alignment.CenterHorizontally) modifier = Modifier.align(Alignment.CenterHorizontally)
) )
@ -314,8 +313,7 @@ private fun TraceKeypadButton(
Text( Text(
text = text, text = text,
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 24.sp, style = MaterialTheme.typography.headlineLarge,
fontWeight = FontWeight.Normal,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
} }

10
app/src/main/java/com/mob/utsmyanmar/ui/sending_to_host/SendingToHostScreen.kt
View File

@ -16,15 +16,14 @@ import androidx.compose.material.icons.rounded.Check
import androidx.compose.material.icons.rounded.Close import androidx.compose.material.icons.rounded.Close
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.input_amount.InputAmount import com.mob.utsmyanmar.ui.input_amount.InputAmount
import com.mob.utsmyanmar.ui.preview.P2Preview import com.mob.utsmyanmar.ui.preview.P2Preview
import com.mob.utsmyanmar.ui.preview.P3Preview import com.mob.utsmyanmar.ui.preview.P3Preview
@ -90,8 +89,7 @@ fun ProcessingScreen(state: ProcessingState) {
Text( Text(
text = state.title, text = state.title,
color = White, color = White,
fontSize = 24.sp, style = MaterialTheme.typography.headlineLarge
fontWeight = FontWeight.Bold
) )
Spacer(modifier = Modifier.height(10.dp)) Spacer(modifier = Modifier.height(10.dp))
@ -99,7 +97,7 @@ fun ProcessingScreen(state: ProcessingState) {
Text( Text(
text = "Please wait while your transaction is being processed.", text = "Please wait while your transaction is being processed.",
color = White, color = White,
fontSize = 15.sp, style = MaterialTheme.typography.bodyLarge,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
} }
@ -110,7 +108,7 @@ fun ProcessingScreen(state: ProcessingState) {
Text( Text(
text = "Transaction processing in progress.", text = "Transaction processing in progress.",
color = Black, color = Black,
fontSize = 14.sp, style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
} }

27
app/src/main/java/com/mob/utsmyanmar/ui/settlement/SettlementScreen.kt
View File

@ -17,6 +17,7 @@ import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults import androidx.compose.material3.CardDefaults
import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -24,9 +25,8 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
import com.mob.utsmyanmar.viewmodel.SharedViewModel import com.mob.utsmyanmar.viewmodel.SharedViewModel
@ -68,8 +68,7 @@ fun SettlementScreen(
Text( Text(
text = "Settlement Summary", text = "Settlement Summary",
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 18.sp, style = MaterialTheme.typography.titleMedium
fontWeight = FontWeight.Bold
) )
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(12.dp))
@ -84,8 +83,7 @@ fun SettlementScreen(
Text( Text(
text = "Unsettled Records", text = "Unsettled Records",
color = Color.Black, color = Color.Black,
fontSize = 15.sp, style = MaterialTheme.typography.bodyLarge
fontWeight = FontWeight.SemiBold
) )
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
@ -100,7 +98,7 @@ fun SettlementScreen(
Text( Text(
text = "No records available for settlement.", text = "No records available for settlement.",
color = Color.Gray, color = Color.Gray,
fontSize = 14.sp, style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.padding(18.dp) modifier = Modifier.padding(18.dp)
) )
} else { } else {
@ -146,13 +144,12 @@ private fun SummaryRow(
Text( Text(
text = label, text = label,
color = Color.Gray, color = Color.Gray,
fontSize = 13.sp style = MaterialTheme.typography.bodyMedium
) )
Text( Text(
text = value, text = value,
color = Color.Black, color = Color.Black,
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium
fontWeight = FontWeight.Medium
) )
} }
} }
@ -167,14 +164,12 @@ private fun SettlementRecordRow(record: PayDetail) {
Text( Text(
text = record.transType.ifBlank { "UNKNOWN" }, text = record.transType.ifBlank { "UNKNOWN" },
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 14.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.Bold
) )
Text( Text(
text = POSUtil.getInstance().formatAmount(record.amount), text = POSUtil.getInstance().formatAmount(record.amount),
color = Color.Black, color = Color.Black,
fontSize = 14.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.SemiBold
) )
} }
@ -183,12 +178,12 @@ private fun SettlementRecordRow(record: PayDetail) {
Text( Text(
text = "Trace ${record.voucherNo.ifBlank { "-" }}", text = "Trace ${record.voucherNo.ifBlank { "-" }}",
color = Color.Black, color = Color.Black,
fontSize = 12.sp style = MaterialTheme.typography.bodySmall
) )
Text( Text(
text = "Card ${record.cardNo.ifBlank { "-" }}", text = "Card ${record.cardNo.ifBlank { "-" }}",
color = Color.Gray, color = Color.Gray,
fontSize = 12.sp style = MaterialTheme.typography.bodySmall
) )
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(12.dp))

9
app/src/main/java/com/mob/utsmyanmar/ui/sign_on/SignOnScreen.kt
View File

@ -32,9 +32,8 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import com.mob.utsmyanmar.ui.components.appbar.AppBar import com.mob.utsmyanmar.ui.components.appbar.AppBar
import com.mob.utsmyanmar.ui.theme.Color as AppColor import com.mob.utsmyanmar.ui.theme.Color as AppColor
@ -101,8 +100,7 @@ fun SignOnScreen(
) )
Text( Text(
text = "Host Sign On", text = "Host Sign On",
fontSize = 22.sp, style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.Bold,
color = AppColor.LegacyRed color = AppColor.LegacyRed
) )
Text( Text(
@ -226,8 +224,7 @@ fun SignOnResultScreen(
Text( Text(
text = if (isSuccess) "Sign On Success" else "Sign On Failed", text = if (isSuccess) "Sign On Success" else "Sign On Failed",
fontSize = 24.sp, style = MaterialTheme.typography.headlineLarge,
fontWeight = FontWeight.Bold,
color = accent color = accent
) )

65
app/src/main/java/com/mob/utsmyanmar/ui/theme/Type.kt
View File

@ -6,29 +6,72 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
// Set of Material typography styles to start with
val Typography = Typography( val Typography = Typography(
displayLarge = TextStyle(
fontWeight = FontWeight.Bold,
fontSize = 32.sp,
lineHeight = 40.sp,
),
displayMedium = TextStyle(
fontWeight = FontWeight.Bold,
fontSize = 30.sp,
lineHeight = 38.sp,
),
headlineLarge = TextStyle(
fontWeight = FontWeight.Bold,
fontSize = 24.sp,
lineHeight = 32.sp,
),
headlineMedium = TextStyle(
fontWeight = FontWeight.Bold,
fontSize = 20.sp,
lineHeight = 28.sp,
),
titleLarge = TextStyle(
fontWeight = FontWeight.SemiBold,
fontSize = 22.sp,
lineHeight = 28.sp,
),
titleMedium = TextStyle(
fontWeight = FontWeight.SemiBold,
fontSize = 18.sp,
lineHeight = 26.sp,
),
titleSmall = TextStyle(
fontWeight = FontWeight.Medium,
fontSize = 14.sp,
lineHeight = 20.sp,
),
bodyLarge = TextStyle( bodyLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal, fontWeight = FontWeight.Normal,
fontSize = 16.sp, fontSize = 16.sp,
lineHeight = 24.sp, lineHeight = 24.sp,
letterSpacing = 0.5.sp letterSpacing = 0.5.sp
) ),
/* Other default text styles to override bodyMedium = TextStyle(
titleLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal, fontWeight = FontWeight.Normal,
fontSize = 22.sp, fontSize = 14.sp,
lineHeight = 28.sp, lineHeight = 20.sp,
letterSpacing = 0.sp ),
bodySmall = TextStyle(
fontWeight = FontWeight.Normal,
fontSize = 12.sp,
lineHeight = 16.sp,
),
labelLarge = TextStyle(
fontWeight = FontWeight.Medium,
fontSize = 14.sp,
lineHeight = 20.sp,
),
labelMedium = TextStyle(
fontWeight = FontWeight.Medium,
fontSize = 12.sp,
lineHeight = 16.sp,
), ),
labelSmall = TextStyle( labelSmall = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Medium, fontWeight = FontWeight.Medium,
fontSize = 11.sp, fontSize = 11.sp,
lineHeight = 16.sp, lineHeight = 16.sp,
letterSpacing = 0.5.sp letterSpacing = 0.5.sp
) )
*/
) )

14
app/src/main/java/com/mob/utsmyanmar/ui/tms_setup/TmsSetupScreen.kt
View File

@ -22,6 +22,7 @@ import androidx.compose.material3.CardDefaults
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -31,10 +32,8 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.StrokeCap
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.theme.Color as AppColor import com.mob.utsmyanmar.ui.theme.Color as AppColor
@Composable @Composable
@ -92,8 +91,7 @@ fun TmsSetupScreen(
state.isError -> "Configuration Error" state.isError -> "Configuration Error"
else -> "Setting Up Terminal" else -> "Setting Up Terminal"
}, },
fontSize = 22.sp, style = MaterialTheme.typography.titleLarge,
fontWeight = FontWeight.Bold,
color = AppColor.LegacyRed, color = AppColor.LegacyRed,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
@ -124,7 +122,7 @@ fun TmsSetupScreen(
Text( Text(
text = state.statusText, text = state.statusText,
fontSize = 14.sp, style = MaterialTheme.typography.bodyMedium,
color = AppColor.Black, color = AppColor.Black,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
@ -141,7 +139,7 @@ fun TmsSetupScreen(
) { ) {
Text( Text(
text = state.errorMessage, text = state.errorMessage,
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium,
color = AppColor.Error, color = AppColor.Error,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
@ -165,7 +163,7 @@ fun TmsSetupScreen(
.padding(end = 8.dp) .padding(end = 8.dp)
.size(18.dp) .size(18.dp)
) )
Text(text = "Retry", fontSize = 16.sp) Text(text = "Retry", style = MaterialTheme.typography.bodyLarge)
} }
if (!state.isTerminalDisabled) { if (!state.isTerminalDisabled) {
@ -175,7 +173,7 @@ fun TmsSetupScreen(
shape = RoundedCornerShape(12.dp), shape = RoundedCornerShape(12.dp),
colors = ButtonDefaults.outlinedButtonColors(contentColor = AppColor.LegacyRed) colors = ButtonDefaults.outlinedButtonColors(contentColor = AppColor.LegacyRed)
) { ) {
Text(text = "Skip", fontSize = 16.sp) Text(text = "Skip", style = MaterialTheme.typography.bodyLarge)
} }
} }
} }

23
app/src/main/java/com/mob/utsmyanmar/ui/transaction_result/TransactionResultScreen.kt
View File

@ -20,10 +20,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.shadow import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.mob.utsmyanmar.ui.preview.P2Preview import com.mob.utsmyanmar.ui.preview.P2Preview
import com.mob.utsmyanmar.ui.theme.Color import com.mob.utsmyanmar.ui.theme.Color
import com.utsmyanmar.paylibs.model.PayDetail import com.utsmyanmar.paylibs.model.PayDetail
@ -65,8 +63,7 @@ fun TransactionResultScreen(
Text( Text(
text = state.title, text = state.title,
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 24.sp, style = MaterialTheme.typography.headlineLarge
fontWeight = FontWeight.Bold
) )
Spacer(modifier = Modifier.height(6.dp)) Spacer(modifier = Modifier.height(6.dp))
@ -74,7 +71,7 @@ fun TransactionResultScreen(
Text( Text(
text = state.message.ifBlank { "Your payment has been processed successfully." }, text = state.message.ifBlank { "Your payment has been processed successfully." },
color = Color.Gray, color = Color.Gray,
fontSize = 13.sp, style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center textAlign = TextAlign.Center
) )
@ -193,16 +190,14 @@ private fun AmountCard(
Text( Text(
text = "PAID AMOUNT", text = "PAID AMOUNT",
color = Color.Gray, color = Color.Gray,
fontSize = 15.sp, style = MaterialTheme.typography.bodyLarge
fontWeight = FontWeight.SemiBold
) )
Text( Text(
text = amount, text = amount,
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 30.sp, style = MaterialTheme.typography.displayMedium
fontWeight = FontWeight.Bold
) )
Spacer(modifier = Modifier.height(6.dp)) Spacer(modifier = Modifier.height(6.dp))
@ -210,8 +205,7 @@ private fun AmountCard(
Text( Text(
text = "MMK", text = "MMK",
color = Color.LegacyRed, color = Color.LegacyRed,
fontSize = 14.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.Bold
) )
} }
} }
@ -296,21 +290,20 @@ private fun InfoItem(
Text( Text(
text = title, text = title,
color = Color.Gray, color = Color.Gray,
fontSize = 11.sp style = MaterialTheme.typography.labelSmall
) )
Text( Text(
text = value, text = value,
color = Color.Black, color = Color.Black,
fontSize = 13.sp, style = MaterialTheme.typography.titleSmall
fontWeight = FontWeight.Bold
) )
if (subValue.isNotEmpty()) { if (subValue.isNotEmpty()) {
Text( Text(
text = subValue, text = subValue,
color = Color.Black, color = Color.Black,
fontSize = 11.sp style = MaterialTheme.typography.labelSmall
) )
} }
} }