Merge issue 2.0

lib/ui/dialogs/id/business_card_dialog.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 
-import '../../../app_state/app_state.dart';
-import '../../../classes/utils.dart';
+import 'package:mohem_flutter_app/app_state/app_state.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
 
 class BusinessCardDialog extends StatelessWidget {
   @override

lib/ui/dialogs/id/employee_digital_id_dialog.dart

@@ -5,8 +5,8 @@ import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/widgets/button/default_button.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 
-import '../../../classes/utils.dart';
-import '../../../main.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
+import 'package:mohem_flutter_app/main.dart';
 
 class EmployeeDigitialIdDialog extends StatelessWidget {
   @override

lib/ui/landing/today_attendance_screen.dart

@@ -23,9 +23,9 @@ import 'package:nfc_manager/nfc_manager.dart';
 import 'package:provider/provider.dart';
 import 'package:wifi_iot/wifi_iot.dart';
 
-import '../../provider/dashboard_provider_model.dart';
-import '../../widgets/location/Location.dart';
-import '../../widgets/qr_scanner_dialog.dart';
+import 'package:mohem_flutter_app/widgets/qr_scanner_dialog.dart';
+
+
 
 class TodayAttendanceScreen extends StatefulWidget {
   TodayAttendanceScreen({Key? key}) : super(key: key);

lib/ui/landing/widget/app_drawer.dart

@@ -4,8 +4,8 @@ import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/ui/dialogs/id/employee_digital_id_dialog.dart';
 import 'package:mohem_flutter_app/ui/landing/widget/drawer_item.dart';
 
-import '../../../widgets/dialogs/dialogs.dart';
-import '../../dialogs/id/business_card_dialog.dart';
+import 'package:mohem_flutter_app/widgets/dialogs/dialogs.dart';
+import 'package:mohem_flutter_app/ui/dialogs/id/business_card_dialog.dart';
 
 class AppDrawer extends StatefulWidget {
   @override
@@ -40,55 +40,26 @@ class _AppDrawerState extends State<AppDrawer> {
                       }),
                   const Divider(),
                   InkWell(
-                      child: const DrawerItem(
-                        'Mowadhafhi',
-                        icon: Icons.person,
-                        color: Colors.grey,
-                      ),
-                      onTap: () {
-                        drawerNavigator(context, AppRoutes.mowadhafhi);
-                      }),
+                    child: const DrawerItem(
+                      'Mowadhafhi',
+                      icon: Icons.person,
+                      color: Colors.grey,
+                    ),
+                    onTap: () {
+                      drawerNavigator(context, AppRoutes.mowadhafhi);
+                    },
+                  ),
                   const Divider(),
                   InkWell(
-                      child: const DrawerItem(
-                        'Pending Transactions',
-                        icon: Icons.person,
-                        color: Colors.grey,
-                      ),
-                      onTap: () {
-                        drawerNavigator(context, AppRoutes.pendingTransactions);
-                      })
-                ],
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-      color: Colors.white,
-      child: Drawer(
-        child: Column(
-          children: <Widget>[
-            const SizedBox(
-              height: 200,
-            ),
-            Expanded(
-              child: ListView(
-                padding: const EdgeInsets.all(21),
-                physics: const BouncingScrollPhysics(),
-                children: [
-                  Divider(),
-                  InkWell(
-                    child: DrawerItem(
-                      'My Profile',
+                    child: const DrawerItem(
+                      'Pending Transactions',
                       icon: Icons.person,
                       color: Colors.grey,
                     ),
                     onTap: () {
-                      drawerNavigator(context, AppRoutes.profile);
+                      drawerNavigator(context, AppRoutes.pendingTransactions);
                     },
                   ),
-                  Divider(),
                   InkWell(
                     child: DrawerItem(
                       'Employee Digital ID',

lib/widgets/qr_scanner_dialog.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:qr_code_scanner/qr_code_scanner.dart';
 
-import 'button/default_button.dart';
+import 'package:mohem_flutter_app/widgets/button/default_button.dart';
 
 class QrScannerDialog extends StatefulWidget {
   @override

pubspec.yaml

@@ -40,7 +40,7 @@ dependencies:
   easy_localization: ^3.0.0
   http: ^0.13.4
   permission_handler: ^9.2.0
-  flutter_svg: ^1.0.0
+  flutter_svg: any
   sizer: ^2.0.15
   local_auth: ^1.1.9
   fluttertoast: ^8.0.8