refresh indicator added.

main_design2.0
Sikander Saleem 2 years ago
parent 08ada0c275
commit 4804dc1839

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
import 'package:test_sa/controllers/providers/api/notifications_provider.dart'; import 'package:test_sa/controllers/providers/api/notifications_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
@ -10,44 +11,59 @@ import 'package:test_sa/views/widgets/notifications/notification_item.dart';
class RecentActivitiesFragment extends StatelessWidget { class RecentActivitiesFragment extends StatelessWidget {
RecentActivitiesFragment({Key key}) : super(key: key); RecentActivitiesFragment({Key key}) : super(key: key);
NotificationsProvider _notificationsProvider; //NotificationsProvider _notificationsProvider;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_notificationsProvider ??= Provider.of<NotificationsProvider>(context, listen: false); //_notificationsProvider ??= Provider.of<NotificationsProvider>(context, listen: false);
return SingleChildScrollView( return Consumer<NotificationsProvider>(builder: (context, _notificationsProvider, _) {
padding: const EdgeInsets.all(16), return RefreshIndicator(
child: Container( onRefresh: () {
decoration: ShapeDecoration( Provider.of<AllRequestsProvider>(context, listen: false).getRequests();
color: AppColor.background(context), _notificationsProvider.getSystemNotifications();
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)), return Future.delayed(const Duration(microseconds: 250));
shadows: [boxShadowR14], },
), child: SingleChildScrollView(
child: Column( padding: const EdgeInsets.all(16),
mainAxisSize: MainAxisSize.min, child: Container(
crossAxisAlignment: CrossAxisAlignment.start, decoration: ShapeDecoration(
children: [ color: AppColor.background(context),
context.translation.recentActivities.heading5(context).paddingOnly(top: 16, start: 16, end: 16), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
ListView.separated( shadows: [boxShadowR14],
shrinkWrap: true, ),
physics: const NeverScrollableScrollPhysics(), child: Column(
padding: const EdgeInsets.all(16), mainAxisSize: MainAxisSize.min,
itemCount: _notificationsProvider.notifications.length, crossAxisAlignment: CrossAxisAlignment.start,
separatorBuilder: (context, itemIndex) => const Divider().defaultStyle(context).paddingOnly(top: 16, bottom: 16), children: [
itemBuilder: (context, itemIndex) { context.translation.recentActivities
// todo add priority & progress tag to show chip .heading5(context)
return NotificationItem( .toShimmer(
notification: _notificationsProvider.notifications[itemIndex], isShow: _notificationsProvider.isLoading,
onPressed: (notification) { )
// todo @sikander, check notifications payload, because notification model is different to need to check from backend .paddingOnly(top: 16, start: 16, end: 16),
//Navigator.of(context).pushNamed(FutureRequestServiceDetails.id, arguments: notification.requestId); ListView.separated(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.all(16),
itemCount: _notificationsProvider.notifications.length,
separatorBuilder: (context, itemIndex) => const Divider().defaultStyle(context).paddingOnly(top: 16, bottom: 16),
itemBuilder: (context, itemIndex) {
// todo add priority & progress tag to show chip
return NotificationItem(
isLoading: _notificationsProvider.isLoading,
notification: _notificationsProvider.notifications[itemIndex],
onPressed: (notification) {
// todo @sikander, check notifications payload, because notification model is different to need to check from backend
//Navigator.of(context).pushNamed(FutureRequestServiceDetails.id, arguments: notification.requestId);
},
);
}, },
); ),
}, ],
), ),
], ),
), ),
), );
); });
} }
} }

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/all_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
import 'package:test_sa/controllers/providers/api/notifications_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
@ -18,23 +19,30 @@ class RequestsFragment extends StatelessWidget {
// todo check here, nurse can add request not engineer // todo check here, nurse can add request not engineer
floatingActionButton: const AppFloatingActionButton(), floatingActionButton: const AppFloatingActionButton(),
body: Consumer<AllRequestsProvider>( body: Consumer<AllRequestsProvider>(
builder: (context, snapshot, _) => GridView( builder: (context, snapshot, _) => RefreshIndicator(
padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16), onRefresh: () {
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 191 / 237, crossAxisSpacing: 16, mainAxisSpacing: 16), snapshot.getRequests();
children: [ Provider.of<NotificationsProvider>(context, listen: false).getSystemNotifications();
gridItem( return Future.delayed(const Duration(microseconds: 250));
snapshot.highPriorityRequests?.total?.count, },
"high_priority", child: GridView(
context.translation.highPriority, padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
context, gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 191 / 237, crossAxisSpacing: 16, mainAxisSpacing: 16),
snapshot.isHighPriorityLoading, children: [
0, gridItem(
context.isDark ? AppColor.redStatus(context) : AppColor.red50, snapshot.highPriorityRequests?.total?.count,
), "high_priority",
gridItem(snapshot.overdueRequests?.total?.count, "overdue", context.translation.overdue, context, snapshot.isOverdueLoading, 1, AppColor.yellowStatus(context)), context.translation.highPriority,
gridItem(snapshot.openRequests?.total?.count, "new_request", context.translation.newR, context, snapshot.isOpenLoading, 2, AppColor.primary40), context,
gridItem(snapshot.completedRequests?.total?.count, "complete_request", context.translation.completed, context, snapshot.isCompleteLoading, 3, AppColor.greenStatus(context)), snapshot.isHighPriorityLoading,
], 0,
context.isDark ? AppColor.redStatus(context) : AppColor.red50,
),
gridItem(snapshot.overdueRequests?.total?.count, "overdue", context.translation.overdue, context, snapshot.isOverdueLoading, 1, AppColor.yellowStatus(context)),
gridItem(snapshot.openRequests?.total?.count, "new_request", context.translation.newR, context, snapshot.isOpenLoading, 2, AppColor.primary40),
gridItem(snapshot.completedRequests?.total?.count, "complete_request", context.translation.completed, context, snapshot.isCompleteLoading, 3, AppColor.greenStatus(context)),
],
),
), ),
), ),
); );

