From 0b908dc6c6c168c0cf99d3f1837cb9c8d9ef19bf Mon Sep 17 00:00:00 2001 From: Rajshinde046 Date: Tue, 16 Apr 2024 19:39:01 +0530 Subject: [PATCH] notification fixed --- .../png/sidemenu/past perfomance icon.png | Bin 0 -> 282 bytes lib/Utils/Common/CommonBottomNavigation.dart | 2 +- lib/controller/content_bytes_controller.dart | 5 ++ lib/view/MainScreen/Notification.dart | 77 +++++++++--------- .../Sidemenu/ContentByte/ContentBytes.dart | 6 ++ .../Notification/notification_api.dart | 2 +- 6 files changed, 50 insertions(+), 42 deletions(-) create mode 100644 assets/images/png/sidemenu/past perfomance icon.png diff --git a/assets/images/png/sidemenu/past perfomance icon.png b/assets/images/png/sidemenu/past perfomance icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b9620fe558f83caa000e4b38b38631f56f2dbfa5 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^9zg8E!3HFi^ownP6lZ})WHAGSjyDK1F14Mu5-7-6 z9OUlAu*y literal 0 HcmV?d00001 diff --git a/lib/Utils/Common/CommonBottomNavigation.dart b/lib/Utils/Common/CommonBottomNavigation.dart index c3b43dc..4d0dd1e 100644 --- a/lib/Utils/Common/CommonBottomNavigation.dart +++ b/lib/Utils/Common/CommonBottomNavigation.dart @@ -146,7 +146,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) { ), BottomNavigationBarItem( icon: Image.asset( - 'assets/images/png/sidemenu/inactiveshorttrade.png', + 'assets/images/png/sidemenu/past perfomance icon.png', height: 26.h, width: 26.w, ), diff --git a/lib/controller/content_bytes_controller.dart b/lib/controller/content_bytes_controller.dart index 39ff627..60384c1 100644 --- a/lib/controller/content_bytes_controller.dart +++ b/lib/controller/content_bytes_controller.dart @@ -27,6 +27,11 @@ class ContentBytesController extends GetxController { final buttonNotifier = ValueNotifier(ButtonState.paused); late AudioPlayer _audioPlayer; + @override + void dispose() { + _audioPlayer.stop(); + super.dispose(); + } void getAudio() => _audioPlayer; diff --git a/lib/view/MainScreen/Notification.dart b/lib/view/MainScreen/Notification.dart index a617234..c4a9f6d 100644 --- a/lib/view/MainScreen/Notification.dart +++ b/lib/view/MainScreen/Notification.dart @@ -17,6 +17,24 @@ class NotificationScreen extends StatefulWidget { class _NotificationScreenState extends State { StreamController NotificationController = StreamController(); + late Timer timer; + + @override + void initState() { + // timer = Timer.periodic(Duration(seconds: 2), (timer) { + NotificationsAPI().notificationList(streamControl: NotificationController); + // }); + super.initState(); + } + + @override + void dispose() { + // TODO: implement dispose + NotificationController.close(); + timer.cancel(); + super.dispose(); + } + @override Widget build(BuildContext context) { return Scaffold( @@ -26,7 +44,9 @@ class _NotificationScreenState extends State { stream: NotificationController.stream, builder: (ctx, snapshot) { if (snapshot.data == null) { - return Text("data"); + return Center( + child: text25W600("No Notification!"), + ); } if (snapshot.connectionState == ConnectionState.done) { if (snapshot.hasError) { @@ -78,7 +98,7 @@ class _NotificationScreenState extends State { Row( children: [ CircleAvatar( - backgroundImage: AssetImage(profileimg), + backgroundImage: NetworkImage(profileimg), radius: 26.5.r, ), sizedBoxWidth(12.w), @@ -107,51 +127,28 @@ class _NotificationScreenState extends State { child: text25W600('Notifications'), ), sizedBoxHeight(40.h), - Padding( - padding: EdgeInsets.only(left: 16.w), - child: text16W400('Today'), - ), - sizedBoxHeight(25.h), - notificationCard( - profileimg: 'assets/images/png/Ellipse 591.png', - title: 'Mokshada Kesarkar', - subtitle: 'Lorem ipsum dolor sit amet cons......', - time: '30 mins ago'), - Container( - height: 1, - margin: EdgeInsets.symmetric(vertical: 20.h), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Color.fromRGBO(176, 176, 176, 0.5), - width: 1, - ), - ), - ), - ), - notificationCard( - profileimg: 'assets/images/png/Ellipse 588.png', - title: 'Mokshada Kesarkar', - subtitle: 'Lorem ipsum dolor sit amet cons......', - time: '1 Hour ago'), - sizedBoxHeight(30.h), - Padding( - padding: EdgeInsets.only(left: 16.w), - child: text16W400('Yesterday'), - ), - sizedBoxHeight(30.h), ListView.builder( physics: NeverScrollableScrollPhysics(), shrinkWrap: true, - itemCount: CardList.length, + itemCount: notificationobj!.data!.list!.length, itemBuilder: (context, index) { return Column( children: [ notificationCard( - profileimg: CardList[index]['profileimg']!, - title: CardList[index]['title']!, - subtitle: CardList[index]['subtitle']!, - time: CardList[index]['time']!), + profileimg: notificationobj!.data!.list! + .elementAt(index) + .notificationImage!, + title: notificationobj!.data!.list! + .elementAt(index) + .notificationMessage!, + subtitle: notificationobj!.data!.list! + .elementAt(index) + .messageName ?? + "", + time: notificationobj!.data!.list! + .elementAt(index) + .deliverySchedule ?? + ""), if (index != CardList.length - 1) Container( height: 1, diff --git a/lib/view/Sidemenu/ContentByte/ContentBytes.dart b/lib/view/Sidemenu/ContentByte/ContentBytes.dart index 845b2fc..ee0fb86 100644 --- a/lib/view/Sidemenu/ContentByte/ContentBytes.dart +++ b/lib/view/Sidemenu/ContentByte/ContentBytes.dart @@ -71,6 +71,12 @@ class _ContentBytesState extends State { super.initState(); } + @override + void dispose() { + contentBytesController.stop(); + super.dispose(); + } + @override Widget build(BuildContext context) { return WillPopScope( diff --git a/lib/view_model/Notification/notification_api.dart b/lib/view_model/Notification/notification_api.dart index ce70b7d..c24373c 100644 --- a/lib/view_model/Notification/notification_api.dart +++ b/lib/view_model/Notification/notification_api.dart @@ -4,7 +4,7 @@ import 'package:traderscircuit/Utils/base_manager.dart'; import 'package:traderscircuit/data/network/network_api_services.dart'; import 'package:traderscircuit/model/Notification/notification_model.dart'; -GetNotification? notificationobj; +GetNotification?notificationobj; class NotificationsAPI { Future> notificationList(