mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added markAll as read for notification

Browse Source
This commit is contained in:
llsajjad
2025-09-23 15:01:42 +03:30
parent c0b6121db6
commit 70066c26e8
7 changed files with 101 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/data/repositories/notification_repository.dart
+4 -3
View File
@@ -18,7 +18,8 @@ class NotificationsRepository {
); );
} }
Future<Result<NotificationResponseModel>> markAllAsRead() async { Future<Result<Map<String, dynamic>>> markAllAsRead() async {
return _notificationsService.markAllAsRead(); return _notificationsService.markAllAsRead();
} }
} }
lib/data/services/api/notification_api.dart
+1 -1
View File
@@ -7,7 +7,7 @@ class NotificationApi {
static const String markAllAsRead = '/api/v1/notifications'; static const String markAllAsRead = '/api/v1/notifications/mark';
static const String markAsRead = '/api/v1/notifications/mark-as-read'; static const String markAsRead = '/api/v1/notifications/mark-as-read';
static const String tenderApprovalsTender = '/api/v1/notifications'; static const String tenderApprovalsTender = '/api/v1/notifications';
static String getTenderApprovalById({required String tenderId}) { static String getTenderApprovalById({required String tenderId}) {
lib/data/services/notification_service.dart
+9 -8
View File
@@ -24,14 +24,15 @@ class NotificationsService {
return result; return result;
} }
Future<Result<NotificationResponseModel>> markAllAsRead() async { Future<Result<Map<String, dynamic>>> markAllAsRead() async {
final result = await _networkManager.makeRequest( final result = await _networkManager.makeRequest(
NotificationApi.markAllAsRead, NotificationApi.markAllAsRead,
method: 'POST', method: 'GET',
(json) => NotificationResponseModel.fromJson(json), (json) => json,
); );
return result; return result;
} }
Future<Result<NotificationResponseModel>> markAsRead({ Future<Result<NotificationResponseModel>> markAsRead({
required String notificationId, required String notificationId,
lib/view_models/notification_view_model.dart
+65 -47
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:tm_app/core/utils/app_toast.dart';
import 'package:tm_app/core/utils/result.dart'; import 'package:tm_app/core/utils/result.dart';
import 'package:tm_app/data/repositories/notification_repository.dart'; import 'package:tm_app/data/repositories/notification_repository.dart';
import 'package:tm_app/data/services/model/notification__response/notification_response_model.dart'; import 'package:tm_app/data/services/model/notification__response/notification_response_model.dart';
@@ -30,49 +31,49 @@ class NotificationViewModel with ChangeNotifier {
int get totalPages => _totalPages; int get totalPages => _totalPages;
/// Fetch notifications /// Fetch notifications
Future<void> getNotifications({int page = 1, bool isMobile = false}) async { Future<void> getNotifications({int page = 1, bool isMobile = false}) async {
_isLoading = true; _isLoading = true;
notifyListeners(); notifyListeners();
final int offset = _pageSize * page; final int offset = _pageSize * page;
final result = await _repository.getNotifications( final result = await _repository.getNotifications(
limit: _pageSize, limit: _pageSize,
offset: offset, offset: offset,
); );
switch (result) { switch (result) {
case Ok<NotificationResponseModel>(): case Ok<NotificationResponseModel>():
if (isMobile && page > 1) { if (isMobile && page > 1) {
final oldNotifications = final oldNotifications =
_notificationResponseModel?.data?.notifications ?? []; _notificationResponseModel?.data?.notifications ?? [];
final newNotifications = result.value.data?.notifications ?? []; final newNotifications = result.value.data?.notifications ?? [];
_notificationResponseModel = result.value.copyWith( _notificationResponseModel = result.value.copyWith(
data: result.value.data?.copyWith( data: result.value.data?.copyWith(
notifications: [...oldNotifications, ...newNotifications], notifications: [...oldNotifications, ...newNotifications],
), ),
); );
} else { } else {
_notificationResponseModel = result.value; _notificationResponseModel = result.value;
} }
currentPage = page; currentPage = page;
_hasMoreData = _hasMoreData =
(result.value.data?.notifications?.length ?? 0) >= _pageSize; (result.value.data?.notifications?.length ?? 0) >= _pageSize;
_totalPages = result.value.data?.meta?.pages ?? 1; _totalPages = result.value.data?.meta?.pages ?? 1;
break; break;
case Error<NotificationResponseModel>(): case Error<NotificationResponseModel>():
_errorMessage = result.error.toString(); _errorMessage = result.error.toString();
break; break;
}
_isLoading = false;
notifyListeners();
} }
_isLoading = false;
notifyListeners();
}
/// Jump to page /// Jump to page
Future<void> jumpToPage(int page) async { Future<void> jumpToPage(int page) async {
if (_totalPages == 0 || page < 1 || page > _totalPages) { if (_totalPages == 0 || page < 1 || page > _totalPages) {
@@ -82,33 +83,50 @@ Future<void> getNotifications({int page = 1, bool isMobile = false}) async {
} }
/// Mark all as read /// Mark all as read
Future<void> markAllAsRead() async { Future<void> markAllAsRead(BuildContext context) async {
_isLoading = true;
_errorMessage = null; _errorMessage = null;
notifyListeners(); notifyListeners();
final result = await _repository.markAllAsRead(); final result = await _repository.markAllAsRead();
switch (result) { switch (result) {
case Ok<NotificationResponseModel>(): case Ok<Map<String, dynamic>>():
if (_notificationResponseModel?.data?.notifications != null) { final response = result.value;
final updatedNotifications = final success = response['success'] as bool? ?? false;
_notificationResponseModel!.data!.notifications! final message = response['message'] as String? ?? 'Unknown response';
.map((n) => n.copyWith(seen: true))
.toList();
_notificationResponseModel = _notificationResponseModel!.copyWith( if (success) {
data: _notificationResponseModel!.data!.copyWith( if (_notificationResponseModel?.data?.notifications != null) {
notifications: updatedNotifications, final updatedNotifications =
), _notificationResponseModel!.data!.notifications!
); .map((n) => n.copyWith(seen: true))
.toList();
_notificationResponseModel = _notificationResponseModel!.copyWith(
data: _notificationResponseModel!.data!.copyWith(
notifications: updatedNotifications,
),
);
}
await getNotifications(page: 1);
// toast success
AppToast.success(context, 'All notifications marked as read.');
} else {
_errorMessage = message;
AppToast.error(context, message);
} }
break; break;
case Error<NotificationResponseModel>(): case Error<Map<String, dynamic>>():
_errorMessage = result.error.toString(); _errorMessage = result.error.toString();
AppToast.error(context, _errorMessage!);
break; break;
} }
_isLoading = false;
notifyListeners(); notifyListeners();
} }
lib/views/notification/pages/d_notification_page.dart
+10 -5
View File
@@ -4,12 +4,13 @@ import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart'; import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/notification_view_model.dart'; import 'package:tm_app/view_models/notification_view_model.dart';
import 'package:tm_app/views/notification/strings/notification_strings.dart'; import 'package:tm_app/views/notification/strings/notification_strings.dart';
import 'package:tm_app/views/shared/page_selection_dialog.dart';
import 'package:tm_app/views/shared/desktop_navigation_widget.dart'; import 'package:tm_app/views/shared/desktop_navigation_widget.dart';
import 'package:tm_app/views/shared/page_selection_dialog.dart';
import '../../shared/main_tab_bar.dart';
import '../widgets/notification_all_tab.dart'; import '../widgets/notification_all_tab.dart';
import '../widgets/notification_important_tab.dart'; import '../widgets/notification_important_tab.dart';
import '../widgets/notification_unread_tab.dart'; import '../widgets/notification_unread_tab.dart';
import '../../shared/main_tab_bar.dart';
class DesktopNotificationPage extends StatefulWidget { class DesktopNotificationPage extends StatefulWidget {
const DesktopNotificationPage({super.key}); const DesktopNotificationPage({super.key});
@@ -65,7 +66,9 @@ class _DesktopNotificationPageState extends State<DesktopNotificationPage>
child: Align( child: Align(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: InkWell( child: InkWell(
onTap: viewModel.markAllAsRead, onTap: () {
viewModel.markAllAsRead(context);
},
borderRadius: BorderRadius.circular(99), borderRadius: BorderRadius.circular(99),
child: Container( child: Container(
width: 132.0.w(), width: 132.0.w(),
@@ -116,8 +119,10 @@ class _DesktopNotificationPageState extends State<DesktopNotificationPage>
onTap: () async { onTap: () async {
final selectedPage = await showDialog<int>( final selectedPage = await showDialog<int>(
context: context, context: context,
builder: (context) => PageSelectionDialog( builder:
totalPages: viewModel.totalPages), (context) => PageSelectionDialog(
totalPages: viewModel.totalPages,
),
); );
if (selectedPage != null) { if (selectedPage != null) {
lib/views/notification/pages/m_notification_page.dart
+5 -3
View File
@@ -36,7 +36,7 @@ class _MobileNotificationPageState extends State<MobileNotificationPage>
viewModel.hasMoreData) { viewModel.hasMoreData) {
viewModel.getNotifications( viewModel.getNotifications(
page: viewModel.currentPage + 1, page: viewModel.currentPage + 1,
isMobile: true, isMobile: true,
); );
} }
}); });
@@ -51,7 +51,7 @@ class _MobileNotificationPageState extends State<MobileNotificationPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final viewModel = context.watch<NotificationViewModel>(); // ✅ وصل به ویومدل final viewModel = context.watch<NotificationViewModel>();
return Scaffold( return Scaffold(
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
@@ -72,7 +72,9 @@ class _MobileNotificationPageState extends State<MobileNotificationPage>
child: Align( child: Align(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: InkWell( child: InkWell(
onTap: viewModel.markAllAsRead, // ✅ مثل دسکتاپ/تبلت onTap: () {
viewModel.markAllAsRead(context);
},
borderRadius: BorderRadius.circular(99), borderRadius: BorderRadius.circular(99),
child: Container( child: Container(
width: 132.0.w(), width: 132.0.w(),
lib/views/notification/pages/t_notification_page.dart
+7 -4
View File
@@ -70,7 +70,9 @@ class _TabletNotificationPageState extends State<TabletNotificationPage>
child: Align( child: Align(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: InkWell( child: InkWell(
onTap: viewModel.markAllAsRead, onTap: () {
viewModel.markAllAsRead(context);
},
borderRadius: BorderRadius.circular(99), borderRadius: BorderRadius.circular(99),
child: Container( child: Container(
width: 132.0.w(), width: 132.0.w(),
@@ -121,9 +123,10 @@ class _TabletNotificationPageState extends State<TabletNotificationPage>
onTap: () async { onTap: () async {
final selectedPage = await showDialog<int>( final selectedPage = await showDialog<int>(
context: context, context: context,
builder: (context) => PageSelectionDialog( builder:
totalPages: viewModel.totalPages, (context) => PageSelectionDialog(
), totalPages: viewModel.totalPages,
),
); );
if (selectedPage != null) { if (selectedPage != null) {