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

notification

Browse Source
This commit is contained in:
moon 2026-06-10 23:03:21 +06:30
parent c32c93338e
commit b69dfeb292
8 changed files with 402 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package com.mob.utsmyanmar.ui.components.appbar
import androidx.compose.foundation.layout.RowScope
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
@ -20,6 +21,7 @@ fun AppBar(
title: String,
icon: ImageVector? = null,
onIconClick: (() -> Unit)? = null,
actions: @Composable RowScope.() -> Unit = {}
) {
CenterAlignedTopAppBar(
title = {
@ -44,6 +46,8 @@ fun AppBar(
}
},
actions = actions,
colors = TopAppBarDefaults.topAppBarColors(
containerColor = Color.LegacyRed
)

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

@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
@ -32,11 +33,13 @@ import androidx.compose.material.icons.filled.CreditCard
import androidx.compose.material.icons.filled.Lock
import androidx.compose.material.icons.filled.LockOpen
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material.icons.filled.Replay
import androidx.compose.material.icons.filled.SwapHoriz
import androidx.compose.material.icons.filled.Sync
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.IconButton
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
@ -93,6 +96,7 @@ fun DashboardScreen2(
onNavigateVersion: () -> Unit = {},
onNavigateFunctions: () -> Unit = {},
onNavigateAction: (String) -> Unit = {},
onNavigateNotifications: () -> Unit = {},
dashboardUiState: DashboardUiState = DashboardUiState(),
deviceInfoViewModel: DeviceInfoViewModel = viewModel()
) {
@ -360,7 +364,26 @@ fun DashboardScreen2(
AppBar(
title = "Dashboard",
icon = Icons.Default.Menu,
onIconClick = { scope.launch { drawerState.open() } })
onIconClick = { scope.launch { drawerState.open() } },
actions = {
IconButton(onClick = onNavigateNotifications) {
Box {
Icon(
imageVector = Icons.Default.Notifications,
contentDescription = "Notifications",
tint = Color.White
)
Box(
modifier = Modifier
.size(8.dp)
.background(Color.GoldenGlow, CircleShape)
.align(Alignment.TopEnd)
.offset(x = 2.dp, y = (-2).dp)
)
}
}
}
)
}) { paddingValues ->
Column(
modifier = Modifier

34
app/src/main/java/com/mob/utsmyanmar/ui/navigation/AppNavGraph.kt
View File

@ -43,6 +43,9 @@ import com.mob.utsmyanmar.ui.tms_setup.TmsSetupViewModel
import com.mob.utsmyanmar.ui.transaction_result.TransactionResultEvent
import com.mob.utsmyanmar.ui.transaction_result.TransactionResultRoute
import com.mob.utsmyanmar.ui.transaction_result.TransactionResultViewModel
import com.mob.utsmyanmar.ui.notification.NotificationDetailScreen
import com.mob.utsmyanmar.ui.notification.NotificationListScreen
import com.mob.utsmyanmar.ui.notification.NotificationViewModel
import com.mob.utsmyanmar.ui.version.VersionScreen
import com.mob.utsmyanmar.viewmodel.CardReaderViewModel
import com.mob.utsmyanmar.viewmodel.EmvTransactionProcessViewModel
@ -115,6 +118,9 @@ fun AppNavGraph(
"Void" -> navController.navigate(Routes.VoidTrace.route) { launchSingleTop = true }
else -> navController.navigate(Routes.Amount.createRoute(action)) { launchSingleTop = true }
}
},
onNavigateNotifications = {
navController.navigate(Routes.NotificationList.route) { launchSingleTop = true }
}
)
}
@ -488,6 +494,34 @@ fun AppNavGraph(
}
)
}
composable(Routes.NotificationList.route) {
val notificationViewModel: NotificationViewModel = hiltViewModel()
NotificationListScreen(
viewModel = notificationViewModel,
onBack = { navController.popBackStack() },
onNavigateDetail = { id ->
navController.navigate(Routes.NotificationDetail.createRoute(id)) {
launchSingleTop = true
}
}
)
}
composable(
route = Routes.NotificationDetail.route,
arguments = listOf(
navArgument("notificationId") { type = NavType.IntType }
)
) { backStackEntry ->
val notificationViewModel: NotificationViewModel = hiltViewModel()
val id = backStackEntry.arguments?.getInt("notificationId") ?: return@composable
NotificationDetailScreen(
viewModel = notificationViewModel,
notificationId = id,
onBack = { navController.popBackStack() }
)
}
}
}

