From 96526c1972e2cd45f7e5bf82befcfd30dfd806a9 Mon Sep 17 00:00:00 2001 From: Efril Date: Thu, 14 May 2026 15:05:04 +0700 Subject: [PATCH] update --- .../dashboard_analytic_loader_state.dart | 2 +- .../order/order_loader/order_loader_state.dart | 2 +- lib/presentation/pages/home/home_page.dart | 2 ++ lib/presentation/pages/report/report_page.dart | 16 +++++++++++++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/application/analytic/dashboard_analytic_loader/dashboard_analytic_loader_state.dart b/lib/application/analytic/dashboard_analytic_loader/dashboard_analytic_loader_state.dart index b0a3917..6507cf8 100644 --- a/lib/application/analytic/dashboard_analytic_loader/dashboard_analytic_loader_state.dart +++ b/lib/application/analytic/dashboard_analytic_loader/dashboard_analytic_loader_state.dart @@ -14,7 +14,7 @@ class DashboardAnalyticLoaderState with _$DashboardAnalyticLoaderState { DashboardAnalyticLoaderState( dashboardAnalytic: DashboardAnalytic.empty(), failureOptionDashboardAnalytic: none(), - dateFrom: DateTime.now().subtract(const Duration(days: 30)), + dateFrom: DateTime.now(), dateTo: DateTime.now(), ); } diff --git a/lib/application/order/order_loader/order_loader_state.dart b/lib/application/order/order_loader/order_loader_state.dart index 2fdbc49..fdce154 100644 --- a/lib/application/order/order_loader/order_loader_state.dart +++ b/lib/application/order/order_loader/order_loader_state.dart @@ -18,7 +18,7 @@ class OrderLoaderState with _$OrderLoaderState { factory OrderLoaderState.initial() => OrderLoaderState( orders: [], failureOptionOrder: none(), - dateFrom: DateTime.now().subtract(const Duration(days: 30)), + dateFrom: DateTime.now(), dateTo: DateTime.now(), status: 'all', ); diff --git a/lib/presentation/pages/home/home_page.dart b/lib/presentation/pages/home/home_page.dart index 12f5a94..a811baf 100644 --- a/lib/presentation/pages/home/home_page.dart +++ b/lib/presentation/pages/home/home_page.dart @@ -91,6 +91,8 @@ class _HomePageState extends State with TickerProviderStateMixin { child: Scaffold( backgroundColor: AppColor.background, body: RefreshIndicator( + backgroundColor: AppColor.white, + color: AppColor.primary, onRefresh: () { _refetchDashboard(context); return Future.value(); diff --git a/lib/presentation/pages/report/report_page.dart b/lib/presentation/pages/report/report_page.dart index d790f86..1234863 100644 --- a/lib/presentation/pages/report/report_page.dart +++ b/lib/presentation/pages/report/report_page.dart @@ -107,7 +107,20 @@ class _ReportPageState extends State with TickerProviderStateMixin { DashboardAnalyticLoaderState >( builder: (context, state) { - return CustomScrollView( + return RefreshIndicator( + color: AppColor.primary, + onRefresh: () async { + context.read().add( + DashboardAnalyticLoaderEvent.fetched(), + ); + // tunggu sampai fetching selesai + await context + .read() + .stream + .firstWhere((s) => !s.isFetching); + }, + child: CustomScrollView( + physics: const AlwaysScrollableScrollPhysics(), slivers: [ SliverAppBar( expandedHeight: 120, @@ -197,6 +210,7 @@ class _ReportPageState extends State with TickerProviderStateMixin { ), ), ], + ), ); }, ),