diff --git a/lib/pages/home/radar/radar.dart b/lib/pages/home/radar/radar.dart index a0e9674..29dbccf 100644 --- a/lib/pages/home/radar/radar.dart +++ b/lib/pages/home/radar/radar.dart @@ -170,12 +170,10 @@ class _RadarState extends State { data: ActionSheetData( title: 'فیلتر جستجو', titleIcon: DidvanIcons.filter_regular, - hasDismissButton: false, + dismissTitle: 'حذف فیلتر', confrimTitle: 'نمایش نتایج', - onConfirmed: () { - Navigator.of(context).pop(); - state.getRadarOverviews(page: 1, filter: true); - }, + onDismissed: state.resetFilters, + onConfirmed: () => state.getRadarOverviews(page: 1, filter: true), content: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/pages/home/radar/radar_state.dart b/lib/pages/home/radar/radar_state.dart index 1c2806b..3807720 100644 --- a/lib/pages/home/radar/radar_state.dart +++ b/lib/pages/home/radar/radar_state.dart @@ -19,6 +19,7 @@ class RadarState extends CoreProvier { startDate = null; endDate = null; selectedCats.clear(); + getRadarOverviews(page: 1); } Future getRadarOverviews({ diff --git a/lib/utils/action_sheet.dart b/lib/utils/action_sheet.dart index a05f319..8eaece4 100644 --- a/lib/utils/action_sheet.dart +++ b/lib/utils/action_sheet.dart @@ -109,6 +109,10 @@ class ActionSheetUtils { if (data.hasDismissButton) Expanded( child: DidvanButton( + onPressed: () { + Navigator.of(context).pop(); + data.onDismissed?.call(); + }, title: data.dismissTitle ?? 'بازگشت', style: ButtonStyleMode.flat, ), @@ -117,7 +121,10 @@ class ActionSheetUtils { Expanded( child: DidvanButton( style: ButtonStyleMode.primary, - onPressed: data.onConfirmed, + onPressed: () { + Navigator.of(context).pop(); + data.onConfirmed?.call(); + }, title: data.confrimTitle ?? 'تایید', ), ), diff --git a/lib/widgets/didvan/button.dart b/lib/widgets/didvan/button.dart index 7578856..79eaf90 100644 --- a/lib/widgets/didvan/button.dart +++ b/lib/widgets/didvan/button.dart @@ -1,4 +1,5 @@ import 'package:didvan/config/design_config.dart'; +import 'package:didvan/config/theme_data.dart'; import 'package:didvan/models/enums.dart'; import 'package:didvan/widgets/didvan/text.dart'; import 'package:flutter/material.dart'; @@ -23,7 +24,9 @@ class DidvanButton extends StatelessWidget { borderRadius: DesignConfig.lowBorderRadius, ), height: 48, - color: Theme.of(context).colorScheme.primary, + color: style == ButtonStyleMode.primary + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.secondCTA, onPressed: () { FocusScope.of(context).unfocus(); onPressed?.call();