From 1119fa1640360110100108a14eefbce2047d3749 Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@hmg.local>
Date: Wed, 28 Sep 2022 12:01:42 +0300
Subject: [PATCH] Updates & fixes

---
 lib/ui/attendance/monthly_attendance_screen.dart |  2 +-
 lib/ui/my_team/view_attendance.dart              |  2 +-
 lib/ui/work_list/sheets/delegate_sheet.dart      |  3 ++-
 lib/widgets/nfc/nfc_reader_sheet.dart            | 15 ++++++++-------
 pubspec.yaml                                     |  5 +++--
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/ui/attendance/monthly_attendance_screen.dart b/lib/ui/attendance/monthly_attendance_screen.dart
index c45dc0b..ebbf03f 100644
--- a/lib/ui/attendance/monthly_attendance_screen.dart
+++ b/lib/ui/attendance/monthly_attendance_screen.dart
@@ -16,7 +16,7 @@ import 'package:mohem_flutter_app/models/get_schedule_shifts_details_list_model.
 import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:mohem_flutter_app/widgets/circular_step_progress_bar.dart';
-import 'package:month_picker_dialog/month_picker_dialog.dart';
+import 'package:month_picker_dialog_2/month_picker_dialog_2.dart';
 import 'package:pie_chart/pie_chart.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
 
diff --git a/lib/ui/my_team/view_attendance.dart b/lib/ui/my_team/view_attendance.dart
index 7d8a6e0..0ca1bab 100644
--- a/lib/ui/my_team/view_attendance.dart
+++ b/lib/ui/my_team/view_attendance.dart
@@ -12,7 +12,7 @@ import 'package:mohem_flutter_app/models/get_day_hours_type_details_list_model.d
 import 'package:mohem_flutter_app/models/get_time_card_summary_list_model.dart';
 import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
-import 'package:month_picker_dialog/month_picker_dialog.dart';
+import 'package:month_picker_dialog_2/month_picker_dialog_2.dart';
 import 'package:pie_chart/pie_chart.dart';
 import 'package:syncfusion_flutter_calendar/calendar.dart';
 
diff --git a/lib/ui/work_list/sheets/delegate_sheet.dart b/lib/ui/work_list/sheets/delegate_sheet.dart
index 2904e07..229ddb1 100644
--- a/lib/ui/work_list/sheets/delegate_sheet.dart
+++ b/lib/ui/work_list/sheets/delegate_sheet.dart
@@ -200,7 +200,8 @@ class _DelegateSheetState extends State<DelegateSheet> {
                           ),
                         ),
                         if (isNeedEnableTextField)
-                          FlatButton(
+                        //Todo: Button to be fixed
+                          TextButton(
                             onPressed: () {
                               fetchUserByInput();
                             },
diff --git a/lib/widgets/nfc/nfc_reader_sheet.dart b/lib/widgets/nfc/nfc_reader_sheet.dart
index 53c0d4f..33332b9 100644
--- a/lib/widgets/nfc/nfc_reader_sheet.dart
+++ b/lib/widgets/nfc/nfc_reader_sheet.dart
@@ -88,18 +88,20 @@ class _NfcLayoutState extends State<NfcLayout> {
             "assets/icons/nfc/ic_nfc.png",
             height: MediaQuery.of(context).size.width / 3,
           ),
-          SizedBox(
+          const SizedBox(
             height: 30,
           ),
-          Text(
+          const Text(
             "Approach an NFC Tag",
             style: TextStyle(
               fontSize: 18,
             ),
           ),
-          SizedBox(
+          const SizedBox(
             height: 30,
           ),
+
+          //Todo: Button to be fixed
           ButtonTheme(
             minWidth: MediaQuery.of(context).size.width / 1.2,
             height: 45.0,
@@ -107,12 +109,11 @@ class _NfcLayoutState extends State<NfcLayout> {
             shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(6),
             ),
-            child: RaisedButton(
+            child: TextButton(
               onPressed: () {
                 NfcManager.instance.stopSession();
                 Navigator.pop(context);
               },
-              elevation: 0,
               child: Text("CANCEL"),
             ),
           ),
@@ -159,6 +160,7 @@ class _NfcLayoutState extends State<NfcLayout> {
           SizedBox(
             height: 30,
           ),
+          //Todo: Button to be fixed
           ButtonTheme(
             minWidth: MediaQuery.of(context).size.width / 1.2,
             height: 45.0,
@@ -166,14 +168,13 @@ class _NfcLayoutState extends State<NfcLayout> {
             shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(6),
             ),
-            child: RaisedButton(
+            child: TextButton(
               // onPressed: () {
               //   _stream?.cancel();
               //   widget.onNcfScan(nfcId);
               //   Navigator.pop(context);
               // },
               onPressed: null,
-              elevation: 0,
               child: Text("DONE"),
             ),
           ),
diff --git a/pubspec.yaml b/pubspec.yaml
index ee15638..161f2ea 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -52,7 +52,7 @@ dependencies:
   shimmer: ^2.0.0
   logger: ^1.1.0
   flutter_countdown_timer: ^4.1.0
-  nfc_manager: ^3.1.1
+  nfc_manager: ^3.2.0
   uuid: ^3.0.6
   image_picker: ^0.8.5+3
   file_picker: ^4.6.1
@@ -64,7 +64,8 @@ dependencies:
   #  flutter_compass: ^0.6.1
   google_maps_flutter_web: ^0.3.2
   month_year_picker: ^0.2.0+1
-  month_picker_dialog: ^0.4.0
+#  month_picker_dialog: ^0.4.0
+  month_picker_dialog_2: 0.5.5
   open_file: ^3.2.1
   wifi_iot: ^0.3.16
   flutter_html: ^2.2.1