import optimization

lib/controllers/localization/localization.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 
-import 'package:test_sa/models/subtitle.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:test_sa/models/subtitle.dart';
 
 
 class AppLocalization {

lib/controllers/notification/firebase_notification_manger.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:test_sa/models/app_notification.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/models/app_notification.dart';
 
 import 'notification_manger.dart';
 

lib/controllers/notification/notification_manger.dart

@@ -1,6 +1,6 @@
-import 'package:test_sa/views/app_style/colors.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:test_sa/views/app_style/colors.dart';
 
 class NotificationManger{
   // private constructor to avoid create object

lib/controllers/providers/api/departments_provider.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/department.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/department.dart';
 
 class DepartmentsProvider extends ChangeNotifier{
 

lib/controllers/providers/api/device_transfer_provider.dart

@@ -1,21 +1,11 @@
 import 'dart:convert';
 
+import 'package:flutter/cupertino.dart';
+import 'package:http/http.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart';
-import 'package:test_sa/models/department.dart';
 import 'package:test_sa/models/device/device_transfer.dart';
-import 'package:test_sa/models/device/device.dart';
 import 'package:test_sa/models/device/device_transfer_info.dart';
-import 'package:test_sa/models/gas_refill/gas_refill_model.dart';
-import 'package:test_sa/models/hospital.dart';
-import 'package:test_sa/models/issue.dart';
-import 'package:test_sa/models/service_report.dart';
-import 'package:test_sa/models/service_request/service_request.dart';
-import 'package:test_sa/models/service_request/service_request_search.dart';
-import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/models/user.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:http/http.dart';
 
 class DeviceTransferProvider extends ChangeNotifier{
 
@@ -74,10 +64,6 @@ class DeviceTransferProvider extends ChangeNotifier{
     // return 200;
     Response response;
     try{
-      print( Uri.parse(
-          "$host${URLs.getDeviceTransfer}?uid=${user.id}"
-              "&token=${user.token}&page=${(items?.length ?? 0) ~/pageItemNumber}"
-      ),);
       response = await get(
           Uri.parse(
               "$host${URLs.getDeviceTransfer}?uid=${user.id}"
@@ -106,7 +92,6 @@ class DeviceTransferProvider extends ChangeNotifier{
       return response.statusCode;
 
     } catch(error) {
-      print(error);
       isLoading = false;
       stateCode = -1;
       notifyListeners();
@@ -136,8 +121,6 @@ class DeviceTransferProvider extends ChangeNotifier{
           host+URLs.requestDeviceTransfer),
           body: body,
       );
-
-      print(response.body);
       stateCode = response.statusCode;
       if(response.statusCode >= 200 && response.statusCode < 300) {
         if(items != null) {
@@ -153,7 +136,6 @@ class DeviceTransferProvider extends ChangeNotifier{
       return response.statusCode;
 
     } catch(error) {
-      print(error);
       return -1;
     }
 
@@ -175,16 +157,12 @@ class DeviceTransferProvider extends ChangeNotifier{
     };
     
     body.addAll(newModel.toJson(isSender));
-    print(body);
     Response response;
     try{
-      print(Uri.parse("$host${URLs.updateDeviceTransfer}/$requestId"),);
       response = await post(
         Uri.parse("$host${URLs.updateDeviceTransfer}/$requestId"),
         body: body,
       );
-
-      print(response.body);
       stateCode = response.statusCode;
       if(response.statusCode >= 200 && response.statusCode < 300) {
         reset();
@@ -198,7 +176,6 @@ class DeviceTransferProvider extends ChangeNotifier{
       return response.statusCode;
 
     } catch(error) {
-      print(error);
       return -1;
     }
 

lib/controllers/providers/api/devices_provider.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
 
+import 'package:flutter/cupertino.dart';
+import 'package:http/http.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
 import 'package:test_sa/models/device/device.dart';
 import 'package:test_sa/models/user.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:http/http.dart';
 
 class DevicesProvider extends ChangeNotifier{
 

lib/controllers/providers/api/gas_refill_provider.dart

@@ -1,16 +1,10 @@
 import 'dart:convert';
 
+import 'package:flutter/cupertino.dart';
+import 'package:http/http.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart';
 import 'package:test_sa/models/gas_refill/gas_refill_model.dart';
-import 'package:test_sa/models/issue.dart';
-import 'package:test_sa/models/service_report.dart';
-import 'package:test_sa/models/service_request/service_request.dart';
-import 'package:test_sa/models/service_request/service_request_search.dart';
-import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/models/user.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:http/http.dart';
 
 class GasRefillProvider extends ChangeNotifier{
 

lib/controllers/providers/api/hospitals_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/hospital.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/hospital.dart';
+import 'package:test_sa/models/user.dart';
 
 class HospitalsProvider extends ChangeNotifier{
 

lib/controllers/providers/api/notifications_provider.dart

@@ -1,10 +1,10 @@
 import 'dart:convert';
 
+import 'package:flutter/cupertino.dart';
+import 'package:http/http.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
 import 'package:test_sa/models/app_notification.dart';
 import 'package:test_sa/models/user.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:http/http.dart';
 
 class NotificationsProvider extends ChangeNotifier{
 

lib/controllers/providers/api/service_requests_provider.dart

@@ -1,5 +1,7 @@
 import 'dart:convert';
 
+import 'package:flutter/cupertino.dart';
+import 'package:http/http.dart';
 import 'package:test_sa/controllers/api_routes/urls.dart';
 import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart';
 import 'package:test_sa/models/issue.dart';
@@ -10,8 +12,6 @@ import 'package:test_sa/models/service_request/service_request_search.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/models/timer_model.dart';
 import 'package:test_sa/models/user.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:http/http.dart';
 
 class ServiceRequestsProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/employee/employee_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class EmployeesProvider extends ChangeNotifier{
 
@@ -52,7 +52,6 @@ class EmployeesProvider extends ChangeNotifier{
         Uri.parse(
             host + URLs.getEmployees),
       );
-      print(response.body);
       _stateCode = response.statusCode;
       if(response.statusCode >= 200 && response.statusCode < 300) {
         // client's request was successfully received

lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class GasCylinderSizesProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart

@@ -61,7 +61,6 @@ class GasTypesProvider extends ChangeNotifier{
       notifyListeners();
       return response.statusCode;
     } catch(error) {
-      print(error);
       _loading = false;
       _stateCode = -1;
       notifyListeners();

lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class PentryStatusProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class PentryTaskStatusProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class PentryVisitStatusProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class ServiceRequestDefectTypesProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class ServiceReportLastCallsProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class ServiceRequestPriorityProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class ServiceReportReasonsProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class ServiceReportStatusProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class ServiceReportTypesProvider extends ChangeNotifier{
 

lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 
-import 'package:test_sa/controllers/api_routes/urls.dart';
-import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/user.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
+import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/user.dart';
 
 class ServiceStatusProvider extends ChangeNotifier{
 

lib/extensions/widget_extensions.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:test_sa/views/app_style/colors.dart';
 
 extension WidgetExtensions on Widget {
   Widget onPress(VoidCallback onTap) => InkWell(onTap: onTap, child: this);

lib/main.dart

@@ -1,6 +1,9 @@
 import 'dart:io';
 
 import 'package:firebase_core/firebase_core.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/departments_provider.dart';
 import 'package:test_sa/controllers/providers/api/device_transfer_provider.dart';
@@ -35,9 +38,7 @@ import 'package:test_sa/views/pages/user/visits/preventive_maintenance_visits_pa
 import 'package:test_sa/views/pages/user/visits/regular_visits_page.dart';
 import 'package:test_sa/views/widgets/departments/single_department_picker.dart';
 import 'package:test_sa/views/widgets/equipment/single_device_picker.dart';
-import 'package:flutter/material.dart';
+
-import 'package:flutter_localizations/flutter_localizations.dart';
-import 'package:provider/provider.dart';
 import 'controllers/providers/api/parts_provider.dart';
 import 'controllers/providers/api/preventive_maintenance_visits_provider.dart';
 import 'controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart';

lib/models/device/device_transfer.dart

@@ -1,9 +1,5 @@
-import 'package:http/http.dart';
-import 'package:test_sa/models/department.dart';
 import 'package:test_sa/models/device/device.dart';
 import 'package:test_sa/models/device/device_transfer_info.dart';
-import 'package:test_sa/models/hospital.dart';
-import 'package:test_sa/models/lookup.dart';
 
 class DeviceTransfer{
   String id;

lib/models/device/device_transfer_info.dart

@@ -1,6 +1,4 @@
-import 'package:http/http.dart';
 import 'package:test_sa/models/department.dart';
-import 'package:test_sa/models/device/device.dart';
 import 'package:test_sa/models/hospital.dart';
 import 'package:test_sa/models/lookup.dart';
 

lib/models/pantry/pentry.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/pantry/calibration_tools.dart';
-import 'package:test_sa/models/pantry/contact.dart';
 import 'package:test_sa/models/pantry/pm_kit.dart';
 import 'package:test_sa/models/pantry/ppm_check_list.dart';
 import 'package:test_sa/models/timer_model.dart';

lib/models/service_report.dart

@@ -1,8 +1,8 @@
 import 'dart:convert';
 
 import 'package:test_sa/models/device/device.dart';
-import 'package:test_sa/models/part.dart';
 import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/part.dart';
 import 'package:test_sa/models/timer_model.dart';
 
 class ServiceReport {

lib/models/service_request/service_request.dart

@@ -1,7 +1,5 @@
 import 'package:test_sa/models/lookup.dart';
 
-import '../timer_model.dart';
-
 class ServiceRequest{
   String id;
   String requestCode;

lib/models/visits/visit.dart

@@ -1,5 +1,4 @@
 import 'package:test_sa/models/lookup.dart';
-import 'package:test_sa/models/timer_model.dart';
 
 class Visit{
   String id;

lib/views/pages/device_transfer/device_transfer_details.dart

@@ -15,7 +15,6 @@ import 'package:test_sa/views/widgets/buttons/app_small_button.dart';
 import 'package:test_sa/views/widgets/device_trancfer/device_transfer_info_section.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/requests/info_row.dart';
-import 'package:test_sa/views/widgets/requests/request_status.dart';
 
 class DeviceTransferDetails extends StatefulWidget {
   final DeviceTransfer model;
@@ -51,7 +50,6 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
     _userProvider = Provider.of<UserProvider>(context);
     _settingProvider = Provider.of<SettingProvider>(context);
     _deviceTransferProvider = Provider.of<DeviceTransferProvider>(context);
-    print(_userProvider.user.id);
     _isSender = _userProvider.user.id == widget.model.sender?.userId;
     _isReceiver = _userProvider.user.id == widget.model.receiver?.userId;
     return Scaffold(

lib/views/pages/device_transfer/request_device_transfer.dart

@@ -12,7 +12,6 @@ import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
 import 'package:test_sa/views/widgets/departments/department_button.dart';
-import 'package:test_sa/views/widgets/e_signature/e_signature.dart';
 import 'package:test_sa/views/widgets/equipment/device_button.dart';
 import 'package:test_sa/views/widgets/hospitals/hospital_button.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';

lib/views/pages/device_transfer/track_device_transfer.dart

@@ -1,21 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/device_transfer_provider.dart';
-import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart';
-import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
-import 'package:test_sa/models/service_request/service_request_search.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/colors.dart';
-import 'package:test_sa/views/widgets/device_trancfer/device_transfer_list.dart';
-import 'package:test_sa/views/widgets/gas_refill/gas_refill_list.dart';
-import 'package:test_sa/views/widgets/requests/service_request_list.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
-import 'package:test_sa/views/widgets/buttons/app_icon_button.dart';
+import 'package:test_sa/views/widgets/device_trancfer/device_transfer_list.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
-import 'package:test_sa/views/widgets/search/service_request_search_bar.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class TrackDeviceTransferPage extends StatefulWidget {
   static const String id = "/track-device-transfer";
 

lib/views/pages/device_transfer/update_device_transfer.dart

@@ -14,10 +14,7 @@ import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/app_text_form_field.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
-import 'package:test_sa/views/widgets/departments/department_button.dart';
 import 'package:test_sa/views/widgets/e_signature/e_signature.dart';
-import 'package:test_sa/views/widgets/equipment/device_button.dart';
-import 'package:test_sa/views/widgets/hospitals/hospital_button.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/gas_refill/gas_status.dart';
 import 'package:test_sa/views/widgets/titles/app_sub_title.dart';

lib/views/pages/splash_screen.dart

@@ -1,16 +1,16 @@
 import 'dart:convert';
 
+import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flare_flutter/flare_actor.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/notification/notification_manger.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/app_notification.dart';
 import 'package:test_sa/models/user.dart';
 import 'package:test_sa/views/pages/user/land_page.dart';
-import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
 import 'login.dart';
 
@@ -70,7 +70,6 @@ class _SplashScreenState extends State<SplashScreen> {
               print(await FirebaseMessaging.instance.getToken());
               Navigator.of(context).pushNamed(Login.id);
               if(_settingProvider.isLoaded && _settingProvider.user != null){
-                print(_settingProvider.user.toJson());
                 _goToUserScreen(_settingProvider.user);
               }
             },

lib/views/pages/user/gas_refill/gas_refill_details.dart

@@ -13,7 +13,6 @@ import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_icon_button.dart';
-import 'package:test_sa/views/widgets/gas_refill/gas_refill_create_details_item.dart';
 import 'package:test_sa/views/widgets/gas_refill/gas_refill_update_details_item.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/requests/info_row.dart';

lib/views/pages/user/gas_refill/track_gas_refill.dart

@@ -1,19 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart';
-import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
-import 'package:test_sa/models/service_request/service_request_search.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/colors.dart';
-import 'package:test_sa/views/widgets/gas_refill/gas_refill_list.dart';
-import 'package:test_sa/views/widgets/requests/service_request_list.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
-import 'package:test_sa/views/widgets/buttons/app_icon_button.dart';
+import 'package:test_sa/views/widgets/gas_refill/gas_refill_list.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
-import 'package:test_sa/views/widgets/search/service_request_search_bar.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class TrackGasRefillPage extends StatefulWidget {
   static const String id = "/track-gas-refill";
 

lib/views/pages/user/land_page.dart

@@ -33,7 +33,6 @@ import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_icon_button.dart';
 import 'package:test_sa/views/widgets/dialogs/dialog.dart';
 import 'package:test_sa/views/widgets/drawer/drawer_item.dart';
-import 'package:test_sa/views/widgets/loaders/image_loader.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../widgets/land_page/land_page_item.dart';
@@ -94,7 +93,6 @@ class _LandPageState extends State<LandPage> {
     _buttonHeight = 68 * AppStyle.getScaleFactor(context);
     return WillPopScope(
       onWillPop: () async {
-        print("back pressed");
         bool result = await showDialog(
             context: context,
             builder: (_) => AAlertDialog(
@@ -280,7 +278,7 @@ class _LandPageState extends State<LandPage> {
                     decoration: BoxDecoration(border: Border.all(color: Theme.of(context).primaryColor, width: 2), shape: BoxShape.circle),
                     child: ClipOval(
                       child: ClipOval(
-                        child: Icon(Icons.person,size: 72,color: Theme.of(context).colorScheme.primary,),
+                        child: Icon(Icons.person,size: 36,color: Theme.of(context).colorScheme.primary,),
                       ),
                     ),
                   ),

lib/views/pages/user/notifications/notifications_page.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/notifications_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
@@ -7,8 +9,6 @@ import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/pages/user/notifications/notifications_list.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class NotificationsPage extends StatefulWidget {
   static final String id = "/notifications";
   @override

lib/views/pages/user/report_issues_page.dart

@@ -1,3 +1,6 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
@@ -8,15 +11,11 @@ import 'package:test_sa/models/service_request/service_request.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-
 import 'package:test_sa/views/widgets/app_text_form_field.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
 import 'package:test_sa/views/widgets/issues/report_issue_item.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:provider/provider.dart';
 class ReportIssuesPage extends StatefulWidget {
   static final String id = "/report-issue";
   final ServiceRequest serviceRequest;

lib/views/pages/user/requests/create_request.dart

@@ -194,7 +194,6 @@ class _CreateRequestPageState extends State<CreateRequestPage> {
                             final file = File(_serviceRequest.audio);
                             _serviceRequest.audio = base64Encode(file.readAsBytesSync());
                           }
-                          print("pass data");
                           int status = await _serviceRequestsProvider.createRequest(
                             user: _userProvider.user,
                             host: _settingProvider.host,

lib/views/pages/user/requests/report/edit_service_report.dart

@@ -1,18 +1,20 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
-import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart';
 import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
+import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/controllers/validator/validator.dart';
-import 'package:test_sa/models/device/device.dart';
 import 'package:test_sa/models/part.dart';
 import 'package:test_sa/models/service_report.dart';
 import 'package:test_sa/models/service_request/service_request.dart';
-import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
@@ -33,10 +35,6 @@ import 'package:test_sa/views/widgets/status/report/service_report_type.dart';
 import 'package:test_sa/views/widgets/status/report/service_status.dart';
 import 'package:test_sa/views/widgets/timer/app_timer.dart';
 import 'package:test_sa/views/widgets/titles/app_sub_title.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:provider/provider.dart';
 class EditServiceReport extends StatefulWidget {
   static final String id = "/edit-service-report";
   final ServiceRequest request ;

lib/views/pages/user/requests/report/future_service_report.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
@@ -5,11 +7,8 @@ import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/service_report.dart';
 import 'package:test_sa/models/service_request/service_request.dart';
 import 'package:test_sa/models/subtitle.dart';
-import 'package:test_sa/views/pages/user/requests/request_details.dart';
 import 'package:test_sa/views/widgets/loaders/app_loading.dart';
 import 'package:test_sa/views/widgets/loaders/failed_loading.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
 import 'edit_service_report.dart';
 class FutureServiceReport extends StatefulWidget {

lib/views/pages/user/requests/request_details.dart

@@ -1,3 +1,7 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
@@ -20,11 +24,6 @@ import 'package:test_sa/views/widgets/requests/request_status.dart';
 import 'package:test_sa/views/widgets/requests/service_request_update_dialog.dart';
 import 'package:test_sa/views/widgets/sound/sound_player.dart';
 import 'package:test_sa/views/widgets/titles/app_sub_title.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
 
 import '../report_issues_page.dart';
 import 'report/future_service_report.dart';

lib/views/pages/user/requests/requests_page.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
@@ -5,13 +7,11 @@ import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/service_request/service_request_search.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/colors.dart';
-import 'package:test_sa/views/widgets/requests/service_request_list.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_icon_button.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
+import 'package:test_sa/views/widgets/requests/service_request_list.dart';
 import 'package:test_sa/views/widgets/search/service_request_search_bar.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class ServiceRequestsPage extends StatefulWidget {
   static final String id = "/service-requests";
   @override

lib/views/pages/user/visits/preventive_maintenance_visits_page.dart

@@ -1,3 +1,7 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/preventive_maintenance_visits_provider.dart';
@@ -8,16 +12,12 @@ import 'package:test_sa/models/visits/visits_group.dart';
 import 'package:test_sa/models/visits/visits_search.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/pages/user/visits/update_visits_group_sheet.dart';
-import 'package:test_sa/views/widgets/visits/visits_list.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_icon_button.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/search/visits_search_bar.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:test_sa/views/widgets/visits/visits_list.dart';
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:provider/provider.dart';
 class PreventiveMaintenanceVisitsPage extends StatefulWidget {
   static final String id = "/preventive-maintenance-visits";
   @override

lib/views/pages/user/visits/regular_visits_page.dart

@@ -1,3 +1,7 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/regular_visits_provider.dart';
@@ -8,16 +12,12 @@ import 'package:test_sa/models/visits/visits_group.dart';
 import 'package:test_sa/models/visits/visits_search.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/pages/user/visits/update_visits_group_sheet.dart';
-import 'package:test_sa/views/widgets/visits/visits_list.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_icon_button.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/search/visits_search_bar.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:test_sa/views/widgets/visits/visits_list.dart';
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:provider/provider.dart';
 class RegularVisitsPage extends StatefulWidget {
   static final String id = "/Regular-visits";
   @override

lib/views/pages/user/visits/update_visits_group_sheet.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/subtitle.dart';
@@ -15,7 +16,6 @@ import 'package:test_sa/views/widgets/date_and_time/date_picker.dart';
 import 'package:test_sa/views/widgets/images/one_image_picker.dart';
 import 'package:test_sa/views/widgets/search/filter_item.dart';
 import 'package:test_sa/views/widgets/visits/visit_status.dart';
-import 'package:flutter/material.dart';
 class UpdateVisitsGroupSheet extends StatefulWidget {
   final List<Visit> visits;
   final String title;

lib/views/pages/user/visits/visit_details.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/subtitle.dart';
@@ -11,7 +12,6 @@ import 'package:test_sa/views/widgets/images/images_list.dart';
 import 'package:test_sa/views/widgets/loaders/image_loader.dart';
 import 'package:test_sa/views/widgets/requests/info_row.dart';
 import 'package:test_sa/views/widgets/visits/visit_status.dart';
-import 'package:flutter/material.dart';
 
 import '../../../../controllers/providers/api/regular_visits_provider.dart';
 

lib/views/widgets/app_name_bar.dart

@@ -1,6 +1,6 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
 class AppNameBar extends StatelessWidget {
   @override
   Widget build(BuildContext context) {

lib/views/widgets/buttons/app_icon_button.dart

@@ -1,7 +1,7 @@
-import 'package:test_sa/views/app_style/colors.dart';
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:test_sa/views/app_style/colors.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 class AIconButton extends StatelessWidget {
 
   final IconData iconData;

lib/views/widgets/date_and_time/date_picker.dart

@@ -1,6 +1,5 @@
-import 'package:test_sa/views/app_style/colors.dart';
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 
 class ADatePicker extends StatelessWidget {
   final DateTime date;

lib/views/widgets/date_and_time/from_to_date_bar.dart

@@ -1,7 +1,7 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
 
 import 'date_picker.dart';
 class FromToDateBar extends StatefulWidget {

lib/views/widgets/departments/department_item.dart

@@ -1,7 +1,7 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/models/department.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
 class DepartmentItem extends StatelessWidget {
   final Department department;
   final Function(Department) onPressed;

lib/views/widgets/departments/single_department_picker.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/departments_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
@@ -6,8 +8,6 @@ import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/widgets/departments/department_item.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/loaders/no_item_found.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
 import '../app_text_form_field.dart';
 class SingleDepartmentPicker extends StatefulWidget {

lib/views/widgets/device_trancfer/device_transfer_info_section.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/device/device_transfer_info.dart';
 import 'package:test_sa/views/app_style/colors.dart';
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/loaders/image_loader.dart';
 import 'package:test_sa/views/widgets/requests/info_row.dart';
 import 'package:test_sa/views/widgets/requests/request_status.dart';

lib/views/widgets/device_trancfer/device_transfer_list.dart

@@ -1,17 +1,11 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/device/device_transfer.dart';
-import 'package:test_sa/models/gas_refill/gas_refill_model.dart';
-import 'package:test_sa/models/service_request/service_request.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/pages/device_transfer/device_transfer_details.dart';
-import 'package:test_sa/views/pages/user/gas_refill/gas_refill_details.dart';
-import 'package:test_sa/views/pages/user/requests/request_details.dart';
 import 'package:test_sa/views/widgets/device_trancfer/device_transfer_item.dart';
-import 'package:test_sa/views/widgets/gas_refill/gas_refill_item.dart';
 import 'package:test_sa/views/widgets/loaders/lazy_loading.dart';
 import 'package:test_sa/views/widgets/loaders/no_item_found.dart';
-import 'package:test_sa/views/widgets/requests/service_request_item.dart';
-import 'package:flutter/material.dart';
 class DeviceTransferList extends StatelessWidget {
   final List<DeviceTransfer> items;
   final bool nextPage;

lib/views/widgets/e_signature/e_signature.dart

@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:signature/signature.dart';

lib/views/widgets/equipment/auto_complete_devices_field.dart

@@ -1,13 +1,12 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_typeahead/flutter_typeahead.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/devices_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/device/device.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_typeahead/flutter_typeahead.dart';
-import 'package:provider/provider.dart';
 class AutoCompleteDeviceField extends StatefulWidget {
   final Device initialValue;
   final String hospitalId;

lib/views/widgets/equipment/device_item.dart

@@ -1,9 +1,9 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/device/device.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
 class DeviceItem extends StatelessWidget {
   final Device device;
   final Function(Device) onPressed;

lib/views/widgets/equipment/single_device_picker.dart

@@ -1,3 +1,6 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/devices_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
@@ -8,9 +11,6 @@ import 'package:test_sa/views/widgets/equipment/device_item.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/loaders/no_item_found.dart';
 import 'package:test_sa/views/widgets/qr/scan_qr.dart';
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:provider/provider.dart';
 
 import '../app_text_form_field.dart';
 class SingleDevicePicker extends StatefulWidget {

lib/views/widgets/gas_refill/gas_refill_list.dart

@@ -1,14 +1,11 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/gas_refill/gas_refill_model.dart';
-import 'package:test_sa/models/service_request/service_request.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/pages/user/gas_refill/gas_refill_details.dart';
-import 'package:test_sa/views/pages/user/requests/request_details.dart';
 import 'package:test_sa/views/widgets/gas_refill/gas_refill_item.dart';
 import 'package:test_sa/views/widgets/loaders/lazy_loading.dart';
 import 'package:test_sa/views/widgets/loaders/no_item_found.dart';
-import 'package:test_sa/views/widgets/requests/service_request_item.dart';
-import 'package:flutter/material.dart';
 class GasRefillList extends StatelessWidget {
   final List<GasRefillModel> items;
   final bool nextPage;

lib/views/widgets/gas_refill/gas_refill_update_details_item.dart

@@ -3,7 +3,6 @@ import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/validator/validator.dart';
 import 'package:test_sa/models/gas_refill/gas_refill_details.dart';
 import 'package:test_sa/models/subtitle.dart';
-import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/widgets/app_text_form_field.dart';
 import 'package:test_sa/views/widgets/requests/info_row.dart';
 import 'package:test_sa/views/widgets/titles/app_sub_title.dart';

lib/views/widgets/hospitals/single_hospital_picker.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/controllers/providers/api/hospitals_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
@@ -6,8 +8,6 @@ import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/widgets/hospitals/hospital_item.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/loaders/no_item_found.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
 import '../app_text_form_field.dart';
 class SingleHospitalPicker extends StatefulWidget {

lib/views/widgets/images/image_item.dart

@@ -1,8 +1,8 @@
+import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/loaders/image_loader.dart';
-import 'package:flutter/material.dart';
-import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 class ImageItem extends StatelessWidget {
   final String url;
   final bool isVideo;

lib/views/widgets/images/images_list.dart

@@ -1,5 +1,5 @@
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 
 import 'image_item.dart';
 import 'images_viewer.dart';

lib/views/widgets/images/images_viewer.dart

@@ -1,6 +1,6 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/loaders/image_loader.dart';
-import 'package:flutter/material.dart';
 
 class ImagesViewer extends StatelessWidget {
   final List<String> images;

lib/views/widgets/images/mini_one_image_picker.dart

@@ -1,11 +1,11 @@
 import 'dart:io';
 
-import 'package:test_sa/controllers/localization/localization.dart';
-import 'package:test_sa/models/subtitle.dart';
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:test_sa/controllers/localization/localization.dart';
+import 'package:test_sa/models/subtitle.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 
 class AMiniOneImagePicker extends StatefulWidget {
   final Function(File) onPick;

lib/views/widgets/images/multi_image_picker_item.dart

@@ -1,9 +1,9 @@
 import 'dart:io';
 
+import 'package:flutter/material.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
-import 'package:flutter/material.dart';
 
 
 class MultiImagesPickerItem extends StatelessWidget {

lib/views/widgets/images/one_image_picker.dart

@@ -1,11 +1,11 @@
 import 'dart:io';
 
-import 'package:test_sa/controllers/localization/localization.dart';
-import 'package:test_sa/models/subtitle.dart';
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:test_sa/controllers/localization/localization.dart';
+import 'package:test_sa/models/subtitle.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 
 class AOneImagePicker extends StatefulWidget {
   final Function(File) onPick;

lib/views/widgets/issues/report_issue_item.dart

@@ -1,6 +1,6 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
 class ReportIssueItem extends StatelessWidget {
   final bool isSelected;
   final String issueInfo;

lib/views/widgets/loaders/app_lazy_loading.dart

@@ -1,5 +1,5 @@
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 
 import 'app_loading.dart';
 class ALazyLoading extends StatelessWidget {

lib/views/widgets/loaders/failed_loading.dart

@@ -1,6 +1,6 @@
 
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 class FailedLoading extends StatelessWidget {
   final String message;
   final VoidCallback onReload;

lib/views/widgets/loaders/lazy_loading.dart

@@ -1,5 +1,5 @@
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 
 import 'app_loading.dart';
 class LazyLoading extends StatefulWidget {

lib/views/widgets/loaders/loading_manager.dart

@@ -1,7 +1,7 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/http_status_manger/http_status_manger.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/subtitle.dart';
-import 'package:flutter/material.dart';
 
 import 'app_loading.dart';
 import 'failed_loading.dart';

lib/views/widgets/loaders/no_item_found.dart

@@ -1,5 +1,5 @@
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 class NoItemFound extends StatelessWidget {
   final String message;
 

lib/views/widgets/parts/auto_complete_parts_field.dart

@@ -1,3 +1,6 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_typeahead/flutter_typeahead.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/parts_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
@@ -5,9 +8,6 @@ import 'package:test_sa/models/part.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_typeahead/flutter_typeahead.dart';
-import 'package:provider/provider.dart';
 class AutoCompletePartsField extends StatefulWidget {
   final String initialValue;
   final Function(Part) onPick;

lib/views/widgets/requests/info_row.dart

@@ -1,5 +1,5 @@
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 class RequestInfoRow extends StatelessWidget {
   final String title;
   final String info;

lib/views/widgets/requests/request_status.dart

@@ -1,8 +1,6 @@
-import 'package:test_sa/models/service_request/service_request.dart';
+import 'package:flutter/material.dart';
-import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
 class StatusLabel extends StatelessWidget {
   final String label;
   final Color color;

lib/views/widgets/requests/service_request_list.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/service_request/service_request.dart';
 import 'package:test_sa/models/subtitle.dart';
@@ -5,7 +6,6 @@ import 'package:test_sa/views/pages/user/requests/request_details.dart';
 import 'package:test_sa/views/widgets/loaders/lazy_loading.dart';
 import 'package:test_sa/views/widgets/loaders/no_item_found.dart';
 import 'package:test_sa/views/widgets/requests/service_request_item.dart';
-import 'package:flutter/material.dart';
 class ServiceRequestsList extends StatelessWidget {
   final List<ServiceRequest> requests;
   final bool nextPage;

lib/views/widgets/search/filter_item.dart

@@ -1,7 +1,7 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
 
 class FilterItem extends StatelessWidget {
   final bool isSelected;

lib/views/widgets/search/service_request_search_bar.dart

@@ -1,12 +1,12 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
-import 'package:test_sa/models/service_request/service_request_search.dart';
 import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/service_request/service_request_search.dart';
 import 'package:test_sa/models/subtitle.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:test_sa/views/widgets/buttons/app_button.dart';
 import 'package:test_sa/views/widgets/buttons/app_small_button.dart';
 import 'package:test_sa/views/widgets/hospitals/hospital_auto_complete_field.dart';
-import 'package:flutter/material.dart';
 
 import '../app_text_form_field.dart';
 import 'filter_item.dart';

lib/views/widgets/search/visits_search_bar.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:test_sa/controllers/localization/localization.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/models/subtitle.dart';
@@ -8,8 +10,6 @@ import 'package:test_sa/views/widgets/buttons/app_small_button.dart';
 import 'package:test_sa/views/widgets/date_and_time/from_to_date_bar.dart';
 import 'package:test_sa/views/widgets/hospitals/hospital_auto_complete_field.dart';
 import 'package:test_sa/views/widgets/titles/app_sub_title.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 
 import '../app_text_form_field.dart';
 import 'filter_item.dart';

lib/views/widgets/sound/record_sound.dart

@@ -83,7 +83,6 @@ class _RecordSoundState extends State<RecordSound> {
 
     _recording = true;
     setState(() {});
-    print("onTapDown");
   }
 
   _stopRecording() async {
@@ -93,12 +92,10 @@ class _RecordSoundState extends State<RecordSound> {
       return;
     }
     String path = (await _myRecorder.stopRecorder()).toString();
-    print("audio path ----> $path <-----");
     _record = path;
     widget.onRecord(path);
     _recording = false;
     setState(() {});
-    print("onTapUp");
   }
 
   _cancelRecording() async {
@@ -111,7 +108,6 @@ class _RecordSoundState extends State<RecordSound> {
     _recording = false;
     await Future.delayed(const Duration(seconds: 1));
     if (!_recording) setState(() {});
-    print("onTapCancel");
     // _message.memoryAudio.;
   }
 

lib/views/widgets/sound/sound_player.dart

@@ -81,7 +81,6 @@ class _ASoundPlayerState extends State<ASoundPlayer> {
           icon: const Icon( Icons.replay_rounded),
           onPressed: () async {
             _failedToLoad = false;
-            print(!Uri.parse(_audio).isAbsolute);
             try {
               _audioPlayer.seek(const Duration(milliseconds: 0));
               _audioPlayer.stop();
@@ -131,7 +130,6 @@ class _ASoundPlayerState extends State<ASoundPlayer> {
     }
     // set up listeners
     _audioPlayer.onPositionChanged.listen((Duration  duration) {
-      //print('Current position: $p');
       if(!_sliderMoving){
         _audioPosition = duration;
         rebuild();

lib/views/widgets/status/employee/employee_mune.dart

@@ -1,11 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/employee/employee_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class EmployeeMenu extends StatelessWidget {
   final Function(Lookup) onSelect;
   final Lookup initialValue;

lib/views/widgets/status/gas_refill/gas_cylinder_size.dart

@@ -1,13 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart';
-import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart';
-import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_types_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class GasCylinderSizeMenu extends StatelessWidget {
   final Function(Lookup) onSelect;
   final Lookup initialValue;

lib/views/widgets/status/gas_refill/gas_status.dart

@@ -1,13 +1,11 @@
-import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart';
-import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_types_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class GasStatusMenu extends StatelessWidget {
   final Function(Lookup) onSelect;
   final Lookup initialValue;

lib/views/widgets/status/gas_refill/gas_type.dart

@@ -1,14 +1,11 @@
-import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart';
+import 'package:flutter/material.dart';
-import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart';
-import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_types_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class GasTypeMenu extends StatelessWidget {
   final Function(Lookup) onSelect;
   final Lookup initialValue;

lib/views/widgets/status/multi_status_menu.dart

@@ -1,10 +1,9 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
-import 'package:test_sa/views/widgets/app_text_form_field.dart';
 class MultiStatusMenu extends StatefulWidget {
   final List<Lookup> statuses;
   final List<Lookup> initialSelectedStatus;

lib/views/widgets/status/report/service_report_last_call.dart

@@ -1,10 +1,10 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart';
-import 'package:test_sa/models/service_report.dart';
 import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/service_report.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class ServiceReportLastCallsMenu extends StatelessWidget {
   final Function(Lookup) onSelect;
   final ServiceReport report;

lib/views/widgets/status/report/service_report_reasons.dart

@@ -1,11 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class ServiceReportReasonsMenu extends StatelessWidget {
   final Lookup initialValue;
   final Function(Lookup) onSelect;

lib/views/widgets/status/report/service_report_status.dart

@@ -1,15 +1,15 @@
 import 'dart:math';
 
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
-import 'package:test_sa/models/service_report.dart';
 import 'package:test_sa/models/lookup.dart';
+import 'package:test_sa/models/service_report.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class ServiceReportStatusMenu extends StatefulWidget {
   final Function(Lookup) onSelect;
   final ServiceReport report;

lib/views/widgets/status/report/service_report_type.dart

@@ -1,11 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class ServiceReportTypeMenu extends StatelessWidget {
   final Function(Lookup) onSelect;
   final Lookup initialValue;

lib/views/widgets/status/report/service_status.dart

@@ -1,11 +1,11 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_types_provider.dart';
 import 'package:test_sa/controllers/providers/api/user_provider.dart';
 import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
 import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
 import 'package:test_sa/views/widgets/status/single_status_menu.dart';
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 class ServiceStatusMenu extends StatelessWidget {
   final Function(Lookup) onSelect;
   final Lookup initialValue;

lib/views/widgets/titles/app_sub_title.dart

@@ -1,5 +1,5 @@
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 class ASubTitle extends StatelessWidget {
   final String text;
   final EdgeInsets padding;

lib/views/widgets/titles/expandable_info_row.dart

@@ -1,6 +1,6 @@
-import 'package:test_sa/views/app_style/sizing.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:test_sa/views/app_style/sizing.dart';
 class ExpandableInfoRow extends StatefulWidget {
   final IconData iconData;
   final String title;

lib/views/widgets/visits/visit_status.dart

@@ -1,7 +1,7 @@
+import 'package:flutter/material.dart';
 import 'package:test_sa/models/visits/visit.dart';
 import 'package:test_sa/views/app_style/colors.dart';
 import 'package:test_sa/views/app_style/sizing.dart';
-import 'package:flutter/material.dart';
 class VisitStatusLabel extends StatelessWidget {
   final Visit visit;