From 76c5f474185597bfeb585ec7b8fd26687fe01d85 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 20 Mar 2023 13:41:30 +0700
Subject: [PATCH] TF-997 Apply new design for mobile

(cherry picked from commit 3c72fcecc6a86d21ac6d6df8335e9d912b863bae)
---
 .../base/mixin/date_range_picker_mixin.dart   | 49 +++++++------------
 1 file changed, 19 insertions(+), 30 deletions(-)

diff --git a/lib/features/base/mixin/date_range_picker_mixin.dart b/lib/features/base/mixin/date_range_picker_mixin.dart
index ab6b809a9..78ff97a84 100644
--- a/lib/features/base/mixin/date_range_picker_mixin.dart
+++ b/lib/features/base/mixin/date_range_picker_mixin.dart
@@ -1,9 +1,8 @@
 
 import 'package:core/presentation/utils/app_toast.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_date_range_picker/multiple_view_date_range_picker.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter_date_range_picker/material_date_range_picker_dialog.dart';
 import 'package:get/get.dart';
-import 'package:pointer_interceptor/pointer_interceptor.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
 
@@ -15,33 +14,23 @@ mixin DateRangePickerMixin {
     DateTime? initEndDate,
     {Function(DateTime? startDate, DateTime? endDate)? onCallbackAction}
   ) {
-    showGeneralDialog(
-      context: context,
-      barrierDismissible: true,
-      barrierLabel: '',
-      barrierColor: Colors.black54,
-      pageBuilder: (context, _, __) {
-        return Dialog(
-          elevation: 0,
-          backgroundColor: Colors.white,
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(18.0)),
-          child: PointerInterceptor(child: MultipleViewDateRangePicker(
-              confirmText: AppLocalizations.of(context).setDate,
-              cancelText: AppLocalizations.of(context).cancel,
-              last7daysTitle: AppLocalizations.of(context).last7Days,
-              last30daysTitle: AppLocalizations.of(context).last30Days,
-              last6monthsTitle: AppLocalizations.of(context).last6Months,
-              lastYearTitle: AppLocalizations.of(context).lastYears,
-              startDate: initStartDate,
-              endDate: initEndDate,
-              setDateActionCallback: ({startDate, endDate}) =>
-                _handleSelectDateRangeResult(
-                  context,
-                  startDate,
-                  endDate,
-                  onCallbackAction: onCallbackAction
-                )
-          ))
+    MaterialDateRangePickerDialog.showDateRangePicker(
+      context,
+      confirmText: AppLocalizations.of(context).setDate,
+      cancelText: AppLocalizations.of(context).cancel,
+      last7daysTitle: AppLocalizations.of(context).last7Days,
+      last30daysTitle: AppLocalizations.of(context).last30Days,
+      last6monthsTitle: AppLocalizations.of(context).last6Months,
+      lastYearTitle: AppLocalizations.of(context).lastYears,
+      initStartDate: initStartDate,
+      initEndDate: initEndDate,
+      autoClose: false,
+      selectDateRangeActionCallback: (startDate, endDate) {
+        _handleSelectDateRangeResult(
+          context,
+          startDate,
+          endDate,
+          onCallbackAction: onCallbackAction
         );
       }
     );