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,12 +11,19 @@ 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, _) {
return RefreshIndicator(
onRefresh: () {
Provider.of<AllRequestsProvider>(context, listen: false).getRequests();
_notificationsProvider.getSystemNotifications();
return Future.delayed(const Duration(microseconds: 250));
},
child: SingleChildScrollView(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Container( child: Container(
decoration: ShapeDecoration( decoration: ShapeDecoration(
@ -27,7 +35,12 @@ class RecentActivitiesFragment extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
context.translation.recentActivities.heading5(context).paddingOnly(top: 16, start: 16, end: 16), context.translation.recentActivities
.heading5(context)
.toShimmer(
isShow: _notificationsProvider.isLoading,
)
.paddingOnly(top: 16, start: 16, end: 16),
ListView.separated( ListView.separated(
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
@ -37,6 +50,7 @@ class RecentActivitiesFragment extends StatelessWidget {
itemBuilder: (context, itemIndex) { itemBuilder: (context, itemIndex) {
// todo add priority & progress tag to show chip // todo add priority & progress tag to show chip
return NotificationItem( return NotificationItem(
isLoading: _notificationsProvider.isLoading,
notification: _notificationsProvider.notifications[itemIndex], notification: _notificationsProvider.notifications[itemIndex],
onPressed: (notification) { onPressed: (notification) {
// todo @sikander, check notifications payload, because notification model is different to need to check from backend // todo @sikander, check notifications payload, because notification model is different to need to check from backend
@ -48,6 +62,8 @@ class RecentActivitiesFragment extends StatelessWidget {
], ],
), ),
), ),
),
); );
});
} }
} }

@ -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,7 +19,13 @@ 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(
onRefresh: () {
snapshot.getRequests();
Provider.of<NotificationsProvider>(context, listen: false).getSystemNotifications();
return Future.delayed(const Duration(microseconds: 250));
},
child: GridView(
padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16), padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 191 / 237, crossAxisSpacing: 16, mainAxisSpacing: 16), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 191 / 237, crossAxisSpacing: 16, mainAxisSpacing: 16),
children: [ children: [
@ -37,6 +44,7 @@ class RequestsFragment extends StatelessWidget {
], ],
), ),
), ),
),
); );
} }

@ -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