diff --git a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt index f7fcbcd..1c16ed8 100644 --- a/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt +++ b/app/src/main/java/com/mob/utsmyanmar/ui/dashboard/DashboardScreen2.kt @@ -40,6 +40,8 @@ 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)) @@ -48,13 +50,30 @@ fun DashboardScreen2( onNavigateSignOn = onNavigateSignOn ) 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( @@ -103,7 +122,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)) @@ -143,7 +162,7 @@ private fun SummaryItem( ) Text(subtitle, fontSize = 12.sp) } - IconCircle(icon, iconBg) +// IconCircle(icon, iconBg) } } @@ -242,158 +261,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 diff --git a/paysdk-lib/build/.transforms/4368da0550439403899b7eb94caaaeb1/results.bin b/paysdk-lib/build/.transforms/4368da0550439403899b7eb94caaaeb1/results.bin new file mode 100644 index 0000000..c790d94 --- /dev/null +++ b/paysdk-lib/build/.transforms/4368da0550439403899b7eb94caaaeb1/results.bin @@ -0,0 +1 @@ +o/PayLib-release-1.4.64-runtime diff --git a/paysdk-lib/build/.transforms/4368da0550439403899b7eb94caaaeb1/transformed/PayLib-release-1.4.64-runtime/PayLib-release-1.4.64-runtime_dex/classes.dex b/paysdk-lib/build/.transforms/4368da0550439403899b7eb94caaaeb1/transformed/PayLib-release-1.4.64-runtime/PayLib-release-1.4.64-runtime_dex/classes.dex new file mode 100644 index 0000000..2dc28a9 Binary files /dev/null and b/paysdk-lib/build/.transforms/4368da0550439403899b7eb94caaaeb1/transformed/PayLib-release-1.4.64-runtime/PayLib-release-1.4.64-runtime_dex/classes.dex differ diff --git a/sunmiui-lib/build/.transforms/3efb04d35d4f1adaa5dc685f461245a2/results.bin b/sunmiui-lib/build/.transforms/3efb04d35d4f1adaa5dc685f461245a2/results.bin new file mode 100644 index 0000000..800956c --- /dev/null +++ b/sunmiui-lib/build/.transforms/3efb04d35d4f1adaa5dc685f461245a2/results.bin @@ -0,0 +1 @@ +o/sunmiui-1.1.27-runtime diff --git a/sunmiui-lib/build/.transforms/3efb04d35d4f1adaa5dc685f461245a2/transformed/sunmiui-1.1.27-runtime/sunmiui-1.1.27-runtime_dex/classes.dex b/sunmiui-lib/build/.transforms/3efb04d35d4f1adaa5dc685f461245a2/transformed/sunmiui-1.1.27-runtime/sunmiui-1.1.27-runtime_dex/classes.dex new file mode 100644 index 0000000..a06cd2e Binary files /dev/null and b/sunmiui-lib/build/.transforms/3efb04d35d4f1adaa5dc685f461245a2/transformed/sunmiui-1.1.27-runtime/sunmiui-1.1.27-runtime_dex/classes.dex differ