4
app/src/main/java/com/mob/utsmyanmar/ui/navigation/Routes.kt
View File

@ -33,4 +33,8 @@ sealed class Routes(val route: String) {
fun createRoute(destination: String, passwordType: String): String =
"password/${Uri.encode(destination)}/$passwordType"
}
data object NotificationList : Routes("notification_list")
data object NotificationDetail : Routes("notification_detail/{notificationId}") {
fun createRoute(id: Int): String = "notification_detail/$id"
}
}

116
app/src/main/java/com/mob/utsmyanmar/ui/notification/NotificationDetailScreen.kt Normal file
View File

@ -0,0 +1,116 @@
package com.mob.utsmyanmar.ui.notification
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.font.FontWeight
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.theme.Color
@Composable
fun NotificationDetailScreen(
viewModel: NotificationViewModel,
notificationId: Int,
onBack: () -> Unit
) {
val notification = viewModel.getById(notificationId)
Scaffold(
containerColor = Color.IvoryBeige,
topBar = {
AppBar(
title = "Notification Detail",
icon = Icons.AutoMirrored.Filled.ArrowBack,
onIconClick = onBack
)
}
) { paddingValues ->
if (notification == null) {
Box(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues),
contentAlignment = Alignment.Center
) {
Text(text = "Notification not found", color = Color.Gray)
}
} else {
Column(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues)
.padding(16.dp)
) {
Card(
modifier = Modifier.fillMaxWidth(),
shape = RoundedCornerShape(16.dp),
colors = CardDefaults.cardColors(containerColor = Color.White),
elevation = CardDefaults.cardElevation(4.dp)
) {
Column(modifier = Modifier.padding(20.dp)) {
Box(
modifier = Modifier
.size(56.dp)
.background(Color.LegacyRed.copy(alpha = 0.1f), CircleShape),
contentAlignment = Alignment.Center
) {
Icon(
imageVector = Icons.Default.Notifications,
contentDescription = null,
tint = Color.LegacyRed,
modifier = Modifier.size(28.dp)
)
}
Spacer(Modifier.height(16.dp))
Text(
text = notification.title,
fontSize = 18.sp,
fontWeight = FontWeight.Bold,
color = Color.Black
)
Spacer(Modifier.height(6.dp))
Text(
text = notification.timestamp,
fontSize = 12.sp,
color = Color.Gray
)
Spacer(Modifier.height(16.dp))
Text(
text = notification.message,
fontSize = 14.sp,
color = Color.Black,
lineHeight = 22.sp
)
}
}
}
}
}
}

174
app/src/main/java/com/mob/utsmyanmar/ui/notification/NotificationListScreen.kt Normal file
View File

