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

Merge branch 'dev' of https://hub.utsmyanmar.com/Kyaw_Min_Khant/mob_pos into dev

Browse Source
This commit is contained in:
moon 2026-05-21 11:05:18 +06:30
commit 0f435192ee
5 changed files with 177 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

331
app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt
View File

@ -40,6 +40,8 @@ fun DashboardScreen2(
.fillMaxSize() .fillMaxSize()
.padding(horizontal = 16.dp) .padding(horizontal = 16.dp)
) { ) {
Spacer(modifier = Modifier.height(0.dp))
AdvertisingArea()
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
SummaryCard() SummaryCard()
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
@ -48,13 +50,30 @@ fun DashboardScreen2(
onNavigateSignOn = onNavigateSignOn onNavigateSignOn = onNavigateSignOn
) )
Spacer(modifier = Modifier.height(18.dp)) Spacer(modifier = Modifier.height(18.dp))
RecentTransactionHeader() // RecentTransactionHeader()
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(8.dp))
RecentTransactionList() // RecentTransactionList()
} }
} }
} }
@Composable
private fun AdvertisingArea() {
Card(
modifier = Modifier.fillMaxWidth(),
shape = RoundedCornerShape(0.dp),
colors = CardDefaults.cardColors(containerColor = Color.White),
elevation = CardDefaults.cardElevation(8.dp)
) {
Row(
modifier = Modifier.height(170.dp) ) {
}
}
}
@Composable @Composable
private fun SummaryCard() { private fun SummaryCard() {
Card( Card(
@ -103,7 +122,7 @@ private fun SummaryCard() {
text = "Last Sync", text = "Last Sync",
fontSize = 12.sp, fontSize = 12.sp,
) )
IconCircle(Icons.Default.Sync, Color.CrimsonRed) // IconCircle(Icons.Default.Sync, Color.CrimsonRed)
} }
Spacer(Modifier.height(6.dp)) Spacer(Modifier.height(6.dp))
@ -143,7 +162,7 @@ private fun SummaryItem(
) )
Text(subtitle, fontSize = 12.sp) Text(subtitle, fontSize = 12.sp)
} }
IconCircle(icon, iconBg) // IconCircle(icon, iconBg)
} }
} }
@ -242,158 +261,158 @@ private fun MenuCard(
} }
} }
} }
//
@Composable //@Composable
private fun RecentTransactionHeader() { //private fun RecentTransactionHeader() {
Row( // Row(
modifier = Modifier.fillMaxWidth(), // modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically // verticalAlignment = Alignment.CenterVertically
) { // ) {
Text( // Text(
text = "Recent Transactions", // text = "Recent Transactions",
color = Color.LegacyRed, // color = Color.LegacyRed,
fontSize = 16.sp, // fontSize = 16.sp,
fontWeight = FontWeight.SemiBold, // fontWeight = FontWeight.SemiBold,
modifier = Modifier.weight(1f) // modifier = Modifier.weight(1f)
) // )
//
Text( // Text(
text = "View All", // text = "View All",
color = Color.LegacyRed, // color = Color.LegacyRed,
fontSize = 14.sp // fontSize = 14.sp
) // )
//
Icon( // Icon(
imageVector = Icons.Default.ChevronRight, // imageVector = Icons.Default.ChevronRight,
contentDescription = null, // contentDescription = null,
tint = Color.LegacyRed // tint = Color.LegacyRed
) // )
} // }
} //}
//
@Composable //@Composable
private fun RecentTransactionList() { //private fun RecentTransactionList() {
Card( // Card(
modifier = Modifier.fillMaxWidth(), // modifier = Modifier.fillMaxWidth(),
shape = RoundedCornerShape(14.dp), // shape = RoundedCornerShape(14.dp),
colors = CardDefaults.cardColors(containerColor = Color.White), // colors = CardDefaults.cardColors(containerColor = Color.White),
elevation = CardDefaults.cardElevation(2.dp) // elevation = CardDefaults.cardElevation(2.dp)
) { // ) {
Column { // Column {
TransactionRow( // TransactionRow(
iconText = "VISA", // iconText = "VISA",
time = "4:12 PM", // time = "4:12 PM",
type = "Card Payment", // type = "Card Payment",
amount = "MMK 100,000", // amount = "MMK 100,000",
status = "Success", // status = "Success",
statusColor = Color.LegacyRed, // statusColor = Color.LegacyRed,
statusTextColor = Color.LegacyRed // statusTextColor = Color.LegacyRed
) // )
//
Divider(color = Color.LegacyRed) // Divider(color = Color.LegacyRed)
//
TransactionRow( // TransactionRow(
iconText = "MMQR", // iconText = "MMQR",
time = "8:43 AM", // time = "8:43 AM",
type = "MMQR", // type = "MMQR",
amount = "MMK 50,000", // amount = "MMK 50,000",
status = "Success", // status = "Success",
statusColor = Color.LegacyRed, // statusColor = Color.LegacyRed,
statusTextColor = Color.LegacyRed // statusTextColor = Color.LegacyRed
) // )
//
Divider(color = Color.LegacyRed) // Divider(color = Color.LegacyRed)
//
TransactionRow( // TransactionRow(
iconText = "MC", // iconText = "MC",
time = "9:10 PM", // time = "9:10 PM",
type = "Card Payment", // type = "Card Payment",
amount = "MMK 150,000", // amount = "MMK 150,000",
status = "Failed", // status = "Failed",
statusColor = Color.LegacyRed, // statusColor = Color.LegacyRed,
statusTextColor = Color.LegacyRed // statusTextColor = Color.LegacyRed
) // )
} // }
} // }
} //}
//
@Composable //@Composable
private fun TransactionRow( //private fun TransactionRow(
iconText: String, // iconText: String,
time: String, // time: String,
type: String, // type: String,
amount: String, // amount: String,
status: String, // status: String,
statusColor: androidx.compose.ui.graphics.Color, // statusColor: androidx.compose.ui.graphics.Color,
statusTextColor: androidx.compose.ui.graphics.Color // statusTextColor: androidx.compose.ui.graphics.Color
) { //) {
Row( // Row(
modifier = Modifier // modifier = Modifier
.fillMaxWidth() // .fillMaxWidth()
.height(62.dp) // .height(62.dp)
.padding(horizontal = 14.dp), // .padding(horizontal = 14.dp),
verticalAlignment = Alignment.CenterVertically // verticalAlignment = Alignment.CenterVertically
) { // ) {
Text( // Text(
text = iconText, // text = iconText,
color = Color.LegacyRed, // color = Color.LegacyRed,
fontWeight = FontWeight.Bold, // fontWeight = FontWeight.Bold,
fontSize = 20.sp, // fontSize = 20.sp,
modifier = Modifier.width(70.dp) // modifier = Modifier.width(70.dp)
) // )
//
Column(modifier = Modifier.weight(1f)) { // Column(modifier = Modifier.weight(1f)) {
Text(time, fontSize = 12.sp, color = Color.Black) // Text(time, fontSize = 12.sp, color = Color.Black)
Text(type, fontSize = 12.sp, color = Color.Gray) // Text(type, fontSize = 12.sp, color = Color.Gray)
} // }
//
Text( // Text(
text = amount, // text = amount,
fontSize = 12.sp, // fontSize = 12.sp,
color = Color.Black, // color = Color.Black,
modifier = Modifier.width(90.dp) // modifier = Modifier.width(90.dp)
) // )
//
Box( // Box(
modifier = Modifier // modifier = Modifier
.clip(RoundedCornerShape(8.dp)) // .clip(RoundedCornerShape(8.dp))
.padding(horizontal = 10.dp, vertical = 5.dp) // .padding(horizontal = 10.dp, vertical = 5.dp)
) { // ) {
Text( // Text(
text = status, // text = status,
fontSize = 12.sp, // fontSize = 12.sp,
) // )
} // }
//
Icon( // Icon(
imageVector = Icons.Default.ChevronRight, // imageVector = Icons.Default.ChevronRight,
contentDescription = null, // contentDescription = null,
tint = Color.LegacyRed, // tint = Color.LegacyRed,
modifier = Modifier.size(26.dp) // modifier = Modifier.size(26.dp)
) // )
} // }
} //}
//
@Composable //@Composable
private fun IconCircle( //private fun IconCircle(
icon: ImageVector, // icon: ImageVector,
color: androidx.compose.ui.graphics.Color // color: androidx.compose.ui.graphics.Color
) { //) {
Box( // Box(
modifier = Modifier // modifier = Modifier
.size(38.dp) // .size(38.dp)
.clip(CircleShape) // .clip(CircleShape)
.background(color.copy(alpha = 0.1f)), // .background(color.copy(alpha = 0.1f)),
contentAlignment = Alignment.Center // contentAlignment = Alignment.Center
) { // ) {
Icon( // Icon(
imageVector = icon, // imageVector = icon,
contentDescription = null, // contentDescription = null,
tint = color, // tint = color,
modifier = Modifier.size(22.dp) // modifier = Modifier.size(22.dp)
) // )
} // }
} //}
@P2Preview @P2Preview
@Composable @Composable

1
paysdk-lib/build/.transforms/4368da0550439403899b7eb94caaaeb1/results.bin Normal file
View File

@ -0,0 +1 @@
o/PayLib-release-1.4.64-runtime

BIN
paysdk-lib/build/.transforms/4368da0550439403899b7eb94caaaeb1/transformed/PayLib-release-1.4.64-runtime/PayLib-release-1.4.64-runtime_dex/classes.dex Normal file
View File

Binary file not shown.

1
sunmiui-lib/build/.transforms/3efb04d35d4f1adaa5dc685f461245a2/results.bin Normal file
View File

@ -0,0 +1 @@
o/sunmiui-1.1.27-runtime

BIN
sunmiui-lib/build/.transforms/3efb04d35d4f1adaa5dc685f461245a2/transformed/sunmiui-1.1.27-runtime/sunmiui-1.1.27-runtime_dex/classes.dex Normal file
View File

Binary file not shown.