diff --git a/lib/screens/notification_screen.dart b/lib/screens/notification_screen.dart index 84283df..d6abc36 100644 --- a/lib/screens/notification_screen.dart +++ b/lib/screens/notification_screen.dart @@ -1,5 +1,4 @@ import 'package:cheminova/models/notification_list_response.dart'; -import 'package:cheminova/models/rejected_applicaton_response.dart'; import 'package:cheminova/provider/notification_provider.dart'; import 'package:flutter/material.dart'; import 'package:cheminova/widgets/common_background.dart'; @@ -8,7 +7,6 @@ import 'package:cheminova/widgets/common_app_bar.dart'; import 'package:cheminova/widgets/common_elevated_button.dart'; import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; -import '../provider/rejected_provider.dart'; class NotificationScreen extends StatefulWidget { const NotificationScreen({super.key}); @@ -29,37 +27,38 @@ class NotificationScreenState extends State { @override Widget build(BuildContext context) { return ChangeNotifierProvider( - create: (context) => _notificationProvider, - child: CommonBackground( - child: Scaffold( + create: (context) => _notificationProvider, + child: CommonBackground( + child: Scaffold( + backgroundColor: Colors.transparent, + appBar: CommonAppBar( + actions: [ + IconButton( + onPressed: () { + Navigator.pop(context); + }, + icon: Image.asset('assets/Back_attendance.png'), + padding: const EdgeInsets.only(right: 20), + ), + ], + title: const Text('Notification', + style: TextStyle( + fontSize: 20, + color: Colors.black, + fontWeight: FontWeight.w400, + fontFamily: 'Anek')), backgroundColor: Colors.transparent, - appBar: CommonAppBar( - actions: [ - IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Image.asset('assets/Back_attendance.png'), - padding: const EdgeInsets.only(right: 20), - ), - ], - title: const Text('Notification', - style: TextStyle( - fontSize: 20, - color: Colors.black, - fontWeight: FontWeight.w400, - fontFamily: 'Anek')), - backgroundColor: Colors.transparent, - elevation: 0, - ), - drawer: const CommonDrawer(), - body: Consumer( - builder: (context, value, child) => value.isLoading - ? const Center(child: CircularProgressIndicator()) - : MyListView(value: value), - ), + elevation: 0, ), - )); + drawer: const CommonDrawer(), + body: Consumer( + builder: (context, value, child) => value.isLoading + ? const Center(child: CircularProgressIndicator()) + : MyListView(value: value), + ), + ), + ), + ); } } @@ -87,29 +86,52 @@ class MyListView extends StatelessWidget { @override Widget build(BuildContext context) { + // Group notifications by date + Map> groupedNotifications = {}; + + for (var notification in value.notificationList) { + String date = DateFormat("dd MMM yyyy").format(DateTime.parse(notification.createdAt ?? '')); + if (!groupedNotifications.containsKey(date)) { + groupedNotifications[date] = []; + } + groupedNotifications[date]!.add(notification); + } + return ListView.builder( padding: const EdgeInsets.only(top: 15), - itemCount: value.notificationList.length, + itemCount: groupedNotifications.length, itemBuilder: (context, index) { - Notifications item = value.notificationList[index]; + String date = groupedNotifications.keys.elementAt(index); + List notificationsForDate = groupedNotifications[date]!; + return Padding( padding: const EdgeInsets.only(bottom: 10, left: 10, right: 10), - child: ExpansionTile( - collapsedBackgroundColor: Colors.white, - backgroundColor: Colors.white, - trailing: const SizedBox.shrink(), - title: Text( - item.title ?? '', - style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500), - ), - subtitle: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text((DateFormat("dd/MMM/yyyy") - .format(DateTime.parse(item.createdAt ?? '')))), - Text(item.msg ?? ''), - ], - ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Display the date once + Padding( + padding: const EdgeInsets.only(bottom: 8.0), + child: Text( + date, + style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold), + ), + ), + // Display notifications for the date + ...notificationsForDate.map((item) => Padding( + padding: const EdgeInsets.only(bottom: 10), + child: ExpansionTile( + collapsedBackgroundColor: Colors.white, + backgroundColor: Colors.white, + trailing: const SizedBox.shrink(), + title: Text( + item.title ?? '', + style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500), + ), + subtitle: Text(item.msg ?? ''), + ), + )), + ], ), ); },