@ -0,0 +1,174 @@
package com.mob.utsmyanmar.ui.notification
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
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.theme.Color
@Composable
fun NotificationListScreen(
viewModel: NotificationViewModel,
onBack: () -> Unit,
onNavigateDetail: (Int) -> Unit
) {
val notifications by viewModel.notifications.collectAsState()
Scaffold(
containerColor = Color.IvoryBeige,
topBar = {
AppBar(
title = "Notifications",
icon = Icons.AutoMirrored.Filled.ArrowBack,
onIconClick = onBack,
actions = {
if (notifications.any { !it.isRead }) {
TextButton(onClick = { viewModel.markAllAsRead() }) {
Text(text = "Mark all read", color = Color.White, fontSize = 12.sp)
}
}
}
)
}
) { paddingValues ->
if (notifications.isEmpty()) {
Box(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues),
contentAlignment = Alignment.Center
) {
Column(horizontalAlignment = Alignment.CenterHorizontally) {
Icon(
imageVector = Icons.Default.Notifications,
contentDescription = null,
tint = Color.Gray,
modifier = Modifier.size(64.dp)
)
Text(text = "No notifications", color = Color.Gray, fontSize = 14.sp)
}
}
} else {
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(paddingValues)
.padding(horizontal = 12.dp, vertical = 8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
items(items = notifications, key = { it.id }) { notification ->
NotificationItem(
notification = notification,
onClick = {
viewModel.markAsRead(notification.id)
onNavigateDetail(notification.id)
}
)
}
}
}
}
}
@Composable
private fun NotificationItem(
notification: AppNotification,
onClick: () -> Unit
) {
Row(
modifier = Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(12.dp))
.background(Color.White)
.clickable(onClick = onClick)
.padding(12.dp),
verticalAlignment = Alignment.CenterVertically
) {
Box(
modifier = Modifier
.size(42.dp)
.background(
color = if (notification.isRead) Color.Gray.copy(alpha = 0.12f)
else Color.LegacyRed.copy(alpha = 0.12f),
shape = CircleShape
),
contentAlignment = Alignment.Center
) {
Icon(
imageVector = Icons.Default.Notifications,
contentDescription = null,
tint = if (notification.isRead) Color.Gray else Color.LegacyRed,
modifier = Modifier.size(22.dp)
)
}
Spacer(Modifier.width(12.dp))
Column(modifier = Modifier.weight(1f)) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = notification.title,
fontSize = 13.sp,
fontWeight = if (notification.isRead) FontWeight.Normal else FontWeight.SemiBold,
color = if (notification.isRead) Color.Gray else Color.Black,
modifier = Modifier.weight(1f),
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
if (!notification.isRead) {
Box(
modifier = Modifier
.size(8.dp)
.background(Color.LegacyRed, CircleShape)
)
}
}
Text(
text = notification.message,
fontSize = 12.sp,
color = Color.Gray,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
Text(
text = notification.timestamp,
fontSize = 11.sp,
color = Color.Gray.copy(alpha = 0.7f)
)
}
}
}

9
app/src/main/java/com/mob/utsmyanmar/ui/notification/NotificationModel.kt Normal file
View File

@ -0,0 +1,9 @@
package com.mob.utsmyanmar.ui.notification
data class AppNotification(
val id: Int,
val title: String,
val message: String,
val timestamp: String,
val isRead: Boolean = false
)

37
app/src/main/java/com/mob/utsmyanmar/ui/notification/NotificationViewModel.kt Normal file
View File

@ -0,0 +1,37 @@
package com.mob.utsmyanmar.ui.notification
import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import javax.inject.Inject
@HiltViewModel
class NotificationViewModel @Inject constructor() : ViewModel() {
private val _notifications = MutableStateFlow(sampleNotifications)
val notifications: StateFlow<List<AppNotification>> = _notifications.asStateFlow()
val unreadCount: Int get() = _notifications.value.count { !it.isRead }
fun markAsRead(id: Int) {
_notifications.value = _notifications.value.map {
if (it.id == id) it.copy(isRead = true) else it
}
}
fun markAllAsRead() {
_notifications.value = _notifications.value.map { it.copy(isRead = true) }
}
fun getById(id: Int): AppNotification? = _notifications.value.find { it.id == id }
}
private val sampleNotifications = listOf(
AppNotification(1, "Settlement Reminder", "Your daily settlement is pending. Please settle before end of day.", "Today, 17:30", isRead = false),
AppNotification(2, "TMS Update Available", "A new terminal configuration update is ready. Please restart to apply.", "Today, 09:15", isRead = false),
AppNotification(3, "Transaction Approved", "Sale of MMK 50,000 was approved successfully. Trace #001234.", "Yesterday, 14:22", isRead = true),
AppNotification(4, "Network Warning", "Intermittent network issues detected. Contact your administrator if the problem persists.", "Yesterday, 11:05", isRead = true),
AppNotification(5, "Log-On Required", "Your terminal session has expired. Please log on again to continue.", "06/09, 08:00", isRead = true),
)