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

Merge pull request 'dashboard ui changed' (#1) from dev_ptk into dev

Browse Source 
Reviewed-on: Dashboard Ui change
This commit is contained in:
Kyaw_Min_Khant 2026-05-21 04:32:40 +00:00
commit 10f5bcf355
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

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