From 7ca9096d8995f5788c996aef62ba9c27ff820ccf Mon Sep 17 00:00:00 2001 From: devmirza121 Date: Wed, 27 Jul 2022 11:08:04 +0300 Subject: [PATCH] Merge issue 2.0 --- lib/ui/dialogs/id/business_card_dialog.dart | 4 +- .../id/employee_digital_id_dialog.dart | 4 +- lib/ui/landing/today_attendance_screen.dart | 6 +- lib/ui/landing/widget/app_drawer.dart | 57 +++++-------------- lib/widgets/qr_scanner_dialog.dart | 2 +- pubspec.yaml | 2 +- 6 files changed, 23 insertions(+), 52 deletions(-) diff --git a/lib/ui/dialogs/id/business_card_dialog.dart b/lib/ui/dialogs/id/business_card_dialog.dart index 9b6b50b..3488958 100644 --- a/lib/ui/dialogs/id/business_card_dialog.dart +++ b/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 diff --git a/lib/ui/dialogs/id/employee_digital_id_dialog.dart b/lib/ui/dialogs/id/employee_digital_id_dialog.dart index e5db30c..e0e1054 100644 --- a/lib/ui/dialogs/id/employee_digital_id_dialog.dart +++ b/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 diff --git a/lib/ui/landing/today_attendance_screen.dart b/lib/ui/landing/today_attendance_screen.dart index dca2232..fcc4adb 100644 --- a/lib/ui/landing/today_attendance_screen.dart +++ b/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); diff --git a/lib/ui/landing/widget/app_drawer.dart b/lib/ui/landing/widget/app_drawer.dart index b8e2adf..0cf71ff 100644 --- a/lib/ui/landing/widget/app_drawer.dart +++ b/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 { }), 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: [ - 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', diff --git a/lib/widgets/qr_scanner_dialog.dart b/lib/widgets/qr_scanner_dialog.dart index 89a1912..a3adb79 100644 --- a/lib/widgets/qr_scanner_dialog.dart +++ b/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 diff --git a/pubspec.yaml b/pubspec.yaml index 1f7f410..789d51c 100644 --- a/pubspec.yaml +++ b/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