@ -11,7 +11,9 @@ class NotificationItem extends StatelessWidget {
final SystemNotificationModel notification; final SystemNotificationModel notification;
final Function(SystemNotificationModel) onPressed; final Function(SystemNotificationModel) onPressed;
const NotificationItem({Key key, this.notification, this.onPressed}) : super(key: key); final bool isLoading;
const NotificationItem({Key key, this.notification, this.onPressed, this.isLoading = false}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -26,7 +28,7 @@ class NotificationItem extends StatelessWidget {
style: AppTextStyles.heading6.copyWith( style: AppTextStyles.heading6.copyWith(
color: context.isDark ? AppColor.neutral30 : AppColor.neutral50, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50,
), ),
).expanded, ).toShimmer(isShow: isLoading).expanded,
8.width, 8.width,
Text( Text(
notification.createdOn.toServiceRequestCardFormat ?? "", notification.createdOn.toServiceRequestCardFormat ?? "",
@ -34,7 +36,7 @@ class NotificationItem extends StatelessWidget {
style: AppTextStyles.tinyFont.copyWith( style: AppTextStyles.tinyFont.copyWith(
color: context.isDark ? AppColor.neutral20 : AppColor.neutral50, color: context.isDark ? AppColor.neutral20 : AppColor.neutral50,
), ),
), ).toShimmer(isShow: isLoading),
], ],
), ),
Text( Text(
@ -42,7 +44,7 @@ class NotificationItem extends StatelessWidget {
style: AppTextStyles.bodyText2.copyWith( style: AppTextStyles.bodyText2.copyWith(
color: context.isDark ? AppColor.neutral10 : Color(0xFF757575), color: context.isDark ? AppColor.neutral10 : Color(0xFF757575),
), ),
), ).toShimmer(isShow: isLoading),
], ],
).onPress(() { ).onPress(() {
onPressed(notification); onPressed(notification);

Loading…
Cancel
Save