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

Compare commits

base: Kyaw_Min_Khant:10f5bcf355cd437dbeaa2e9050f40a4b59cc476b
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:emv_latest
Kyaw_Min_Khant:uat/3.3
Kyaw_Min_Khant:emv
Kyaw_Min_Khant:dev
Kyaw_Min_Khant:uat/3.1
Kyaw_Min_Khant:cz
Kyaw_Min_Khant:test
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:tms
Kyaw_Min_Khant:new_dash
Kyaw_Min_Khant:Password_screen
..
compare: Kyaw_Min_Khant:ff2858d484b8ba042f708d0f985323488236e6b3
Branches Tags
Kyaw_Min_Khant:latest
Kyaw_Min_Khant:emv_latest
Kyaw_Min_Khant:uat/3.3
Kyaw_Min_Khant:emv
Kyaw_Min_Khant:dev
Kyaw_Min_Khant:uat/3.1
Kyaw_Min_Khant:cz
Kyaw_Min_Khant:test
Kyaw_Min_Khant:mpu
Kyaw_Min_Khant:tms
Kyaw_Min_Khant:new_dash
Kyaw_Min_Khant:Password_screen
Kyaw_Min_Khant:main

No commits in common. "10f5bcf355cd437dbeaa2e9050f40a4b59cc476b" and "ff2858d484b8ba042f708d0f985323488236e6b3" have entirely different histories.
10f5bcf355 ... ff2858d484

5 changed files with 156 additions and 177 deletions
Show Stats Expand all files Collapse all files

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

@ -39,37 +39,18 @@ 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))
MenuGrid(onNavigateAmount = onNavigateAmount) MenuGrid(onNavigateAmount = onNavigateAmount)
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(
@ -118,7 +99,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))
@ -158,7 +139,7 @@ private fun SummaryItem(
) )
Text(subtitle, fontSize = 12.sp) Text(subtitle, fontSize = 12.sp)
} }
// IconCircle(icon, iconBg) IconCircle(icon, iconBg)
} }
} }
@ -251,158 +232,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
View File

@ -1 +0,0 @@
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
View File

Binary file not shown.

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

@ -1 +0,0 @@
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
View File

Binary file not shown.